From 0a77851c0262fdee323a0bbdbaffbd651b44ae3b Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 27 Oct 2014 16:42:05 +0000
Subject: [PATCH] OPENDJ-1585 Replace calls to DN.toNormalizeString() by calls to DN.toString() in logging statements and toString() methods
---
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java | 4
opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java | 6
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 24 +++---
opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java | 34 ++++----
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/AuthMethodConnectionCriteria.java | 4
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java | 2
opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java | 6
opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java | 6
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java | 2
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/Target.java | 6 -
opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java | 2
opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java | 6
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java | 12 +-
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/ChangelogBackendTestCase.java | 26 +++---
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java | 4
opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java | 10 +-
opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java | 4
opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java | 10 +-
opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java | 4
opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java | 4
24 files changed, 91 insertions(+), 93 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/Target.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/Target.java
index 111ff69..71e63ba 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/Target.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/Target.java
@@ -95,10 +95,8 @@
} else {
urlDN=targetURL.getBaseDN();
if(!urlDN.isDescendantOf(aciDN)) {
- LocalizableMessage message = WARN_ACI_SYNTAX_TARGET_DN_NOT_DESCENDENTOF.
- get(urlDN.toNormalizedString(),
- aciDN.toNormalizedString());
- throw new AciException(message);
+ throw new AciException(WARN_ACI_SYNTAX_TARGET_DN_NOT_DESCENDENTOF.get(urlDN.toString(),
+ aciDN.toString()));
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java
index d08bdf6..50728c6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java
@@ -284,7 +284,7 @@
processedEntries.getAndIncrement();
} catch (Exception ex) {
logger.traceException(ex);
- logger.error(ERR_CACHE_PRELOAD_ENTRY_FAILED, entry.getName().toNormalizedString(),
+ logger.error(ERR_CACHE_PRELOAD_ENTRY_FAILED, entry.getName().toString(),
(ex.getCause() != null ? ex.getCause().getMessage() :
stackTraceToSingleLineString(ex)));
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
index 0890092..ddfef85 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -1703,7 +1703,7 @@
if (nodeID == null)
{
LocalizableMessage msg =
- ERR_JEB_MISSING_DN2ID_RECORD.get(dn.toNormalizedString());
+ ERR_JEB_MISSING_DN2ID_RECORD.get(dn.toString());
throw new JebException(msg);
}
@@ -2066,7 +2066,7 @@
if (parentID == null)
{
LocalizableMessage msg =
- ERR_JEB_MISSING_DN2ID_RECORD.get(parentDN.toNormalizedString());
+ ERR_JEB_MISSING_DN2ID_RECORD.get(parentDN.toString());
throw new JebException(msg);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
index 38a1c68..d9e8596 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
@@ -601,7 +601,7 @@
{
logger.trace("File dn2id has DN <%s> referencing entry " +
"with wrong DN <%s>%n", new String(key.getData()),
- entry.getName().toNormalizedString());
+ entry.getName().toString());
}
}
}
@@ -1235,7 +1235,7 @@
if (logger.isTraceEnabled())
{
logger.trace("File dn2id is missing key %s.%n",
- dn.toNormalizedString());
+ dn.toString());
}
errorCount++;
}
@@ -1318,7 +1318,7 @@
if (logger.isTraceEnabled())
{
logger.trace("File dn2id is missing key %s.%n",
- parentDN.toNormalizedString());
+ parentDN.toString());
}
errorCount++;
}
@@ -1330,7 +1330,7 @@
logger.traceException(e);
logger.trace("File dn2id has error reading key %s: %s.",
- parentDN.toNormalizedString(),
+ parentDN.toString(),
e.getMessage());
}
errorCount++;
@@ -1390,7 +1390,7 @@
if (logger.isTraceEnabled())
{
logger.trace("File dn2id is missing key %s.%n",
- dn.toNormalizedString());
+ dn.toString());
}
errorCount++;
}
@@ -1402,7 +1402,7 @@
logger.traceException(e);
logger.trace("File dn2id has error reading key %s: %s.%n",
- dn.toNormalizedString(),
+ dn.toString(),
e.getMessage());
}
errorCount++;
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java b/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java
index 3c73504..977fd6b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java
@@ -551,6 +551,6 @@
@Override
public String toString()
{
- return entry.getName().toNormalizedString();
+ return entry.getName().toString();
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java b/opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java
index e4a2c3a..1efc486 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java
@@ -179,7 +179,7 @@
{
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
ERR_PWPOLICY_UNDEFINED_PASSWORD_ATTRIBUTE.get(
- this.passwordPolicySubentryDN.toNormalizedString(), value));
+ this.passwordPolicySubentryDN.toString(), value));
}
// Check the syntax.
@@ -263,7 +263,7 @@
{
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
ERR_PWPOLICY_UNKNOWN_VALIDATOR.get(
- this.passwordPolicySubentryDN.toNormalizedString(),
+ this.passwordPolicySubentryDN.toString(),
validatorDN.toString(), PWD_ATTR_VALIDATOR));
}
pValidatorNames.add(validatorDN);
@@ -717,7 +717,7 @@
// Only log an error once, on first error
if (isAlreadyLogged.compareAndSet(false, true)) {
logger.error(ERR_PWPOLICY_REJECT_DUE_TO_UNKNOWN_VALIDATOR_LOG,
- userEntry.getName().toNormalizedString(), pwPolicyName, validatorName);
+ userEntry.getName().toString(), pwPolicyName, validatorName);
}
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/AuthMethodConnectionCriteria.java b/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/AuthMethodConnectionCriteria.java
index 35bc4bc..cdc52f4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/AuthMethodConnectionCriteria.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/AuthMethodConnectionCriteria.java
@@ -115,14 +115,14 @@
switch (method)
{
case ANONYMOUS:
- if (bindDN.toNormalizedString().length() == 0)
+ if (bindDN.toString().length() == 0)
{
return true;
}
break;
case SIMPLE:
if (authType == AuthenticationType.SIMPLE
- && bindDN.toNormalizedString().length() > 0)
+ && bindDN.toString().length() > 0)
{
return true;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
index c59fd4a..deac7a3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
@@ -190,7 +190,7 @@
{
// The asynchronous setting is being turned on.
writer = new AsynchronousTextWriter(
- "Asynchronous Text Writer for " + config.dn().toNormalizedString(),
+ "Asynchronous Text Writer for " + config.dn().toString(),
config.getQueueSize(), config.isAutoFlush(), mfWriter);
}
@@ -198,7 +198,7 @@
{
// The asynchronous setting is being turned on.
writer = new ParallelTextWriter(
- "Parallel Text Writer for " + config.dn().toNormalizedString(),
+ "Parallel Text Writer for " + config.dn().toString(),
config.isAutoFlush(), mfWriter);
}
@@ -253,7 +253,7 @@
&& !cfg.isAsynchronous();
final MultifileTextWriter theWriter = new MultifileTextWriter(
- "Multifile Text Writer for " + cfg.dn().toNormalizedString(),
+ "Multifile Text Writer for " + cfg.dn().toString(),
cfg.getTimeInterval(), fnPolicy, perm, errorHandler, "UTF-8",
writerAutoFlush, cfg.isAppend(), (int) cfg.getBufferSize());
@@ -273,13 +273,13 @@
if (cfg.getQueueSize() > 0)
{
this.writer = new AsynchronousTextWriter(
- "Asynchronous Text Writer for " + cfg.dn().toNormalizedString(),
+ "Asynchronous Text Writer for " + cfg.dn().toString(),
cfg.getQueueSize(), cfg.isAutoFlush(), theWriter);
}
else
{
this.writer = new ParallelTextWriter("Parallel Text Writer for "
- + cfg.dn().toNormalizedString(), cfg.isAutoFlush(), theWriter);
+ + cfg.dn().toString(), cfg.isAutoFlush(), theWriter);
}
}
else
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
index 66e3e09..f45c6f6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
@@ -140,7 +140,7 @@
// The asynchronous setting is being turned on.
writer = new AsynchronousTextWriter(
"Asynchronous Text Writer for " +
- config.dn().toNormalizedString(),
+ config.dn().toString(),
config.getQueueSize(), config.isAutoFlush(), mfWriter);
}
@@ -199,7 +199,7 @@
&& !cfg.isAsynchronous();
MultifileTextWriter writer = new MultifileTextWriter(
- "Multifile Text Writer for " + cfg.dn().toNormalizedString(),
+ "Multifile Text Writer for " + cfg.dn().toString(),
cfg.getTimeInterval(), fnPolicy, perm, errorHandler, "UTF-8",
writerAutoFlush, cfg.isAppend(), (int) cfg.getBufferSize());
@@ -217,7 +217,7 @@
if (cfg.isAsynchronous())
{
this.writer = new AsynchronousTextWriter("Asynchronous Text Writer for "
- + cfg.dn().toNormalizedString(), cfg.getQueueSize(), cfg
+ + cfg.dn().toString(), cfg.getQueueSize(), cfg
.isAutoFlush(), writer);
}
else
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java
index eef3175..f5f1908 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java
@@ -140,7 +140,7 @@
MultifileTextWriter writer =
new MultifileTextWriter("Multifile Text Writer for " +
- config.dn().toNormalizedString(),
+ config.dn().toString(),
config.getTimeInterval(),
fnPolicy,
perm,
@@ -164,7 +164,7 @@
if(config.isAsynchronous())
{
this.writer = new AsynchronousTextWriter(
- "Asynchronous Text Writer for " + config.dn().toNormalizedString(),
+ "Asynchronous Text Writer for " + config.dn().toString(),
config.getQueueSize(), config.isAutoFlush(), writer);
}
else
@@ -307,7 +307,7 @@
{
// The asynchronous setting is being turned on.
writer = new AsynchronousTextWriter("Asynchronous Text Writer for " +
- config.dn().toNormalizedString(), config.getQueueSize(),
+ config.dn().toString(), config.getQueueSize(),
config.isAutoFlush(),
mfWriter);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
index 1f13712..dbfbd2a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
@@ -137,7 +137,7 @@
MultifileTextWriter writer =
new MultifileTextWriter("Multifile Text Writer for " +
- config.dn().toNormalizedString(),
+ config.dn().toString(),
config.getTimeInterval(),
fnPolicy,
perm,
@@ -162,7 +162,7 @@
{
this.writer = new AsynchronousTextWriter(
"Asynchronous Text Writer for " +
- config.dn().toNormalizedString(),
+ config.dn().toString(),
config.getQueueSize(), config.isAutoFlush(), writer);
}
else
@@ -520,7 +520,7 @@
{
// The asynchronous setting is being turned on.
writer = new AsynchronousTextWriter("Asynchronous Text Writer for " +
- config.dn().toNormalizedString(), config.getQueueSize(),
+ config.dn().toString(), config.getQueueSize(),
config.isAutoFlush(),
mfWriter);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
index 802d34f..517ab00 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
@@ -200,7 +200,7 @@
// The asynchronous setting is being turned on.
final AsynchronousTextWriter asyncWriter =
new AsynchronousTextWriter("Asynchronous Text Writer for "
- + config.dn().toNormalizedString(), config.getQueueSize(),
+ + config.dn().toString(), config.getQueueSize(),
config.isAutoFlush(), mfWriter);
writer = asyncWriter;
}
@@ -209,7 +209,7 @@
{
// The asynchronous setting is being turned on.
final ParallelTextWriter asyncWriter = new ParallelTextWriter(
- "Parallel Text Writer for " + config.dn().toNormalizedString(),
+ "Parallel Text Writer for " + config.dn().toString(),
config.isAutoFlush(), mfWriter);
writer = asyncWriter;
}
@@ -322,7 +322,7 @@
&& !cfg.isAsynchronous();
final MultifileTextWriter theWriter = new MultifileTextWriter(
- "Multifile Text Writer for " + cfg.dn().toNormalizedString(),
+ "Multifile Text Writer for " + cfg.dn().toString(),
cfg.getTimeInterval(), fnPolicy, perm, errorHandler, "UTF-8",
writerAutoFlush, cfg.isAppend(), (int) cfg.getBufferSize());
@@ -342,13 +342,13 @@
if (cfg.getQueueSize() > 0)
{
this.writer = new AsynchronousTextWriter(
- "Asynchronous Text Writer for " + cfg.dn().toNormalizedString(),
+ "Asynchronous Text Writer for " + cfg.dn().toString(),
cfg.getQueueSize(), cfg.isAutoFlush(), theWriter);
}
else
{
this.writer = new ParallelTextWriter("Parallel Text Writer for "
- + cfg.dn().toNormalizedString(), cfg.isAutoFlush(), theWriter);
+ + cfg.dn().toString(), cfg.isAutoFlush(), theWriter);
}
}
else
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java
index 405d754..7646cd3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java
@@ -680,7 +680,7 @@
* historical information is going to be kept.
* Log information for the repair tool.
*/
- logger.error(ERR_UNKNOWN_ATTRIBUTE_IN_HISTORICAL, entry.getName().toNormalizedString(),
+ logger.error(ERR_UNKNOWN_ATTRIBUTE_IN_HISTORICAL, entry.getName().toString(),
histVal.getAttrString());
continue;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
index 03a6c13..67f337d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
@@ -344,7 +344,7 @@
{
// An error happened trying to search for the updates
// Log an error
- logger.error(ERR_CANNOT_RECOVER_CHANGES, baseDN.toNormalizedString());
+ logger.error(ERR_CANNOT_RECOVER_CHANGES, baseDN.toString());
return;
}
@@ -369,7 +369,7 @@
{
// Update the serverState with the new maxCsn present in the database
update(dbMaxCSN);
- logger.info(NOTE_SERVER_STATE_RECOVERY, baseDN.toNormalizedString(), dbMaxCSN);
+ logger.info(NOTE_SERVER_STATE_RECOVERY, baseDN.toString(), dbMaxCSN);
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java
index 1c2d107..1c32ad8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java
@@ -464,7 +464,7 @@
replicationServerDomain.register(this);
logger.debug(INFO_REPLICATION_SERVER_CONNECTION_FROM_DS, getReplicationServerId(), getServerId(),
- replicationServerDomain.getBaseDN().toNormalizedString(),
+ replicationServerDomain.getBaseDN().toString(),
session.getReadableRemoteAddress());
super.finalizeStart();
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java
index e3684be..65d05af 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java
@@ -610,7 +610,7 @@
if (!this.baseDN.equals(baseDN))
{
LocalizableMessage message = ERR_RS_DN_DOES_NOT_MATCH.get(
- this.baseDN.toNormalizedString(), baseDN.toNormalizedString());
+ this.baseDN.toString(), baseDN.toString());
throw new DirectoryException(ResultCode.OTHER, message, null);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java
index eb3247c..8eb57e6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java
@@ -311,7 +311,7 @@
{
// This is a response for an earlier request whose computing is
// already complete.
- logger.debug(INFO_IGNORING_REMOTE_MONITOR_DATA, domain.getBaseDN().toNormalizedString(), msg.getSenderID());
+ logger.debug(INFO_IGNORING_REMOTE_MONITOR_DATA, domain.getBaseDN().toString(), msg.getSenderID());
return;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index 5fec6a9..7a48bbc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -853,7 +853,7 @@
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(ERR_RS_ERROR_SENDING_ACK.get(
localReplicationServer.getServerId(), origServer.getServerId(),
- csn, baseDN.toNormalizedString()));
+ csn, baseDN.toString()));
mb.append(" ");
mb.append(stackTraceToSingleLineString(e));
logger.error(mb.toMessage());
@@ -930,7 +930,7 @@
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(ERR_RS_ERROR_SENDING_ACK.get(
localReplicationServer.getServerId(), origServer.getServerId(),
- csn, baseDN.toNormalizedString()));
+ csn, baseDN.toString()));
mb.append(" ");
mb.append(stackTraceToSingleLineString(e));
logger.error(mb.toMessage());
@@ -1484,7 +1484,7 @@
RoutableMsg msg)
{
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
- mb.append(ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get(baseDN.toNormalizedString(), msg.getDestination()));
+ mb.append(ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get(baseDN.toString(), msg.getDestination()));
mb.append(" In Replication Server=").append(
this.localReplicationServer.getMonitorInstanceName());
mb.append(" unroutable message =").append(msg.getClass().getSimpleName());
@@ -1527,7 +1527,7 @@
*/
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get(
- baseDN.toNormalizedString(), msg.getDestination()));
+ baseDN.toString(), msg.getDestination()));
mb.append(" unroutable message =" + msg.getClass().getSimpleName());
mb.append(" Details: " + ioe.getLocalizedMessage());
final LocalizableMessage message = mb.toMessage();
@@ -1847,7 +1847,7 @@
}
} catch (IOException e)
{
- logger.error(ERR_EXCEPTION_FORWARDING_RESET_GEN_ID, baseDN.toNormalizedString(), e.getMessage());
+ logger.error(ERR_EXCEPTION_FORWARDING_RESET_GEN_ID, baseDN.toString(), e.getMessage());
}
}
@@ -1860,7 +1860,7 @@
dsHandler.changeStatusForResetGenId(newGenId);
} catch (IOException e)
{
- logger.error(ERR_EXCEPTION_CHANGING_STATUS_AFTER_RESET_GEN_ID, baseDN.toNormalizedString(),
+ logger.error(ERR_EXCEPTION_CHANGING_STATUS_AFTER_RESET_GEN_ID, baseDN.toString(),
dsHandler.getServerId(), e.getMessage());
}
}
@@ -1872,7 +1872,7 @@
// treatment.
sendTopoInfoToAll();
- logger.info(NOTE_RESET_GENERATION_ID, baseDN.toNormalizedString(), newGenId);
+ logger.info(NOTE_RESET_GENERATION_ID, baseDN.toString(), newGenId);
}
catch(Exception e)
{
@@ -1926,7 +1926,7 @@
enqueueTopoInfoToAllExcept(senderHandler);
logger.info(NOTE_DIRECTORY_SERVER_CHANGED_STATUS,
- senderHandler.getServerId(), baseDN.toNormalizedString(), newStatus);
+ senderHandler.getServerId(), baseDN.toString(), newStatus);
}
catch(Exception e)
{
@@ -1988,7 +1988,7 @@
catch (IOException e)
{
logger.error(ERR_EXCEPTION_CHANGING_STATUS_FROM_STATUS_ANALYZER,
- baseDN.toNormalizedString(), dsHandler.getServerId(), e.getMessage());
+ baseDN.toString(), dsHandler.getServerId(), e.getMessage());
}
if (newStatus == ServerStatus.INVALID_STATUS || newStatus == oldStatus)
@@ -2136,7 +2136,7 @@
LocalizableMessage message =
WARN_BAD_GENERATION_ID_FROM_RS.get(rsHandler.getServerId(),
rsHandler.session.getReadableRemoteAddress(), rsHandler
- .getGenerationId(), baseDN.toNormalizedString(),
+ .getGenerationId(), baseDN.toString(),
getLocalRSServerId(), generationId);
logger.warn(message);
@@ -2318,7 +2318,7 @@
{
return "Replication server RS(" + localReplicationServer.getServerId()
+ ") " + localReplicationServer.getServerURL() + ",cn="
- + baseDN.toNormalizedString().replace(',', '_').replace('=', '_')
+ + baseDN.toString().replace(',', '_').replace('=', '_')
+ ",cn=Replication";
}
@@ -2379,7 +2379,7 @@
if (i == 2)
{
logger.error(ERR_EXCEPTION_SENDING_TOPO_INFO,
- baseDN.toNormalizedString(), type, handler.getServerId(),
+ baseDN.toString(), type, handler.getServerId(),
e.getMessage());
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
index c7d61a0..5a7377a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
@@ -251,7 +251,7 @@
}
logger.debug(INFO_REPLICATION_SERVER_CONNECTION_TO_RS, getReplicationServerId(), getServerId(),
- replicationServerDomain.getBaseDN().toNormalizedString(),
+ replicationServerDomain.getBaseDN().toString(),
session.getReadableRemoteAddress());
super.finalizeStart();
@@ -375,7 +375,7 @@
replicationServerDomain.receiveTopoInfoFromRS(inTopoMsg, this, false);
logger.debug(INFO_REPLICATION_SERVER_CONNECTION_FROM_RS, getReplicationServerId(), getServerId(),
- replicationServerDomain.getBaseDN().toNormalizedString(),
+ replicationServerDomain.getBaseDN().toString(),
session.getReadableRemoteAddress());
super.finalizeStart();
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
index e5935c3..e606564 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
@@ -450,7 +450,7 @@
@Override
public String toString()
{
- return serverId + " " + baseDN.toNormalizedString();
+ return serverId + " " + baseDN.toString();
}
/** Hold a cursor and an indicator of wether the cursor should be considered as empty. */
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java
index eecfc65..d68d635 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java
@@ -829,12 +829,12 @@
final int rsServerId = rs.rsInfo.getServerId();
if (rsGenId == getGenerationID() || rsGenId == -1)
{
- logger.info(NOTE_NOW_FOUND_SAME_GENERATION_CHANGELOG, serverId, rsServerId, baseDN.toNormalizedString(),
+ logger.info(NOTE_NOW_FOUND_SAME_GENERATION_CHANGELOG, serverId, rsServerId, baseDN.toString(),
rs.replicationServer, getGenerationID());
}
else
{
- logger.warn(WARN_NOW_FOUND_BAD_GENERATION_CHANGELOG, serverId, rsServerId, baseDN.toNormalizedString(),
+ logger.warn(WARN_NOW_FOUND_BAD_GENERATION_CHANGELOG, serverId, rsServerId, baseDN.toString(),
rs.replicationServer, getGenerationID(), rsGenId);
}
}
@@ -849,12 +849,12 @@
if (rsInfos.size() > 0)
{
- logger.warn(WARN_COULD_NOT_FIND_CHANGELOG, serverId, baseDN.toNormalizedString(),
+ logger.warn(WARN_COULD_NOT_FIND_CHANGELOG, serverId, baseDN.toString(),
Utils.joinAsString(", ", rsInfos.keySet()));
}
else
{
- logger.warn(WARN_NO_AVAILABLE_CHANGELOGS, serverId, baseDN.toNormalizedString());
+ logger.warn(WARN_NO_AVAILABLE_CHANGELOGS, serverId, baseDN.toString());
}
}
}
@@ -962,7 +962,7 @@
*/
logger.warn(WARN_CONNECTED_TO_SERVER_WITH_WRONG_GROUP_ID,
groupId, rs.getServerId(), rsInfo.getServerURL(), rs.getGroupId(),
- baseDN.toNormalizedString(), getServerId());
+ baseDN.toString(), getServerId());
}
startRSHeartBeatMonitoring(rs);
if (rsInfo.getProtocolVersion() >=
@@ -974,7 +974,7 @@
}
catch (Exception e)
{
- logger.error(ERR_COMPUTING_FAKE_OPS, baseDN.toNormalizedString(), rsInfo.getServerURL(),
+ logger.error(ERR_COMPUTING_FAKE_OPS, baseDN.toString(), rsInfo.getServerURL(),
e.getLocalizedMessage() + " " + stackTraceToSingleLineString(e));
}
finally
@@ -1109,7 +1109,7 @@
if (!getBaseDN().equals(repDN))
{
errorMessage = ERR_DS_DN_DOES_NOT_MATCH.get(
- repDN.toNormalizedString(), getBaseDN().toNormalizedString());
+ repDN.toString(), getBaseDN().toString());
return setConnectedRS(ConnectedRS.noConnectedRS());
}
@@ -1139,17 +1139,17 @@
catch (ConnectException e)
{
errorMessage = WARN_NO_CHANGELOG_SERVER_LISTENING.get(getServerId(),
- serverURL, getBaseDN().toNormalizedString());
+ serverURL, getBaseDN().toString());
}
catch (SocketTimeoutException e)
{
errorMessage = WARN_TIMEOUT_CONNECTING_TO_RS.get(getServerId(),
- serverURL, getBaseDN().toNormalizedString());
+ serverURL, getBaseDN().toString());
}
catch (Exception e)
{
errorMessage = WARN_EXCEPTION_STARTING_SESSION_PHASE.get(getServerId(),
- serverURL, getBaseDN().toNormalizedString(),
+ serverURL, getBaseDN().toString(),
stackTraceToSingleLineString(e));
}
finally
@@ -1223,7 +1223,7 @@
{
logger.error(WARN_EXCEPTION_STARTING_SESSION_PHASE,
getServerId(), electedRS.rsInfo.getServerURL(),
- getBaseDN().toNormalizedString(), stackTraceToSingleLineString(e));
+ getBaseDN().toString(), stackTraceToSingleLineString(e));
setConnectedRS(ConnectedRS.noConnectedRS());
return null;
@@ -2184,7 +2184,7 @@
catch (Exception e)
{
logger.error(NOTE_EXCEPTION_RESTARTING_SESSION,
- getBaseDN().toNormalizedString(), e.getLocalizedMessage() + " " + stackTraceToSingleLineString(e));
+ getBaseDN().toString(), e.getLocalizedMessage() + " " + stackTraceToSingleLineString(e));
}
if (rs.isConnected() || !infiniteTry)
@@ -2488,7 +2488,7 @@
{
// RS performs a proper disconnection
logger.warn(WARN_REPLICATION_SERVER_PROPERLY_DISCONNECTED, previousRsServerID, rs.replicationServer,
- serverId, baseDN.toNormalizedString());
+ serverId, baseDN.toString());
// Try to find a suitable RS
reStart(rs.session, true);
@@ -2554,7 +2554,7 @@
{
message = NOTE_LOAD_BALANCE_REPLICATION_SERVER.get(
serverId, previousRsServerID, rs.replicationServer,
- baseDN.toNormalizedString());
+ baseDN.toString());
}
else
{
@@ -2562,7 +2562,7 @@
message = NOTE_NEW_BEST_REPLICATION_SERVER.get(
serverId, previousRsServerID, rs.replicationServer,
bestRsServerId,
- baseDN.toNormalizedString(),
+ baseDN.toString(),
evals.getEvaluation(previousRsServerID),
evals.getEvaluation(bestRsServerId));
}
@@ -2597,7 +2597,7 @@
{
// We did not initiate the close on our side, log an error message.
logger.error(WARN_REPLICATION_SERVER_BADLY_DISCONNECTED,
- serverId, baseDN.toNormalizedString(), previousRsServerID,
+ serverId, baseDN.toString(), previousRsServerID,
rs.replicationServer);
}
@@ -2853,7 +2853,7 @@
new ChangeStatusMsg(ServerStatus.INVALID_STATUS, newStatus));
} catch (IOException ex)
{
- logger.error(ERR_EXCEPTION_SENDING_CS, getBaseDN().toNormalizedString(),
+ logger.error(ERR_EXCEPTION_SENDING_CS, getBaseDN().toString(),
getServerId(), ex.getLocalizedMessage() + " " + stackTraceToSingleLineString(ex));
}
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/ChangelogBackendTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/ChangelogBackendTestCase.java
index 5b7cbf8..13f8b53 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/ChangelogBackendTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/ChangelogBackendTestCase.java
@@ -1257,7 +1257,7 @@
/** Check the DEL entry has the right content. */
private void assertDelEntry(SearchResultEntry entry, String uid, String entryUUID,
- long changeNumber, CSN csn, String cookie)
+ long changeNumber, CSN csn, String cookie) throws Exception
{
assertAttributeValue(entry, "changetype", "delete");
assertAttributeValue(entry, "targetuniqueid", entryUUID);
@@ -1267,7 +1267,7 @@
/** Check the ADD entry has the right content. */
private void assertAddEntry(SearchResultEntry entry, String uid, String entryUUID,
- long changeNumber, CSN csn, String cookie)
+ long changeNumber, CSN csn, String cookie) throws Exception
{
assertAttributeValue(entry, "changetype", "add");
assertEntryMatchesLDIF(entry, "changes",
@@ -1278,7 +1278,7 @@
}
private void assertModEntry(SearchResultEntry entry, String uid, String entryUUID,
- long changeNumber, CSN csn, String cookie)
+ long changeNumber, CSN csn, String cookie) throws Exception
{
assertAttributeValue(entry, "changetype", "modify");
assertEntryMatchesLDIF(entry, "changes",
@@ -1289,7 +1289,7 @@
}
private void assertModDNEntry(SearchResultEntry entry, String uid, String newUid,
- String entryUUID, long changeNumber, CSN csn, String cookie)
+ String entryUUID, long changeNumber, CSN csn, String cookie) throws Exception
{
assertAttributeValue(entry, "changetype", "modrdn");
assertAttributeValue(entry, "newrdn", "uid=" + newUid);
@@ -1300,7 +1300,7 @@
}
private void assertEntryCommonAttributes(SearchResultEntry resultEntry,
- String uid, String entryUUID, long changeNumber, CSN csn, String cookie)
+ String uid, String entryUUID, long changeNumber, CSN csn, String cookie) throws Exception
{
if (changeNumber == 0)
{
@@ -1383,18 +1383,18 @@
.isEqualToIgnoringCase(expectedValue);
}
- private void assertDNWithChangeNumber(SearchResultEntry resultEntry, long changeNumber)
+ private void assertDNWithChangeNumber(SearchResultEntry resultEntry, long changeNumber) throws Exception
{
- String actualDN = resultEntry.getName().toNormalizedString();
- String expectedDN = "changenumber=" + changeNumber + ",cn=changelog";
- assertThat(actualDN).isEqualToIgnoringCase(expectedDN);
+ DN actualDN = resultEntry.getName();
+ DN expectedDN = DN.valueOf("changenumber=" + changeNumber + ",cn=changelog");
+ assertThat(actualDN).isEqualTo(expectedDN);
}
- private void assertDNWithCSN(SearchResultEntry resultEntry, CSN csn)
+ private void assertDNWithCSN(SearchResultEntry resultEntry, CSN csn) throws Exception
{
- String actualDN = resultEntry.getName().toNormalizedString();
- String expectedDN = "replicationcsn=" + csn + "," + TEST_ROOT_DN_STRING + ",cn=changelog";
- assertThat(actualDN).isEqualToIgnoringCase(expectedDN);
+ DN actualDN = resultEntry.getName();
+ DN expectedDN = DN.valueOf("replicationcsn=" + csn + "," + TEST_ROOT_DN_STRING + ",cn=changelog");
+ assertThat(actualDN).isEqualTo(expectedDN);
}
/**
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java
index 754e8fd..4f420fd 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java
@@ -395,7 +395,7 @@
String compromisedTime = TimeThread.getGeneralizedTime();
for (Entry e : searchOp.getSearchEntries()) {
TestCaseUtils.applyModifications(true,
- "dn: " + e.getName().toNormalizedString(),
+ "dn: " + e.getName().toString(),
"changetype: modify",
"replace: " + ConfigConstants.ATTR_CRYPTO_KEY_COMPROMISED_TIME,
ConfigConstants.ATTR_CRYPTO_KEY_COMPROMISED_TIME + ": "
@@ -426,7 +426,7 @@
// using a compromised key can no longer be decrypted.
for (Entry e : searchOp.getSearchEntries()) {
TestCaseUtils.applyModifications(true,
- "dn: " + e.getName().toNormalizedString(), "changetype: delete");
+ "dn: " + e.getName().toString(), "changetype: delete");
}
Thread.sleep(1000); // Clearing the cache is asynchronous.
try {
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
index 89213cf..467b9f9 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
@@ -874,7 +874,7 @@
"ds-task-initialize-domain-dn: " + baseDN,
"ds-task-initialize-replica-server-id: -3");
addTask(taskInit, ResultCode.OTHER,
- ERR_INVALID_IMPORT_SOURCE.get(baseDN.toNormalizedString(), server1ID,"-3",""));
+ ERR_INVALID_IMPORT_SOURCE.get(baseDN.toString(), server1ID,"-3",""));
// Scope containing a serverID absent from the domain
// createTask(taskInitTargetS2);
@@ -1126,7 +1126,7 @@
"ds-task-initialize-replica-server-id: " + server1ID);
addTask(taskInit, ResultCode.OTHER, ERR_INVALID_IMPORT_SOURCE.get(
- baseDN.toNormalizedString(), server1ID, "20", ""));
+ baseDN.toString(), server1ID, "20", ""));
if (replDomain != null)
{
--
Gitblit v1.10.0