From 1c989ddb590b2365b73f9cd6b5994d7b7cf5a1fd Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 03 Feb 2014 13:50:34 +0000
Subject: [PATCH] Removed now useless calls to .toString() on arguments of Logger.*(...).
---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 6
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java | 8 -
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java | 7 -
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java | 15 +-
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tasks/BackupTask.java | 5
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java | 19 +--
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java | 30 +----
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java | 5
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java | 5
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java | 5
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java | 3
opendj-sdk/opendj3-server-dev/replace.rb | 7 -
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java | 35 ++----
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java | 12 -
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java | 23 +---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java | 5
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTask.java | 6 -
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java | 20 +--
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/LockManager.java | 9 -
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ErrorMsg.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java | 9 -
25 files changed, 85 insertions(+), 163 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/replace.rb b/opendj-sdk/opendj3-server-dev/replace.rb
index 8b4d2ec..5f2607d 100755
--- a/opendj-sdk/opendj3-server-dev/replace.rb
+++ b/opendj-sdk/opendj3-server-dev/replace.rb
@@ -227,9 +227,7 @@
:extensions => ["java"],
:replacements =>
[
- # Need to fix removing the last parentheses
- /(logger\.\s*(trace|debug|warn|info|error)\s*\([^;]*)\s*String\s*\.\s*valueOf\s*\(/m,
- /([A-Z0-9_]+\s*\.\s*get\s*\([^;]*)\.toString\(\)/m,
+ /(logger\.\s*(trace|debug|warn|info|error)\s*\([^;]*)\s*\.toString\(\)/m,
'\1',
]
}
@@ -258,8 +256,7 @@
}
# List of replacements to run
- REPLACEMENTS = [ LOGGER_STRING_VALUEOF ]
- #REPLACEMENTS = [ MESSAGES, TYPES, DN_TYPES, EXCEPTIONS, LOGGERS, I18N_LOGGERS ]
+ REPLACEMENTS = [ LOGGER_TOSTRING ]
################################### Processing methods ########################################
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java
index b1e274f..0d2458b 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java
@@ -127,9 +127,8 @@
{
if (logger.isTraceEnabled())
{
- logger.trace("Attribute %s resolves to true for user entry "
- + "%s", attributeType.getNameOrOID(),
- entry.getName().toString());
+ logger.trace("Attribute %s resolves to true for user entry %s",
+ attributeType.getNameOrOID(), entry.getName());
}
return ConditionResult.TRUE;
@@ -140,9 +139,8 @@
{
if (logger.isTraceEnabled())
{
- logger.trace("Attribute %s resolves to false for user "
- + "entry %s", attributeType.getNameOrOID(), entry.getName()
- .toString());
+ logger.trace("Attribute %s resolves to false for user entry %s",
+ attributeType.getNameOrOID(), entry.getName());
}
return ConditionResult.FALSE;
@@ -152,7 +150,7 @@
{
logger.trace("Unable to resolve value %s for attribute %s "
+ "in user entry %s as a Boolean.", valueString,
- attributeType.getNameOrOID(), entry.getName().toString());
+ attributeType.getNameOrOID(), entry.getName());
}
final LocalizableMessage message = ERR_PWPSTATE_CANNOT_DECODE_BOOLEAN
@@ -165,8 +163,8 @@
if (logger.isTraceEnabled())
{
logger.trace("Returning %s because attribute %s does not exist "
- + "in user entry %s", ConditionResult.UNDEFINED.toString(),
- attributeType.getNameOrOID(), entry.getName().toString());
+ + "in user entry %s", ConditionResult.UNDEFINED,
+ attributeType.getNameOrOID(), entry.getName());
}
return ConditionResult.UNDEFINED;
@@ -215,10 +213,8 @@
if (logger.isTraceEnabled())
{
logger.traceException(e);
-
logger.trace("Unable to decode value %s for attribute %s "
- + "in user entry %s: %s", v.getValue().toString(),
- attributeType.getNameOrOID(), entry.getName().toString(),
+ + "in user entry %s: %s", v.getValue(), attributeType.getNameOrOID(), entry.getName(),
stackTraceToSingleLineString(e));
}
@@ -236,8 +232,7 @@
if (logger.isTraceEnabled())
{
logger.trace("Returning -1 because attribute %s does not "
- + "exist in user entry %s", attributeType.getNameOrOID(), entry
- .getName().toString());
+ + "exist in user entry %s", attributeType.getNameOrOID(), entry.getName());
}
}
// FIXME: else to be consistent...
@@ -324,8 +319,8 @@
{
logger.trace("User %s is considered administratively "
+ "disabled because an error occurred while "
- + "attempting to make the determination: %s.", userEntry.getName()
- .toString(), stackTraceToSingleLineString(e));
+ + "attempting to make the determination: %s.", userEntry.getName(),
+ stackTraceToSingleLineString(e));
}
return true;
@@ -337,17 +332,15 @@
if (logger.isTraceEnabled())
{
logger.trace("User %s is not administratively disabled since "
- + "the attribute \"%s\" is not present in the entry.", userEntry
- .getName().toString(), OP_ATTR_ACCOUNT_DISABLED);
+ + "the attribute \"%s\" is not present in the entry.", userEntry.getName(), OP_ATTR_ACCOUNT_DISABLED);
}
return false;
}
if (logger.isTraceEnabled())
{
- logger.trace("User %s %s administratively disabled.", userEntry
- .getName().toString(), ((isDisabled == ConditionResult.TRUE) ? " is"
- : " is not"));
+ logger.trace("User %s is%s administratively disabled.", userEntry.getName(),
+ (isDisabled == ConditionResult.TRUE ? "" : " not"));
}
return isDisabled == ConditionResult.TRUE;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java
index 1ed8847..1eb5018 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java
@@ -452,9 +452,7 @@
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
logger.trace("Index entry exceeded in index %s. " +
"Limit: %d. ID list size: %d.\nKey:%s",
- name, indexEntryLimit, entryIDList.size(),
- builder.toString());
-
+ name, indexEntryLimit, entryIDList.size(), builder);
}
}
@@ -503,9 +501,7 @@
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- logger.trace(
- "The expected key does not exist in the index %s.\nKey:%s ",
- name, builder.toString());
+ logger.trace("The expected key does not exist in the index %s.\nKey:%s ", name, builder);
}
}
@@ -559,9 +555,7 @@
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- logger.trace(
- "The expected key does not exist in the index %s.\nKey:%s ",
- name, builder.toString());
+ logger.trace("The expected key does not exist in the index %s.\nKey:%s ", name, builder);
}
setTrusted(txn, false);
@@ -632,8 +626,7 @@
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
logger.trace("Index entry exceeded in index %s. " +
"Limit: %d. ID list size: %d.\nKey:%s",
- name, indexEntryLimit, idCountDelta + addedIDs.size(),
- builder.toString());
+ name, indexEntryLimit, idCountDelta + addedIDs.size(), builder);
}
}
@@ -682,9 +675,7 @@
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- logger.trace(
- "The expected key does not exist in the index %s.\nKey:%s",
- name, builder.toString());
+ logger.trace("The expected key does not exist in the index %s.\nKey:%s", name, builder);
}
setTrusted(txn, false);
@@ -788,9 +779,7 @@
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- logger.trace(
- "The expected key does not exist in the index %s.\nKey:%s",
- name, builder.toString());
+ logger.trace("The expected key does not exist in the index %s.\nKey:%s",name, builder);
}
setTrusted(txn, false);
@@ -838,8 +827,7 @@
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
logger.trace("The expected entry ID does not exist in " +
- "the entry ID list for index %s.\nKey:%s",
- name, builder.toString());
+ "the entry ID list for index %s.\nKey:%s", name, builder);
}
setTrusted(txn, false);
@@ -872,9 +860,7 @@
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- logger.trace(
- "The expected key does not exist in the index %s.\nKey:%s",
- name, builder.toString());
+ logger.trace("The expected key does not exist in the index %s.\nKey:%s", name, builder);
}
setTrusted(txn, false);
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
index 3f90df2..fbf48e0 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
@@ -207,9 +207,8 @@
if (logger.isTraceEnabled())
{
- logger.trace("JE (%s) environment opened with the following " +
- "config: %n%s", JEVersion.CURRENT_VERSION.toString(),
- env.getConfig().toString());
+ logger.trace("JE (%s) environment opened with the following config: %n%s",
+ JEVersion.CURRENT_VERSION, env.getConfig());
// Get current size of heap in bytes
long heapSize = Runtime.getRuntime().totalMemory();
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
index 6af591e..b89bfe4 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
@@ -749,8 +749,7 @@
{
logger.trace("File id2children has ID %d with DN <%s> " +
"referencing ID %d with non-child DN <%s>%n",
- entryID.longValue(), entry.getName().toString(),
- id.longValue(), childEntry.getName().toString());
+ entryID.longValue(), entry.getName(), id.longValue(), childEntry.getName());
}
}
}
@@ -879,10 +878,8 @@
if (logger.isTraceEnabled())
{
logger.trace("File id2subtree has ID %d with DN <%s> " +
- "referencing ID %d with non-subordinate " +
- "DN <%s>%n",
- entryID.longValue(), entry.getName().toString(),
- id.longValue(), subordEntry.getName().toString());
+ "referencing ID %d with non-subordinate DN <%s>%n",
+ entryID.longValue(), entry.getName(), id.longValue(), subordEntry.getName());
}
}
}
@@ -1576,9 +1573,7 @@
{
if(logger.isTraceEnabled())
{
- logger.trace("Missing entry %s in VLV index %s",
- entry.getName().toString(),
- vlvIndex.getName());
+ logger.trace("Missing entry %s in VLV index %s", entry.getName(), vlvIndex.getName());
}
errorCount++;
}
@@ -1601,11 +1596,8 @@
if (logger.isTraceEnabled())
{
logger.traceException(e);
-
logger.trace("Error reading VLV index %s for entry %s: %s",
- vlvIndex.getName(),
- entry.getName().toString(),
- StaticUtils.getBacktrace(e));
+ vlvIndex.getName(), entry.getName(), StaticUtils.getBacktrace(e));
}
errorCount++;
}
@@ -1614,11 +1606,8 @@
if (logger.isTraceEnabled())
{
logger.traceException(e);
-
logger.trace("Error reading VLV index %s for entry %s: %s",
- vlvIndex.getName(),
- entry.getName().toString(),
- StaticUtils.getBacktrace(e));
+ vlvIndex.getName(), entry.getName(), StaticUtils.getBacktrace(e));
}
errorCount++;
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
index 9073e49..411d522 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -3318,8 +3318,7 @@
}
else
{
- logger.info(NOTE_JEB_REBUILD_CLEARDEGRADEDSTATE_FINAL_STATUS, rebuildConfig
- .getRebuildList().toString());
+ logger.info(NOTE_JEB_REBUILD_CLEARDEGRADEDSTATE_FINAL_STATUS, rebuildConfig.getRebuildList());
}
setRebuildListIndexesTrusted(true);
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
index fa3f550..66670ed 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
@@ -353,9 +353,8 @@
{
if (logger.isTraceEnabled())
{
- logger.trace("Could not create password policy subentry "
- + "DN %s: %s", entry.getName().toString(),
- stackTraceToSingleLineString(e));
+ logger.trace("Could not create password policy subentry DN %s: %s",
+ entry.getName(), stackTraceToSingleLineString(e));
}
}
}
@@ -399,9 +398,8 @@
{
if (logger.isTraceEnabled())
{
- logger.trace("Could not create password policy subentry "
- + "DN %s: %s", newEntry.getName().toString(),
- stackTraceToSingleLineString(e));
+ logger.trace("Could not create password policy subentry DN %s: %s",
+ newEntry.getName(), stackTraceToSingleLineString(e));
}
}
}
@@ -432,9 +430,8 @@
{
if (logger.isTraceEnabled())
{
- logger.trace("Could not create password policy subentry "
- + "DN %s: %s", newEntry.getName().toString(),
- stackTraceToSingleLineString(e));
+ logger.trace("Could not create password policy subentry DN %s: %s",
+ newEntry.getName(), stackTraceToSingleLineString(e));
}
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
index 5891542..b5b3343 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
@@ -239,7 +239,7 @@
logger.trace("Unable to decode value %s for attribute %s" +
"in user entry %s: %s",
- v.getValue().toString(), attributeType.getNameOrOID(),
+ v.getValue(), attributeType.getNameOrOID(),
userDNString, stackTraceToSingleLineString(e));
}
@@ -1484,11 +1484,9 @@
{
reason.append("there is no last login time, but ");
}
- reason.append(
- "the password changed time is in an acceptable window");
+ reason.append("the password changed time is in an acceptable window");
}
- logger.trace("Returning false for user %s because %s.",
- userDNString, reason.toString());
+ logger.trace("Returning false for user %s because %s.", userDNString, reason);
}
}
else
@@ -2779,8 +2777,8 @@
{
if (logger.isTraceEnabled())
{
- logger.trace("The password provided for user %s failed "
- + "validation: %s", userDNString, invalidReason.toString());
+ logger.trace("The password provided for user %s failed validation: %s",
+ userDNString, invalidReason);
}
return false;
}
@@ -3400,8 +3398,7 @@
if (logger.isTraceEnabled())
{
- logger.trace("Removing history value " +
- v.getValue().toString() + " to preserve the history count.");
+ logger.trace("Removing history value %s to preserve the history count.", v.getValue());
}
}
@@ -3434,9 +3431,7 @@
if (logger.isTraceEnabled())
{
- logger.trace("Removing history value " +
- v.getValue().toString() +
- " to preserve the history duration.");
+ logger.trace("Removing history value %s to preserve the history duration.", v.getValue());
}
}
else
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
index c9e5a4c..57aecf5 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
@@ -148,10 +148,8 @@
if (logger.isTraceEnabled())
{
- logger.trace("Failed to retrieve password " +
- "policy for user %s: %s",
- entry.getName().toString(),
- stackTraceToSingleLineString(de));
+ logger.trace("Failed to retrieve password policy for user %s: %s",
+ entry.getName(), stackTraceToSingleLineString(de));
}
}
@@ -161,8 +159,7 @@
// entries should have at least the default password policy.
if (logger.isTraceEnabled())
{
- logger.trace("No applicable password policy for user %s", entry
- .getName().toString());
+ logger.trace("No applicable password policy for user %s", entry.getName());
}
}
else if (policy.isPasswordPolicy())
@@ -180,10 +177,8 @@
if (logger.isTraceEnabled())
{
- logger.trace("Failed to retrieve password " +
- "policy state for user %s: %s",
- entry.getName().toString(),
- stackTraceToSingleLineString(de));
+ logger.trace("Failed to retrieve password policy state for user %s: %s",
+ entry.getName(), stackTraceToSingleLineString(de));
}
}
@@ -195,9 +190,8 @@
// Not a password policy, could be PTA, etc.
if (logger.isTraceEnabled())
{
- logger.trace("Authentication policy %s found for user %s is "
- + "not a password policy", policy.getDN().toString(), entry
- .getName().toString());
+ logger.trace("Authentication policy %s found for user %s is not a password policy",
+ policy.getDN(), entry.getName());
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
index f37429a..0516460 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
@@ -92,10 +92,8 @@
if (logger.isTraceEnabled())
{
- logger.trace("Failed to retrieve password " +
- "policy for user %s: %s",
- entry.getName().toString(),
- stackTraceToSingleLineString(de));
+ logger.trace("Failed to retrieve password policy for user %s: %s",
+ entry.getName(), stackTraceToSingleLineString(de));
}
}
@@ -105,8 +103,7 @@
// entries should have at least the default password policy.
if (logger.isTraceEnabled())
{
- logger.trace("No applicable password policy for user %s", entry
- .getName().toString());
+ logger.trace("No applicable password policy for user %s", entry.getName());
}
}
else if (policy.isPasswordPolicy())
@@ -124,8 +121,7 @@
if (logger.isTraceEnabled())
{
logger.trace("Authentication policy %s found for user %s is "
- + "not a password policy", policy.getDN().toString(), entry
- .getName().toString());
+ + "not a password policy", policy.getDN(), entry.getName());
}
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
index a9828bf..0561ca9 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
@@ -545,9 +545,8 @@
{
if (logger.isTraceEnabled())
{
- logger.trace("Adding end user recipient " +
- v.getValue().toString() + " from attr " +
- a.getNameWithOptions());
+ logger.trace("Adding end user recipient %s from attr %s",
+ v.getValue(), a.getNameWithOptions());
}
recipients.add(v.getValue().toString());
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
index 1a50a45..7cc04e3 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
@@ -776,7 +776,7 @@
if (logger.isTraceEnabled())
{
- logger.trace(modifyOperation.getResultCode().toString());
+ logger.trace("rc=%s", modifyOperation.getResultCode());
}
}
catch (final DirectoryException e)
@@ -857,8 +857,7 @@
{
if (logger.isTraceEnabled())
{
- logger.trace("Skipping '" + modifyOperation.getEntryDN().toString()
- + "' because it does not have Samba object class.");
+ logger.trace("Skipping '%s' because it does not have Samba object class.", modifyOperation.getEntryDN());
}
return PluginResult.PreOperation.continueOperationProcessing();
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java
index 579faf0..5942d3d 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java
@@ -455,8 +455,7 @@
{
if (logger.isTraceEnabled())
{
- logger.trace("Result Code: " +
- operation.getResultCode().toString());
+ logger.trace("Result Code: %s", operation.getResultCode());
}
LocalizableMessage m = INFO_LDIF_CONNHANDLER_RESULT_CODE.get(
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
index f7bb217..a8224d3 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -983,8 +983,7 @@
if (logger.isTraceEnabled())
{
- logger.trace(
- message.toString());
+ logger.trace("LDAPMessage=%s", message);
}
if (keepStats)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
index 5b39c0d..71fa40f 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
@@ -193,7 +193,7 @@
((search.getResultCode() != ResultCode.NO_SUCH_OBJECT)))
{
logger.error(ERR_ERROR_SEARCHING_RUV, search.getResultCode().getResultCodeName(), search,
- search.getErrorMessage(), baseDn.toString());
+ search.getErrorMessage(), baseDn);
return null;
}
@@ -336,10 +336,8 @@
op.run();
if (op.getResultCode() != ResultCode.SUCCESS)
{
- logger.trace(DEBUG_ERROR_UPDATING_RUV, op.getResultCode().getResultCodeName(),
- op.toString(),
- op.getErrorMessage().toString(),
- baseDn.toString());
+ logger.trace(DEBUG_ERROR_UPDATING_RUV,
+ op.getResultCode().getResultCodeName(), op, op.getErrorMessage(), baseDn);
}
return op.getResultCode();
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ErrorMsg.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ErrorMsg.java
index c9ff6d1..9fd451d 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ErrorMsg.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ErrorMsg.java
@@ -88,7 +88,7 @@
this.creationTime = System.currentTimeMillis();
if (logger.isTraceEnabled())
- logger.trace(this.toString());
+ logger.trace("new ErrorMsg=%s", this);
}
/**
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
index 64f5486..7540600 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
@@ -263,8 +263,7 @@
// This is probably a connection attempt from an unexpected client
// log that to warn the administrator.
logger.debug(INFO_SSL_SERVER_CON_ATTEMPT_ERROR, socket.getRemoteSocketAddress(),
- socket.getLocalSocketAddress().toString(),
- e.getLocalizedMessage());
+ socket.getLocalSocketAddress(), e.getLocalizedMessage());
return null;
}
finally
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index a035df9..8c7b865 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -2037,12 +2037,12 @@
sendTopoInfoToAllExcept(senderHandler);
- logger.info(NOTE_DIRECTORY_SERVER_CHANGED_STATUS, senderHandler.getServerId(), baseDN.toNormalizedString(),
- newStatus.toString());
+ logger.info(NOTE_DIRECTORY_SERVER_CHANGED_STATUS,
+ senderHandler.getServerId(), baseDN.toNormalizedString(), newStatus);
}
catch(Exception e)
{
- logger.error(LocalizableMessage.raw( stackTraceToSingleLineString(e)));
+ logger.error(LocalizableMessage.raw(stackTraceToSingleLineString(e)));
}
finally
{
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java
index 2a85a66..5c0614a 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -75,9 +75,8 @@
if (providedMsg != null)
{
if (logger.isTraceEnabled())
- logger.trace("In " +
- ((handler != null) ? handler.toString() : "Replication Server") +
- " closing session with err=" + providedMsg);
+ logger.trace("In %s closing session with err=%s",
+ ((handler != null) ? handler : "Replication Server"), providedMsg);
logger.error(providedMsg);
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
index 5b866d0..a4bc4b1 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
@@ -808,8 +808,7 @@
* TODO : This should be handled by the repair functionality.
*/
logger.error(ERR_REPLICATIONDB_CANNOT_PROCESS_CHANGE_RECORD, replicationServer.getServerId(),
- (csn == null ? "" : csn.toString()),
- e.getMessage());
+ csn, e.getMessage());
}
}
return currentChange;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tasks/BackupTask.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tasks/BackupTask.java
index 2e14d6d..28719ea 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tasks/BackupTask.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tasks/BackupTask.java
@@ -429,9 +429,8 @@
// backend
if (! backupDir.getConfigEntryDN().equals(cfg.dn()))
{
- logger.error(ERR_BACKUPDB_CANNOT_BACKUP_IN_DIRECTORY, b.getBackendID(),backupLocation.getPath(),
- backupDir.getConfigEntryDN().rdn().
- getAttributeValue(0).toString());
+ logger.error(ERR_BACKUPDB_CANNOT_BACKUP_IN_DIRECTORY, b.getBackendID(), backupLocation.getPath(),
+ backupDir.getConfigEntryDN().rdn().getAttributeValue(0));
return false ;
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTask.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTask.java
index 430d1ab..e38d9d8 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTask.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTask.java
@@ -168,11 +168,7 @@
initState = TaskState.STOPPED_BY_ERROR;
}
- if (logger.isTraceEnabled())
- {
- logger.trace("[IE] InitializeTask is ending with state:%s",
- initState.toString());
- }
+ logger.trace("[IE] InitializeTask is ending with state: %s", initState);
return initState;
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
index 1a5707e..c6a0160 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
@@ -505,8 +505,7 @@
if (dn != null // This is an ADD
&& entry.getName().equals(DN.valueOf(dn)))
{
- logger.debug(LocalizableMessage.raw(String.format("Entry %s found", entry.getName()
- .toString())));
+ logger.debug(LocalizableMessage.raw(String.format("Entry %s found", entry.getName())));
alreadyExist = true;
}
writer.writeEntry(entry);
@@ -611,8 +610,7 @@
destinationSchemaEntry.getAttribute("attributeTypes").add(
attributeType);
changeCount++;
- logger.debug(LocalizableMessage.raw(String.format("Added %s", attributeType
- .toString())));
+ logger.debug(LocalizableMessage.raw(String.format("Added %s", attributeType)));
}
}
@@ -624,8 +622,7 @@
getSchemaElement(templateSchemaEntry, "objectClasses", oc);
destinationSchemaEntry.getAttribute("objectClasses").add(objectClass);
changeCount++;
- logger.debug(LocalizableMessage.raw(
- String.format("Added %s", objectClass.toString())));
+ logger.trace("Added %s", objectClass);
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/LockManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/LockManager.java
index 43e20c9..ef8ac36 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/LockManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/LockManager.java
@@ -131,18 +131,15 @@
ReentrantReadWriteLock lock = oldTable.get(dn);
if (lock.isWriteLocked())
{
- logger.trace("Found stale write lock on " +
- dn.toString());
+ logger.trace("Found stale write lock on %s", dn);
}
else if (lock.getReadLockCount() > 0)
{
- logger.trace("Found stale read lock on " +
- dn.toString());
+ logger.trace("Found stale read lock on %s", dn);
}
else
{
- logger.trace("Found stale unheld lock on " +
- dn.toString());
+ logger.trace("Found stale unheld lock on %s", dn);
}
}
catch (Exception e)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java
index a70cc5a..ac6f2a0 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java
@@ -2751,11 +2751,8 @@
{
logger.trace(
"Returning FALSE for equality component %s in filter " +
- "%s because entry %s didn't have attribute type " +
- "%s with value %s",
- this, completeFilter, entry.getName(),
- attributeType.getNameOrOID(),
- assertionValue.getValue().toString());
+ "%s because entry %s didn't have attribute type %s with value %s",
+ this, completeFilter, entry.getName(), attributeType.getNameOrOID(), assertionValue.getValue());
}
return ConditionResult.FALSE;
}
--
Gitblit v1.10.0