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/task/TaskBackend.java | 98 ++++++++++++++++---------------------------------
1 files changed, 32 insertions(+), 66 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
index 59de7ee..5083574 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
@@ -179,7 +179,7 @@
// This should never happen.
LocalizableMessage message = ERR_TASKBE_CANNOT_DECODE_RECURRING_TASK_BASE_DN.get(
- String.valueOf(recurringTaskBaseString), getExceptionMessage(e));
+ recurringTaskBaseString, getExceptionMessage(e));
throw new ConfigException(message, e);
}
@@ -195,7 +195,7 @@
// This should never happen.
LocalizableMessage message = ERR_TASKBE_CANNOT_DECODE_SCHEDULED_TASK_BASE_DN.get(
- String.valueOf(scheduledTaskBaseString), getExceptionMessage(e));
+ scheduledTaskBaseString, getExceptionMessage(e));
throw new ConfigException(message, e);
}
}
@@ -517,8 +517,7 @@
if (parentDN == null)
{
LocalizableMessage message = ERR_TASKBE_ADD_DISALLOWED_DN.
- get(String.valueOf(scheduledTaskParentDN),
- String.valueOf(recurringTaskParentDN));
+ get(scheduledTaskParentDN, recurringTaskParentDN);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
@@ -542,8 +541,7 @@
// We won't allow the entry to be added.
LocalizableMessage message = ERR_TASKBE_ADD_DISALLOWED_DN.
- get(String.valueOf(scheduledTaskParentDN),
- String.valueOf(recurringTaskParentDN));
+ get(scheduledTaskParentDN, recurringTaskParentDN);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
@@ -561,8 +559,7 @@
DN parentDN = entryDN.getParentDNInSuffix();
if (parentDN == null)
{
- LocalizableMessage message =
- ERR_TASKBE_DELETE_INVALID_ENTRY.get(String.valueOf(entryDN));
+ LocalizableMessage message = ERR_TASKBE_DELETE_INVALID_ENTRY.get(entryDN);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
else if (parentDN.equals(scheduledTaskParentDN))
@@ -571,8 +568,7 @@
Task t = taskScheduler.getScheduledTask(entryDN);
if (t == null)
{
- LocalizableMessage message =
- ERR_TASKBE_DELETE_NO_SUCH_TASK.get(String.valueOf(entryDN));
+ LocalizableMessage message = ERR_TASKBE_DELETE_NO_SUCH_TASK.get(entryDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
}
@@ -603,8 +599,7 @@
}
else
{
- LocalizableMessage message =
- ERR_TASKBE_DELETE_RUNNING.get(String.valueOf(entryDN));
+ LocalizableMessage message = ERR_TASKBE_DELETE_RUNNING.get(entryDN);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
}
@@ -614,8 +609,7 @@
RecurringTask rt = taskScheduler.getRecurringTask(entryDN);
if (rt == null)
{
- LocalizableMessage message = ERR_TASKBE_DELETE_NO_SUCH_RECURRING_TASK.get(
- String.valueOf(entryDN));
+ LocalizableMessage message = ERR_TASKBE_DELETE_NO_SUCH_RECURRING_TASK.get(entryDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
}
@@ -623,8 +617,7 @@
}
else
{
- LocalizableMessage message =
- ERR_TASKBE_DELETE_INVALID_ENTRY.get(String.valueOf(entryDN));
+ LocalizableMessage message = ERR_TASKBE_DELETE_INVALID_ENTRY.get(entryDN);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
}
@@ -647,8 +640,7 @@
if (entryLock == null)
{
throw new DirectoryException(ResultCode.BUSY,
- ERR_TASKBE_MODIFY_CANNOT_LOCK_ENTRY.get(
- String.valueOf(entryDN)));
+ ERR_TASKBE_MODIFY_CANNOT_LOCK_ENTRY.get(entryDN));
}
}
@@ -659,8 +651,7 @@
DN parentDN = entryDN.getParentDNInSuffix();
if (parentDN == null)
{
- LocalizableMessage message =
- ERR_TASKBE_MODIFY_INVALID_ENTRY.get(String.valueOf(entryDN));
+ LocalizableMessage message = ERR_TASKBE_MODIFY_INVALID_ENTRY.get(entryDN);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
else if (parentDN.equals(scheduledTaskParentDN))
@@ -669,8 +660,7 @@
Task t = taskScheduler.getScheduledTask(entryDN);
if (t == null)
{
- LocalizableMessage message =
- ERR_TASKBE_MODIFY_NO_SUCH_TASK.get(String.valueOf(entryDN));
+ LocalizableMessage message = ERR_TASKBE_MODIFY_NO_SUCH_TASK.get(entryDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
}
@@ -703,17 +693,14 @@
}
else
{
- LocalizableMessage message =
- ERR_TASKBE_MODIFY_RUNNING.get(String.valueOf(entryDN));
- throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
- message);
+ LocalizableMessage message = ERR_TASKBE_MODIFY_RUNNING.get(entryDN);
+ throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
}
else if (TaskState.isPending(state) && t.isRecurring())
{
// Pending recurring task iterations can only be canceled.
boolean acceptable = isReplaceEntryAcceptable(modifyOperation);
-
if (acceptable)
{
Task newTask = taskScheduler.entryToScheduledTask(newEntry,
@@ -742,31 +729,25 @@
}
else
{
- LocalizableMessage message =
- ERR_TASKBE_MODIFY_RECURRING.get(String.valueOf(entryDN));
- throw new DirectoryException(
- ResultCode.UNWILLING_TO_PERFORM, message);
+ LocalizableMessage message = ERR_TASKBE_MODIFY_RECURRING.get(entryDN);
+ throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
}
else
{
- LocalizableMessage message =
- ERR_TASKBE_MODIFY_COMPLETED.get(String.valueOf(entryDN));
- throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
- message);
+ LocalizableMessage message = ERR_TASKBE_MODIFY_COMPLETED.get(entryDN);
+ throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
}
else if (parentDN.equals(recurringTaskParentDN))
{
// We don't currently support altering recurring tasks.
- LocalizableMessage message =
- ERR_TASKBE_MODIFY_RECURRING.get(String.valueOf(entryDN));
+ LocalizableMessage message = ERR_TASKBE_MODIFY_RECURRING.get(entryDN);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
else
{
- LocalizableMessage message =
- ERR_TASKBE_MODIFY_INVALID_ENTRY.get(String.valueOf(entryDN));
+ LocalizableMessage message = ERR_TASKBE_MODIFY_INVALID_ENTRY.get(entryDN);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
}
@@ -934,8 +915,7 @@
DN parentDN = baseDN.getParentDNInSuffix();
if (parentDN == null)
{
- LocalizableMessage message =
- ERR_TASKBE_SEARCH_INVALID_BASE.get(String.valueOf(baseDN));
+ LocalizableMessage message = ERR_TASKBE_SEARCH_INVALID_BASE.get(baseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
}
else if (parentDN.equals(scheduledTaskParentDN))
@@ -947,8 +927,7 @@
Entry e = taskScheduler.getScheduledTaskEntry(baseDN);
if (e == null)
{
- LocalizableMessage message =
- ERR_TASKBE_SEARCH_NO_SUCH_TASK.get(String.valueOf(baseDN));
+ LocalizableMessage message = ERR_TASKBE_SEARCH_NO_SUCH_TASK.get(baseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message,
scheduledTaskParentDN, null);
}
@@ -976,8 +955,7 @@
Entry e = taskScheduler.getRecurringTaskEntry(baseDN);
if (e == null)
{
- LocalizableMessage message = ERR_TASKBE_SEARCH_NO_SUCH_RECURRING_TASK.get(
- String.valueOf(baseDN));
+ LocalizableMessage message = ERR_TASKBE_SEARCH_NO_SUCH_RECURRING_TASK.get(baseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message,
recurringTaskParentDN, null);
}
@@ -998,8 +976,7 @@
}
else
{
- LocalizableMessage message =
- ERR_TASKBE_SEARCH_INVALID_BASE.get(String.valueOf(baseDN));
+ LocalizableMessage message = ERR_TASKBE_SEARCH_INVALID_BASE.get(baseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
}
}
@@ -1115,10 +1092,8 @@
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_TASKS_CANNOT_EXPORT_TO_FILE.get(String.valueOf(e));
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message, e);
+ LocalizableMessage message = ERR_TASKS_CANNOT_EXPORT_TO_FILE.get(e);
+ throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
}
// Write to.
@@ -1155,11 +1130,8 @@
{
if (! le.canContinueReading())
{
- LocalizableMessage message =
- ERR_TASKS_CANNOT_EXPORT_TO_FILE.get(String.valueOf(e));
- throw new DirectoryException(
- DirectoryServer.getServerErrorResultCode(),
- message, le);
+ LocalizableMessage message = ERR_TASKS_CANNOT_EXPORT_TO_FILE.get(e);
+ throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, le);
}
else
{
@@ -1362,10 +1334,8 @@
logger.traceException(e);
LocalizableMessage message = ERR_TASKS_BACKUP_CANNOT_CREATE_ARCHIVE_FILE.
- get(String.valueOf(filename), backupDirectory.getPath(),
- getExceptionMessage(e));
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message, e);
+ get(filename, backupDirectory.getPath(), getExceptionMessage(e));
+ throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
}
@@ -2053,16 +2023,12 @@
}
else if (! p.exists())
{
-
- messages.add(ERR_TASKBE_BACKING_FILE_MISSING_PARENT.get(
- String.valueOf(p), tmpBackingFile));
+ messages.add(ERR_TASKBE_BACKING_FILE_MISSING_PARENT.get(p, tmpBackingFile));
resultCode = ResultCode.CONSTRAINT_VIOLATION;
}
else if (! p.isDirectory())
{
-
- messages.add(ERR_TASKBE_BACKING_FILE_PARENT_NOT_DIRECTORY.get(
- String.valueOf(p), tmpBackingFile));
+ messages.add(ERR_TASKBE_BACKING_FILE_PARENT_NOT_DIRECTORY.get(p, tmpBackingFile));
resultCode = ResultCode.CONSTRAINT_VIOLATION;
}
}
--
Gitblit v1.10.0