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/SchemaBackend.java | 66 +++++++++++----------------------
1 files changed, 22 insertions(+), 44 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
index a399b9b..9c44134 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
@@ -1075,9 +1075,8 @@
public void addEntry(Entry entry, AddOperation addOperation)
throws DirectoryException
{
- LocalizableMessage message =
- ERR_SCHEMA_ADD_NOT_SUPPORTED.get(String.valueOf(entry.getName()));
- throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
+ throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
+ ERR_SCHEMA_ADD_NOT_SUPPORTED.get(entry.getName()));
}
@@ -1089,9 +1088,8 @@
public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
throws DirectoryException
{
- LocalizableMessage message =
- ERR_SCHEMA_DELETE_NOT_SUPPORTED.get(String.valueOf(entryDN));
- throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
+ throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
+ ERR_SCHEMA_DELETE_NOT_SUPPORTED.get(entryDN));
}
@@ -1501,10 +1499,8 @@
if ((!m.isInternal()) &&
(!modifyOperation.isSynchronizationOperation()))
{
- LocalizableMessage message = ERR_SCHEMA_INVALID_MODIFICATION_TYPE.get(
- String.valueOf(m.getModificationType()));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
- message);
+ ERR_SCHEMA_INVALID_MODIFICATION_TYPE.get(m.getModificationType()));
}
else
{
@@ -1523,10 +1519,8 @@
break;
default:
- LocalizableMessage message = ERR_SCHEMA_INVALID_MODIFICATION_TYPE.get(
- String.valueOf(m.getModificationType()));
- throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
- message);
+ throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
+ ERR_SCHEMA_INVALID_MODIFICATION_TYPE.get(m.getModificationType()));
}
}
@@ -4097,9 +4091,8 @@
ModifyDNOperation modifyDNOperation)
throws DirectoryException
{
- LocalizableMessage message =
- ERR_SCHEMA_MODIFY_DN_NOT_SUPPORTED.get(String.valueOf(currentDN));
- throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
+ throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
+ ERR_SCHEMA_MODIFY_DN_NOT_SUPPORTED.get(currentDN));
}
@@ -4132,7 +4125,7 @@
if (! found)
{
- LocalizableMessage message = ERR_SCHEMA_INVALID_BASE.get(String.valueOf(baseDN));
+ LocalizableMessage message = ERR_SCHEMA_INVALID_BASE.get(baseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message,
matchedDN, null);
}
@@ -4273,10 +4266,8 @@
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_MEMORYBACKEND_CANNOT_CREATE_LDIF_READER.get(String.valueOf(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message, e);
+ ERR_MEMORYBACKEND_CANNOT_CREATE_LDIF_READER.get(e), e);
}
@@ -4297,11 +4288,9 @@
{
if (! le.canContinueReading())
{
- LocalizableMessage message =
- ERR_MEMORYBACKEND_ERROR_READING_LDIF.get(String.valueOf(e));
throw new DirectoryException(
- DirectoryServer.getServerErrorResultCode(),
- message, le);
+ DirectoryServer.getServerErrorResultCode(),
+ ERR_MEMORYBACKEND_ERROR_READING_LDIF.get(e), le);
}
else
{
@@ -4322,10 +4311,8 @@
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_MEMORYBACKEND_ERROR_DURING_IMPORT.get(String.valueOf(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message, e);
+ ERR_MEMORYBACKEND_ERROR_DURING_IMPORT.get(e), e);
}
finally
{
@@ -4730,8 +4717,7 @@
logger.traceException(e);
LocalizableMessage message = ERR_SCHEMA_BACKUP_CANNOT_CREATE_ARCHIVE_FILE.
- get(String.valueOf(filename), backupDirectory.getPath(),
- getExceptionMessage(e));
+ get(filename, backupDirectory.getPath(), getExceptionMessage(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
}
@@ -5256,8 +5242,7 @@
{
LocalizableMessage message = ERR_SCHEMA_RESTORE_CANNOT_RENAME_CURRENT_DIRECTORY.
get(backupID, schemaInstanceDirPath,
- String.valueOf(backupInstanceDirPath),
- stackTraceToSingleLineString(e));
+ backupInstanceDirPath, stackTraceToSingleLineString(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
}
@@ -5557,8 +5542,7 @@
messages.add(ERR_SCHEMA_CANNOT_DETERMINE_BASE_DN.get(
- String.valueOf(configEntryDN),
- getExceptionMessage(e)));
+ configEntryDN, getExceptionMessage(e)));
resultCode = DirectoryServer.getServerErrorResultCode();
newBaseDNs = null;
}
@@ -5602,8 +5586,7 @@
logger.traceException(e);
messages.add(ERR_CONFIG_BACKEND_ERROR_INTERACTING_WITH_BACKEND_ENTRY.get(
- String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e)));
+ configEntryDN, stackTraceToSingleLineString(e)));
resultCode = DirectoryServer.getServerErrorResultCode();
}
@@ -5633,16 +5616,13 @@
try
{
DirectoryServer.deregisterBaseDN(dn);
- messages.add(INFO_SCHEMA_DEREGISTERED_BASE_DN.get(
- String.valueOf(dn)));
+ messages.add(INFO_SCHEMA_DEREGISTERED_BASE_DN.get(dn));
}
catch (Exception e)
{
logger.traceException(e);
- messages.add(ERR_SCHEMA_CANNOT_DEREGISTER_BASE_DN.get(
- String.valueOf(dn),
- getExceptionMessage(e)));
+ messages.add(ERR_SCHEMA_CANNOT_DEREGISTER_BASE_DN.get(dn, getExceptionMessage(e)));
resultCode = DirectoryServer.getServerErrorResultCode();
}
}
@@ -5653,15 +5633,13 @@
try
{
DirectoryServer.registerBaseDN(dn, this, true);
- messages.add(INFO_SCHEMA_REGISTERED_BASE_DN.get(String.valueOf(dn)));
+ messages.add(INFO_SCHEMA_REGISTERED_BASE_DN.get(dn));
}
catch (Exception e)
{
logger.traceException(e);
- messages.add(ERR_SCHEMA_CANNOT_REGISTER_BASE_DN.get(
- String.valueOf(dn),
- getExceptionMessage(e)));
+ messages.add(ERR_SCHEMA_CANNOT_REGISTER_BASE_DN.get(dn, getExceptionMessage(e)));
resultCode = DirectoryServer.getServerErrorResultCode();
}
}
--
Gitblit v1.10.0