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/LDIFModify.java |   55 ++++++++++++++-----------------------------------------
 1 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java
index cf45c3b..7f03c51 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java
@@ -169,8 +169,7 @@
           // The entry must not exist in the add list.
           if (adds.containsKey(changeDN))
           {
-            errorList.add(ERR_LDIFMODIFY_CANNOT_ADD_ENTRY_TWICE.get(
-                    String.valueOf(changeDN)));
+            errorList.add(ERR_LDIFMODIFY_CANNOT_ADD_ENTRY_TWICE.get(changeDN));
             continue;
           }
           else
@@ -185,8 +184,7 @@
           // them.
           if (adds.containsKey(changeDN))
           {
-            errorList.add(ERR_LDIFMODIFY_CANNOT_DELETE_AFTER_ADD.get(
-                    String.valueOf(changeDN)));
+            errorList.add(ERR_LDIFMODIFY_CANNOT_DELETE_AFTER_ADD.get(changeDN));
             continue;
           }
           else
@@ -200,8 +198,7 @@
           // The entry must not exist in the add or delete lists.
           if (adds.containsKey(changeDN) || deletes.containsKey(changeDN))
           {
-            errorList.add(ERR_LDIFMODIFY_CANNOT_MODIFY_ADDED_OR_DELETED.get(
-                    String.valueOf(changeDN)));
+            errorList.add(ERR_LDIFMODIFY_CANNOT_MODIFY_ADDED_OR_DELETED.get(changeDN));
             continue;
           }
           else
@@ -231,14 +228,11 @@
           break;
 
         case MODIFY_DN:
-          errorList.add(ERR_LDIFMODIFY_MODDN_NOT_SUPPORTED.get(
-                  String.valueOf(changeDN)));
+          errorList.add(ERR_LDIFMODIFY_MODDN_NOT_SUPPORTED.get(changeDN));
           continue;
 
         default:
-          errorList.add(ERR_LDIFMODIFY_UNKNOWN_CHANGETYPE.get(
-                  String.valueOf(changeDN),
-               String.valueOf(changeRecord.getChangeOperationType())));
+          errorList.add(ERR_LDIFMODIFY_UNKNOWN_CHANGETYPE.get(changeDN, changeRecord.getChangeOperationType()));
           continue;
       }
     }
@@ -285,9 +279,7 @@
       // exists.
       if (adds.remove(entryDN) != null)
       {
-
-        errorList.add(ERR_LDIFMODIFY_ADD_ALREADY_EXISTS.get(
-                String.valueOf(entryDN)));
+        errorList.add(ERR_LDIFMODIFY_ADD_ALREADY_EXISTS.get(entryDN));
         continue;
       }
 
@@ -372,8 +364,7 @@
     {
       for (DN dn : deletes.keySet())
       {
-        errorList.add(
-                ERR_LDIFMODIFY_DELETE_NO_SUCH_ENTRY.get(String.valueOf(dn)));
+        errorList.add(ERR_LDIFMODIFY_DELETE_NO_SUCH_ENTRY.get(dn));
       }
     }
 
@@ -381,8 +372,7 @@
     {
       for (DN dn : modifications.keySet())
       {
-        errorList.add(ERR_LDIFMODIFY_MODIFY_NO_SUCH_ENTRY.get(
-                String.valueOf(dn)));
+        errorList.add(ERR_LDIFMODIFY_MODIFY_NO_SUCH_ENTRY.get(dn));
       }
     }
     return targetWriter.writeEntries(ldifEntries.values()) &&
@@ -551,10 +541,7 @@
         }
         catch (Exception e)
         {
-          LocalizableMessage message = ERR_LDIFMODIFY_CANNOT_INITIALIZE_JMX.get(
-                  String.valueOf(configFile.getValue()),
-                                      e.getMessage());
-          err.println(message);
+          err.println(ERR_LDIFMODIFY_CANNOT_INITIALIZE_JMX.get(configFile.getValue(), e.getMessage()));
           return 1;
         }
 
@@ -565,10 +552,7 @@
         }
         catch (Exception e)
         {
-          LocalizableMessage message = ERR_LDIFMODIFY_CANNOT_INITIALIZE_CONFIG.get(
-                  String.valueOf(configFile.getValue()),
-                                      e.getMessage());
-          err.println(message);
+          err.println(ERR_LDIFMODIFY_CANNOT_INITIALIZE_CONFIG.get(configFile.getValue(), e.getMessage()));
           return 1;
         }
 
@@ -578,10 +562,7 @@
         }
         catch (Exception e)
         {
-          LocalizableMessage message = ERR_LDIFMODIFY_CANNOT_INITIALIZE_SCHEMA.get(
-                  String.valueOf(configFile.getValue()),
-                                      e.getMessage());
-          err.println(message);
+          err.println(ERR_LDIFMODIFY_CANNOT_INITIALIZE_SCHEMA.get(configFile.getValue(), e.getMessage()));
           return 1;
         }
       }
@@ -606,10 +587,7 @@
     }
     catch (IOException ioe)
     {
-      LocalizableMessage message = ERR_LDIFMODIFY_CANNOT_OPEN_SOURCE.get(
-              sourceFile.getValue(),
-                                  String.valueOf(ioe));
-      err.println(message);
+      err.println(ERR_LDIFMODIFY_CANNOT_OPEN_SOURCE.get(sourceFile.getValue(), ioe));
       return LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR;
     }
 
@@ -617,9 +595,7 @@
     File changes = new File(changesFile.getValue());
     if (! changes.exists())
     {
-      LocalizableMessage message = ERR_LDIFMODIFY_CHANGES_DOES_NOT_EXIST.get(
-              changesFile.getValue());
-      err.println(message);
+      err.println(ERR_LDIFMODIFY_CHANGES_DOES_NOT_EXIST.get(changesFile.getValue()));
       return LDAPResultCode.CLIENT_SIDE_PARAM_ERROR;
     }
 
@@ -665,10 +641,7 @@
     }
     catch (Exception e)
     {
-      LocalizableMessage message = ERR_LDIFMODIFY_ERROR_PROCESSING_LDIF.get(
-              String.valueOf(e));
-      err.println(message);
-
+      err.println(ERR_LDIFMODIFY_ERROR_PROCESSING_LDIF.get(e));
       successful = false;
     }
 

--
Gitblit v1.10.0