From 998747bfaaa3c6b28bbfaf0e282e6c0ccbf46bc0 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 17 Feb 2015 18:44:58 +0000
Subject: [PATCH] AutoRefactor: fix StringBuilder usage
---
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java | 4
opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java | 2
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java | 10
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java | 23
opendj-server-legacy/src/main/java/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java | 7
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java | 10
opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java | 2
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java | 20
opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java | 494 ++++++++++++-------------
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java | 4
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java | 11
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java | 2
opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java | 3
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java | 6
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java | 11
opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java | 5
opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java | 6
opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java | 15
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java | 6
opendj-server-legacy/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java | 6
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java | 16
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java | 8
opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java | 2
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java | 6
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java | 28
opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java | 7
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java | 6
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java | 6
opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java | 4
opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java | 4
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java | 4
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java | 7
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java | 69 --
opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java | 6
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java | 6
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java | 6
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java | 4
opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java | 4
opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchChangeType.java | 6
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java | 8
opendj-server-legacy/src/main/java/org/opends/quicksetup/CliUserInteraction.java | 4
opendj-server-legacy/src/main/java/org/opends/server/types/AdditionalLogItem.java | 4
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java | 8
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java | 4
opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java | 4
opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java | 2
opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java | 5
opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RandomTag.java | 4
opendj-server-legacy/src/main/java/org/opends/server/types/IntermediateResponse.java | 8
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddResponseProtocolOp.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java | 6
opendj-server-legacy/src/main/java/org/opends/server/admin/SizePropertyDefinition.java | 7
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java | 6
opendj-server-legacy/src/main/java/org/opends/server/types/DN.java | 2
opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java | 14
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java | 3
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddRequestProtocolOp.java | 15
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java | 6
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java | 3
opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java | 6
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java | 17
opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java | 9
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java | 19
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java | 4
opendj-server-legacy/src/main/java/org/opends/server/types/FilePermission.java | 8
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelLauncher.java | 5
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java | 8
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java | 8
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java | 2
opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java | 6
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java | 5
opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java | 2
opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java | 8
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java | 5
opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java | 4
opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java | 2
90 files changed, 493 insertions(+), 634 deletions(-)
diff --git a/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java b/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
index 6f3fecc..b469ab2 100644
--- a/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
+++ b/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.dsml.protocol;
@@ -271,8 +271,7 @@
private static LDAPFilter createPresentFilter(AttributeDescription ad)
throws LDAPException
{
- return LDAPFilter.decode(new StringBuilder(ad.getName()).append("=*")
- .toString());
+ return LDAPFilter.decode(ad.getName() + "=*");
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
index 6c26886..569cb39 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
@@ -2529,17 +2529,9 @@
try {
ADSContextHelper helper = new ADSContextHelper();
final LdapName baseDN = new LdapName(baseDNStr);
- final String FILTER_OC_INSTANCE_KEY
- = new StringBuilder("(objectclass=")
- .append(helper.getOcCryptoInstanceKey())
- .append(")").toString();
- final String FILTER_NOT_COMPROMISED = new StringBuilder("(!(")
- .append(helper.getAttrCryptoKeyCompromisedTime())
- .append("=*))").toString();
- final String searchFilter = new StringBuilder("(&")
- .append(FILTER_OC_INSTANCE_KEY)
- .append(FILTER_NOT_COMPROMISED)
- .append(")").toString();
+ final String FILTER_OC_INSTANCE_KEY = "(objectclass=" + helper.getOcCryptoInstanceKey() + ")";
+ final String FILTER_NOT_COMPROMISED = "(!(" + helper.getAttrCryptoKeyCompromisedTime() + "=*))";
+ final String searchFilter = "(&" + FILTER_OC_INSTANCE_KEY + FILTER_NOT_COMPROMISED + ")";
final SearchControls searchControls = new SearchControls();
searchControls.setSearchScope(SearchControls.ONELEVEL_SCOPE);
final String attrIDs[]= {
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
index a8c2f00..bcd568b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
@@ -1538,7 +1538,7 @@
sb.append(baseDN);
for (ServerDescriptor server : servers)
{
- sb.append(Constants.LINE_SEPARATOR+" ");
+ sb.append(Constants.LINE_SEPARATOR).append(" ");
sb.append(server.getHostPort(true));
}
return sb.toString();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelLauncher.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelLauncher.java
index 8a4a520..e134566 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelLauncher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelLauncher.java
@@ -194,9 +194,8 @@
StringBuilder buf = new StringBuilder();
while (t != null)
{
- StackTraceElement[] stack = t.getStackTrace();
- for (StackTraceElement aStack : stack) {
- buf.append(aStack.toString()).append("\n");
+ for (StackTraceElement aStack : t.getStackTrace()) {
+ buf.append(aStack).append("\n");
}
t = t.getCause();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java
index 17e23c3..ec10871 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -175,12 +175,12 @@
this.monitoringEntries = Collections.unmodifiableSet(monitoringEntries);
StringBuilder builder = new StringBuilder();
- builder.append(getProtocol() + " " + getState() + " ");
+ builder.append(getProtocol()).append(" ").append(getState()).append(" ");
for (InetAddress address : addresses)
{
- builder.append(address.toString());
+ builder.append(address);
}
- builder.append(" Port: "+port);
+ builder.append(" Port: ").append(port);
toString = builder.toString();
hashCode = toString.hashCode();
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
index 5f10e1d..4b360a6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
@@ -287,7 +287,7 @@
added = true;
if (desc.getPort() > 0)
{
- buf.append(":"+desc.getPort());
+ buf.append(":").append(desc.getPort());
}
}
returnValue = buf.toString();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java
index 04eab50..aef5ef7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -168,7 +168,7 @@
sb.append(ch.getName());
break;
default:
- sb.append(ch.getProtocol().getDisplayMessage().toString());
+ sb.append(ch.getProtocol().getDisplayMessage());
break;
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
index 65e307a..1a391f6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -172,7 +173,7 @@
StringBuilder sb = new StringBuilder();
for (IndexType t : types)
{
- sb.append(t+",");
+ sb.append(t).append(",");
}
if (getBackend() != null)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
index 88a4113..ddf6f55 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -162,7 +163,7 @@
StringBuilder sb = new StringBuilder();
for (VLVSortOrder s : sortOrder)
{
- sb.append(s.getAttributeName()+s.isAscending()+",");
+ sb.append(s.getAttributeName()).append(s.isAscending()).append(",");
}
if (getBackend() != null)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
index ff272b5..ad15ebb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
@@ -318,7 +318,7 @@
String equiv = getEquivalentCommandLine(getCommandLinePath("ldapmodify"),
args);
StringBuilder sb = new StringBuilder();
- sb.append(INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_CREATE_ENTRY.get()+"<br><b>");
+ sb.append(INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_CREATE_ENTRY.get()).append("<br><b>");
sb.append(equiv);
sb.append("<br>");
String[] lines = ldif.split("\n");
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java
index c184481..fd41815 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java
@@ -292,8 +292,8 @@
*/
public void newLine(String msg)
{
- outputLogs.append(msg+"\n");
- logs.append(msg+"\n");
+ outputLogs.append(msg).append("\n");
+ logs.append(msg).append("\n");
}
});
errorPrintStream.addListener(new PrintStreamListener()
@@ -304,8 +304,8 @@
*/
public void newLine(String msg)
{
- errorLogs.append(msg+"\n");
- logs.append(msg+"\n");
+ errorLogs.append(msg).append("\n");
+ logs.append(msg).append("\n");
}
});
server = info.getServerDescriptor();
@@ -942,10 +942,10 @@
args);
StringBuilder sb = new StringBuilder();
- sb.append(INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_MODIFY.get()+"<br><b>");
+ sb.append(INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_MODIFY.get()).append("<br><b>");
sb.append(equiv);
sb.append("<br>");
- sb.append("dn: "+dn);
+ sb.append("dn: ").append(dn);
boolean firstChangeType = true;
for (ModificationItem mod : mods)
{
@@ -962,15 +962,15 @@
String attrName = attr.getID();
if (mod.getModificationOp() == DirContext.ADD_ATTRIBUTE)
{
- sb.append("add: "+attrName+"<br>");
+ sb.append("add: ").append(attrName).append("<br>");
}
else if (mod.getModificationOp() == DirContext.REPLACE_ATTRIBUTE)
{
- sb.append("replace: "+attrName+"<br>");
+ sb.append("replace: ").append(attrName).append("<br>");
}
else
{
- sb.append("delete: "+attrName+"<br>");
+ sb.append("delete: ").append(attrName).append("<br>");
}
for (int i=0; i<attr.size(); i++)
{
@@ -981,11 +981,11 @@
// Use the attribute names to figure out the value to be displayed.
if (displayBase64(attr.getID()))
{
- sb.append(attrName+":: ");
+ sb.append(attrName).append(":: ");
}
else
{
- sb.append(attrName+": ");
+ sb.append(attrName).append(": ");
}
sb.append(obfuscateAttributeStringValue(attrName, o));
sb.append("<br>");
@@ -1082,13 +1082,13 @@
String equiv = getEquivalentCommandLine(getCommandLinePath("ldapmodify"),
args);
StringBuilder sb = new StringBuilder();
- sb.append(INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_RENAME.get()+"<br><b>");
+ sb.append(INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_RENAME.get()).append("<br><b>");
sb.append(equiv);
sb.append("<br>");
- sb.append("dn: "+oldDN);
+ sb.append("dn: ").append(oldDN);
sb.append("<br>");
sb.append("changetype: moddn<br>");
- sb.append("newrdn: "+newDN.rdn()+"<br>");
+ sb.append("newrdn: ").append(newDN.rdn()).append("<br>");
sb.append("deleteoldrdn: 1");
sb.append("</b><br><br>");
getProgressDialog().appendProgressHtml(
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 ca692f7..a21123e 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -356,7 +356,7 @@
StringBuilder sb = new StringBuilder();
for (String line : lines)
{
- sb.append(line+ServerConstants.EOL);
+ sb.append(line).append(ServerConstants.EOL);
}
return sb.toString();
}
@@ -598,7 +598,7 @@
StringBuilder sb = new StringBuilder();
for (LocalizableMessage msg : msgs)
{
- sb.append("<br>-"+msg);
+ sb.append("<br>-").append(msg);
}
confirm = displayConfirmationDialog(
INFO_CTRL_PANEL_VLV_INDEXES_NOT_DEFINED_CONFIRMATION_TITLE.get(),
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java
index c26f5b4..0b43aba 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -370,7 +370,7 @@
mb.append(
INFO_CTRL_PANEL_AUTH_REQUIRED_TO_BROWSE_MONITORING_SUMMARY.
get());
- mb.append("<br><br>"+getAuthenticateHTML());
+ mb.append("<br><br>").append(getAuthenticateHTML());
errorDetails = mb.toMessage();
errorTitle = INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_SUMMARY.get();
@@ -382,7 +382,7 @@
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_DETAILS.get(
server.getHostname()));
- mb.append("<br><br>"+getAuthenticateHTML());
+ mb.append("<br><br>").append(getAuthenticateHTML());
errorDetails = mb.toMessage();
errorTitle = INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_SUMMARY.get();
displayErrorPane = true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
index 94733c3..de2eefe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
@@ -344,7 +344,7 @@
mb.append(
INFO_CTRL_PANEL_AUTH_REQUIRED_TO_SEE_TRAFFIC_MONITORING_SUMMARY.
get());
- mb.append("<br><br>"+getAuthenticateHTML());
+ mb.append("<br><br>").append(getAuthenticateHTML());
errorDetails = mb.toMessage();
errorTitle = INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_SUMMARY.get();
@@ -356,7 +356,7 @@
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_DETAILS.get(
server.getHostname()));
- mb.append("<br><br>"+getAuthenticateHTML());
+ mb.append("<br><br>").append(getAuthenticateHTML());
errorDetails = mb.toMessage();
errorTitle = INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_SUMMARY.get();
displayErrorPane = true;
@@ -476,7 +476,7 @@
sb.append(ch.getName());
break;
default:
- sb.append(ch.getProtocol().getDisplayMessage().toString());
+ sb.append(ch.getProtocol().getDisplayMessage());
break;
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java
index 2ba3eaf..ac3e3fd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -167,7 +167,7 @@
mb.append(INFO_CTRL_PANEL_CONFIRMATION_DELETE_BACKENDS_DETAILS.get());
for (BackendDescriptor backend : backendsToDelete)
{
- mb.append("<br> - "+backend.getBackendID());
+ mb.append("<br> - ").append(backend.getBackendID());
}
mb.append("<br><br>");
mb.append(INFO_CTRL_PANEL_DO_YOU_WANT_TO_CONTINUE.get());
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
index c40d3a0..8bc05f4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -466,7 +466,7 @@
mb.append(INFO_CTRL_PANEL_CONFIRMATION_DELETE_BASE_DNS_DETAILS.get());
for (BaseDNDescriptor baseDN : baseDNsToDelete)
{
- mb.append("<br> - "+baseDN.getDn());
+ mb.append("<br> - ").append(baseDN.getDn());
}
if (indirectBackendsToDelete.size() > 0)
{
@@ -475,7 +475,7 @@
INFO_CTRL_PANEL_CONFIRMATION_DELETE_BASE_DNS_INDIRECT_DETAILS.get());
for (String backendID : indirectBackendsToDelete)
{
- mb.append("<br> - "+backendID);
+ mb.append("<br> - ").append(backendID);
}
}
mb.append("<br><br>");
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 46baca5..8053361 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -389,7 +389,7 @@
{
String dn = this.dn.getText();
StringBuilder sb = new StringBuilder();
- sb.append("dn: "+dn);
+ sb.append("dn: ").append(dn);
for (String attrName : entryToDuplicate.getAttributeNames())
{
List<Object> values = entryToDuplicate.getAttributeValues(attrName);
@@ -399,7 +399,7 @@
String pwd = new String(password.getPassword());
if (!pwd.isEmpty())
{
- sb.append(attrName+": " + pwd);
+ sb.append(attrName).append(": ").append(pwd);
}
}
else if (!attrName.equalsIgnoreCase(rdnAttribute))
@@ -412,17 +412,14 @@
for (Object value : values)
{
sb.append("\n");
- if (value instanceof String)
+ if (value instanceof byte[])
{
- sb.append(attrName+": "+value);
- }
- else if (value instanceof byte[])
- {
- sb.append(attrName+":: "+Base64.encode((byte[])value));
+ final String base64 = Base64.encode((byte[]) value);
+ sb.append(attrName).append(":: ").append(base64);
}
else
{
- sb.append(attrName+": "+value);
+ sb.append(attrName).append(": ").append(value);
}
}
}
@@ -442,7 +439,7 @@
if (values.size() == 1)
{
sb.append("\n");
- sb.append(attrName+": "+newValue);
+ sb.append(attrName).append(": ").append(newValue);
}
else
{
@@ -462,11 +459,11 @@
sb.append("\n");
if (oldValue.equals(value))
{
- sb.append(attrName+": "+newValue);
+ sb.append(attrName).append(": ").append(newValue);
}
else
{
- sb.append(attrName+": "+value);
+ sb.append(attrName).append(": ").append(value);
}
}
}
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 a608e7b..a899254 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -719,7 +719,7 @@
StringBuilder sb = new StringBuilder();
for (String line : lines)
{
- sb.append(line+ServerConstants.EOL);
+ sb.append(line).append(ServerConstants.EOL);
}
return sb.toString();
}
@@ -772,7 +772,7 @@
getObfuscatedCommandLineArguments(getDSConfigCommandLineArguments());
for (String arg : args)
{
- sb.append(" "+CommandBuilder.escapeValue(arg));
+ sb.append(" ").append(CommandBuilder.escapeValue(arg));
}
ManagementContext mCtx = LDAPManagementContext.createFromContext(
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 eb68e7e..ac9ccce 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
@@ -768,7 +768,7 @@
args.removeAll(getConfigCommandLineArguments());
for (String arg : args)
{
- sb.append(" "+CommandBuilder.escapeValue(arg));
+ sb.append(" ").append(CommandBuilder.escapeValue(arg));
}
return sb.toString();
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java
index 47d1bcd..70e6aae 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -105,7 +105,7 @@
protected String getLDIF()
{
StringBuilder sb = new StringBuilder();
- sb.append("dn: "+dn.getText()+"\n");
+ sb.append("dn: ").append(dn.getText()).append("\n");
String[] attrNames = {"dc", "description"};
JTextField[] textFields = {name, description};
sb.append("objectclass: top\n");
@@ -115,11 +115,9 @@
String value = textFields[i].getText().trim();
if (value.length() > 0)
{
- sb.append(attrNames[i]+": "+value+"\n");
+ sb.append(attrNames[i]).append(": ").append(value).append("\n");
}
}
return sb.toString();
}
}
-
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java
index 1a58f6f..1c4e533 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -98,7 +98,7 @@
sb.append(emptyDn);
if (parentNode != null)
{
- sb.append(","+parentNode.getDN());
+ sb.append(",").append(parentNode.getDN());
}
sb.append("\nobjectClass: top");
ldif.setText(sb.toString());
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 d19b82e..ba9ab9a 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -563,7 +563,7 @@
StringBuilder sb = new StringBuilder();
for (String line : lines)
{
- sb.append(line+ServerConstants.EOL);
+ sb.append(line).append(ServerConstants.EOL);
}
return sb.toString();
}
@@ -640,7 +640,7 @@
getObfuscatedCommandLineArguments(getDSConfigCommandLineArguments());
for (String arg : args)
{
- sb.append(" "+CommandBuilder.escapeValue(arg));
+ sb.append(" ").append(CommandBuilder.escapeValue(arg));
}
ctx.createSubcontext(indexEntry.getName().toString(), attrs);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java
index 61a1727..8265ec1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
/*
@@ -49,7 +49,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -305,7 +305,7 @@
protected String getLDIF()
{
StringBuilder sb = new StringBuilder();
- sb.append("dn: "+dn.getText()+"\n");
+ sb.append("dn: ").append(dn.getText()).append("\n");
String[] attrNames = {"o", "description"};
JTextField[] textFields = {name, description};
sb.append("objectclass: top\n");
@@ -315,7 +315,7 @@
String value = textFields[i].getText().trim();
if (value.length() > 0)
{
- sb.append(attrNames[i]+": "+value+"\n");
+ sb.append(attrNames[i]).append(": ").append(value).append("\n");
}
}
return sb.toString();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java
index 2d2a99d..1c25ee2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -276,7 +276,7 @@
protected String getLDIF()
{
StringBuilder sb = new StringBuilder();
- sb.append("dn: "+dn.getText()+"\n");
+ sb.append("dn: ").append(dn.getText()).append("\n");
String[] attrNames = {"ou", "description", "postalAddress",
"telephoneNumber", "facsimileTelephoneNumber"};
JTextField[] textFields = {name, description, address,
@@ -288,7 +288,7 @@
String value = textFields[i].getText().trim();
if (value.length() > 0)
{
- sb.append(attrNames[i]+": "+value+"\n");
+ sb.append(attrNames[i]).append(": ").append(value).append("\n");
}
}
return sb.toString();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java
index b4198ae..649b153 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -366,7 +366,7 @@
protected String getLDIF()
{
StringBuilder sb = new StringBuilder();
- sb.append("dn: "+dn.getText()+"\n");
+ sb.append("dn: ").append(dn.getText()).append("\n");
String[] attrNames = {"givenName", "sn", "cn", "uid", "userPassword",
"mail", "telephoneNumber", "facsimileTelephoneNumber"};
JTextField[] textFields = {firstName, lastName, commonName, userID,
@@ -379,7 +379,7 @@
String value = textFields[i].getText().trim();
if (value.length() > 0)
{
- sb.append(attrNames[i]+": "+value+"\n");
+ sb.append(attrNames[i]).append(": ").append(value).append("\n");
}
}
return sb.toString();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
index 555e5ec..216ea3d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
@@ -673,7 +673,7 @@
{
if (subType != null)
{
- l.append(NAME + " ("+subType+")");
+ l.append(NAME).append(" (").append(subType).append(")");
}
else
{
@@ -692,7 +692,7 @@
l.append(friendly);
if (subType != null)
{
- l.append(" ("+subType+")");
+ l.append(" (").append(subType).append(")");
}
}
}
@@ -1416,8 +1416,7 @@
private String getLDIF()
{
StringBuilder sb = new StringBuilder();
-
- sb.append("dn: "+getDisplayedDN());
+ sb.append("dn: ").append(getDisplayedDN());
for (String attrName : hmEditors.keySet())
{
@@ -1653,13 +1652,13 @@
{
newDN = parent.child(newRDN);
}
- sb.append(newDN.toString());
+ sb.append(newDN);
}
else
{
if (parent != null)
{
- sb.append(","+parent.toString());
+ sb.append(",").append(parent);
}
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java
index 1bd82d4..f7159ac 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -257,7 +257,7 @@
mb.append(
INFO_CTRL_PANEL_AUTH_REQUIRED_TO_BROWSE_MONITORING_SUMMARY.
get());
- mb.append("<br><br>"+getAuthenticateHTML());
+ mb.append("<br><br>").append(getAuthenticateHTML());
LocalizableMessage title =
INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_SUMMARY.get();
updateErrorPane(errorPane, title,
@@ -272,7 +272,7 @@
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_DETAILS.get(
desc.getHostname()));
- mb.append("<br><br>"+getAuthenticateHTML());
+ mb.append("<br><br>").append(getAuthenticateHTML());
LocalizableMessage title =
INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_SUMMARY.get();
updateErrorPane(errorPane, title,
@@ -306,19 +306,16 @@
if (!desc.isAuthenticated())
{
mb.append("<br>");
- mb.append(
- INFO_CTRL_PANEL_AUTH_REQUIRED_TO_BROWSE_MONITORING_SUMMARY.
- get());
- mb.append("<br><br>"+getAuthenticateHTML());
+ mb.append(INFO_CTRL_PANEL_AUTH_REQUIRED_TO_BROWSE_MONITORING_SUMMARY.get());
+ mb.append("<br><br>").append(getAuthenticateHTML());
}
}
else if (desc.getStatus() ==
ServerDescriptor.ServerStatus.NOT_CONNECTED_TO_REMOTE)
{
mb.append("<br>");
- mb.append(INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_DETAILS.get(
- desc.getHostname()));
- mb.append("<br><br>"+getAuthenticateHTML());
+ mb.append(INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_DETAILS.get(desc.getHostname()));
+ mb.append("<br><br>").append(getAuthenticateHTML());
}
updateErrorPane(errorPane, title, ColorAndFontConstants.errorTitleFont,
mb.toMessage(), ColorAndFontConstants.defaultFont);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
index 2a77a52..234555c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
@@ -270,7 +270,7 @@
private String getLDIF()
{
StringBuilder sb = new StringBuilder();
- sb.append("dn: "+getDisplayedDN());
+ sb.append("dn: ").append(getDisplayedDN());
for (int i=0; i<tableModel.getRowCount(); i++)
{
String attrName = (String)tableModel.getValueAt(i, 0);
@@ -383,13 +383,13 @@
{
newDN = parent.child(newRDN);
}
- sb.append(newDN.toString());
+ sb.append(newDN);
}
else
{
if (parent != null)
{
- sb.append(","+parent.toString());
+ sb.append(",").append(parent);
}
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java
index 2dbd6b9..d122bbe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -625,7 +625,7 @@
int h = Integer.parseInt(sTime.substring(0, index).trim());
int m = Integer.parseInt(sTime.substring(index+1).trim());
StringBuilder sb = new StringBuilder();
- sb.append(m+" "+h+" * * ");
+ sb.append(m).append(" ").append(h).append(" * * ");
boolean oneDayAdded = false;
for (int i=0; i<weekDays.length; i++)
@@ -649,7 +649,7 @@
int h = Integer.parseInt(sTime.substring(0, index).trim());
int m = Integer.parseInt(sTime.substring(index+1).trim());
StringBuilder sb = new StringBuilder();
- sb.append(m+" "+h+" ");
+ sb.append(m).append(" ").append(h).append(" ");
boolean oneDayAdded = false;
for (int i=0; i<monthDays.length; i++)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
index 42acb6b..d854ea5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
@@ -444,7 +444,7 @@
if (ocValue.getStructural() != null)
{
sb.append("\n");
- sb.append(attrName+": "+ocValue.getStructural());
+ sb.append(attrName).append(": ").append(ocValue.getStructural());
Schema schema = getInfo().getServerDescriptor().getSchema();
if (schema != null)
{
@@ -456,7 +456,7 @@
for (String name : names)
{
sb.append("\n");
- sb.append(attrName+": "+name);
+ sb.append(attrName).append(": ").append(name);
}
}
}
@@ -464,7 +464,7 @@
for (String v : ocValue.getAuxiliary())
{
sb.append("\n");
- sb.append(attrName+": "+v);
+ sb.append(attrName).append(": ").append(v);
}
}
else if (value instanceof byte[])
@@ -472,21 +472,18 @@
if (((byte[])value).length > 0)
{
sb.append("\n");
- sb.append(attrName+":: "+Base64.encode((byte[])value));
+ sb.append(attrName).append(":: ").append(Base64.encode((byte[])value));
}
}
else if (value instanceof BinaryValue)
{
sb.append("\n");
- sb.append(attrName+":: "+((BinaryValue)value).getBase64());
+ sb.append(attrName).append(":: ").append(((BinaryValue)value).getBase64());
}
- else
+ else if (String.valueOf(value).trim().length() > 0)
{
- if (String.valueOf(value).trim().length() > 0)
- {
- sb.append("\n");
- sb.append(attrName+": "+value);
- }
+ sb.append("\n");
+ sb.append(attrName).append(": ").append(value);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java
index 3d0c693..fa77e6d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui.components;
@@ -228,7 +228,7 @@
toolTip = Utilities.stripHtmlToSingleLine(toolTip);
if (toolTip != null)
{
- sb.append(" - "+toolTip);
+ sb.append(" - ").append(toolTip);
}
}
getAccessibleContext().setAccessibleName(sb.toString());
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
index de5365e..ac340eb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.util;
@@ -1170,7 +1170,7 @@
// Check where to insert a line break
if (lastSpace != -1)
{
- sb.append(lastLine.subSequence(0, lastSpace));
+ sb.append(lastLine, 0, lastSpace);
sb.append("<br>");
lastLine.delete(0, lastSpace + 1);
lastLine.append(c);
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/CliUserInteraction.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/CliUserInteraction.java
index 0b6c313..f08a755 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/CliUserInteraction.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/CliUserInteraction.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.quicksetup;
@@ -160,7 +160,7 @@
if (list != null) {
for (Object o : list) {
sb.append(/*bullet=*/"* ");
- sb.append(o.toString());
+ sb.append(o);
sb.append(Constants.LINE_SEPARATOR);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java
index c134af9..05f4d38 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.quicksetup;
@@ -216,9 +216,8 @@
StringBuilder buf = new StringBuilder();
while (t != null)
{
- StackTraceElement[] stack = t.getStackTrace();
- for (StackTraceElement aStack : stack) {
- buf.append(aStack.toString()).append("\n");
+ for (StackTraceElement aStack : t.getStackTrace()) {
+ buf.append(aStack).append("\n");
}
t = t.getCause();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
index 45ab47e..809be53 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
@@ -1106,17 +1106,10 @@
public void toString(StringBuilder builder) {
super.toString(builder);
- builder.append(" parentPath=");
- builder.append(parentPath);
-
- builder.append(" relationDefinition=");
- builder.append(relationDefinition.getName());
-
- builder.append(" targetNeedsEnablingCondition=");
- builder.append(String.valueOf(targetNeedsEnablingCondition));
-
- builder.append(" targetIsEnabledCondition=");
- builder.append(String.valueOf(targetIsEnabledCondition));
+ builder.append(" parentPath=").append(parentPath);
+ builder.append(" relationDefinition=").append(relationDefinition.getName());
+ builder.append(" targetNeedsEnablingCondition=").append(targetNeedsEnablingCondition);
+ builder.append(" targetIsEnabledCondition=").append(targetIsEnabledCondition);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java
index b874292..2b7fb4f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java
@@ -432,13 +432,8 @@
* <code>null</code> if there is no information available.
*/
public String printExtensionInformation() {
- File extensionsPath =
- new File(new StringBuilder(DirectoryServer.getServerRoot()).
- append(File.separator).
- append(LIB_DIR).
- append(File.separator).
- append(EXTENSIONS_DIR).
- toString());
+ String pathname = DirectoryServer.getServerRoot() + File.separator + LIB_DIR + File.separator + EXTENSIONS_DIR;
+ File extensionsPath = new File(pathname);
if (!extensionsPath.exists() || !extensionsPath.isDirectory()) {
// no extensions' directory
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java
index 53b4cf6..e81e2c6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java
@@ -494,11 +494,7 @@
}
// Encode the size value using the base unit.
- StringBuilder builder = new StringBuilder();
- builder.append(value);
- builder.append(' ');
- builder.append(baseUnit.toString());
- return builder.toString();
+ return value + " " + baseUnit;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/SizePropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/SizePropertyDefinition.java
index 5907bca..79e61dd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/SizePropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/SizePropertyDefinition.java
@@ -308,15 +308,12 @@
}
// Encode the size value using the best-fit unit.
- StringBuilder builder = new StringBuilder();
SizeUnit unit = SizeUnit.getBestFitUnitExact(value);
+ long fromBytes = (long) unit.fromBytes(value);
// Cast to a long to remove fractional part (which should not be there
// anyway as the best-fit unit should result in an exact conversion).
- builder.append((long) unit.fromBytes(value));
- builder.append(' ');
- builder.append(unit.toString());
- return builder.toString();
+ return fromBytes + " " + unit;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
index 4f857f3..5e96a54 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
@@ -275,11 +275,10 @@
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append('{');
- for (Map.Entry<PropertyDefinition<?>, MyProperty<?>> entry : properties
- .entrySet()) {
+ for (Map.Entry<PropertyDefinition<?>, MyProperty<?>> entry : properties.entrySet()) {
builder.append(entry.getKey().getName());
builder.append('=');
- builder.append(entry.getValue().toString());
+ builder.append(entry.getValue());
builder.append(' ');
}
builder.append('}');
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java
index a3a4a7e..4a77501 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2010-2014 ForgeRock AS.
+ * Portions Copyright 2010-2015 ForgeRock AS.
*/
package org.opends.server.backends.jeb;
@@ -243,8 +243,7 @@
if (ABBREVIATIONS.contains(component)) {
buffer.append(component.toUpperCase());
} else {
- buffer.append(component.substring(0, 1).toUpperCase() +
- component.substring(1));
+ buffer.append(component.substring(0, 1).toUpperCase()).append(component.substring(1));
}
}
return buffer.toString();
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 c15638f..094bbbe 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
@@ -959,7 +959,7 @@
buffer.append("-");
buffer.append(message.ordinal());
buffer.append(" message=\"");
- buffer.append(message.toString());
+ buffer.append(message);
buffer.append("\"");
if (exception != null)
{
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 1323f93..43e44f3 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
@@ -136,7 +136,7 @@
for (int j = rdns.length - 1; j >= 0; j--)
{
int rdnIndex = rdns.length - j;
- buffer.append(",Rdn" + rdnIndex + "=") ;
+ buffer.append(",Rdn").append(rdnIndex).append("=") ;
for (int i = 0; i < rdns[j].length(); i++)
{
char c = rdns[j].charAt(i);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java
index 6b1f06d..b467788 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.controls;
import org.forgerock.i18n.LocalizableMessage;
@@ -304,13 +304,11 @@
public void toString(StringBuilder buffer)
{
buffer.append("EntryChangeNotificationControl(changeType=");
- buffer.append(changeType.toString());
+ buffer.append(changeType);
if (previousDN != null)
{
- buffer.append(",previousDN=\"");
- buffer.append(previousDN.toString());
- buffer.append("\"");
+ buffer.append(",previousDN=\"").append(previousDN).append("\"");
}
if (changeNumber > 0)
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 b82e7de..d87263d 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.controls;
import static org.opends.messages.ProtocolMessages.ERR_ECLN_CANNOT_DECODE_VALUE;
@@ -160,7 +160,7 @@
public void toString(StringBuilder buffer)
{
buffer.append("EntryChangelogNotificationControl(cookie=");
- buffer.append(cookie.toString());
+ buffer.append(cookie);
buffer.append(")");
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java
index 5d3c0f0..d7cb8d2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.controls;
import org.forgerock.i18n.LocalizableMessage;
@@ -319,7 +319,7 @@
if (warningType != null)
{
- buffer.append(warningType.toString());
+ buffer.append(warningType);
buffer.append("=");
buffer.append(warningValue);
@@ -331,7 +331,7 @@
if (errorType != null)
{
- buffer.append(errorType.toString());
+ buffer.append(errorType);
}
buffer.append(")");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchChangeType.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchChangeType.java
index e47bf3f..90a63e4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchChangeType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchChangeType.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.controls;
@@ -309,12 +309,12 @@
Iterator<PersistentSearchChangeType> iterator = changeTypes.iterator();
if (iterator.hasNext())
{
- buffer.append(iterator.next().toString());
+ buffer.append(iterator.next());
while (iterator.hasNext())
{
buffer.append("|");
- buffer.append(iterator.next().toString());
+ buffer.append(iterator.next());
}
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java
index 7f223bd..48c723f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java
@@ -149,7 +149,7 @@
public void toString(StringBuilder buffer)
{
buffer.append("SubentriesControl(visibility=\"");
- buffer.append(Boolean.toString(visibility));
+ buffer.append(visibility);
buffer.append("\")");
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java
index 71473d1..be071ca 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java
@@ -827,7 +827,7 @@
buffer.append(EOL);
buffer.append("Update Failure Policy: ");
- buffer.append(configuration.getStateUpdateFailurePolicy().toString());
+ buffer.append(configuration.getStateUpdateFailurePolicy());
buffer.append(EOL);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java
index 370a0c6..8381728 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -80,7 +80,7 @@
{
for (ByteString v : a)
{
- buffer.append(v.toString());
+ buffer.append(v);
return;
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java
index b6673d6..1dc674a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -56,7 +56,7 @@
public void generateValue(LocalizableMessageBuilder buffer,
AccountStatusNotification notification)
{
- buffer.append(notification.getUserDN().toString());
+ buffer.append(notification.getUserDN());
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
index 69df0b1..7b56625 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -178,7 +178,7 @@
public void toString(StringBuilder buffer)
{
buffer.append("AddRequest(dn=");
- buffer.append(dn.toString());
+ buffer.append(dn);
buffer.append(", attrs={");
if (! attributes.isEmpty())
@@ -221,7 +221,7 @@
buffer.append(indentBuf);
buffer.append(" DN: ");
- buffer.append(dn.toString());
+ buffer.append(dn);
buffer.append(EOL);
buffer.append(" Attributes:");
@@ -269,14 +269,14 @@
}
else
{
- buffer.append(dnString.substring(0, colsRemaining));
+ buffer.append(dnString, 0, colsRemaining);
buffer.append(EOL);
int startPos = colsRemaining;
while ((dnLength - startPos) > (wrapColumn - 1))
{
buffer.append(" ");
- buffer.append(dnString.substring(startPos, (startPos+wrapColumn-1)));
+ buffer.append(dnString, startPos, (startPos+wrapColumn-1));
buffer.append(EOL);
startPos += (wrapColumn-1);
@@ -325,15 +325,14 @@
}
else
{
- buffer.append(valueString.substring(0, colsRemaining));
+ buffer.append(valueString, 0, colsRemaining);
buffer.append(EOL);
int startPos = colsRemaining;
while ((valueLength - startPos) > (wrapColumn - 1))
{
buffer.append(" ");
- buffer.append(valueString.substring(startPos,
- (startPos+wrapColumn-1)));
+ buffer.append(valueString, startPos, (startPos+wrapColumn-1));
buffer.append(EOL);
startPos += (wrapColumn-1);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddResponseProtocolOp.java
index 22ecbee..effb035 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddResponseProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
import org.forgerock.i18n.LocalizableMessage;
@@ -254,7 +254,7 @@
if (matchedDN != null)
{
buffer.append(", matchedDN=");
- buffer.append(matchedDN.toString());
+ buffer.append(matchedDN);
}
if ((referralURLs != null) && (! referralURLs.isEmpty()))
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
index 6a4d6ac..72c3d7b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
import org.forgerock.i18n.LocalizableMessage;
@@ -304,7 +304,7 @@
if (matchedDN != null)
{
buffer.append(", matchedDN=");
- buffer.append(matchedDN.toString());
+ buffer.append(matchedDN);
}
if ((referralURLs != null) && (! referralURLs.isEmpty()))
@@ -326,7 +326,7 @@
if (serverSASLCredentials != null)
{
buffer.append(", serverSASLCredentials=");
- buffer.append(serverSASLCredentials.toString());
+ buffer.append(serverSASLCredentials);
}
buffer.append(")");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
index 14633cc..5ed8fd7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -163,11 +163,11 @@
public void toString(StringBuilder buffer)
{
buffer.append("CompareRequest(dn=");
- buffer.append(dn.toString());
+ buffer.append(dn);
buffer.append(", attribute=");
buffer.append(attributeType);
buffer.append(", value=");
- buffer.append(assertionValue.toString());
+ buffer.append(assertionValue);
buffer.append(")");
}
@@ -195,7 +195,7 @@
buffer.append(indentBuf);
buffer.append(" Target DN: ");
- buffer.append(dn.toString());
+ buffer.append(dn);
buffer.append(EOL);
buffer.append(indentBuf);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java
index f6dd6b4..7e83066 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
import org.forgerock.i18n.LocalizableMessage;
@@ -255,7 +255,7 @@
if (matchedDN != null)
{
buffer.append(", matchedDN=");
- buffer.append(matchedDN.toString());
+ buffer.append(matchedDN);
}
if ((referralURLs != null) && (! referralURLs.isEmpty()))
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
index 8ffbf07..2c383c3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -119,7 +119,7 @@
public void toString(StringBuilder buffer)
{
buffer.append("DeleteRequest(dn=");
- buffer.append(dn.toString());
+ buffer.append(dn);
buffer.append(")");
}
@@ -147,7 +147,7 @@
buffer.append(indentBuf);
buffer.append(" Entry DN: ");
- buffer.append(dn.toString());
+ buffer.append(dn);
buffer.append(EOL);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
index 09e2871..a876eb4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
import org.forgerock.i18n.LocalizableMessage;
@@ -258,7 +258,7 @@
if (matchedDN != null)
{
buffer.append(", matchedDN=");
- buffer.append(matchedDN.toString());
+ buffer.append(matchedDN);
}
if ((referralURLs != null) && (! referralURLs.isEmpty()))
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
index e49b25f..c5f2304 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -165,7 +165,7 @@
if (value != null)
{
buffer.append(", value=");
- buffer.append(value.toString());
+ buffer.append(value);
}
buffer.append(")");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
index fc45952..80d11ea 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
import org.forgerock.i18n.LocalizableMessage;
@@ -328,7 +328,7 @@
if (matchedDN != null)
{
buffer.append(", matchedDN=");
- buffer.append(matchedDN.toString());
+ buffer.append(matchedDN);
}
if ((referralURLs != null) && (! referralURLs.isEmpty()))
@@ -356,7 +356,7 @@
if (value != null)
{
buffer.append(", value=");
- buffer.append(value.toString());
+ buffer.append(value);
}
buffer.append(")");
@@ -432,7 +432,7 @@
{
buffer.append(indentBuf);
buffer.append(" Response Value: ");
- buffer.append(value.toString());
+ buffer.append(value);
buffer.append(EOL);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
index 9a029ad..98b4efc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -164,15 +164,11 @@
*/
public void toString(StringBuilder buffer)
{
- buffer.append("IntermediateResponse(oid=");
- buffer.append(String.valueOf(oid));
-
+ buffer.append("IntermediateResponse(oid=").append(oid);
if (value != null)
{
- buffer.append(", value=");
- buffer.append(value.toString());
+ buffer.append(", value=").append(value);
}
-
buffer.append(")");
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java
index c3abaf9..8e63596 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -152,8 +152,7 @@
*/
public void toString(StringBuilder buffer)
{
- buffer.append("LDAPModification(type=");
- buffer.append(String.valueOf(modificationType));
+ buffer.append("LDAPModification(type=").append(modificationType);
buffer.append(", attr=");
attribute.toString(buffer);
buffer.append("})");
@@ -177,16 +176,11 @@
indentBuf.append(' ');
}
- buffer.append(indentBuf);
- buffer.append("LDAP Modification");
- buffer.append(EOL);
+ buffer.append(indentBuf).append("LDAP Modification").append(EOL);
buffer.append(indentBuf);
- buffer.append(" Modification Type: ");
- buffer.append(String.valueOf(modificationType));
- buffer.append(" (");
- buffer.append(modificationType.intValue());
- buffer.append(")");
+ buffer.append(" Modification Type: ").append(modificationType);
+ buffer.append(" (").append(modificationType.intValue()).append(")");
buffer.append(EOL);
buffer.append(" Attribute:");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
index c75f699..ded704b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -202,17 +202,13 @@
*/
public void toString(StringBuilder buffer)
{
- buffer.append("ModifyDNRequest(dn=");
- buffer.append(entryDN.toString());
- buffer.append(", newRDN=");
- buffer.append(newRDN.toString());
- buffer.append(", deleteOldRDN=");
- buffer.append(deleteOldRDN);
+ buffer.append("ModifyDNRequest(dn=").append(entryDN);
+ buffer.append(", newRDN=").append(newRDN);
+ buffer.append(", deleteOldRDN=").append(deleteOldRDN);
if (newSuperior != null)
{
- buffer.append(", newSuperior=");
- buffer.append(newSuperior.toString());
+ buffer.append(", newSuperior=").append(newSuperior);
}
buffer.append(")");
@@ -242,12 +238,12 @@
buffer.append(indentBuf);
buffer.append(" Entry DN: ");
- buffer.append(entryDN.toString());
+ buffer.append(entryDN);
buffer.append(EOL);
buffer.append(indentBuf);
buffer.append(" New RDN: ");
- buffer.append(newRDN.toString());
+ buffer.append(newRDN);
buffer.append(EOL);
buffer.append(indentBuf);
@@ -259,7 +255,7 @@
{
buffer.append(indentBuf);
buffer.append(" New Superior: ");
- buffer.append(newSuperior.toString());
+ buffer.append(newSuperior);
buffer.append(EOL);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java
index 275cd15..e64c1fc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
import org.forgerock.i18n.LocalizableMessage;
@@ -254,7 +254,7 @@
if (matchedDN != null)
{
buffer.append(", matchedDN=");
- buffer.append(matchedDN.toString());
+ buffer.append(matchedDN);
}
if ((referralURLs != null) && (! referralURLs.isEmpty()))
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java
index 2eb436f..d45b63d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -177,8 +177,7 @@
@Override
public void toString(StringBuilder buffer)
{
- buffer.append("ModifyRequest(dn=");
- buffer.append(dn.toString());
+ buffer.append("ModifyRequest(dn=").append(dn);
buffer.append(", mods={");
if (! modifications.isEmpty())
@@ -221,7 +220,7 @@
buffer.append(indentBuf);
buffer.append(" DN: ");
- buffer.append(dn.toString());
+ buffer.append(dn);
buffer.append(EOL);
buffer.append(" Modifications:");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java
index 4159a85..240b82e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
import org.forgerock.i18n.LocalizableMessage;
@@ -252,7 +252,7 @@
if (matchedDN != null)
{
buffer.append(", matchedDN=");
- buffer.append(matchedDN.toString());
+ buffer.append(matchedDN);
}
if ((referralURLs != null) && (! referralURLs.isEmpty()))
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
index dcd8194..a963d7e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -272,18 +272,12 @@
@Override
public void toString(StringBuilder buffer)
{
- buffer.append("SearchRequest(baseDN=");
- buffer.append(baseDN.toString());
- buffer.append(", scope=");
- buffer.append(String.valueOf(scope));
- buffer.append(", derefPolicy=");
- buffer.append(String.valueOf(dereferencePolicy));
- buffer.append(", sizeLimit=");
- buffer.append(sizeLimit);
- buffer.append(", timeLimit=");
- buffer.append(timeLimit);
- buffer.append(", typesOnly=");
- buffer.append(typesOnly);
+ buffer.append("SearchRequest(baseDN=").append(baseDN);
+ buffer.append(", scope=").append(scope);
+ buffer.append(", derefPolicy=").append(dereferencePolicy);
+ buffer.append(", sizeLimit=").append(sizeLimit);
+ buffer.append(", timeLimit=").append(timeLimit);
+ buffer.append(", typesOnly=").append(typesOnly);
buffer.append(", filter=");
filter.toString(buffer);
buffer.append(", attributes={");
@@ -322,57 +316,26 @@
indentBuf.append(' ');
}
- buffer.append(indentBuf);
- buffer.append("Search Request");
- buffer.append(EOL);
-
- buffer.append(indentBuf);
- buffer.append(" Base DN: ");
- buffer.append(baseDN.toString());
- buffer.append(EOL);
-
- buffer.append(indentBuf);
- buffer.append(" Scope: ");
- buffer.append(String.valueOf(scope));
- buffer.append(EOL);
-
- buffer.append(indentBuf);
- buffer.append(" Dereference Policy: ");
- buffer.append(String.valueOf(dereferencePolicy));
- buffer.append(EOL);
-
- buffer.append(indentBuf);
- buffer.append(" Size Limit: ");
- buffer.append(sizeLimit);
- buffer.append(EOL);
-
- buffer.append(indentBuf);
- buffer.append(" Time Limit: ");
- buffer.append(timeLimit);
- buffer.append(EOL);
-
- buffer.append(indentBuf);
- buffer.append(" Types Only: ");
- buffer.append(typesOnly);
- buffer.append(EOL);
+ buffer.append(indentBuf).append("Search Request").append(EOL);
+ buffer.append(indentBuf).append(" Base DN: ").append(baseDN).append(EOL);
+ buffer.append(indentBuf).append(" Scope: ").append(scope).append(EOL);
+ buffer.append(indentBuf).append(" Dereference Policy: ").append(dereferencePolicy).append(EOL);
+ buffer.append(indentBuf).append(" Size Limit: ").append(sizeLimit).append(EOL);
+ buffer.append(indentBuf).append(" Time Limit: ").append(timeLimit).append(EOL);
+ buffer.append(indentBuf).append(" Types Only: ").append(typesOnly).append(EOL);
buffer.append(indentBuf);
buffer.append(" Filter: ");
filter.toString(buffer);
buffer.append(EOL);
- buffer.append(indentBuf);
- buffer.append(" Attributes:");
- buffer.append(EOL);
+ buffer.append(indentBuf).append(" Attributes:").append(EOL);
if (attributes != null)
{
for (String attribute : attributes)
{
- buffer.append(indentBuf);
- buffer.append(" ");
- buffer.append(attribute);
- buffer.append(EOL);
+ buffer.append(indentBuf).append(" ").append(attribute).append(EOL);
}
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java
index 2388eef..9489e65 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
import org.forgerock.i18n.LocalizableMessage;
@@ -255,7 +255,7 @@
if (matchedDN != null)
{
buffer.append(", matchedDN=");
- buffer.append(matchedDN.toString());
+ buffer.append(matchedDN);
}
if ((referralURLs != null) && (! referralURLs.isEmpty()))
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
index d384b23..f5a0e81 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -439,14 +439,14 @@
}
else
{
- buffer.append(dnString.substring(0, colsRemaining));
+ buffer.append(dnString, 0, colsRemaining);
buffer.append(EOL);
int startPos = colsRemaining;
while ((dnLength - startPos) > (wrapColumn - 1))
{
buffer.append(" ");
- buffer.append(dnString.substring(startPos, (startPos+wrapColumn-1)));
+ buffer.append(dnString, startPos, (startPos+wrapColumn-1));
buffer.append(EOL);
startPos += (wrapColumn-1);
@@ -495,15 +495,14 @@
}
else
{
- buffer.append(valueString.substring(0, colsRemaining));
+ buffer.append(valueString, 0, colsRemaining);
buffer.append(EOL);
int startPos = colsRemaining;
while ((valueLength - startPos) > (wrapColumn - 1))
{
buffer.append(" ");
- buffer.append(valueString.substring(startPos,
- (startPos+wrapColumn-1)));
+ buffer.append(valueString, startPos, (startPos+wrapColumn-1));
buffer.append(EOL);
startPos += (wrapColumn-1);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java
index 9248763..bbf4a28 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -1519,8 +1519,8 @@
*/
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get(baseDN, msg.getDestination()));
- mb.append(" unroutable message =" + msg.getClass().getSimpleName());
- mb.append(" Details: " + ioe.getLocalizedMessage());
+ mb.append(" unroutable message =").append(msg.getClass().getSimpleName());
+ mb.append(" Details: ").append(ioe.getLocalizedMessage());
final LocalizableMessage message = mb.toMessage();
logger.error(message);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
index bcd1072..91e0250 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
@@ -339,8 +339,7 @@
StringBuilder builder = new StringBuilder();
for(DN dn : backend.getBaseDNs())
{
- builder.append(dn.toString());
- builder.append(" ");
+ builder.append(dn).append(" ");
}
LocalizableMessage message = ERR_LDIFIMPORT_MISSING_CLEAR_BACKEND.get(
builder, typeClearBackend.getNameOrOID());
@@ -527,11 +526,11 @@
backend.getBaseDNs().length > 1 && !clearBackend)
{
StringBuilder builder = new StringBuilder();
- builder.append(backend.getBaseDNs()[0].toString());
+ builder.append(backend.getBaseDNs()[0]);
for(int i = 1; i < backend.getBaseDNs().length; i++)
{
builder.append(" / ");
- builder.append(backend.getBaseDNs()[i].toString());
+ builder.append(backend.getBaseDNs()[i]);
}
logger.error(ERR_LDIFIMPORT_MISSING_CLEAR_BACKEND, builder, ATTR_IMPORT_CLEAR_BACKEND);
return TaskState.STOPPED_BY_ERROR;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
index a91e8d4..bbf40b5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
@@ -1279,11 +1279,11 @@
private StringBuilder join(final DN[] baseDNs, final String separator)
{
final StringBuilder builder = new StringBuilder();
- builder.append(baseDNs[0].toString());
+ builder.append(baseDNs[0]);
for (int i = 1; i < baseDNs.length; i++)
{
builder.append(separator);
- builder.append(baseDNs[i].toString());
+ builder.append(baseDNs[i]);
}
return builder;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java
index d3d9da0..5ed2b46 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
-
package org.opends.server.tools;
import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
@@ -495,20 +494,19 @@
Properties properties)
{
StringBuilder buf = new StringBuilder();
- buf.append("#!/bin/sh"+EOL+EOL);
+ buf.append("#!/bin/sh").append(EOL).append(EOL);
if (!overwriteJavaHome)
{
- buf.append(
- "# See if the environment variables for java home are set"+EOL+
- "# in the path and try to figure it out."+EOL+
- "if test ! -f \"${OPENDJ_JAVA_BIN}\""+EOL+
- "then"+EOL+
- " if test ! -d \"${OPENDJ_JAVA_HOME}\""+EOL+
- " then"+EOL+
- " if test ! -f \"${OPENDS_JAVA_BIN}\""+EOL+
- " then"+EOL+
- " if test ! -d \"${OPENDS_JAVA_HOME}\""+EOL);
+ buf.append("# See if the environment variables for java home are set").append(EOL)
+ .append("# in the path and try to figure it out.").append(EOL)
+ .append("if test ! -f \"${OPENDJ_JAVA_BIN}\"").append(EOL)
+ .append("then").append(EOL)
+ .append(" if test ! -d \"${OPENDJ_JAVA_HOME}\"").append(EOL)
+ .append(" then").append(EOL)
+ .append(" if test ! -f \"${OPENDS_JAVA_BIN}\"").append(EOL)
+ .append(" then").append(EOL)
+ .append(" if test ! -d \"${OPENDS_JAVA_HOME}\"").append(EOL);
}
boolean propertiesAdded = false;
@@ -543,31 +541,28 @@
{
s = "";
}
- buf.append(
- s+"elif test \"${SCRIPT_NAME}.java-home\" = \""+name+"\""+EOL);
+ buf.append(s).append("elif test \"${SCRIPT_NAME}.java-home\" = \"").append(name).append("\"").append(EOL);
}
else if (!overwriteJavaHome)
{
- buf.append(
- " then"+EOL+
- " if test \"${SCRIPT_NAME}.java-home\" = \""+name+"\""+EOL);
+ buf.append(" then").append(EOL)
+ .append(" if test \"${SCRIPT_NAME}.java-home\" = \"").append(name).append("\"").append(EOL);
s = " ";
}
else
{
- buf.append(
- "if test \"${SCRIPT_NAME}.java-home\" = \""+name+"\""+EOL);
+ buf.append("if test \"${SCRIPT_NAME}.java-home\" = \"").append(name).append("\"").append(EOL);
s = "";
}
- buf.append(
- s+"then"+EOL+
- s+" TEMP=\""+value+"/bin/java\""+EOL+
- s+" if test -f \"${TEMP}\""+EOL+
- s+" then"+EOL+
- s+" OPENDJ_JAVA_BIN=\""+value+"/bin/java\""+EOL+
- s+" export OPENDJ_JAVA_BIN"+EOL+
- s+" fi"+EOL);
+ buf
+ .append(s).append("then").append(EOL)
+ .append(s).append(" TEMP=\"").append(value).append("/bin/java\"").append(EOL)
+ .append(s).append(" if test -f \"${TEMP}\"").append(EOL)
+ .append(s).append(" then").append(EOL)
+ .append(s).append(" OPENDJ_JAVA_BIN=\"").append(value).append("/bin/java\"").append(EOL)
+ .append(s).append(" export OPENDJ_JAVA_BIN").append(EOL)
+ .append(s).append(" fi").append(EOL);
nIfs++;
}
}
@@ -585,29 +580,26 @@
{
s = "";
}
- buf.append(
- s+"else"+EOL+
- s+" OPENDJ_JAVA_BIN=\""+defaultJavaHome+"/bin/java\""+EOL+
- s+" export OPENDJ_JAVA_BIN"+EOL);
+ buf.append(s).append("else").append(EOL)
+ .append(s).append(" OPENDJ_JAVA_BIN=\"").append(defaultJavaHome).append("/bin/java\"").append(EOL)
+ .append(s).append(" export OPENDJ_JAVA_BIN").append(EOL);
}
else
{
if (!overwriteJavaHome)
{
- buf.append(
- " then"+EOL+
- " TEMP=\""+defaultJavaHome+"/bin/java\""+EOL+
- " if test -f \"${TEMP}\""+EOL+
- " then"+EOL+
- " OPENDJ_JAVA_BIN=\"${TEMP}\""+EOL+
- " export OPENDJ_JAVA_BIN"+EOL+
- " fi"+EOL);
+ buf.append(" then").append(EOL)
+ .append(" TEMP=\"").append(defaultJavaHome).append("/bin/java\"").append(EOL)
+ .append(" if test -f \"${TEMP}\"").append(EOL)
+ .append(" then").append(EOL)
+ .append(" OPENDJ_JAVA_BIN=\"${TEMP}\"").append(EOL)
+ .append(" export OPENDJ_JAVA_BIN").append(EOL)
+ .append(" fi").append(EOL);
}
else
{
- buf.append(
- "OPENDJ_JAVA_BIN=\""+defaultJavaHome+"/bin/java\""+EOL+
- "export OPENDJ_JAVA_BIN"+EOL);
+ buf.append("OPENDJ_JAVA_BIN=\"").append(defaultJavaHome).append("/bin/java\"").append(EOL)
+ .append("export OPENDJ_JAVA_BIN").append(EOL);
}
}
propertiesAdded = true;
@@ -624,8 +616,7 @@
{
s = "";
}
- buf.append(
- s+"fi"+EOL);
+ buf.append(s).append("fi").append(EOL);
}
@@ -634,104 +625,101 @@
if (!propertiesAdded)
{
// No properties added: this is required not to break the script
- buf.append(
- " then"+EOL+
- " OPENDJ_JAVA_BIN=\"${OPENDJ_JAVA_BIN}\""+EOL);
+ buf.append(" then").append(EOL)
+ .append(" OPENDJ_JAVA_BIN=\"${OPENDJ_JAVA_BIN}\"").append(EOL);
}
- buf.append(
- " else"+EOL+
- " OPENDJ_JAVA_BIN=\"${OPENDS_JAVA_HOME}/bin/java\""+EOL+
- " export OPENDJ_JAVA_BIN"+EOL+
- " fi"+EOL+
- " else"+EOL+
- " OPENDJ_JAVA_BIN=\"${OPENDS_JAVA_BIN}\""+EOL+
- " export OPENDJ_JAVA_BIN"+EOL+
- " fi"+EOL+
- " else"+EOL+
- " OPENDJ_JAVA_BIN=\"${OPENDJ_JAVA_HOME}/bin/java\""+EOL+
- " export OPENDJ_JAVA_BIN"+EOL+
- " fi"+EOL+
-
- "fi"+EOL+EOL);
+ buf.append(" else").append(EOL)
+ .append(" OPENDJ_JAVA_BIN=\"${OPENDS_JAVA_HOME}/bin/java\"").append(EOL)
+ .append(" export OPENDJ_JAVA_BIN").append(EOL)
+ .append(" fi").append(EOL)
+ .append(" else").append(EOL)
+ .append(" OPENDJ_JAVA_BIN=\"${OPENDS_JAVA_BIN}\"").append(EOL)
+ .append(" export OPENDJ_JAVA_BIN").append(EOL)
+ .append(" fi").append(EOL)
+ .append(" else").append(EOL)
+ .append(" OPENDJ_JAVA_BIN=\"${OPENDJ_JAVA_HOME}/bin/java\"").append(EOL)
+ .append(" export OPENDJ_JAVA_BIN").append(EOL)
+ .append(" fi").append(EOL)
+ .append("fi").append(EOL)
+ .append(EOL);
}
else if (defaultJavaHome == null)
{
- buf.append(
- EOL+
- "if test ! -f \"${OPENDJ_JAVA_BIN}\""+EOL+
- "then"+EOL+
- " if test ! -d \"${OPENDJ_JAVA_HOME}\""+EOL+
- " then"+EOL+
- " if test ! -f \"${OPENDS_JAVA_BIN}\""+EOL+
- " then"+EOL+
- " if test ! -d \"${OPENDS_JAVA_HOME}\""+EOL+
- " then"+EOL+
- " if test ! -f \"${JAVA_BIN}\""+EOL+
- " then"+EOL+
- " if test ! -d \"${JAVA_HOME}\""+EOL+
- " then"+EOL+
- " OPENDJ_JAVA_BIN=`which java 2> /dev/null`"+EOL+
- " if test ${?} -eq 0"+EOL+
- " then"+EOL+
- " export OPENDJ_JAVA_BIN"+EOL+
- " else"+EOL+
- " echo \"You must specify the path to a valid Java 6.0 "+
- "or higher version in the\""+EOL+
- " echo \"properties file and then run the "+
- "dsjavaproperties tool. \""+EOL+
- " echo \"The procedure to follow is:\""+EOL+
- " echo \"You must specify the path to a valid Java 6.0 "+
- "or higher version. The \""+EOL+
- " echo \"procedure to follow is:\""+EOL+
- " echo \"1. Delete the file "+
- "${INSTANCE_ROOT}/lib/set-java-home\""+EOL+
- " echo \"2. Set the environment variable "+
- "OPENDJ_JAVA_HOME to the root of a valid \""+EOL+
- " echo \"Java 6.0 installation.\""+EOL+
- " echo \"If you want to have specificjava settings for"+
- " each command line you must\""+EOL+
- " echo \"follow the steps 3 and 4\""+EOL+
- " echo \"3. Edit the properties file specifying the "+
- "java binary and the java arguments\""+EOL+
- " echo \"for each command line. The java properties "+
- "file is located in:\""+EOL+
- " echo \"${INSTANCE_ROOT}/config/java.properties.\""+EOL+
- " echo \"4. Run the command-line "+
- "${INSTANCE_ROOT}/bin/dsjavaproperties\""+EOL+
- " exit 1"+EOL+
- " fi"+EOL+
- " else"+EOL+
- " OPENDJ_JAVA_BIN=\"${JAVA_HOME}/bin/java\""+EOL+
- " export OPENDJ_JAVA_BIN"+EOL+
- " fi"+EOL+
- " else"+EOL+
- " OPENDJ_JAVA_BIN=\"${JAVA_BIN}\""+EOL+
- " export OPENDJ_JAVA_BIN"+EOL+
- " fi"+EOL+
- " else"+EOL+
- " OPENDJ_JAVA_BIN=\"${OPENDS_JAVA_HOME}/bin/java\""+EOL+
- " export OPENDJ_JAVA_BIN"+EOL+
- " fi"+EOL+
- " else"+EOL+
- " OPENDJ_JAVA_BIN=\"${OPENDS_JAVA_BIN}\""+EOL+
- " export OPENDJ_JAVA_BIN"+EOL+
- " fi"+EOL+
- " else"+EOL+
- " OPENDJ_JAVA_BIN=\"${OPENDJ_JAVA_HOME}/bin/java\""+EOL+
- " export OPENDJ_JAVA_BIN"+EOL+
- " fi"+EOL+
- "fi"+EOL+EOL);
+ buf.append(EOL)
+ .append("if test ! -f \"${OPENDJ_JAVA_BIN}\"").append(EOL)
+ .append("then").append(EOL)
+ .append(" if test ! -d \"${OPENDJ_JAVA_HOME}\"").append(EOL)
+ .append(" then").append(EOL)
+ .append(" if test ! -f \"${OPENDS_JAVA_BIN}\"").append(EOL)
+ .append(" then").append(EOL)
+ .append(" if test ! -d \"${OPENDS_JAVA_HOME}\"").append(EOL)
+ .append(" then").append(EOL)
+ .append(" if test ! -f \"${JAVA_BIN}\"").append(EOL)
+ .append(" then").append(EOL)
+ .append(" if test ! -d \"${JAVA_HOME}\"").append(EOL)
+ .append(" then").append(EOL)
+ .append(" OPENDJ_JAVA_BIN=`which java 2> /dev/null`").append(EOL)
+ .append(" if test ${?} -eq 0").append(EOL)
+ .append(" then").append(EOL)
+ .append(" export OPENDJ_JAVA_BIN").append(EOL)
+ .append(" else").append(EOL)
+ .append(" echo \"You must specify the path to a valid Java 6.0 ")
+ .append("or higher version in the\"").append(EOL)
+ .append(" echo \"properties file and then run the ")
+ .append("dsjavaproperties tool. \"").append(EOL)
+ .append(" echo \"The procedure to follow is:\"").append(EOL)
+ .append(" echo \"You must specify the path to a valid Java 6.0 ")
+ .append("or higher version. The \"").append(EOL)
+ .append(" echo \"procedure to follow is:\"").append(EOL)
+ .append(" echo \"1. Delete the file ")
+ .append("${INSTANCE_ROOT}/lib/set-java-home\"").append(EOL)
+ .append(" echo \"2. Set the environment variable ")
+ .append("OPENDJ_JAVA_HOME to the root of a valid \"").append(EOL)
+ .append(" echo \"Java 6.0 installation.\"").append(EOL)
+ .append(" echo \"If you want to have specificjava settings for")
+ .append(" each command line you must\"").append(EOL)
+ .append(" echo \"follow the steps 3 and 4\"").append(EOL)
+ .append(" echo \"3. Edit the properties file specifying the ")
+ .append("java binary and the java arguments\"").append(EOL)
+ .append(" echo \"for each command line. The java properties ")
+ .append("file is located in:\"").append(EOL)
+ .append(" echo \"${INSTANCE_ROOT}/config/java.properties.\"").append(EOL)
+ .append(" echo \"4. Run the command-line ")
+ .append("${INSTANCE_ROOT}/bin/dsjavaproperties\"").append(EOL)
+ .append(" exit 1").append(EOL)
+ .append(" fi").append(EOL)
+ .append(" else").append(EOL)
+ .append(" OPENDJ_JAVA_BIN=\"${JAVA_HOME}/bin/java\"").append(EOL)
+ .append(" export OPENDJ_JAVA_BIN").append(EOL)
+ .append(" fi").append(EOL)
+ .append(" else").append(EOL)
+ .append(" OPENDJ_JAVA_BIN=\"${JAVA_BIN}\"").append(EOL)
+ .append(" export OPENDJ_JAVA_BIN").append(EOL)
+ .append(" fi").append(EOL)
+ .append(" else").append(EOL)
+ .append(" OPENDJ_JAVA_BIN=\"${OPENDS_JAVA_HOME}/bin/java\"").append(EOL)
+ .append(" export OPENDJ_JAVA_BIN").append(EOL)
+ .append(" fi").append(EOL)
+ .append(" else").append(EOL)
+ .append(" OPENDJ_JAVA_BIN=\"${OPENDS_JAVA_BIN}\"").append(EOL)
+ .append(" export OPENDJ_JAVA_BIN").append(EOL)
+ .append(" fi").append(EOL)
+ .append(" else").append(EOL)
+ .append(" OPENDJ_JAVA_BIN=\"${OPENDJ_JAVA_HOME}/bin/java\"").append(EOL)
+ .append(" export OPENDJ_JAVA_BIN").append(EOL)
+ .append(" fi").append(EOL)
+ .append("fi").append(EOL)
+ .append(EOL);
}
if (!overwriteJavaArgs)
{
- buf.append(
- EOL+
- "# See if the environment variables for arguments are set."+EOL+
- "if test -z \"${OPENDJ_JAVA_ARGS}\""+EOL+
- "then"+EOL+
- " if test -z \"${OPENDS_JAVA_ARGS}\""+EOL);
+ buf.append(EOL)
+ .append("# See if the environment variables for arguments are set.").append(EOL)
+ .append("if test -z \"${OPENDJ_JAVA_ARGS}\"").append(EOL)
+ .append("then").append(EOL)
+ .append(" if test -z \"${OPENDS_JAVA_ARGS}\"").append(EOL);
}
propertiesAdded = false;
@@ -759,24 +747,21 @@
propertiesAdded = true;
if (nIfs > 0)
{
- buf.append(
- s+" elif test \"${SCRIPT_NAME}.java-args\" = \""+name+"\""+EOL);
+ buf.append(s).append(" elif test \"${SCRIPT_NAME}.java-args\" = \"").append(name).append("\"").append(EOL);
}
else if (!overwriteJavaArgs)
{
- buf.append(
- " then"+EOL+
- " if test \"${SCRIPT_NAME}.java-args\" = \""+name+"\""+EOL);
+ buf.append(" then").append(EOL)
+ .append(" if test \"${SCRIPT_NAME}.java-args\" = \"").append(name).append("\"").append(EOL);
}
else
{
- buf.append(
- " if test \"${SCRIPT_NAME}.java-args\" = \""+name+"\""+EOL);
+ buf.append(" if test \"${SCRIPT_NAME}.java-args\" = \"").append(name).append("\"").append(EOL);
}
- buf.append(
- s+" then"+EOL+
- s+" OPENDJ_JAVA_ARGS=\""+value+"\""+EOL+
- s+" export OPENDJ_JAVA_ARGS"+EOL);
+ buf
+ .append(s).append(" then").append(EOL)
+ .append(s).append(" OPENDJ_JAVA_ARGS=\"").append(value).append("\"").append(EOL)
+ .append(s).append(" export OPENDJ_JAVA_ARGS").append(EOL);
nIfs++;
}
}
@@ -786,26 +771,23 @@
String s = overwriteJavaArgs? "":" ";
if (propertiesAdded)
{
- buf.append(
- s+" else"+EOL+
- s+" OPENDJ_JAVA_ARGS=\""+defaultJavaArgs+"\""+EOL+
- s+" export OPENDJ_JAVA_ARGS"+EOL);
+ buf.append(s).append(" else").append(EOL)
+ .append(s).append(" OPENDJ_JAVA_ARGS=\"").append(defaultJavaArgs).append("\"").append(EOL)
+ .append(s).append(" export OPENDJ_JAVA_ARGS").append(EOL);
}
else
{
if (!overwriteJavaArgs)
{
- buf.append(
- " then"+EOL+
- " OPENDJ_JAVA_ARGS=\""+defaultJavaArgs+"\""+EOL+
- " export OPENDJ_JAVA_ARGS"+EOL);
+ buf.append(" then").append(EOL)
+ .append(" OPENDJ_JAVA_ARGS=\"").append(defaultJavaArgs).append("\"").append(EOL)
+ .append(" export OPENDJ_JAVA_ARGS").append(EOL);
}
else
{
- buf.append(
- EOL+
- " OPENDJ_JAVA_ARGS=\""+defaultJavaArgs+"\""+EOL+
- " export OPENDJ_JAVA_ARGS"+EOL);
+ buf.append(EOL)
+ .append(" OPENDJ_JAVA_ARGS=\"").append(defaultJavaArgs).append("\"").append(EOL)
+ .append(" export OPENDJ_JAVA_ARGS").append(EOL);
}
}
propertiesAdded = true;
@@ -813,7 +795,7 @@
if (nIfs > 0)
{
String s = overwriteJavaArgs? "":" ";
- buf.append(s+"fi"+EOL);
+ buf.append(s).append("fi").append(EOL);
}
if (!overwriteJavaArgs)
@@ -821,16 +803,16 @@
if (!propertiesAdded)
{
// No properties added: this is required not to break the script
- buf.append(
- " then"+EOL+
- " OPENDJ_JAVA_ARGS=${OPENDJ_JAVA_ARGS}"+EOL);
+ buf
+ .append(" then").append(EOL)
+ .append(" OPENDJ_JAVA_ARGS=${OPENDJ_JAVA_ARGS}").append(EOL);
}
- buf.append(
- " else"+EOL+
- " OPENDJ_JAVA_ARGS=${OPENDS_JAVA_ARGS}"+EOL+
- " export OPENDJ_JAVA_ARGS"+EOL+
- " fi"+EOL+
- "fi"+EOL);
+ buf
+ .append(" else").append(EOL)
+ .append(" OPENDJ_JAVA_ARGS=${OPENDS_JAVA_ARGS}").append(EOL)
+ .append(" export OPENDJ_JAVA_ARGS").append(EOL)
+ .append(" fi").append(EOL)
+ .append("fi").append(EOL);
}
return buf.toString();
@@ -877,79 +859,73 @@
javaArgsLabel2 = CHECK_ENV_JAVA_ARGS;
}
- buf.append("goto "+javaHomeLabel1+EOL+EOL);
+ buf.append("goto ").append(javaHomeLabel1).append(EOL).append(EOL);
- buf.append(
- ":"+CHECK_ENV_JAVA_HOME+EOL+
- "if \"%OPENDJ_JAVA_BIN%\" == \"\" goto checkEnvJavaHome"+LEGACY+EOL+
- "if not exist \"%OPENDJ_JAVA_BIN%\" goto checkEnvJavaHome"+LEGACY+EOL+
- "goto "+javaArgsLabel1+EOL+EOL+
- ":checkEnvJavaHome"+LEGACY+EOL+
- "if \"%OPENDS_JAVA_BIN%\" == \"\" goto checkOpendjJavaHome"+EOL+
- "if not exist \"%OPENDS_JAVA_BIN%\" goto checkOpendjJavaHome"+EOL+
- "goto "+javaArgsLabel1+EOL+EOL+
- ":checkOpendjJavaHome"+EOL
- );
+ buf.append(":").append(CHECK_ENV_JAVA_HOME).append(EOL)
+ .append("if \"%OPENDJ_JAVA_BIN%\" == \"\" goto checkEnvJavaHome").append(LEGACY).append(EOL)
+ .append("if not exist \"%OPENDJ_JAVA_BIN%\" goto checkEnvJavaHome").append(LEGACY).append(EOL)
+ .append("goto ").append(javaArgsLabel1).append(EOL)
+ .append(EOL)
+ .append(":checkEnvJavaHome").append(LEGACY).append(EOL)
+ .append("if \"%OPENDS_JAVA_BIN%\" == \"\" goto checkOpendjJavaHome").append(EOL)
+ .append("if not exist \"%OPENDS_JAVA_BIN%\" goto checkOpendjJavaHome").append(EOL)
+ .append("goto ").append(javaArgsLabel1).append(EOL)
+ .append(EOL)
+ .append(":checkOpendjJavaHome").append(EOL);
if (javaHomeLabel1 == CHECK_ENV_JAVA_HOME)
{
- buf.append(
- "if \"%OPENDJ_JAVA_HOME%\" == \"\" goto "+javaHomeLabel2+LEGACY+EOL+
- "set TEMP_EXE=%OPENDJ_JAVA_HOME%\\bin\\java.exe"+EOL+
- "if not exist \"%TEMP_EXE%\" goto "+javaHomeLabel2+LEGACY+EOL+
- "set OPENDJ_JAVA_BIN=%TEMP_EXE%"+EOL+
- "goto "+javaArgsLabel1+EOL+EOL+
- ":"+javaHomeLabel2+LEGACY+EOL+
- "if \"%OPENDS_JAVA_HOME%\" == \"\" goto "+javaHomeLabel2+EOL+
- "set TEMP_EXE=%OPENDS_JAVA_HOME%\\bin\\java.exe"+EOL+
- "if not exist \"%TEMP_EXE%\" goto "+javaHomeLabel2+EOL+
- "set OPENDJ_JAVA_BIN=%TEMP_EXE%"+EOL+
- "goto "+javaArgsLabel1+EOL+EOL
- );
+ buf.append("if \"%OPENDJ_JAVA_HOME%\" == \"\" goto ").append(javaHomeLabel2).append(LEGACY).append(EOL)
+ .append("set TEMP_EXE=%OPENDJ_JAVA_HOME%\\bin\\java.exe").append(EOL)
+ .append("if not exist \"%TEMP_EXE%\" goto ").append(javaHomeLabel2).append(LEGACY).append(EOL)
+ .append("set OPENDJ_JAVA_BIN=%TEMP_EXE%").append(EOL)
+ .append("goto ").append(javaArgsLabel1).append(EOL).append(EOL)
+ .append(":").append(javaHomeLabel2).append(LEGACY).append(EOL)
+ .append("if \"%OPENDS_JAVA_HOME%\" == \"\" goto ")
+ .append(javaHomeLabel2).append(EOL)
+ .append("set TEMP_EXE=%OPENDS_JAVA_HOME%\\bin\\java.exe").append(EOL)
+ .append("if not exist \"%TEMP_EXE%\" goto ").append(javaHomeLabel2).append(EOL)
+ .append("set OPENDJ_JAVA_BIN=%TEMP_EXE%").append(EOL)
+ .append("goto ").append(javaArgsLabel1).append(EOL)
+ .append(EOL);
}
else
{
- buf.append(
- "if \"%OPENDJ_JAVA_HOME%\" == \"\" goto "+javaArgsLabel1+LEGACY+EOL+
- "set TEMP_EXE=%OPENDJ_JAVA_HOME%\\bin\\java.exe"+EOL+
- "if not exist \"%TEMP_EXE%\" goto "+javaArgsLabel1+LEGACY+EOL+
- "set OPENDJ_JAVA_BIN=%TEMP_EXE%"+EOL+
- "goto "+javaArgsLabel1+EOL+EOL+
- ":"+javaArgsLabel1+LEGACY+EOL+
- "if \"%OPENDS_JAVA_HOME%\" == \"\" goto "+javaArgsLabel1+EOL+
- "set TEMP_EXE=%OPENDS_JAVA_HOME%\\bin\\java.exe"+EOL+
- "if not exist \"%TEMP_EXE%\" goto "+javaArgsLabel1+EOL+
- "set OPENDJ_JAVA_BIN=%TEMP_EXE%"+EOL+
- "goto "+javaArgsLabel1+EOL+EOL
- );
+ buf.append("if \"%OPENDJ_JAVA_HOME%\" == \"\" goto ").append(javaArgsLabel1).append(LEGACY).append(EOL)
+ .append("set TEMP_EXE=%OPENDJ_JAVA_HOME%\\bin\\java.exe").append(EOL)
+ .append("if not exist \"%TEMP_EXE%\" goto ").append(javaArgsLabel1).append(LEGACY).append(EOL)
+ .append("set OPENDJ_JAVA_BIN=%TEMP_EXE%").append(EOL)
+ .append("goto ").append(javaArgsLabel1).append(EOL).append(EOL)
+ .append(":").append(javaArgsLabel1).append(LEGACY).append(EOL)
+ .append("if \"%OPENDS_JAVA_HOME%\" == \"\" goto ")
+ .append(javaArgsLabel1).append(EOL)
+ .append("set TEMP_EXE=%OPENDS_JAVA_HOME%\\bin\\java.exe").append(EOL)
+ .append("if not exist \"%TEMP_EXE%\" goto ").append(javaArgsLabel1).append(EOL)
+ .append("set OPENDJ_JAVA_BIN=%TEMP_EXE%").append(EOL)
+ .append("goto ").append(javaArgsLabel1).append(EOL).append(EOL);
}
if (defaultJavaHome != null)
{
if (javaHomeLabel1 == CHECK_ENV_JAVA_HOME)
{
- buf.append(
- ":"+CHECK_DEFAULT_JAVA_HOME+EOL+
- "set TEMP_EXE="+defaultJavaHome+"\\bin\\java.exe"+EOL+
- "if not exist \"%TEMP_EXE%\" goto "+javaArgsLabel1+EOL+
- "set OPENDJ_JAVA_BIN=%TEMP_EXE%"+EOL+
- "goto "+javaArgsLabel1+EOL+EOL
- );
+ buf.append(":").append(CHECK_DEFAULT_JAVA_HOME).append(EOL)
+ .append("set TEMP_EXE=").append(defaultJavaHome).append("\\bin\\java.exe").append(EOL)
+ .append("if not exist \"%TEMP_EXE%\" goto ").append(javaArgsLabel1).append(EOL)
+ .append("set OPENDJ_JAVA_BIN=%TEMP_EXE%").append(EOL)
+ .append("goto ").append(javaArgsLabel1).append(EOL).append(EOL);
}
else
{
- buf.append(
- ":"+CHECK_DEFAULT_JAVA_HOME+EOL+
- "set TEMP_EXE="+defaultJavaHome+"\\bin\\java.exe"+EOL+
- "if not exist \"%TEMP_EXE%\" goto "+CHECK_ENV_JAVA_HOME+EOL+
- "set OPENDJ_JAVA_BIN=%TEMP_EXE%"+EOL+
- "goto "+javaArgsLabel1+EOL+EOL
- );
+ buf.append(":").append(CHECK_DEFAULT_JAVA_HOME).append(EOL)
+ .append("set TEMP_EXE=").append(defaultJavaHome).append("\\bin\\java.exe").append(EOL)
+ .append("if not exist \"%TEMP_EXE%\" goto ").append(CHECK_ENV_JAVA_HOME).append(EOL)
+ .append("set OPENDJ_JAVA_BIN=%TEMP_EXE%").append(EOL)
+ .append("goto ").append(javaArgsLabel1).append(EOL).append(EOL);
}
}
- buf.append(
- ":"+CHECK_JAVA_HOME+EOL);
+ buf.append(":").append(CHECK_JAVA_HOME).append(EOL);
Enumeration<?> propertyNames = properties.propertyNames();
while (propertyNames.hasMoreElements())
{
@@ -965,22 +941,21 @@
{
String scriptName = name.substring(0,
name.length() - ".java-home".length());
- buf.append(
- "if \"%SCRIPT_NAME%.java-home\" == \""+name+"\" goto check"+
- scriptName+"JavaHome"+EOL);
+ buf.append("if \"%SCRIPT_NAME%.java-home\" == \"").append(name)
+ .append("\" goto check").append(scriptName).append("JavaHome").append(EOL);
}
}
if (defaultJavaHome != null)
{
- buf.append("goto "+CHECK_DEFAULT_JAVA_HOME+EOL+EOL);
+ buf.append("goto ").append(CHECK_DEFAULT_JAVA_HOME).append(EOL).append(EOL);
}
else if (javaHomeLabel1 != CHECK_ENV_JAVA_HOME)
{
- buf.append("goto "+CHECK_ENV_JAVA_HOME+EOL+EOL);
+ buf.append("goto ").append(CHECK_ENV_JAVA_HOME).append(EOL).append(EOL);
}
else
{
- buf.append("goto "+javaArgsLabel1+EOL+EOL);
+ buf.append("goto ").append(javaArgsLabel1).append(EOL).append(EOL);
}
propertyNames = properties.propertyNames();
@@ -999,53 +974,44 @@
{
String scriptName = name.substring(0,
name.length() - ".java-home".length());
- buf.append(
- ":check"+scriptName+"JavaHome"+EOL+
- "set TEMP_EXE="+value+"\\bin\\java.exe"+EOL);
+ buf.append(":check").append(scriptName).append("JavaHome").append(EOL)
+ .append("set TEMP_EXE=").append(value).append("\\bin\\java.exe").append(EOL);
if (defaultJavaHome != null)
{
- buf.append(
- "if not exist \"%TEMP_EXE%\" goto "+CHECK_DEFAULT_JAVA_HOME+EOL);
+ buf.append("if not exist \"%TEMP_EXE%\" goto ").append(CHECK_DEFAULT_JAVA_HOME).append(EOL);
}
else if (javaHomeLabel1 != CHECK_ENV_JAVA_HOME)
{
- buf.append(
- "if not exist \"%TEMP_EXE%\" goto "+CHECK_ENV_JAVA_HOME+EOL);
+ buf.append("if not exist \"%TEMP_EXE%\" goto ").append(CHECK_ENV_JAVA_HOME).append(EOL);
}
- buf.append(
- "set OPENDJ_JAVA_BIN=%TEMP_EXE%"+EOL+
- "goto "+javaArgsLabel1+EOL+EOL);
+ buf.append("set OPENDJ_JAVA_BIN=%TEMP_EXE%").append(EOL)
+ .append("goto ").append(javaArgsLabel1).append(EOL).append(EOL);
}
}
- buf.append(
- ":"+CHECK_ENV_JAVA_ARGS+EOL);
+ buf.append(":").append(CHECK_ENV_JAVA_ARGS).append(EOL);
if (javaArgsLabel1 == CHECK_ENV_JAVA_ARGS)
{
- buf.append(
- "if \"%OPENDJ_JAVA_ARGS%\" == \"\" goto "+javaArgsLabel2+LEGACY+EOL+
- "goto end"+EOL+EOL+
- ":"+javaArgsLabel2+LEGACY+EOL+
- "if \"%OPENDS_JAVA_ARGS%\" == \"\" goto "+javaArgsLabel2+EOL+
- "set OPENDJ_JAVA_ARGS=%OPENDS_JAVA_ARGS%"+EOL+
- "goto end"+EOL+EOL);
+ buf.append("if \"%OPENDJ_JAVA_ARGS%\" == \"\" goto ").append(javaArgsLabel2).append(LEGACY).append(EOL)
+ .append("goto end").append(EOL).append(EOL)
+ .append(":").append(javaArgsLabel2).append(LEGACY).append(EOL)
+ .append("if \"%OPENDS_JAVA_ARGS%\" == \"\" goto ").append(javaArgsLabel2).append(EOL)
+ .append("set OPENDJ_JAVA_ARGS=%OPENDS_JAVA_ARGS%").append(EOL)
+ .append("goto end").append(EOL).append(EOL);
}
else
{
- buf.append(
- "goto end"+EOL+EOL);
+ buf.append("goto end").append(EOL).append(EOL);
}
if (defaultJavaArgs != null)
{
- buf.append(
- ":"+CHECK_DEFAULT_JAVA_ARGS+EOL+
- "set OPENDJ_JAVA_ARGS="+defaultJavaArgs+EOL+
- "goto end"+EOL+EOL);
+ buf.append(":").append(CHECK_DEFAULT_JAVA_ARGS).append(EOL)
+ .append("set OPENDJ_JAVA_ARGS=").append(defaultJavaArgs).append(EOL)
+ .append("goto end").append(EOL).append(EOL);
}
- buf.append(
- ":"+CHECK_JAVA_ARGS+EOL);
+ buf.append(":").append(CHECK_JAVA_ARGS).append(EOL);
propertyNames = properties.propertyNames();
while (propertyNames.hasMoreElements())
{
@@ -1061,22 +1027,21 @@
{
String scriptName = name.substring(0,
name.length() - ".java-args".length());
- buf.append(
- "if \"%SCRIPT_NAME%.java-args\" == \""+name+"\" goto check"+
- scriptName+"JavaArgs"+EOL);
+ buf.append("if \"%SCRIPT_NAME%.java-args\" == \"").append(name)
+ .append("\" goto check").append(scriptName).append("JavaArgs").append(EOL);
}
}
if (defaultJavaArgs != null)
{
- buf.append("goto "+CHECK_DEFAULT_JAVA_ARGS+EOL+EOL);
+ buf.append("goto ").append(CHECK_DEFAULT_JAVA_ARGS).append(EOL).append(EOL);
}
else if (javaArgsLabel1 != CHECK_ENV_JAVA_ARGS)
{
- buf.append("goto "+CHECK_ENV_JAVA_ARGS+EOL+EOL);
+ buf.append("goto ").append(CHECK_ENV_JAVA_ARGS).append(EOL).append(EOL);
}
else
{
- buf.append("goto end"+EOL+EOL);
+ buf.append("goto end").append(EOL).append(EOL);
}
propertyNames = properties.propertyNames();
@@ -1095,14 +1060,13 @@
{
String scriptName = name.substring(0,
name.length() - ".java-args".length());
- buf.append(
- ":check"+scriptName+"JavaArgs"+EOL+
- "set OPENDJ_JAVA_ARGS="+value+EOL+
- "goto end"+EOL+EOL);
+ buf.append(":check").append(scriptName).append("JavaArgs").append(EOL)
+ .append("set OPENDJ_JAVA_ARGS=").append(value).append(EOL)
+ .append("goto end").append(EOL).append(EOL);
}
}
- buf.append(":end"+EOL);
+ buf.append(":end").append(EOL);
return buf.toString();
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
index e924997..251d6f3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
@@ -444,15 +444,14 @@
}
else
{
- buffer.append(dnString.substring(0, colsRemaining));
+ buffer.append(dnString, 0, colsRemaining);
buffer.append(EOL);
int startPos = colsRemaining;
while ((dnLength - startPos) > (wrapColumn - 1))
{
buffer.append(" ");
- buffer.append(dnString.substring(startPos, (startPos+wrapColumn-1)));
-
+ buffer.append(dnString, startPos, (startPos+wrapColumn-1));
buffer.append(EOL);
startPos += (wrapColumn-1);
@@ -507,15 +506,14 @@
buffer.append(EOL);
} else
{
- buffer.append(valueString.substring(0, colsRemaining));
+ buffer.append(valueString, 0, colsRemaining);
buffer.append(EOL);
int startPos = colsRemaining;
while ((valueLength - startPos) > (wrapColumn - 1))
{
buffer.append(" ");
- buffer.append(valueString.substring(startPos,
- (startPos+wrapColumn-1)));
+ buffer.append(valueString, startPos, (startPos+wrapColumn-1));
buffer.append(EOL);
startPos += (wrapColumn-1);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java
index 72edd1b..8855b32 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java
@@ -475,11 +475,11 @@
}
if (dn.size() > 1)
{
- buf.append("\""+dn.toString()+"\"");
+ buf.append("\"").append(dn).append("\"");
}
else
{
- buf.append(dn.toString());
+ buf.append(dn);
}
}
table.appendCell(buf.toString());
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RandomTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RandomTag.java
index 37f6781..9695856 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RandomTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RandomTag.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -651,7 +651,7 @@
}
else
{
- buffer.append(month.substring(0, maxLength));
+ buffer.append(month, 0, maxLength);
}
break;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java
index 81d49a4..09f70de 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java
@@ -107,8 +107,7 @@
*/
static private String getName()
{
- return new StringBuilder(getLegalDirectory()).append(File.separatorChar)
- .append("license_to_accept.txt").toString();
+ return getLegalDirectory() + File.separatorChar + "license_to_accept.txt";
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java
index ded9b6e..0cea734 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java
@@ -68,9 +68,8 @@
if (logFile == null)
{
- logFile =
- new File(new StringBuilder(UpgradeUtils.getInstallationPath())
- .append(File.separator).append(UPGRADELOGNAME).toString());
+ logFile = new File(
+ UpgradeUtils.getInstallationPath() + File.separator + UPGRADELOGNAME);
}
try
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/AdditionalLogItem.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AdditionalLogItem.java
index 3d7dd14..85d85bc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/AdditionalLogItem.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/AdditionalLogItem.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -230,7 +230,7 @@
{
builder.append('\'');
}
- builder.append(value.toString());
+ builder.append(value);
if (isQuoted)
{
builder.append('\'');
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/DN.java b/opendj-server-legacy/src/main/java/org/opends/server/types/DN.java
index 8184829..f75e39e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/DN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/DN.java
@@ -2684,7 +2684,7 @@
*/
public void toString(StringBuilder buffer)
{
- buffer.append(toString());
+ buffer.append(this);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
index cef85b3..223eddd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
@@ -4329,7 +4329,7 @@
@Override
public void toString(StringBuilder buffer)
{
- buffer.append(toString());
+ buffer.append(this);
}
@@ -4454,12 +4454,12 @@
Iterator<ByteString> valueIterator = a.iterator();
if (valueIterator.hasNext())
{
- buffer.append(valueIterator.next().toString());
+ buffer.append(valueIterator.next());
while (valueIterator.hasNext())
{
buffer.append(",");
- buffer.append(valueIterator.next().toString());
+ buffer.append(valueIterator.next());
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/FilePermission.java b/opendj-server-legacy/src/main/java/org/opends/server/types/FilePermission.java
index 4916685..c9e136d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/FilePermission.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/FilePermission.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.types;
@@ -950,7 +950,7 @@
{
modeByte |= 0x01;
}
- buffer.append(String.valueOf(modeByte));
+ buffer.append(modeByte);
modeByte = 0x00;
if (p.isGroupReadable())
@@ -965,7 +965,7 @@
{
modeByte |= 0x01;
}
- buffer.append(String.valueOf(modeByte));
+ buffer.append(modeByte);
modeByte = 0x00;
if (p.isOtherReadable())
@@ -980,7 +980,7 @@
{
modeByte |= 0x01;
}
- buffer.append(String.valueOf(modeByte));
+ buffer.append(modeByte);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/IntermediateResponse.java b/opendj-server-legacy/src/main/java/org/opends/server/types/IntermediateResponse.java
index a2435d9..78ec647 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/IntermediateResponse.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/IntermediateResponse.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -195,10 +195,8 @@
{
buffer.append("IntermediateResponse(operation=");
operation.toString(buffer);
- buffer.append(",oid=");
- buffer.append(String.valueOf(oid));
- buffer.append(",value=");
- buffer.append(String.valueOf(buffer));
+ buffer.append(",oid=").append(oid);
+ buffer.append(",value=").append(buffer);
if (! controls.isEmpty())
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java
index a557af1..84f6671 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java
@@ -254,9 +254,9 @@
public void toString(StringBuilder buffer)
{
buffer.append("Modification(");
- buffer.append(modificationType.toString());
+ buffer.append(modificationType);
buffer.append(", ");
- buffer.append(attribute.toString());
+ buffer.append(attribute);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java b/opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java
index 0585edd..2a32000 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java
@@ -994,7 +994,7 @@
*/
public void toString(StringBuilder buffer)
{
- buffer.append(toString());
+ buffer.append(this);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java b/opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java
index 68c3329..88afa04 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -374,7 +374,7 @@
buffer.append("\", baseDNs={");
append(buffer, baseDNs);
- buffer.append("}, scope=").append(scope.toString());
+ buffer.append("}, scope=").append(scope);
buffer.append(", groupDNs={");
append(buffer, groupDNs);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java
index 263eacc..4b6947f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java
@@ -122,7 +122,7 @@
{
StringBuilder buffer = new StringBuilder();
buffer.append("AddChangeRecordEntry(dn=\"");
- buffer.append(String.valueOf(getDN()));
+ buffer.append(getDN());
buffer.append("\", attrs={");
Iterator<Attribute> iterator = attributes.iterator();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java
index dabf41d..d15541c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java
@@ -76,7 +76,7 @@
{
StringBuilder buffer = new StringBuilder();
buffer.append("DeleteChangeRecordEntry(dn=\"");
- buffer.append(String.valueOf(getDN()));
+ buffer.append(getDN());
buffer.append("\")");
return buffer.toString();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java
index 281d139..b719f07 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java
@@ -107,7 +107,7 @@
{
StringBuilder buffer = new StringBuilder();
buffer.append("ModifyChangeRecordEntry(dn=\"");
- buffer.append(String.valueOf(getDN()));
+ buffer.append(getDN());
buffer.append("\", mods={");
Iterator<RawModification> iterator = modifications.iterator();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java
index 65cd0a4..a38c259 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java
@@ -138,9 +138,9 @@
{
StringBuilder buffer = new StringBuilder();
buffer.append("ModifyDNChangeRecordEntry(dn=\"");
- buffer.append(String.valueOf(getDN()));
+ buffer.append(getDN());
buffer.append("\", newRDN=\"");
- buffer.append(String.valueOf(newRDN));
+ buffer.append(newRDN);
buffer.append("\", deleteOldRDN=");
buffer.append(deleteOldRDN);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
index c5cedfc..be251d6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
@@ -1560,7 +1560,7 @@
message.append(" (id=");
LocalizableMessage ieMsg = ie.getMessageObject();
if (ieMsg != null) {
- message.append(ieMsg.resourceName() + "-" + ieMsg.ordinal());
+ message.append(ieMsg.resourceName()).append("-").append(ieMsg.ordinal());
} else {
message.append("-1");
}
--
Gitblit v1.10.0