From 58e42cdaa28e32c1225deda4cfeab261d7156496 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 18 May 2015 21:52:13 +0000
Subject: [PATCH] AutoRefactor'ed Use multi-catch

---
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPAuthenticationHandler.java |  158 +++++++++++-----------------------------------------
 1 files changed, 34 insertions(+), 124 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPAuthenticationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPAuthenticationHandler.java
index f06a2f4..fe5bb2e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPAuthenticationHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPAuthenticationHandler.java
@@ -321,8 +321,7 @@
     {
       LocalizableMessage message =
           ERR_LDAPAUTH_CANNOT_SEND_SIMPLE_BIND.get(getExceptionMessage(e));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_ENCODING_ERROR,
-                                message, e);
+      throw new ClientException(ReturnCode.CLIENT_SIDE_ENCODING_ERROR, message, e);
     }
 
 
@@ -339,12 +338,11 @@
                                   message);
       }
     }
-    catch (DecodeException ae)
+    catch (DecodeException | LDAPException e)
     {
       LocalizableMessage message =
-          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-          message, ae);
+          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
+      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
     }
     catch (IOException ioe)
     {
@@ -353,13 +351,6 @@
       throw new ClientException(
           ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
     }
-    catch (LDAPException le)
-    {
-      LocalizableMessage message =
-          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(le));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-                                message, le);
-    }
     catch (Exception e)
     {
       LocalizableMessage message =
@@ -632,8 +623,7 @@
     {
       LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
           SASL_MECHANISM_ANONYMOUS, getExceptionMessage(e));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_ENCODING_ERROR,
-                                message, e);
+      throw new ClientException(ReturnCode.CLIENT_SIDE_ENCODING_ERROR, message, e);
     }
 
 
@@ -650,12 +640,11 @@
                                   message);
       }
     }
-    catch (DecodeException ae)
+    catch (DecodeException | LDAPException e)
     {
       LocalizableMessage message =
-          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-          message, ae);
+          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
+      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
     }
     catch (IOException ioe)
     {
@@ -664,13 +653,6 @@
       throw new ClientException(
               ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
     }
-    catch (LDAPException le)
-    {
-      LocalizableMessage message =
-          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(le));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-                                message, le);
-    }
     catch (Exception e)
     {
       LocalizableMessage message =
@@ -884,8 +866,7 @@
     {
       LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_INITIAL_SASL_BIND.get(
           SASL_MECHANISM_CRAM_MD5, getExceptionMessage(e));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_ENCODING_ERROR,
-                                message, e);
+      throw new ClientException(ReturnCode.CLIENT_SIDE_ENCODING_ERROR, message, e);
     }
 
 
@@ -902,13 +883,12 @@
                                   message);
       }
     }
-    catch (DecodeException ae)
+    catch (DecodeException | LDAPException e)
     {
       LocalizableMessage message =
           ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
-              SASL_MECHANISM_CRAM_MD5, getExceptionMessage(ae));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-          message, ae);
+              SASL_MECHANISM_CRAM_MD5, getExceptionMessage(e));
+      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
     }
     catch (IOException ioe)
     {
@@ -917,13 +897,6 @@
       throw new ClientException(
               ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
     }
-    catch (LDAPException le)
-    {
-      LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
-          SASL_MECHANISM_CRAM_MD5, getExceptionMessage(le));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-                                message, le);
-    }
     catch (Exception e)
     {
       LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
@@ -1046,13 +1019,12 @@
                                   message);
       }
     }
-    catch (DecodeException ae)
+    catch (DecodeException | LDAPException e)
     {
       LocalizableMessage message =
           ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
-              SASL_MECHANISM_CRAM_MD5, getExceptionMessage(ae));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-          message, ae);
+              SASL_MECHANISM_CRAM_MD5, getExceptionMessage(e));
+      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
     }
     catch (IOException ioe)
     {
@@ -1061,13 +1033,6 @@
       throw new ClientException(
               ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
     }
-    catch (LDAPException le)
-    {
-      LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
-          SASL_MECHANISM_CRAM_MD5, getExceptionMessage(le));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-                                message, le);
-    }
     catch (Exception e)
     {
       LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
@@ -1483,13 +1448,12 @@
                                   message);
       }
     }
