From 09231099ef1a49460ef0d04f89e02a43412c7ca6 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 17 Feb 2015 22:27:51 +0000
Subject: [PATCH] AutoRefactor: fix String usage
---
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java | 8 ++--
opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java | 3 -
opendj-server-legacy/src/main/java/org/opends/server/tools/DBTest.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java | 2
opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java | 2
opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextException.java | 2
opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java | 2
opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java | 2
opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java | 2
opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java | 8 ++--
opendj-server-legacy/src/main/java/org/opends/server/util/BSDMD5Crypt.java | 2
opendj-server-legacy/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/StartWindowsService.java | 2
opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java | 2
opendj-server-legacy/src/main/java/org/opends/server/types/BackupDirectory.java | 3 -
opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureWindowsService.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java | 3 -
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskClient.java | 5 +-
opendj-server-legacy/src/main/java/org/opends/server/tools/StopWindowsService.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java | 2
opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java | 2
opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicationEnvironment.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskScheduleInteraction.java | 3 -
opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java | 2
opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java | 2
opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java | 2
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java | 2
37 files changed, 50 insertions(+), 55 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextException.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextException.java
index ee00c9a..fda831d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextException.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextException.java
@@ -155,7 +155,7 @@
toString = "ADSContextException: error type "+error+".";
if (getCause() != null)
{
- toString += " Root cause: "+getCause().toString();
+ toString += " Root cause: " + getCause();
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
index 1549ad7..40e005f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
@@ -313,7 +313,7 @@
ArrayList<String> dns = new ArrayList<String>();
for (BaseDNDescriptor baseDN : baseDNs)
{
- dns.add("'"+baseDN.getDn().toString()+"'");
+ dns.add("'" + baseDN.getDn() + "'");
}
getProgressDialog().appendProgressHtml(
Utilities.getProgressWithPoints(
@@ -621,7 +621,7 @@
args.add("--remove");
for (BaseDNDescriptor baseDN : baseDNs)
{
- args.add("base-dn:"+baseDN.getDn().toString());
+ args.add("base-dn:" + baseDN.getDn());
}
args.addAll(getConnectionCommandLineArguments());
args.add("--no-prompt");
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
index a21123e..918df78 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
@@ -351,7 +351,7 @@
lines.add("ds-cfg-filter: "+filter.getText().trim());
lines.add("ds-cfg-sort-order: "+getSortOrderStringValue(getSortOrder()));
lines.add("ds-cfg-base-dn: "+getBaseDN());
- lines.add("ds-cfg-scope: "+getScope().toString());
+ lines.add("ds-cfg-scope: " + getScope());
lines.add("ds-cfg-max-block-size: "+maxBlockSize.getText().trim());
StringBuilder sb = new StringBuilder();
for (String line : lines)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
index 8053361..b90d3e3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
@@ -150,7 +150,7 @@
else
{
aParentDN = nodeDN.parent();
- aRdn = nodeDN.rdn().getAttributeValue(0).toString()+"-1";
+ aRdn = nodeDN.rdn().getAttributeValue(0) + "-1";
}
}
catch (DirectoryException de)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java
index a899254..55a2931 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java
@@ -714,7 +714,7 @@
lines.add("ds-cfg-index-entry-limit: "+entryLimitValue);
for (IndexType type : indexTypes)
{
- lines.add("ds-cfg-index-type: "+type.toString());
+ lines.add("ds-cfg-index-type: " + type);
}
StringBuilder sb = new StringBuilder();
for (String line : lines)
@@ -896,12 +896,12 @@
for (IndexType newType : toAdd)
{
args.add("--add");
- args.add("index-type:"+newType.toString());
+ args.add("index-type:" + newType);
}
for (IndexType newType : toDelete)
{
args.add("--remove");
- args.add("index-type:"+newType.toString());
+ args.add("index-type:" + newType);
}
}
if (entryLimitValue != indexToModify.getEntryLimit())
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
index ac9ccce..4994d5d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -1409,7 +1409,7 @@
while (it.hasNext())
{
args.add("--set");
- args.add("index-type:" + it.next().toString());
+ args.add("index-type:" + it.next());
}
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
index ba9ab9a..c6570ef 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
@@ -558,7 +558,7 @@
lines.add("ds-cfg-index-entry-limit: "+entryLimitValue);
for (IndexType type : indexTypes)
{
- lines.add("ds-cfg-index-type: "+type.toString());
+ lines.add("ds-cfg-index-type: " + type);
}
StringBuilder sb = new StringBuilder();
for (String line : lines)
@@ -747,7 +747,7 @@
for (IndexType type : indexTypes)
{
args.add("--set");
- args.add("index-type:"+type.toString());
+ args.add("index-type:"+type);
}
args.add("--set");
args.add("index-entry-limit:"+entryLimitValue);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
index cf5ebed..201c476 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
@@ -507,7 +507,7 @@
args.add("filter:"+filterValue);
args.add("--set");
- args.add("scope:"+scope.toString());
+ args.add("scope:"+scope);
args.add("--set");
args.add("sort-order:"+sortOrderStringValue);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
index e68abad..d916695 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
@@ -934,7 +934,7 @@
if (indexToModify.getScope() != scope)
{
args.add("--set");
- args.add("scope:"+scope.toString());
+ args.add("scope:"+scope);
}
if (!indexToModify.getFilter().equals(filterValue))
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java
index df876f9..84feeca 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java
@@ -109,8 +109,7 @@
*/
public void setText(String text)
{
- label.setText(Utilities.applyFont(text.toString(),
- label.getFont()));
+ label.setText(Utilities.applyFont(text, label.getFont()));
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java
index 87894b6..bf16a2a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java
@@ -700,8 +700,8 @@
*/
public File getBaseSchemaFile() throws ApplicationException
{
- return new File(getConfigurationUpgradeDirectory(), "schema.ldif."
- + getInstanceSvnRev().toString());
+ return new File(getConfigurationUpgradeDirectory(),
+ "schema.ldif." + getInstanceSvnRev());
}
@@ -717,8 +717,8 @@
*/
public File getBaseConfigurationFile() throws ApplicationException
{
- return new File(getConfigurationUpgradeDirectory(), BASE_CONFIG_FILE_PREFIX
- + getInstanceSvnRev().toString());
+ return new File(getConfigurationUpgradeDirectory(),
+ BASE_CONFIG_FILE_PREFIX + getInstanceSvnRev());
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java
index 24f8067..8221aed 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java
@@ -1539,7 +1539,7 @@
default:
throw new IllegalArgumentException("Unknown iconName: " + iconType);
}
- return getParentPackagePath() + "/" + key.toString();
+ return getParentPackagePath() + "/" + key;
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java
index 8a10845..def492e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java
@@ -237,7 +237,7 @@
ManagedObjectDefinitionI18NResource resource =
ManagedObjectDefinitionI18NResource.getInstance();
String property = "property." + getName()
- + ".syntax.enumeration.value." + value.toString()
+ + ".syntax.enumeration.value." + value
+ ".synopsis";
try {
return resource.getMessage(getManagedObjectDefinition(),
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
index 101d17c..b4ed6c6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
@@ -694,7 +694,7 @@
// Property table
startTable();
tableRow("Description",
- ((prop.getSynopsis() != null) ? prop.getSynopsis().toString()+ " " : "") +
+ ((prop.getSynopsis() != null) ? prop.getSynopsis()+ " " : "") +
((prop.getDescription() != null) ?
prop.getDescription().toString() : ""));
@@ -1147,7 +1147,7 @@
for (Object cst : en.getEnumConstants()) {
enumStr += cst.toString();
if (prop.getValueSynopsis((Enum) cst) != null) {
- enumStr += " - " + prop.getValueSynopsis((Enum) cst).toString();
+ enumStr += " - " + prop.getValueSynopsis((Enum) cst);
}
enumStr += getNewLine() + getNewLine();
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java
index 094bbbe..c8b6174 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java
@@ -1167,7 +1167,7 @@
EMailMessage message =
new EMailMessage(taskBackend.getNotificationSenderAddress(),
new ArrayList<String>(recipients),
- taskState.toString() + " " + taskID);
+ taskState + " " + taskID);
String scheduledStartDate;
if (scheduledStartTime <= 0)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java b/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java
index 43e44f3..ac4ac3a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java
@@ -806,8 +806,7 @@
MBeanConstructorInfo[] mBeanConstructors = new MBeanConstructorInfo[0];
return new MBeanInfo(CLASS_NAME,
- "Configurable Attributes for " +
- configEntryDN.toString(),
+ "Configurable Attributes for " + configEntryDN,
mBeanAttributes, mBeanConstructors, mBeanOperations,
mBeanNotifications);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java
index 31d31a6..b7daeb9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java
@@ -173,7 +173,7 @@
}
else
{
- this.authorizationID = "dn:" + authorizationDN.toString();
+ this.authorizationID = "dn:" + authorizationDN;
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java
index d87263d..f00c1e5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java
@@ -134,7 +134,7 @@
public void writeValue(ASN1Writer writer) throws IOException {
writer.writeStartSequence(ASN1.UNIVERSAL_OCTET_STRING_TYPE);
writer.writeStartSequence();
- writer.writeOctetString(cookie.toString());
+ writer.writeOctetString(cookie);
writer.writeEndSequence();
writer.writeEndSequence();
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
index bbfafaa..f37a325 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
@@ -228,7 +228,7 @@
writer.writeStartSequence();
if(authzDN != null)
{
- writer.writeOctetString("dn:" + authzDN.toString());
+ writer.writeOctetString("dn:" + authzDN);
}
else if(rawAuthzDN != null)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
index fd8dc34..5e052a3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
@@ -3243,7 +3243,7 @@
{
if (logger.isTraceEnabled())
{
- logger.trace("Encoded password " + v.toString() +
+ logger.trace("Encoded password " + v +
" cannot be decoded and cannot be added to history.");
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java
index 659b422..2b4e1e8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java
@@ -120,7 +120,7 @@
*/
public String toString()
{
- return "Free Number Retention Policy " + config.dn().toString();
+ return "Free Number Retention Policy " + config.dn();
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
index 3cf338a..6802a57 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
@@ -161,7 +161,7 @@
@Override
public String toString()
{
- return "Free Disk Retention Policy " + config.dn().toString();
+ return "Free Disk Retention Policy " + config.dn();
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java
index f38788f..28f37dd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java
@@ -148,7 +148,7 @@
@Override
public String toString()
{
- return "Size Based Retention Policy " + config.dn().toString();
+ return "Size Based Retention Policy " + config.dn();
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java
index dda49e2..dcf9b29 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java
@@ -182,7 +182,7 @@
{
logger.traceException(ex);
}
- builder.add(entryCount + " " + dn.toString());
+ builder.add(entryCount + " " + dn);
}
}
else
@@ -190,7 +190,7 @@
// This is done to avoid recalculating the number of entries
// using the numSubordinates method in the case where the
// backend has a single base DN.
- builder.add(backendCount + " " + baseDNs[0].toString());
+ builder.add(backendCount + " " + baseDNs[0]);
}
attrs.add(builder.toAttribute());
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index f7b5f97..522796a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -867,7 +867,7 @@
setupWriter();
for(Map.Entry<DN,DN> mapEntry : modDNmap.entrySet())
{
- writer.write(mapEntry.getKey().toString() + "\t" + mapEntry.getValue().toString());
+ writer.write(mapEntry.getKey() + "\t" + mapEntry.getValue());
writer.newLine();
}
writer.flush();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java
index 3f6aedb..1831569 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java
@@ -110,7 +110,7 @@
throws InitializationException
{
super("LDAP Request Handler " + requestHandlerID +
- " for connection handler " + connectionHandler.toString());
+ " for connection handler " + connectionHandler);
handlerName = getName();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicationEnvironment.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicationEnvironment.java
index 066893e..5a6c2aa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicationEnvironment.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicationEnvironment.java
@@ -874,7 +874,7 @@
*/
File getServerIdPath(final String domainId, final int serverId)
{
- return new File(getDomainPath(domainId), String.valueOf(serverId) + SERVER_ID_SUFFIX);
+ return new File(getDomainPath(domainId), serverId + SERVER_ID_SUFFIX);
}
private File getGenerationIdPath(final String domainId, final long generationId)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
index 93b9341..e400564 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
@@ -480,7 +480,7 @@
static Entry<String, String> toReplicaEntry(DN baseDN, int serverId)
{
final String key = serverId + FIELD_SEPARATOR + baseDN.toIrreversibleReadableString();
- final String value = serverId + FIELD_SEPARATOR + baseDN.toString();
+ final String value = serverId + FIELD_SEPARATOR + baseDN;
return new SimpleImmutableEntry<String, String>(key, value);
}
@@ -498,7 +498,7 @@
{
final String key = GENERATION_ID_TAG + FIELD_SEPARATOR + baseDN.toIrreversibleReadableString();
final String data = GENERATION_ID_TAG + FIELD_SEPARATOR + generationId
- + FIELD_SEPARATOR + baseDN.toString();
+ + FIELD_SEPARATOR + baseDN;
return new SimpleImmutableEntry<byte[], byte[]>(toBytes(key), toBytes(data));
}
@@ -528,8 +528,8 @@
{
final int serverId = offlineCSN.getServerId();
final byte[] key = toReplicaOfflineKey(baseDN, serverId);
- final byte[] data = toBytes(String.valueOf(offlineCSN.getTime()) + FIELD_SEPARATOR + serverId
- + FIELD_SEPARATOR + baseDN.toString());
+ final byte[] data = toBytes(offlineCSN.getTime() + FIELD_SEPARATOR + serverId
+ + FIELD_SEPARATOR + baseDN);
return new SimpleImmutableEntry<byte[], byte[]>(key, data);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureWindowsService.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureWindowsService.java
index 5805ed1..8359561 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureWindowsService.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureWindowsService.java
@@ -665,7 +665,7 @@
returnValue = SERVICE_CLEANUP_ERROR;
msg = ERR_WINDOWS_SERVICE_CLEANUP_ERROR.get(serviceName);
err.println(msg);
- err.println("Exception:" + t.toString());
+ err.println("Exception:" + t);
}
return returnValue;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/DBTest.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/DBTest.java
index 70b8626..7181c78 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/DBTest.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/DBTest.java
@@ -764,7 +764,7 @@
for(EntryContainer ec : rc.getEntryContainers())
{
builder.startRow();
- builder.appendCell("Base DN: " + ec.getBaseDN().toString());
+ builder.appendCell("Base DN: " + ec.getBaseDN());
count = appendDatabaseContainerRows(builder, ec, count);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/StartWindowsService.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/StartWindowsService.java
index f3ed7d0..9e6b912 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/StartWindowsService.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/StartWindowsService.java
@@ -135,7 +135,7 @@
{
LocalizableMessage message = ERR_WINDOWS_SERVICE_START_ERROR.get();
err.println(message);
- err.println("Exception:" + t.toString());
+ err.println("Exception:" + t);
returnValue = SERVICE_START_ERROR;
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/StopWindowsService.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/StopWindowsService.java
index 8d2ba66..8ad3915 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/StopWindowsService.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/StopWindowsService.java
@@ -139,7 +139,7 @@
{
LocalizableMessage message = ERR_WINDOWS_SERVICE_STOP_ERROR.get();
err.println(message);
- err.println("Exception:" + t.toString());
+ err.println("Exception:" + t);
returnValue = SERVICE_STOP_ERROR;
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskClient.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskClient.java
index 30b3831..5153724 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskClient.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskClient.java
@@ -176,9 +176,8 @@
if (scheduleRecurring) {
taskID = information.getTaskId();
- if ((taskID == null) || taskID.length() == 0) {
- taskID = information.getTaskClass().getSimpleName() +
- "-" + UUID.randomUUID().toString();
+ if (taskID == null || taskID.length() == 0) {
+ taskID = information.getTaskClass().getSimpleName() + "-" + UUID.randomUUID();
}
} else {
// Use a formatted time/date for the ID so that is remotely useful
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskScheduleInteraction.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskScheduleInteraction.java
index 714c594..513e0eb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskScheduleInteraction.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskScheduleInteraction.java
@@ -279,8 +279,7 @@
private void printAvailableDependencyTaskMessage()
{
StringBuilder sb = new StringBuilder();
- String separator = formatter.getLineBreak().toString() +
- formatter.getTab().toString();
+ String separator = formatter.getLineBreak().toString() + formatter.getTab();
for (TaskEntry entry : taskEntries)
{
sb.append(separator);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/BackupDirectory.java b/opendj-server-legacy/src/main/java/org/opends/server/types/BackupDirectory.java
index 317b5a3..5fdbb9a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/BackupDirectory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/BackupDirectory.java
@@ -352,8 +352,7 @@
// The first line in the file will only contain the DN of the
// configuration entry for the associated backend.
- writer.write(PROPERTY_BACKEND_CONFIG_DN + "=" +
- configEntryDN.toString());
+ writer.write(PROPERTY_BACKEND_CONFIG_DN + "=" + configEntryDN);
writer.newLine();
writer.newLine();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java
index cfdf41a..40a6493 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java
@@ -2143,7 +2143,7 @@
File tempFile = new File(concatFilePath + ".tmp");
BufferedWriter writer =
new BufferedWriter(new FileWriter(tempFile, false));
- writer.write("dn: " + DirectoryServer.getSchemaDN().toString());
+ writer.write("dn: " + DirectoryServer.getSchemaDN());
writer.newLine();
writer.write("objectClass: top");
writer.newLine();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/BSDMD5Crypt.java b/opendj-server-legacy/src/main/java/org/opends/server/util/BSDMD5Crypt.java
index 04df57e..e48d8cd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/BSDMD5Crypt.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/BSDMD5Crypt.java
@@ -280,7 +280,7 @@
}
} catch (Exception e)
{
- System.err.println(e.getMessage().toString());
+ System.err.println(e.getMessage());
System.exit(1);
}
System.exit(0);
--
Gitblit v1.10.0