From 31216400c324b43c15b8a9eea6d89604247ebb14 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 03 Feb 2014 12:10:05 +0000
Subject: [PATCH] Removed now useless calls to String.valueOf() on arguments of ArgN.get(...).

---
 opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java |  129 ++++++++++++++----------------------------
 1 files changed, 43 insertions(+), 86 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
index 0d777b1..f8cb256 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
@@ -399,17 +399,13 @@
         }
         else
         {
-          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
-              String.valueOf(extendedResponse));
-          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
-                                    message);
+          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
+          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
         }
 
       default:
-        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
-            String.valueOf(responseMessage.getProtocolOp()));
-        throw new ClientException(
-                LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
+        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage.getProtocolOp());
+        throw new ClientException( LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
     }
 
 
@@ -714,17 +710,13 @@
         }
         else
         {
-          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
-              String.valueOf(extendedResponse));
-          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
-                                    message);
+          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
+          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
         }
 
       default:
-        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
-            String.valueOf(responseMessage.getProtocolOp()));
-        throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
-                                  message);
+        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage.getProtocolOp());
+        throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
     }
 
 
@@ -961,17 +953,13 @@
         }
         else
         {
-          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
-              String.valueOf(extendedResponse));
-          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
-                                    message);
+          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
+          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
         }
 
       default:
-        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
-            String.valueOf(responseMessage1.getProtocolOp()));
-        throw new ClientException(
-                LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
+        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage1.getProtocolOp());
+        throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
     }
 
 
@@ -1117,17 +1105,13 @@
         }
         else
         {
-          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
-              String.valueOf(extendedResponse));
-          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
-                                    message);
+          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
+          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
         }
 
       default:
-        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
-            String.valueOf(responseMessage2.getProtocolOp()));
-        throw new ClientException(
-                LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
+        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage2.getProtocolOp());
+        throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
     }
 
 
@@ -1548,17 +1532,13 @@
         }
         else
         {
-          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
-              String.valueOf(extendedResponse));
-          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
-                                    message);
+          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
+          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
         }
 
       default:
-        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
-            String.valueOf(responseMessage1.getProtocolOp()));
-        throw new ClientException(
-                LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
+        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage1.getProtocolOp());
+        throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
     }
 
 
@@ -1873,17 +1853,13 @@
         }
         else
         {
-          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
-              String.valueOf(extendedResponse));
-          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
-                                    message);
+          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
+          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
         }
 
       default:
-        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
-            String.valueOf(responseMessage2.getProtocolOp()));
-        throw new ClientException(
-                LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
+        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage2.getProtocolOp());
+        throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
     }
 
 
@@ -2541,17 +2517,13 @@
         }
         else
         {
-          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
-              String.valueOf(extendedResponse));
-          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
-                                    message);
+          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
+          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
         }
 
       default:
-        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
-            String.valueOf(responseMessage.getProtocolOp()));
-        throw new ClientException(
-                LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
+        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage.getProtocolOp());
+        throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
     }
 
 
@@ -3139,17 +3111,13 @@
         }
         else
         {
-          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
-              String.valueOf(extendedResponse));
-          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
-                                    message);
+          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
+          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
         }
 
       default:
-        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
-            String.valueOf(responseMessage.getProtocolOp()));
-        throw new ClientException(
-                LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
+        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage.getProtocolOp());
+        throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
     }
 
 
@@ -3366,17 +3334,13 @@
           }
           else
           {
-            LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
-                String.valueOf(extendedResponse));
-            throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
-                                      message);
+            LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
+            throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
           }
 
         default:
-          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
-              String.valueOf(responseMessage.getProtocolOp()));
-          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
-                                    message);
+          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage.getProtocolOp());
+          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
       }
 
 
@@ -3545,17 +3509,13 @@
               }
               else
               {
-                LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
-                    String.valueOf(extendedResponse));
-                throw new ClientException(
-                               LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
+                LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
+                throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
               }
 
             default:
-              LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
-                  String.valueOf(responseMessage.getProtocolOp()));
-              throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
-                                        message);
+              LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage.getProtocolOp());
+              throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
           }
         }
         else
@@ -3624,8 +3584,7 @@
         }
         else
         {
-          LocalizableMessage message =
-              ERR_LDAPAUTH_UNEXPECTED_GSSAPI_CALLBACK.get(String.valueOf(cb));
+          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_GSSAPI_CALLBACK.get(cb);
           throw new UnsupportedCallbackException(cb, message.toString());
         }
       }
@@ -3729,10 +3688,8 @@
     // If the protocol op isn't an extended response, then that's a problem.
     if (responseMessage.getProtocolOpType() != OP_TYPE_EXTENDED_RESPONSE)
     {
-      LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
-          String.valueOf(responseMessage.getProtocolOp()));
-      throw new ClientException(
-              LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
+      LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage.getProtocolOp());
+      throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
     }
 
 

--
Gitblit v1.10.0