From 3a9cfa61d75850ce15863d199362014d0e2d7240 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 25 Feb 2016 17:27:02 +0000
Subject: [PATCH] Prep work for OPENDJ-1342: align APIs for DNs and RDNs
---
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ParentDNTag.java | 4
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java | 4
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java | 4
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java | 4
opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java | 12 ----
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreDNTag.java | 14 ++--
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddResponseProtocolOp.java | 4
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 | 4
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java | 10 +-
opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPClientConnection.java | 4
opendj-server-legacy/src/main/java/org/opends/server/types/DN.java | 18 -----
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/common/MultiDomainServerState.java | 4
opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/DNTag.java | 12 ++--
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java | 4
opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxClientConnection.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreParentDNTag.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java | 2
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java | 4
opendj-server-legacy/src/main/java/org/opends/server/types/AuthenticationInfo.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java | 2
26 files changed, 62 insertions(+), 88 deletions(-)
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 b52848e..184fae9 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
@@ -606,13 +606,13 @@
else
{
Iterator<DN> iterator = passwordValidators.keySet().iterator();
- iterator.next().toString(buffer);
+ buffer.append(iterator.next());
buffer.append(EOL);
while (iterator.hasNext())
{
buffer.append(" ");
- iterator.next().toString(buffer);
+ buffer.append(iterator.next());
buffer.append(EOL);
}
}
@@ -628,7 +628,7 @@
}
else
{
- configuration.getPasswordGeneratorDN().toString(buffer);
+ buffer.append(configuration.getPasswordGeneratorDN());
}
buffer.append(EOL);
@@ -641,13 +641,13 @@
else
{
Iterator<DN> iterator = notificationHandlers.keySet().iterator();
- iterator.next().toString(buffer);
+ buffer.append(iterator.next());
buffer.append(EOL);
while (iterator.hasNext())
{
buffer.append(" ");
- iterator.next().toString(buffer);
+ buffer.append(iterator.next());
buffer.append(EOL);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java
index d5b8374..dd145a1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java
@@ -487,7 +487,7 @@
buffer.append(",opID=");
buffer.append(searchOperation.getOperationID());
buffer.append(",baseDN=\"");
- searchOperation.getBaseDN().toString(buffer);
+ buffer.append(searchOperation.getBaseDN());
buffer.append("\",scope=");
buffer.append(searchOperation.getScope());
buffer.append(",filter=\"");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPClientConnection.java
index 1b137d5..2cdb5b5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPClientConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPClientConnection.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2013-2015 ForgeRock AS.
+ * Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.protocols.http;
@@ -795,7 +795,7 @@
DN authDN = getAuthenticationInfo().getAuthenticationDN();
if (authDN != null)
{
- authDN.toString(buffer);
+ buffer.append(authDN);
}
return buffer.toString();
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxClientConnection.java
index 4ea6b25..6ef0de9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxClientConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxClientConnection.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.protocols.jmx;
@@ -645,7 +645,7 @@
DN authDN = getAuthenticationInfo().getAuthenticationDN();
if (authDN != null)
{
- authDN.toString(buffer);
+ buffer.append(authDN);
}
buffer.append("\"");
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 11ed4c5..7f123a9 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
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -247,7 +247,7 @@
{
buffer.append(indentBuf);
buffer.append(" Matched DN: ");
- matchedDN.toString(buffer);
+ buffer.append(matchedDN);
buffer.append(EOL);
}
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 98ec8d1..e86afd4 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
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -300,7 +300,7 @@
{
buffer.append(indentBuf);
buffer.append(" Matched DN: ");
- matchedDN.toString(buffer);
+ buffer.append(matchedDN);
buffer.append(EOL);
}
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 c2f64ff..9c15a86 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
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -249,7 +249,7 @@
{
buffer.append(indentBuf);
buffer.append(" Matched DN: ");
- matchedDN.toString(buffer);
+ buffer.append(matchedDN);
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 16b8669..56a89b4 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
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -250,7 +250,7 @@
{
buffer.append(indentBuf);
buffer.append(" Matched DN: ");
- matchedDN.toString(buffer);
+ buffer.append(matchedDN);
buffer.append(EOL);
}
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 8e937ce..c114a6e 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
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -325,7 +325,7 @@
{
buffer.append(indentBuf);
buffer.append(" Matched DN: ");
- matchedDN.toString(buffer);
+ buffer.append(matchedDN);
buffer.append(EOL);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
index 837ff85..ec1cdff 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2010-2015 ForgeRock AS.
+ * Portions Copyright 2010-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -2356,7 +2356,7 @@
DN authDN = getAuthenticationInfo().getAuthenticationDN();
if (authDN != null)
{
- authDN.toString(buffer);
+ buffer.append(authDN);
}
buffer.append("\" security=\"");
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 577b869..ed914d5 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
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -248,7 +248,7 @@
{
buffer.append(indentBuf);
buffer.append(" Matched DN: ");
- matchedDN.toString(buffer);
+ buffer.append(matchedDN);
buffer.append(EOL);
}
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 31569c0..5a9fe4f 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
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -247,7 +247,7 @@
{
buffer.append(indentBuf);
buffer.append(" Matched DN: ");
- matchedDN.toString(buffer);
+ buffer.append(matchedDN);
buffer.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 c367e60..614942a 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
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -249,7 +249,7 @@
{
buffer.append(indentBuf);
buffer.append(" Matched DN: ");
- matchedDN.toString(buffer);
+ buffer.append(matchedDN);
buffer.append(EOL);
}
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 bee7428..cbf5897 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
@@ -340,7 +340,7 @@
public void toString(StringBuilder buffer)
{
buffer.append("SearchResultEntry(dn=");
- dn.toString(buffer);
+ buffer.append(dn);
buffer.append(", attrs={");
LinkedList<LDAPAttribute> tmp = getAttributes();
@@ -384,7 +384,7 @@
buffer.append(indentBuf);
buffer.append(" DN: ");
- dn.toString(buffer);
+ buffer.append(dn);
buffer.append(EOL);
buffer.append(" Attributes:");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/MultiDomainServerState.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/MultiDomainServerState.java
index 1c5743d..0453407 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/MultiDomainServerState.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/MultiDomainServerState.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.replication.common;
@@ -216,7 +216,7 @@
{
for (Entry<DN, ServerState> entry : list.entrySet())
{
- entry.getKey().toString(buffer);
+ buffer.append(entry.getKey());
buffer.append(":");
entry.getValue().toString(buffer);
buffer.append(";");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/DNTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/DNTag.java
index 82c15e8..384933b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/DNTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/DNTag.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -188,17 +188,17 @@
if (numComponents == 0)
{
- dn.toString(templateValue.getValue());
+ templateValue.getValue().append(dn);
}
else if (numComponents > 0)
{
int count = Math.min(numComponents, dn.size());
- dn.getRDN(0).toString(templateValue.getValue());
+ templateValue.getValue().append(dn.getRDN(0));
for (int i = 1; i < count; i++)
{
templateValue.append(",");
- dn.getRDN(i).toString(templateValue.getValue());
+ templateValue.getValue().append(dn.getRDN(i));
}
}
else
@@ -206,11 +206,11 @@
int sz = dn.size();
int count = Math.min(Math.abs(numComponents), sz);
- dn.getRDN(sz - count).toString(templateValue.getValue());
+ templateValue.getValue().append(dn.getRDN(sz - count));
for (int i = 1; i < count; i++)
{
templateValue.append(",");
- dn.getRDN(sz - count + i).toString(templateValue.getValue());
+ templateValue.getValue().append(dn.getRDN(sz - count + i));
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ParentDNTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ParentDNTag.java
index 6902799..39a77ed 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ParentDNTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ParentDNTag.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
@@ -116,7 +116,7 @@
return TagResult.SUCCESS_RESULT;
}
- parentDN.toString(templateValue.getValue());
+ templateValue.getValue().append(parentDN);
return TagResult.SUCCESS_RESULT;
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java
index 5a91dc9..a40c6f2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
@@ -142,7 +142,7 @@
DN dn = templateEntry.getDN();
if (dn != null && !dn.isRootDN())
{
- dn.rdn().toString(templateValue.getValue());
+ templateValue.getValue().append(dn.rdn());
}
return TagResult.SUCCESS_RESULT;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreDNTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreDNTag.java
index 2848d34..9b23304 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreDNTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreDNTag.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -188,22 +188,22 @@
if (numComponents == 0)
{
- dn.getRDN(0).toString(templateValue.getValue());
+ templateValue.getValue().append(dn.getRDN(0));
for (int i=1; i < dn.size(); i++)
{
templateValue.append("_");
- dn.getRDN(i).toString(templateValue.getValue());
+ templateValue.getValue().append(dn.getRDN(i));
}
}
else if (numComponents > 0)
{
int count = Math.min(numComponents, dn.size());
- dn.getRDN(0).toString(templateValue.getValue());
+ templateValue.getValue().append(dn.getRDN(0));
for (int i = 1; i < count; i++)
{
templateValue.append("_");
- dn.getRDN(i).toString(templateValue.getValue());
+ templateValue.getValue().append(dn.getRDN(i));
}
}
else
@@ -211,10 +211,10 @@
int sz = dn.size();
int count = Math.min(Math.abs(numComponents), sz);
- dn.getRDN(sz - count).toString(templateValue.getValue());
+ templateValue.getValue().append(dn.getRDN(sz - count));
for (int i = 1; i < count; i++) {
templateValue.append("_");
- dn.getRDN(sz - count + i).toString(templateValue.getValue());
+ templateValue.getValue().append(dn.getRDN(sz - count + i));
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreParentDNTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreParentDNTag.java
index e1d3956..80610bf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreParentDNTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreParentDNTag.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
@@ -116,11 +116,11 @@
return TagResult.SUCCESS_RESULT;
}
- parentDN.getRDN(0).toString(templateValue.getValue());
+ templateValue.getValue().append(parentDN.getRDN(0));
for (int i=1; i < parentDN.size(); i++)
{
templateValue.append("_");
- parentDN.getRDN(i).toString(templateValue.getValue());
+ templateValue.getValue().append(parentDN.getRDN(i));
}
return TagResult.SUCCESS_RESULT;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/AuthenticationInfo.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AuthenticationInfo.java
index 115b156..e7f7b13 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/AuthenticationInfo.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/AuthenticationInfo.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.types;
@@ -457,7 +457,7 @@
if (authenticationEntry != null)
{
- authenticationEntry.getName().toString(buffer);
+ buffer.append(authenticationEntry.getName());
}
if (authorizationEntry == null)
@@ -467,7 +467,7 @@
else
{
buffer.append("\",authorizationDN=\"");
- authorizationEntry.getName().toString(buffer);
+ buffer.append(authorizationEntry.getName());
buffer.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 77111ea..da6c01a 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
@@ -2450,12 +2450,12 @@
else
{
StringBuilder buffer = new StringBuilder();
- rdnComponents[0].toString(buffer);
+ buffer.append(rdnComponents[0]);
for (int i=1; i < numComponents; i++)
{
buffer.append(",");
- rdnComponents[i].toString(buffer);
+ buffer.append(rdnComponents[i]);
}
dnString = buffer.toString();
@@ -2465,20 +2465,6 @@
return dnString;
}
-
-
- /**
- * Appends a string representation of this DN to the provided
- * buffer.
- *
- * @param buffer The buffer to which the information should be
- * appended.
- */
- public void toString(StringBuilder buffer)
- {
- buffer.append(this);
- }
-
/**
* Retrieves a normalized string representation of this DN.
* <p>
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 3d29400..6d0b783 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
@@ -4132,7 +4132,7 @@
public void toSingleLineString(StringBuilder buffer)
{
buffer.append("Entry(dn=\"");
- dn.toString(buffer);
+ buffer.append(dn);
buffer.append("\",objectClasses={");
Iterator<String> iterator = objectClasses.values().iterator();
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 d3c54d0..2a71f70 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
@@ -583,18 +583,6 @@
}
/**
- * Appends a string representation of this RDN to the provided
- * buffer.
- *
- * @param buffer The buffer to which the string representation
- * should be appended.
- */
- public void toString(StringBuilder buffer)
- {
- buffer.append(this);
- }
-
- /**
* Retrieves a normalized string representation of this RDN.
* <p>
*
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java
index 720cacf..483dd69 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java
@@ -362,7 +362,7 @@
(ModifyDNChangeRecordEntry) changeRecord;
StringBuilder newRDNLine = new StringBuilder("newrdn: ");
- modifyDNRecord.getNewRDN().toString(newRDNLine);
+ newRDNLine.append(modifyDNRecord.getNewRDN());
writeLDIFLine(newRDNLine, writer, wrapLines, wrapColumn);
StringBuilder deleteOldRDNLine = new StringBuilder("deleteoldrdn: ");
@@ -373,7 +373,7 @@
if (newSuperiorDN != null)
{
StringBuilder newSuperiorLine = new StringBuilder("newsuperior: ");
- newSuperiorDN.toString(newSuperiorLine);
+ newSuperiorLine.append(newSuperiorDN);
writeLDIFLine(newSuperiorLine, writer, wrapLines, wrapColumn);
}
}
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 1e160c3..e4cfb57 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
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.util;
@@ -135,7 +135,7 @@
if (newSuperiorDN != null)
{
buffer.append(", newSuperior=\"");
- newSuperiorDN.toString(buffer);
+ buffer.append(newSuperiorDN);
buffer.append("\"");
}
--
Gitblit v1.10.0