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/backends/BackupBackend.java |   32 ++++++++++++--------------------
 1 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java
index 40c39ab..bd065fc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java
@@ -462,8 +462,8 @@
     DN parentDN = entryDN.getParentDNInSuffix();
     if (parentDN == null)
     {
-      LocalizableMessage message = ERR_BACKUP_INVALID_BASE.get(String.valueOf(entryDN));
-      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
+      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
+          ERR_BACKUP_INVALID_BASE.get(entryDN));
     }
     else if (parentDN.equals(backupBaseDN))
     {
@@ -475,7 +475,7 @@
     }
     else
     {
-      LocalizableMessage message = ERR_BACKUP_INVALID_BASE.get(String.valueOf(entryDN));
+      LocalizableMessage message = ERR_BACKUP_INVALID_BASE.get(entryDN);
       throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
               message, backupBaseDN, null);
     }
@@ -506,7 +506,7 @@
     if (v == null)
     {
       LocalizableMessage message =
-          ERR_BACKUP_DN_DOES_NOT_SPECIFY_DIRECTORY.get(String.valueOf(entryDN));
+          ERR_BACKUP_DN_DOES_NOT_SPECIFY_DIRECTORY.get(entryDN);
       throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
                                    backupBaseDN, null);
     }
@@ -525,9 +525,8 @@
     {
       logger.traceException(ce);
 
-      LocalizableMessage message = ERR_BACKUP_INVALID_BACKUP_DIRECTORY.get(
-          String.valueOf(entryDN), ce.getMessage());
-      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
+      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
+          ERR_BACKUP_INVALID_BACKUP_DIRECTORY.get(entryDN, ce.getMessage()));
     }
     catch (Exception e)
     {
@@ -591,8 +590,7 @@
         true);
     AttributeValue idValue = entryDN.rdn().getAttributeValue(idType);
     if (idValue == null) {
-      LocalizableMessage message = ERR_BACKUP_NO_BACKUP_ID_IN_DN.get(String
-          .valueOf(entryDN));
+      LocalizableMessage message = ERR_BACKUP_NO_BACKUP_ID_IN_DN.get(entryDN);
       throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
     }
     String backupID = idValue.getValue().toString();
@@ -600,8 +598,7 @@
     // Next, get the backup directory from the parent DN.
     DN parentDN = entryDN.getParentDNInSuffix();
     if (parentDN == null) {
-      LocalizableMessage message = ERR_BACKUP_NO_BACKUP_PARENT_DN.get(String
-          .valueOf(entryDN));
+      LocalizableMessage message = ERR_BACKUP_NO_BACKUP_PARENT_DN.get(entryDN);
       throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
     }
 
@@ -609,8 +606,7 @@
         ATTR_BACKUP_DIRECTORY_PATH, true);
     AttributeValue v = parentDN.rdn().getAttributeValue(t);
     if (v == null) {
-      LocalizableMessage message = ERR_BACKUP_NO_BACKUP_DIR_IN_DN.get(String
-          .valueOf(entryDN));
+      LocalizableMessage message = ERR_BACKUP_NO_BACKUP_DIR_IN_DN.get(entryDN);
       throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
     }
 
@@ -621,8 +617,7 @@
     } catch (ConfigException ce) {
       logger.traceException(ce);
 
-      LocalizableMessage message = ERR_BACKUP_INVALID_BACKUP_DIRECTORY.get(String
-          .valueOf(entryDN), ce.getMessageObject());
+      LocalizableMessage message = ERR_BACKUP_INVALID_BACKUP_DIRECTORY.get(entryDN, ce.getMessageObject());
       throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
     } catch (Exception e) {
       logger.traceException(e);
@@ -956,9 +951,7 @@
       if ((parentDN == null)
           || (! backupBaseDN.equals(parentDN.getParentDNInSuffix())))
       {
-        LocalizableMessage message = ERR_BACKUP_NO_SUCH_ENTRY.get(
-                String.valueOf(backupBaseDN)
-        );
+        LocalizableMessage message = ERR_BACKUP_NO_SUCH_ENTRY.get(backupBaseDN);
         throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
       }
 
@@ -968,8 +961,7 @@
         Entry backupEntry = getBackupEntry(baseDN);
         if (backupEntry == null)
         {
-          LocalizableMessage message = ERR_BACKUP_NO_SUCH_ENTRY.get(
-                  String.valueOf(backupBaseDN));
+          LocalizableMessage message = ERR_BACKUP_NO_SUCH_ENTRY.get(backupBaseDN);
           throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
         }
 

--
Gitblit v1.10.0