-    catch (DecodeException ae)
+    catch (DecodeException | LDAPException e)
     {
       LocalizableMessage message =
           ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
-              SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(ae));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-          message, ae);
+              SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(e));
+      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
     }
     catch (IOException ioe)
     {
@@ -1498,13 +1462,6 @@
       throw new ClientException(
               ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
     }
-    catch (LDAPException le)
-    {
-      LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
-          SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(le));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-                                message, le);
-    }
     catch (Exception e)
     {
       LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
@@ -1796,13 +1753,12 @@
                                   message);
       }
     }
-    catch (DecodeException ae)
+    catch (DecodeException | LDAPException e)
     {
       LocalizableMessage message =
           ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
-              SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(ae));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-          message, ae);
+              SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(e));
+      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
     }
     catch (IOException ioe)
     {
@@ -1811,13 +1767,6 @@
       throw new ClientException(
               ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
     }
-    catch (LDAPException le)
-    {
-      LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
-          SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(le));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-                                message, le);
-    }
     catch (Exception e)
     {
       LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
@@ -2461,7 +2410,7 @@
                                   message);
       }
     }
-    catch (DecodeException e)
+    catch (DecodeException | LDAPException e)
     {
       LocalizableMessage message =
           ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
@@ -2475,13 +2424,6 @@
       throw new ClientException(
               ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
     }
-    catch (LDAPException le)
-    {
-      LocalizableMessage message =
-          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(le));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-                                message, le);
-    }
     catch (Exception e)
     {
       LocalizableMessage message =
@@ -3055,12 +2997,11 @@
                                   message);
       }
     }
-    catch (DecodeException ae)
+    catch (DecodeException | LDAPException e)
     {
       LocalizableMessage message =
-          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-          message, ae);
+          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
+      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
     }
     catch (IOException ioe)
     {
@@ -3069,13 +3010,6 @@
       throw new ClientException(
               ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
     }
-    catch (LDAPException le)
-    {
-      LocalizableMessage message =
-          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(le));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-                                message, le);
-    }
     catch (Exception e)
     {
       LocalizableMessage message =
@@ -3284,12 +3218,11 @@
                                     message);
         }
       }
-      catch (DecodeException ae)
+      catch (DecodeException | LDAPException e)
       {
         LocalizableMessage message =
-            ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
-        throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-            message, ae);
+            ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
+        throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
       }
       catch (IOException ioe)
       {
@@ -3298,13 +3231,6 @@
         throw new ClientException(
                 ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
       }
-      catch (LDAPException le)
-      {
-        LocalizableMessage message =
-            ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(le));
-        throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-                                  message, le);
-      }
       catch (Exception e)
       {
         LocalizableMessage message =
@@ -3457,13 +3383,12 @@
                                         message);
             }
           }
-          catch (DecodeException ae)
+          catch (DecodeException | LDAPException e)
           {
             LocalizableMessage message =
-                ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE
-                    .get(getExceptionMessage(ae));
+                ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
             throw new ClientException(
-                ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, ae);
+                ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
           }
           catch (IOException ioe)
           {
@@ -3472,13 +3397,6 @@
             throw new ClientException(ReturnCode.CLIENT_SIDE_SERVER_DOWN,
                                       message, ioe);
           }
-          catch (LDAPException le)
-          {
-            LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
-                getExceptionMessage(le));
-            throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-                                      message, le);
-          }
           catch (Exception e)
           {
             LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
@@ -3669,12 +3587,11 @@
                                   message);
       }
     }
-    catch (DecodeException ae)
+    catch (DecodeException | LDAPException e)
     {
       LocalizableMessage message =
-          ERR_LDAPAUTH_CANNOT_READ_WHOAMI_RESPONSE.get(getExceptionMessage(ae));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-          message, ae);
+          ERR_LDAPAUTH_CANNOT_READ_WHOAMI_RESPONSE.get(getExceptionMessage(e));
+      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
     }
     catch (IOException ioe)
     {
@@ -3683,13 +3600,6 @@
       throw new ClientException(
               ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
     }
-    catch (LDAPException le)
-    {
-      LocalizableMessage message =
-          ERR_LDAPAUTH_CANNOT_READ_WHOAMI_RESPONSE.get(getExceptionMessage(le));
-      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
-                                message, le);
-    }
     catch (Exception e)
     {
       LocalizableMessage message =

--
Gitblit v1.10.0