From 30ab041f5cc91deeb2765d03557c90a2a7651d13 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 13 Nov 2014 09:22:53 +0000
Subject: [PATCH] AutoRefactor'ed replacing StringBuilder.append(obj.toString()) with StringBuilder.append(obj).
---
opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java | 2
opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListener.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java | 2
opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java | 2
opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/PropertySet.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java | 2
opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java | 2
opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigChangeResult.java | 2
opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java | 52 +++++++++++--------------
opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java | 2
opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java | 2
opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java | 2
15 files changed, 37 insertions(+), 43 deletions(-)
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java
index 82b28e1..43a7ca7 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java
@@ -1481,7 +1481,7 @@
if (a.needsValue() && a.getDefaultValue() != null && a.getDefaultValue().length() > 0) {
buffer.append(INDENT);
- buffer.append(INFO_ARGPARSER_USAGE_DEFAULT_VALUE.get(a.getDefaultValue()).toString());
+ buffer.append(INFO_ARGPARSER_USAGE_DEFAULT_VALUE.get(a.getDefaultValue()));
buffer.append(EOL);
}
}
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java
index d347011..1f66997 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java
@@ -978,7 +978,7 @@
if (lineLength > MAX_LINE_WIDTH) {
buffer.append(EOL);
}
- buffer.append(newBuffer.toString());
+ buffer.append(newBuffer);
}
buffer.append(EOL);
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java
index efb250c..2a048bc 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java
@@ -408,7 +408,7 @@
StringBuilder builder = new StringBuilder();
builder.append(value);
builder.append(' ');
- builder.append(baseUnit.toString());
+ builder.append(baseUnit);
return builder.toString();
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java
index cd54054..818b42c 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java
@@ -259,7 +259,7 @@
// anyway as the best-fit unit should result in an exact conversion).
builder.append((long) unit.fromBytes(value));
builder.append(' ');
- builder.append(unit.toString());
+ builder.append(unit);
return builder.toString();
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/PropertySet.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/PropertySet.java
index f8dbed2..e3b1d65 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/PropertySet.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/PropertySet.java
@@ -228,7 +228,7 @@
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-config/src/main/java/org/forgerock/opendj/config/server/ConfigChangeResult.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigChangeResult.java
index 9fcb553..dababfe 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigChangeResult.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigChangeResult.java
@@ -173,7 +173,7 @@
*/
public void toString(StringBuilder buffer) {
buffer.append("ConfigChangeResult(result=");
- buffer.append(resultCode.toString());
+ buffer.append(resultCode);
buffer.append(", adminActionRequired=");
buffer.append(adminActionRequired);
buffer.append(", messages={");
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java
index a26514e..d5345db 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java
@@ -174,8 +174,7 @@
*/
return new Iterable<Attribute>() {
private boolean hasNextMustIterate = true;
- private final Iterator<Attribute> iterator = entry.getAllAttributes()
- .iterator();
+ private final Iterator<Attribute> iterator = entry.getAllAttributes().iterator();
private Attribute next = null;
@Override
@@ -187,11 +186,9 @@
hasNextMustIterate = false;
while (iterator.hasNext()) {
final Attribute attribute = iterator.next();
- final AttributeDescription ad =
- attribute.getAttributeDescription();
+ final AttributeDescription ad = attribute.getAttributeDescription();
final AttributeType at = ad.getAttributeType();
- final AttributeDescription requestedAd =
- requestedAttributes.get(ad);
+ final AttributeDescription requestedAd = requestedAttributes.get(ad);
if (requestedAd != null) {
next = renameAttribute(attribute, requestedAd);
return true;
@@ -371,32 +368,29 @@
@Override
public String toString() {
- if (!includeAllOperationalAttributes && !includeAllUserAttributes
+ if (!includeAllOperationalAttributes
+ && !includeAllUserAttributes
&& requestedAttributes.isEmpty()) {
return "1.1";
- } else {
- boolean isFirst = true;
- final StringBuilder builder = new StringBuilder();
- if (includeAllUserAttributes) {
- builder.append('*');
- isFirst = false;
- }
- if (includeAllOperationalAttributes) {
- if (!isFirst) {
- builder.append(", ");
- }
- builder.append('+');
- isFirst = false;
- }
- for (final AttributeDescription requestedAttribute : requestedAttributes.keySet()) {
- if (!isFirst) {
- builder.append(", ");
- }
- builder.append(requestedAttribute.toString());
- isFirst = false;
- }
- return builder.toString();
}
+
+ final StringBuilder builder = new StringBuilder();
+ if (includeAllUserAttributes) {
+ builder.append('*');
+ }
+ if (includeAllOperationalAttributes) {
+ if (builder.length() > 0) {
+ builder.append(", ");
+ }
+ builder.append('+');
+ }
+ for (final AttributeDescription requestedAttribute : requestedAttributes.keySet()) {
+ if (builder.length() > 0) {
+ builder.append(", ");
+ }
+ builder.append(requestedAttribute);
+ }
+ return builder.toString();
}
/**
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java
index c91825b..2f57c7b 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java
@@ -912,7 +912,7 @@
rdn.toString(builder);
if (!parent.isRootDN()) {
builder.append(',');
- builder.append(parent.toString());
+ builder.append(parent);
}
stringValue = builder.toString();
}
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java
index cacedbf..15ea6b0 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java
@@ -406,6 +406,6 @@
}
StringBuilder toString(final StringBuilder builder) {
- return builder.append(toString());
+ return builder.append(this);
}
}
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java
index f75cbac..4a2d62d 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java
@@ -200,7 +200,7 @@
builder.append(", criticality=");
builder.append(isCritical());
builder.append(", filter=\"");
- builder.append(filter.toString());
+ builder.append(filter);
builder.append("\")");
return builder.toString();
}
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java
index 84c4409..e17b864 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java
@@ -347,7 +347,7 @@
builder.append(", criticality=");
builder.append(isCritical());
builder.append(", changeType=");
- builder.append(changeType.toString());
+ builder.append(changeType);
builder.append(", previousDN=\"");
builder.append(previousName);
builder.append("\"");
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java
index a825cd9..4951e6a 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java
@@ -627,7 +627,7 @@
if (attributeUsage != null) {
buffer.append(" USAGE ");
- buffer.append(attributeUsage.toString());
+ buffer.append(attributeUsage);
}
if (approximateMatchingRuleOID != null) {
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java
index 872e495..cd48852 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java
@@ -415,7 +415,7 @@
if (objectClassType != null) {
buffer.append(" ");
- buffer.append(objectClassType.toString());
+ buffer.append(objectClassType);
}
if (!requiredAttributeOIDs.isEmpty()) {
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java
index 435cd8e..4a68244 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java
@@ -75,7 +75,7 @@
public String toString() {
final StringBuilder builder = new StringBuilder();
builder.append("LDAPListener(");
- builder.append(getSocketAddress().toString());
+ builder.append(getSocketAddress());
builder.append(')');
return builder.toString();
}
diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListener.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListener.java
index 931ed4a..992aa4f 100644
--- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListener.java
+++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListener.java
@@ -147,7 +147,7 @@
public String toString() {
final StringBuilder builder = new StringBuilder();
builder.append("LDAPListener(");
- builder.append(getSocketAddress().toString());
+ builder.append(getSocketAddress());
builder.append(')');
return builder.toString();
}
--
Gitblit v1.10.0