From 87bfeae4eac3eff272eedaaf6a066f6a4e24989f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 15 Jul 2015 14:46:53 +0000
Subject: [PATCH] AutoRefactor'ed use StringBuilder
---
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java | 25 -
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java | 64 ++----
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java | 52 +---
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java | 2
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java | 2
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java | 30 +-
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java | 52 +---
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java | 57 +----
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java | 27 --
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java | 13
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java | 17 -
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java | 6
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java | 67 +-----
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java | 2
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java | 50 +---
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java | 7
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java | 2
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java | 97 +++-----
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java | 4
19 files changed, 180 insertions(+), 396 deletions(-)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java
index 9bb01b5..924ed0e 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java
@@ -205,10 +205,9 @@
}
/* add public-key certificate entry */
- final LdapName keyDn = new LdapName((new StringBuilder())
- .append(ServerProperty.INSTANCE_KEY_ID.getAttributeName())
- .append("=").append(Rdn.escapeValue(keyID)).append(",")
- .append(ADSContext.getInstanceKeysContainerDN()).toString());
+ final LdapName keyDn = new LdapName(
+ ServerProperty.INSTANCE_KEY_ID.getAttributeName() + "=" + Rdn.escapeValue(keyID)
+ + "," + ADSContext.getInstanceKeysContainerDN());
ctx.createSubcontext(keyDn, keyAttrs).close();
}
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
index ad9da19..f9eb77f 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
@@ -284,8 +284,7 @@
}
private void jumpSection() {
- htmlBuff.append("<p class=\"category-index\">" +
- "<strong>Jump To:</strong><br>\n");
+ htmlBuff.append("<p class=\"category-index\"><strong>Jump To:</strong><br>\n");
String[] catNames = catTopMoList.keySet().toArray(new String[0]);
for (int ii=0; ii < catNames.length; ii++) {
@@ -526,10 +525,10 @@
}
private void homeLink() {
- htmlBuff.append("<div style=\"font-size:11px;margin-top:-10px;" +
- "margin-bottom:-10px; text-align:right\"><a href=\"" +
- MAIN_FILE +
- "\" target=\"_top\">Configuration Reference Home</a></div>");
+ htmlBuff.append("<div style=\"font-size:11px;margin-top:-10px;")
+ .append("margin-bottom:-10px; text-align:right\"><a href=\"")
+ .append(MAIN_FILE)
+ .append("\" target=\"_top\">Configuration Reference Home</a></div>");
}
@@ -747,12 +746,11 @@
private void propertiesLinkTable(TreeMap<String,
PropertyDefinition> basicProps,
TreeMap<String, PropertyDefinition> advancedProps) {
- htmlBuff.append(
- "<table border=\"0\" cellspacing=\"0\" class=\"jump-table\">\n" +
- " <tr>\n" +
- " <th>Basic Properties:</th>\n" +
- " <th>Advanced Properties:</th>\n" +
- " </tr>\n");
+ htmlBuff.append("<table border=\"0\" cellspacing=\"0\" class=\"jump-table\">\n")
+ .append(" <tr>\n")
+ .append(" <th>Basic Properties:</th>\n")
+ .append(" <th>Advanced Properties:</th>\n")
+ .append(" </tr>\n");
PropertyDefinition[] basicPropsArray =
basicProps.values().toArray(new PropertyDefinition[0]);
@@ -788,7 +786,7 @@
}
htmlBuff.append("<tr>\n");
- htmlBuff.append(basicHtmlCell + advancedHtmlCell);
+ htmlBuff.append(basicHtmlCell).append(advancedHtmlCell);
htmlBuff.append("</tr>\n");
}
htmlBuff.append("</table>\n");
@@ -864,14 +862,12 @@
if (!mo.getName().startsWith(firstChar)) {
firstChar = mo.getName().substring(0, 1);
String letter = firstChar.toUpperCase();
- moPointers.append(getAnchor(letter) + getHeading2(letter));
+ moPointers.append(getAnchor(letter)).append(getHeading2(letter));
lettersPointers += getLink(letter, "#" + letter) + " ";
}
- moPointers.append(
- "<p> " +
- getLink(mo.getUserFriendlyName().toString(), mo.getName() + ".html",
- MAIN_FRAME) +
- "</p>\n");
+ moPointers.append("<p> ")
+ .append(getLink(mo.getUserFriendlyName().toString(), mo.getName() + ".html", MAIN_FRAME))
+ .append("</p>\n");
}
paragraph(lettersPointers);
htmlBuff.append(moPointers);
@@ -899,7 +895,7 @@
if (!propName.startsWith(firstChar)) {
firstChar = propName.substring(0, 1);
String letter = firstChar.toUpperCase();
- htmlBuff.append(getAnchor(letter) + getHeading2(letter));
+ htmlBuff.append(getAnchor(letter)).append(getHeading2(letter));
lettersPointers += getLink(letter, "#" + letter) + " ";
}
String propLink = getLink(propName,
@@ -1315,10 +1311,7 @@
}
private void bullet(String str) {
- htmlBuff.append(
- "<li>" +
- str +
- "</li>\n");
+ htmlBuff.append("<li>").append(str).append("</li>\n");
}
private void heading2(String string) {
@@ -1354,8 +1347,7 @@
}
private void htmlHeader(String pageTitle) {
- htmlBuff.append(getHtmlHeader(pageTitle) +
- "<body>\n");
+ htmlBuff.append(getHtmlHeader(pageTitle)).append("<body>\n");
}
@@ -1444,7 +1436,7 @@
if (!inList) {
htmlStr += "<br>";
}
- htmlBuff.append(htmlStr + "\n");
+ htmlBuff.append(htmlStr).append("\n");
}
private void newline() {
@@ -1486,14 +1478,9 @@
classStr = "class=" + pClass;
}
- htmlBuff.append(
- "<p " +
- indentStr + " " +
- styleStr + " " +
- classStr +
- ">" +
- description +
- "</p>\n");
+ htmlBuff.append("<p ").append(indentStr).append(" ").append(styleStr).append(" ").append(classStr).append(">")
+ .append(description)
+ .append("</p>\n");
}
private int getIndentPixels() {
@@ -1501,13 +1488,12 @@
}
private void startTable() {
- htmlBuff.append(
- "<table " +
- "style=\"width: 100%; text-align: left;\"" +
- "border=\"1\"" +
- "cellpadding=\"1\"" +
- "cellspacing=\"0\"" +
- ">\n");
+ htmlBuff.append("<table ")
+ .append("style=\"width: 100%; text-align: left;\"")
+ .append("border=\"1\"")
+ .append("cellpadding=\"1\"")
+ .append("cellspacing=\"0\"")
+ .append(">\n");
htmlBuff.append("<tbody>\n");
}
@@ -1536,13 +1522,12 @@
"<tr>\n");
for (int ii = 0; ii < strings.length; ii++) {
String string = strings[ii];
- htmlBuff.append(
- "<td style=\"" +
- "vertical-align: top; " +
- ((ii == 0) ? "width: 20%;" : "") +
- "\">" +
- string +
- "<br></td>");
+ htmlBuff.append("<td style=\"")
+ .append("vertical-align: top; ")
+ .append(ii == 0 ? "width: 20%;" : "")
+ .append("\">")
+ .append(string)
+ .append("<br></td>");
}
htmlBuff.append(
"</tr>\n");
@@ -1573,18 +1558,14 @@
}
private void htmlFooter() {
- htmlBuff.append(
- "</body>\n" +
- "</html>\n");
+ htmlBuff.append("</body>\n").append("</html>\n");
}
private void viewHelp(String helpStr) {
- htmlBuff.append(
- "<p class=\"view-help\" >" +
- helpStr +
- "</p>" +
- "\n"
- );
+ htmlBuff.append("<p class=\"view-help\" >")
+ .append(helpStr)
+ .append("</p>")
+ .append("\n");
}
private void generateFile(String fileName) {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java
index e75e3f6..0cce94a 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java
@@ -532,7 +532,7 @@
{
if (indexNameOut.length() > 0)
{
- debugBuffer.append(newUndefinedSet().toString());
+ debugBuffer.append(newUndefinedSet());
appendDebugIndexInformation(debugBuffer, indexNameOut.toString());
}
}
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java
index 16ad8ca..e7a66c7 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java
@@ -287,7 +287,7 @@
}
if (indexNameOut != null)
{
- indexNameOut.append(IndexFilterType.PRESENCE.toString());
+ indexNameOut.append(IndexFilterType.PRESENCE);
}
return entrySet;
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java
index 9dbfb52..1fd731a 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java
@@ -350,23 +350,14 @@
= "cn=secret keys," + ADSContext.getAdministrationSuffixDN();
final DN baseDN = DN.valueOf(baseDNStr);
final String FILTER_OC_INSTANCE_KEY = "(objectclass=" + OC_CRYPTO_CIPHER_KEY + ")";
- final String FILTER_NOT_COMPROMISED = new StringBuilder("(!(")
- .append(ATTR_CRYPTO_KEY_COMPROMISED_TIME)
- .append("=*))").toString();
- final String FILTER_CIPHER_TRANSFORMATION_NAME = new StringBuilder("(")
- .append(ATTR_CRYPTO_CIPHER_TRANSFORMATION_NAME)
- .append("=").append(cipherTransformationName)
- .append(")").toString();
- final String FILTER_CIPHER_KEY_LENGTH = new StringBuilder("(")
- .append(ATTR_CRYPTO_KEY_LENGTH_BITS)
- .append("=").append(String.valueOf(cipherKeyLength))
- .append(")").toString();
- final String searchFilter = new StringBuilder("(&")
- .append(FILTER_OC_INSTANCE_KEY)
- .append(FILTER_NOT_COMPROMISED)
- .append(FILTER_CIPHER_TRANSFORMATION_NAME)
- .append(FILTER_CIPHER_KEY_LENGTH)
- .append(")").toString();
+ final String FILTER_NOT_COMPROMISED =
+ "(!(" + ATTR_CRYPTO_KEY_COMPROMISED_TIME + "=*))";
+ final String FILTER_CIPHER_TRANSFORMATION_NAME =
+ "(" + ATTR_CRYPTO_CIPHER_TRANSFORMATION_NAME + "=" + cipherTransformationName + ")";
+ final String FILTER_CIPHER_KEY_LENGTH =
+ "(" + ATTR_CRYPTO_KEY_LENGTH_BITS + "=" + cipherKeyLength + ")";
+ final String searchFilter =
+ "(&" + FILTER_OC_INSTANCE_KEY + FILTER_NOT_COMPROMISED + FILTER_CIPHER_TRANSFORMATION_NAME + FILTER_CIPHER_KEY_LENGTH + ")";
final SearchRequest request = newSearchRequest(baseDN, SearchScope.SINGLE_LEVEL, searchFilter).addAttribute("dn");
InternalSearchOperation searchOp = getRootConnection().processSearch(request);
assertFalse(searchOp.getSearchEntries().isEmpty());
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
index 75929f4..f1d1b35 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
@@ -87,27 +87,12 @@
final String baseDNStr // TODO: is this DN defined elsewhere as a constant?
= "cn=secret keys," + ADSContext.getAdministrationSuffixDN();
final DN baseDN = DN.valueOf(baseDNStr);
- final String FILTER_OC_INSTANCE_KEY
- = new StringBuilder("(objectclass=")
- .append(ConfigConstants.OC_CRYPTO_CIPHER_KEY)
- .append(")").toString();
- final String FILTER_NOT_COMPROMISED = new StringBuilder("(!(")
- .append(ConfigConstants.ATTR_CRYPTO_KEY_COMPROMISED_TIME)
- .append("=*))").toString();
- final String FILTER_CIPHER_TRANSFORMATION_NAME = new StringBuilder("(")
- .append(ConfigConstants.ATTR_CRYPTO_CIPHER_TRANSFORMATION_NAME)
- .append("=").append(cipherTransformationName)
- .append(")").toString();
- final String FILTER_CIPHER_KEY_LENGTH = new StringBuilder("(")
- .append(ConfigConstants.ATTR_CRYPTO_KEY_LENGTH_BITS)
- .append("=").append(String.valueOf(cipherKeyLength))
- .append(")").toString();
- final String searchFilter = new StringBuilder("(&")
- .append(FILTER_OC_INSTANCE_KEY)
- .append(FILTER_NOT_COMPROMISED)
- .append(FILTER_CIPHER_TRANSFORMATION_NAME)
- .append(FILTER_CIPHER_KEY_LENGTH)
- .append(")").toString();
+ final String FILTER_OC_INSTANCE_KEY = "(objectclass=" + OC_CRYPTO_CIPHER_KEY + ")";
+ final String FILTER_NOT_COMPROMISED = "(!(" + ATTR_CRYPTO_KEY_COMPROMISED_TIME + "=*))";
+ final String FILTER_CIPHER_TRANSFORMATION_NAME = "(" + ATTR_CRYPTO_CIPHER_TRANSFORMATION_NAME + "=" + cipherTransformationName + ")";
+ final String FILTER_CIPHER_KEY_LENGTH = "(" + ATTR_CRYPTO_KEY_LENGTH_BITS + "=" + cipherKeyLength + ")";
+ final String searchFilter =
+ "(&" + FILTER_OC_INSTANCE_KEY + FILTER_NOT_COMPROMISED + FILTER_CIPHER_TRANSFORMATION_NAME + FILTER_CIPHER_KEY_LENGTH + ")";
final SearchRequest request = newSearchRequest(baseDN, SearchScope.SINGLE_LEVEL, searchFilter)
.addAttribute(ConfigConstants.ATTR_CRYPTO_SYMMETRIC_KEY);
InternalSearchOperation searchOp = getRootConnection().processSearch(request);
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java
index 3e99d91..15a27f4 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java
@@ -119,17 +119,12 @@
if (! violatingDNs.isEmpty())
{
StringBuilder message = new StringBuilder();
- message.append("The extensibleObject object class is not allowed for " +
- "use in the server configuration.");
- message.append(EOL);
- message.append("Configuration entries containing the extensibleObject " +
- "object class:");
- message.append(EOL);
+ message.append("The extensibleObject object class is not allowed for use in the server configuration.")
+ .append(EOL);
+ message.append("Configuration entries containing the extensibleObject object class:").append(EOL);
for (DN dn : violatingDNs)
{
- message.append("- ");
- message.append(dn.toString());
- message.append(EOL);
+ message.append("- ").append(dn).append(EOL);
}
throw new AssertionError(message.toString());
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java
index ee00194..6dacde8 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java
@@ -404,7 +404,7 @@
addRequest.toString(buffer);
StringBuilder key = new StringBuilder();
- key.append("AddRequest(dn="+dn+", attrs={");
+ key.append("AddRequest(dn=").append(dn).append(", attrs={");
for (int i = 0; i < numAttributes; i++)
{
attributes.get(i).toString(key);
@@ -443,18 +443,9 @@
}
StringBuilder key = new StringBuilder();
- key.append(indentBuf);
- key.append("Add Request");
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" DN: ");
- key.append(dn.toString());
- key.append(EOL);
-
- key.append(" Attributes:");
- key.append(EOL);
-
+ key.append(indentBuf).append("Add Request").append(EOL);
+ key.append(indentBuf).append(" DN: ").append(dn).append(EOL);
+ key.append(" Attributes:").append(EOL);
for (RawAttribute attribute : attributes)
{
attribute.toString(key, indent+4);
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
index 58ab1ba..480b56c 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
@@ -26,12 +26,12 @@
*/
package org.opends.server.protocols.ldap;
+import static org.forgerock.util.Utils.*;
import static org.opends.server.util.ServerConstants.*;
import static org.testng.Assert.*;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
@@ -322,36 +322,22 @@
@Test
public void TestToStringSingleLine() throws Exception
{
- AddResponseProtocolOp addResponse;
- StringBuilder buffer = new StringBuilder();
- StringBuilder key = new StringBuilder();
-
List<String> referralURLs = Arrays.asList(
"ds1.example.com",
"ds2.example.com",
"ds3.example.com");
- addResponse = new AddResponseProtocolOp(resultCode, resultMsg, dn, referralURLs);
+ AddResponseProtocolOp addResponse = new AddResponseProtocolOp(resultCode, resultMsg, dn, referralURLs);
+
+ StringBuilder buffer = new StringBuilder();
addResponse.toString(buffer);
- key.append("AddResponse(resultCode=" + resultCode
- + ", " + "errorMessage=" + resultMsg + ", matchedDN=" + dn + ", "
- + "referralURLs={");
- join(key, referralURLs);
- key.append("})");
+ String key = "AddResponse(resultCode=" + resultCode
+ + ", errorMessage=" + resultMsg
+ + ", matchedDN=" + dn +
+ ", referralURLs={" + joinAsString(", ", referralURLs) + "})";
- assertEquals(buffer.toString(), key.toString());
- }
-
- static void join(StringBuilder sb, List<String> referralURLs)
- {
- Iterator<String> iterator = referralURLs.iterator();
- sb.append(iterator.next());
- while (iterator.hasNext())
- {
- sb.append(", ");
- sb.append(iterator.next());
- }
+ assertEquals(buffer.toString(), key);
}
/**
@@ -373,8 +359,7 @@
int indent = 5;
int i;
- addResponse = new AddResponseProtocolOp(resultCode, resultMsg, dn,
- referralURLs);
+ addResponse = new AddResponseProtocolOp(resultCode, resultMsg, dn, referralURLs);
addResponse.toString(buffer, indent);
StringBuilder indentBuf = new StringBuilder(indent);
@@ -383,35 +368,15 @@
indentBuf.append(' ');
}
- key.append(indentBuf);
- key.append("Add Response");
- key.append(EOL);
+ key.append(indentBuf).append("Add Response").append(EOL);
+ key.append(indentBuf).append(" Result Code: ").append(resultCode).append(EOL);
+ key.append(indentBuf).append(" Error Message: ").append(resultMsg).append(EOL);
+ key.append(indentBuf).append(" Matched DN: ").append(dn).append(EOL);
- key.append(indentBuf);
- key.append(" Result Code: ");
- key.append(resultCode);
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Error Message: ");
- key.append(resultMsg);
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Matched DN: ");
- key.append(dn.toString());
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Referral URLs: ");
- key.append(EOL);
-
+ key.append(indentBuf).append(" Referral URLs: ").append(EOL);
for (String url : referralURLs)
{
- key.append(indentBuf);
- key.append(" ");
- key.append(url);
- key.append(EOL);
+ key.append(indentBuf).append(" ").append(url).append(EOL);
}
assertEquals(buffer.toString(), key.toString());
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
index 03d2e4d..72e4be2 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
@@ -227,19 +227,16 @@
@Test
public void TestToStringSingleLine() throws Exception
{
- CompareRequestProtocolOp compareRequest;
+ CompareRequestProtocolOp compareRequest = new CompareRequestProtocolOp(
+ dn, attributeType, assertionValue);
StringBuilder buffer = new StringBuilder();
- StringBuilder key = new StringBuilder();
- int i;
-
- compareRequest = new CompareRequestProtocolOp(dn, attributeType,
- assertionValue);
compareRequest.toString(buffer);
- key.append("CompareRequest(dn="+dn+", attribute="+attributeType+", " +
- "value="+assertionValue+")");
+ String key = "CompareRequest(dn=" + dn
+ + ", attribute=" + attributeType
+ + ", value=" + assertionValue + ")";
- assertEquals(buffer.toString(), key.toString());
+ assertEquals(buffer.toString(), key);
}
/**
@@ -250,40 +247,23 @@
@Test
public void TestToStringMultiLine() throws Exception
{
- CompareRequestProtocolOp compareRequest;
- StringBuilder buffer = new StringBuilder();
- StringBuilder key = new StringBuilder();
- int i;
- int indent;
+ int indent = 5;
- indent = 5;
- compareRequest = new CompareRequestProtocolOp(dn, attributeType,
- assertionValue);
+ CompareRequestProtocolOp compareRequest = new CompareRequestProtocolOp(dn, attributeType, assertionValue);
+ StringBuilder buffer = new StringBuilder();
compareRequest.toString(buffer, indent);
StringBuilder indentBuf = new StringBuilder(indent);
- for (i=0 ; i < indent; i++)
+ for (int i = 0 ; i < indent; i++)
{
indentBuf.append(' ');
}
- key.append(indentBuf);
- key.append("Compare Request");
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Target DN: ");
- key.append(dn);
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Attribute Type: ");
- key.append(attributeType);
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Assertion Value:");
- key.append(EOL);
+ StringBuilder key = new StringBuilder();
+ key.append(indentBuf).append("Compare Request").append(EOL);
+ key.append(indentBuf).append(" Target DN: ").append(dn).append(EOL);
+ key.append(indentBuf).append(" Attribute Type: ").append(attributeType).append(EOL);
+ key.append(indentBuf).append(" Assertion Value:").append(EOL);
key.append(assertionValue.toHexPlusAsciiString(indent+4));
assertEquals(buffer.toString(), key.toString());
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
index 527c3f2..f09776d 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
@@ -27,6 +27,8 @@
package org.opends.server.protocols.ldap;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.io.ASN1;
@@ -40,7 +42,7 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import static org.opends.server.protocols.ldap.TestAddResponseProtocolOp.*;
+import static org.forgerock.util.Utils.*;
import static org.opends.server.util.ServerConstants.*;
import static org.testng.Assert.*;
@@ -324,26 +326,22 @@
@Test
public void TestToStringSingleLine() throws Exception
{
- CompareResponseProtocolOp compareResponse;
+ List<String> referralURLs = Arrays.asList(
+ "ds1.example.com",
+ "ds2.example.com",
+ "ds3.example.com");
+
+ CompareResponseProtocolOp compareResponse = new CompareResponseProtocolOp(
+ resultCode, resultMsg, dn, referralURLs);
StringBuilder buffer = new StringBuilder();
- StringBuilder key = new StringBuilder();
-
- ArrayList<String> referralURLs = new ArrayList<>();
- referralURLs.add("ds1.example.com");
- referralURLs.add("ds2.example.com");
- referralURLs.add("ds3.example.com");
-
- compareResponse = new CompareResponseProtocolOp(resultCode, resultMsg, dn,
- referralURLs);
compareResponse.toString(buffer);
- key.append("CompareResponse(resultCode=" + resultCode + ", "
- + "errorMessage=" + resultMsg + ", matchedDN=" + dn
- + ", " + "referralURLs={");
- join(key, referralURLs);
- key.append("})");
+ String key = "CompareResponse(resultCode=" + resultCode
+ + ", errorMessage=" + resultMsg
+ + ", matchedDN=" + dn
+ + ", referralURLs={" + joinAsString(", ", referralURLs) + "})";
- assertEquals(buffer.toString(), key.toString());
+ assertEquals(buffer.toString(), key);
}
/**
@@ -375,35 +373,15 @@
indentBuf.append(' ');
}
- key.append(indentBuf);
- key.append("Compare Response");
- key.append(EOL);
+ key.append(indentBuf).append("Compare Response").append(EOL);
+ key.append(indentBuf).append(" Result Code: ").append(resultCode).append(EOL);
+ key.append(indentBuf).append(" Error LocalizableMessage: ").append(resultMsg).append(EOL);
+ key.append(indentBuf).append(" Matched DN: ").append(dn).append(EOL);
- key.append(indentBuf);
- key.append(" Result Code: ");
- key.append(resultCode);
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Error LocalizableMessage: ");
- key.append(resultMsg);
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Matched DN: ");
- key.append(dn.toString());
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Referral URLs: ");
- key.append(EOL);
-
+ key.append(indentBuf).append(" Referral URLs: ").append(EOL);
for (String url : referralURLs)
{
- key.append(indentBuf);
- key.append(" ");
- key.append(url);
- key.append(EOL);
+ key.append(indentBuf).append(" ").append(url).append(EOL);
}
assertEquals(buffer.toString(), key.toString());
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
index 40b8512..ae6fba9 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
@@ -42,7 +42,7 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import static org.opends.server.protocols.ldap.TestAddResponseProtocolOp.*;
+import static org.forgerock.util.Utils.*;
import static org.opends.server.util.ServerConstants.*;
import static org.testng.Assert.*;
@@ -326,24 +326,20 @@
@Test
public void TestToStringSingleLine() throws Exception
{
- DeleteResponseProtocolOp deleteResponse;
- StringBuilder buffer = new StringBuilder();
- StringBuilder key = new StringBuilder();
-
List<String> referralURLs = Arrays.asList(
"ds1.example.com",
"ds2.example.com",
"ds3.example.com");
- deleteResponse = new DeleteResponseProtocolOp(resultCode, resultMsg, dn, referralURLs);
+ DeleteResponseProtocolOp deleteResponse = new DeleteResponseProtocolOp(resultCode, resultMsg, dn, referralURLs);
+ StringBuilder buffer = new StringBuilder();
deleteResponse.toString(buffer);
- key.append("DeleteResponse(resultCode=" + resultCode + ", "
- + "errorMessage=" + resultMsg + ", matchedDN=" + dn
- + ", " + "referralURLs={");
- join(key, referralURLs);
- key.append("})");
- assertEquals(buffer.toString(), key.toString());
+ String key = "DeleteResponse(resultCode=" + resultCode
+ + ", errorMessage=" + resultMsg
+ + ", matchedDN=" + dn
+ + ", referralURLs={" + joinAsString(", ", referralURLs) + "})";
+ assertEquals(buffer.toString(), key);
}
/**
@@ -375,35 +371,15 @@
indentBuf.append(' ');
}
- key.append(indentBuf);
- key.append("Delete Response");
- key.append(EOL);
+ key.append(indentBuf).append("Delete Response").append(EOL);
+ key.append(indentBuf).append(" Result Code: ").append(resultCode).append(EOL);
+ key.append(indentBuf).append(" Error LocalizableMessage: ").append(resultMsg).append(EOL);
+ key.append(indentBuf).append(" Matched DN: ").append(dn).append(EOL);
- key.append(indentBuf);
- key.append(" Result Code: ");
- key.append(resultCode);
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Error LocalizableMessage: ");
- key.append(resultMsg);
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Matched DN: ");
- key.append(dn.toString());
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Referral URLs: ");
- key.append(EOL);
-
+ key.append(indentBuf).append(" Referral URLs: ").append(EOL);
for (String url : referralURLs)
{
- key.append(indentBuf);
- key.append(" ");
- key.append(url);
- key.append(EOL);
+ key.append(indentBuf).append(" ").append(url).append(EOL);
}
assertEquals(buffer.toString(), key.toString());
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java
index 54a816c..426a514 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.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;
@@ -299,8 +299,8 @@
newSuperiorDn);
modifyRequest.toString(buffer);
- key.append("ModifyDNRequest(dn="+dn+", newRDN="+newRdn+", " +
- "deleteOldRDN="+true+", newSuperior="+newSuperiorDn+")");
+ key.append("ModifyDNRequest(dn=").append(dn).append(", newRDN=").append(newRdn).append(", ").append("deleteOldRDN=").append(true).append(", newSuperior=")
+ .append(newSuperiorDn).append(")");
assertEquals(buffer.toString(), key.toString());
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
index 0f8fc3b..7181ef0 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
@@ -26,7 +26,7 @@
*/
package org.opends.server.protocols.ldap;
-import static org.opends.server.protocols.ldap.TestAddResponseProtocolOp.*;
+import static org.forgerock.util.Utils.*;
import static org.opends.server.util.ServerConstants.*;
import static org.testng.Assert.*;
@@ -330,25 +330,21 @@
@Test
public void TestToStringSingleLine() throws Exception
{
- ModifyDNResponseProtocolOp modifyResponse;
- StringBuilder buffer = new StringBuilder();
- StringBuilder key = new StringBuilder();
-
List<String> referralURLs = Arrays.asList(
"ds1.example.com",
"ds2.example.com",
"ds3.example.com");
- modifyResponse = new ModifyDNResponseProtocolOp(resultCode, resultMsg, dn, referralURLs);
+ ModifyDNResponseProtocolOp modifyResponse = new ModifyDNResponseProtocolOp(resultCode, resultMsg, dn, referralURLs);
+ StringBuilder buffer = new StringBuilder();
modifyResponse.toString(buffer);
- key.append("ModifyDNResponse(resultCode=" + resultCode + ", "
- + "errorMessage=" + resultMsg + ", matchedDN=" + dn + ", "
- + "referralURLs={");
- join(key, referralURLs);
- key.append("})");
+ String key = "ModifyDNResponse(resultCode=" + resultCode
+ + ", errorMessage=" + resultMsg
+ + ", matchedDN=" + dn
+ + ", referralURLs={" + joinAsString(", ", referralURLs) + "})";
- assertEquals(buffer.toString(), key.toString());
+ assertEquals(buffer.toString(), key);
}
/**
@@ -380,35 +376,15 @@
indentBuf.append(' ');
}
- key.append(indentBuf);
- key.append("Modify DN Response");
- key.append(EOL);
+ key.append(indentBuf).append("Modify DN Response").append(EOL);
+ key.append(indentBuf).append(" Result Code: ").append(resultCode).append(EOL);
+ key.append(indentBuf).append(" Error LocalizableMessage: ").append(resultMsg).append(EOL);
+ key.append(indentBuf).append(" Matched DN: ").append(dn).append(EOL);
- key.append(indentBuf);
- key.append(" Result Code: ");
- key.append(resultCode);
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Error LocalizableMessage: ");
- key.append(resultMsg);
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Matched DN: ");
- key.append(dn.toString());
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Referral URLs: ");
- key.append(EOL);
-
+ key.append(indentBuf).append(" Referral URLs: ").append(EOL);
for (String url : referralURLs)
{
- key.append(indentBuf);
- key.append(" ");
- key.append(url);
- key.append(EOL);
+ key.append(indentBuf).append(" ").append(url).append(EOL);
}
assertEquals(buffer.toString(), key.toString());
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java
index 9f6e33a..2c8b335 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java
@@ -352,7 +352,7 @@
new ModifyRequestProtocolOp(dn, modifications);
modifyRequest.toString(buffer);
- key.append("ModifyRequest(dn="+dn+", mods={");
+ key.append("ModifyRequest(dn=").append(dn).append(", mods={");
for (int i = 0; i < numModifications; i++)
{
modifications.get(i).toString(key);
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
index a4fceca..8f51cee 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
@@ -42,7 +42,7 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import static org.opends.server.protocols.ldap.TestAddResponseProtocolOp.*;
+import static org.forgerock.util.Utils.*;
import static org.opends.server.util.ServerConstants.*;
import static org.testng.Assert.*;
@@ -326,25 +326,21 @@
@Test
public void TestToStringSingleLine() throws Exception
{
- ModifyResponseProtocolOp modifyResponse;
- StringBuilder buffer = new StringBuilder();
- StringBuilder key = new StringBuilder();
-
List<String> referralURLs = Arrays.asList(
"ds1.example.com",
"ds2.example.com",
"ds3.example.com");
- modifyResponse = new ModifyResponseProtocolOp(resultCode, resultMsg, dn, referralURLs);
+ ModifyResponseProtocolOp modifyResponse = new ModifyResponseProtocolOp(resultCode, resultMsg, dn, referralURLs);
+ StringBuilder buffer = new StringBuilder();
modifyResponse.toString(buffer);
- key.append("ModifyResponse(resultCode=" + resultCode + ", "
- + "errorMessage=" + resultMsg + ", matchedDN=" + dn
- + ", " + "referralURLs={");
- join(key, referralURLs);
- key.append("})");
+ String key = "ModifyResponse(resultCode=" + resultCode
+ + ", errorMessage=" + resultMsg
+ + ", matchedDN=" + dn
+ + ", referralURLs={" + joinAsString(", ", referralURLs) + "})";
- assertEquals(buffer.toString(), key.toString());
+ assertEquals(buffer.toString(), key);
}
/**
@@ -357,7 +353,6 @@
{
ModifyResponseProtocolOp modifyResponse;
StringBuilder buffer = new StringBuilder();
- StringBuilder key = new StringBuilder();
ArrayList<String> referralURLs = new ArrayList<>();
referralURLs.add("ds1.example.com");
@@ -366,8 +361,7 @@
int indent = 5;
int i;
- modifyResponse = new ModifyResponseProtocolOp(resultCode, resultMsg, dn,
- referralURLs);
+ modifyResponse = new ModifyResponseProtocolOp(resultCode, resultMsg, dn, referralURLs);
modifyResponse.toString(buffer, indent);
StringBuilder indentBuf = new StringBuilder(indent);
@@ -376,35 +370,16 @@
indentBuf.append(' ');
}
- key.append(indentBuf);
- key.append("Modify Response");
- key.append(EOL);
+ StringBuilder key = new StringBuilder();
+ key.append(indentBuf).append("Modify Response").append(EOL);
+ key.append(indentBuf).append(" Result Code: ").append(resultCode).append(EOL);
+ key.append(indentBuf).append(" Error LocalizableMessage: ").append(resultMsg).append(EOL);
+ key.append(indentBuf).append(" Matched DN: ").append(dn).append(EOL);
- key.append(indentBuf);
- key.append(" Result Code: ");
- key.append(resultCode);
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Error LocalizableMessage: ");
- key.append(resultMsg);
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Matched DN: ");
- key.append(dn.toString());
- key.append(EOL);
-
- key.append(indentBuf);
- key.append(" Referral URLs: ");
- key.append(EOL);
-
+ key.append(indentBuf).append(" Referral URLs: ").append(EOL);
for (String url : referralURLs)
{
- key.append(indentBuf);
- key.append(" ");
- key.append(url);
- key.append(EOL);
+ key.append(indentBuf).append(" ").append(url).append(EOL);
}
assertEquals(buffer.toString(), key.toString());
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
index b56d973..f9ad618 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
@@ -154,7 +154,7 @@
private void testSetUp(String tc) throws Exception
{
personEntry = TestCaseUtils.makeEntry(
- "dn: uid=user.1." + tc + "," + baseDN + "",
+ "dn: uid=user.1." + tc + "," + baseDN,
"objectClass: top",
"objectClass: person",
"objectClass: organizationalPerson",
@@ -187,7 +187,7 @@
user1entrysecondUUID = "22222222-2222-2222-2222-222222222222";
user1dn = DN.valueOf("uid=user1" + tc + "," + baseDN);
personWithUUIDEntry = TestCaseUtils.makeEntry(
- "dn: "+ user1dn + "",
+ "dn: " + user1dn,
"objectClass: top", "objectClass: person",
"objectClass: organizationalPerson",
"objectClass: inetOrgPerson", "uid: user.1",
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java
index 2c012cc..138e255 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java
@@ -446,7 +446,7 @@
final StringBuilder sb = new StringBuilder();
for (int i = 0; i < ENTRYCOUNT; i++)
{
- sb.append("key : value" + i + "\n\n");
+ sb.append("key : value").append(i).append("\n\n");
}
return sb.toString();
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java
index e87bf27..c579d73 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java
@@ -99,15 +99,11 @@
if (! invalidOIDs.isEmpty())
{
StringBuilder message = new StringBuilder();
- message.append("All attribute syntaxes defined in OpenDS must have " +
- "valid OIDs assigned.");
- message.append(EOL);
- message.append("Attribute syntaxes without valid OIDs:");
- message.append(EOL);
+ message.append("All attribute syntaxes defined in OpenDS must have valid OIDs assigned.").append(EOL);
+ message.append("Attribute syntaxes without valid OIDs:").append(EOL);
for (String s : invalidOIDs)
{
- message.append("- " + s);
- message.append(EOL);
+ message.append("- ").append(s).append(EOL);
}
throw new AssertionError(message.toString());
@@ -137,14 +133,13 @@
if (! invalidOIDs.isEmpty())
{
StringBuilder message = new StringBuilder();
- message.append("All matching rules defined in OpenDS must have valid " +
- "OIDs assigned.");
+ message.append("All matching rules defined in OpenDS must have valid ").append("OIDs assigned.");
message.append(EOL);
message.append("Matching rules without valid OIDs:");
message.append(EOL);
for (String s : invalidOIDs)
{
- message.append("- " + s);
+ message.append("- ").append(s);
message.append(EOL);
}
@@ -213,14 +208,13 @@
if (! invalidOIDs.isEmpty())
{
StringBuilder message = new StringBuilder();
- message.append("All attribute types defined in OpenDS must have valid " +
- "OIDs assigned.");
+ message.append("All attribute types defined in OpenDS must have valid ").append("OIDs assigned.");
message.append(EOL);
message.append("Attribute types without valid OIDs:");
message.append(EOL);
for (String s : invalidOIDs)
{
- message.append("- " + s);
+ message.append("- ").append(s);
message.append(EOL);
}
@@ -289,14 +283,13 @@
if (! invalidOIDs.isEmpty())
{
StringBuilder message = new StringBuilder();
- message.append("All object classes defined in OpenDS must have valid " +
- "OIDs assigned.");
+ message.append("All object classes defined in OpenDS must have valid ").append("OIDs assigned.");
message.append(EOL);
message.append("Object classes without valid OIDs:");
message.append(EOL);
for (String s : invalidOIDs)
{
- message.append("- " + s);
+ message.append("- ").append(s);
message.append(EOL);
}
@@ -364,14 +357,13 @@
if (! invalidOIDs.isEmpty())
{
StringBuilder message = new StringBuilder();
- message.append("All name forms defined in OpenDS must have valid OIDs " +
- "assigned.");
+ message.append("All name forms defined in OpenDS must have valid OIDs ").append("assigned.");
message.append(EOL);
message.append("Name forms without valid OIDs:");
message.append(EOL);
for (String s : invalidOIDs)
{
- message.append("- " + s);
+ message.append("- ").append(s);
message.append(EOL);
}
--
Gitblit v1.10.0