From 27241fa0824e9b50548e969485436a4c92ad5ae9 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:35 +0000
Subject: [PATCH] DirectoryServer.getConfigEntry(DN) => DirectoryServer.getEntry(DN)
---
opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java | 4 ++--
opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryConfig.java | 21 ---------------------
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java | 4 ++--
opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java | 5 ++---
opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java | 5 +----
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java | 8 ++------
opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java | 2 +-
opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java | 2 +-
opendj-server-legacy/src/test/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java | 3 +--
opendj-server-legacy/src/test/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java | 2 +-
12 files changed, 15 insertions(+), 45 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java
index 859b767..312e71c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java
@@ -29,7 +29,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.messages.Severity;
import org.opends.messages.TaskMessages;
@@ -251,20 +250,17 @@
Entry configEntry;
try
{
- // Get the backend configuration entry.
- configEntry = DirectoryServer.getConfigEntry(configEntryDN);
+ configEntry = DirectoryServer.getEntry(configEntryDN);
}
- catch (ConfigException e)
+ catch (DirectoryException e)
{
logger.traceException(e);
logger.error(ERR_RESTOREDB_NO_BACKENDS_FOR_DN, backupDirectory, configEntryDN);
return TaskState.STOPPED_BY_ERROR;
}
- // Get the backend ID from the configuration entry.
String backendID = TaskUtils.getBackendID(configEntry);
- // Get the backend.
Backend<?> backend = DirectoryServer.getBackend(backendID);
if (!backend.supports(BackendOperation.RESTORE))
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryConfig.java
index cb32ede..313986f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryConfig.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryConfig.java
@@ -22,7 +22,6 @@
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.AttributeType;
@@ -78,26 +77,6 @@
}
/**
- * Retrieves the requested entry from the Directory Server
- * configuration.
- *
- * @param entryDN The DN of the configuration entry to retrieve.
- *
- * @return The requested entry from the Directory Server
- * configuration.
- *
- * @throws ConfigException If a problem occurs while trying to
- * retrieve the requested entry.
- */
- public static Entry getConfigEntry(DN entryDN)
- throws ConfigException
- {
- return DirectoryServer.getConfigEntry(entryDN);
- }
-
-
-
- /**
* Retrieves the path to the root directory for this instance of the
* Directory Server.
*
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
index 7ba895d..f6f3f98 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
@@ -84,7 +84,7 @@
if (configDNString != null)
{
- configEntry = DirectoryServer.getConfigEntry(DN.valueOf(configDNString));
+ configEntry = DirectoryServer.getEntry(DN.valueOf(configDNString));
}
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
index ec47941..b85fa34 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
@@ -61,9 +61,8 @@
public void testDefaultConfiguration()
throws Exception
{
- DN dn = DN.valueOf("cn=Random Password Generator,cn=Password Generators," +
- "cn=config");
- Entry configEntry = DirectoryServer.getConfigEntry(dn);
+ Entry configEntry = DirectoryServer.getEntry(
+ DN.valueOf("cn=Random Password Generator,cn=Password Generators,cn=config"));
assertNotNull(configEntry);
RandomPasswordGenerator generator = InitializationUtils.initializePasswordGenerator(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java
index 31ea0b7..9aad391 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java
@@ -54,14 +54,11 @@
protected GenericMonitorTestCase(String dnString)
throws Exception
{
- super();
-
TestCaseUtils.startServer();
if (dnString != null)
{
- DN dn = DN.valueOf(dnString);
- configEntry = DirectoryServer.getConfigEntry(dn);
+ configEntry = DirectoryServer.getEntry(DN.valueOf(dnString));
assertNotNull(configEntry);
}
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java
index db2cc9b..2644542 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java
@@ -415,13 +415,13 @@
DN synchroServerDN = DN.valueOf(synchroServerStringDN);
- Entry ecle = DirectoryServer.getConfigEntry(DN.valueOf("cn=external changelog," + synchroServerStringDN));
+ Entry ecle = DirectoryServer.getEntry(DN.valueOf("cn=external changelog," + synchroServerStringDN));
if (ecle!=null)
{
DirectoryServer.getConfigurationHandler().deleteEntry(ecle.getName());
}
DirectoryServer.getConfigurationHandler().deleteEntry(synchroServerDN);
- assertNull(DirectoryServer.getConfigEntry(synchroServerEntry.getName()),
+ assertNull(DirectoryServer.getEntry(synchroServerEntry.getName()),
"Unable to delete the synchronized domain");
synchroServerEntry = null;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java
index ed507f6..25f0c23 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java
@@ -104,7 +104,7 @@
// Configure replication domain
DirectoryServer.getConfigurationHandler().addEntry(Converters.from(repDomainEntry));
- assertNotNull(DirectoryServer.getConfigEntry(repDomainEntry.getName()),
+ assertNotNull(DirectoryServer.getEntry(repDomainEntry.getName()),
"Unable to add the synchronized server");
configEntriesToCleanup.add(repDomainEntry.getName());
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
index 151a01c..b88ea77 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
@@ -466,7 +466,7 @@
if (configEntry != null)
{
DirectoryServer.getConfigurationHandler().addEntry(Converters.from(configEntry));
- assertNotNull(DirectoryServer.getConfigEntry(configEntry.getName()), errorMessage);
+ assertNotNull(DirectoryServer.getEntry(configEntry.getName()), errorMessage);
configEntriesToCleanup.add(configEntry.getName());
}
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
index 6fdfd36..6faade2 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
@@ -219,7 +219,7 @@
// Add the config entry to create the replicated domain
DirectoryServer.getConfigurationHandler().addEntry(Converters.from(domainCfgEntry));
- assertNotNull(DirectoryServer.getConfigEntry(domainCfgEntry.getName()),
+ assertNotNull(DirectoryServer.getEntry(domainCfgEntry.getName()),
"Unable to add the domain config entry: " + configEntryLdif);
return domainCfgEntry;
@@ -247,7 +247,7 @@
// Add the config entry to create the replicated domain
DirectoryServer.getConfigurationHandler().addEntry(Converters.from(domainCfgEntry));
- assertNotNull(DirectoryServer.getConfigEntry(domainCfgEntry.getName()),
+ assertNotNull(DirectoryServer.getEntry(domainCfgEntry.getName()),
"Unable to add the domain config entry: " + configEntryLdif);
return domainCfgEntry;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java
index ce9943c..2baccfb 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java
@@ -507,7 +507,7 @@
// Add the config entry to create the replicated domain
DirectoryServer.getConfigurationHandler().addEntry(Converters.from(fractionalDomainCfgEntry));
- assertNotNull(DirectoryServer.getConfigEntry(fractionalDomainCfgEntry.getName()),
+ assertNotNull(DirectoryServer.getEntry(fractionalDomainCfgEntry.getName()),
"Unable to add the domain config entry: " + configEntryLdif);
}
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
index befd32d..8e48e2c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
@@ -55,8 +55,7 @@
{
ByteString bytePassword = ByteString.valueOfUtf8(password);
- Entry configEntry =
- DirectoryServer.getConfigEntry(
+ Entry configEntry = DirectoryServer.getEntry(
DN.valueOf("cn=Salted MD5,cn=Password Storage Schemes,cn=config"));
SaltedMD5PasswordStorageScheme scheme = InitializationUtils.initializePasswordStorageScheme(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
index 21b117a..5bcfe15 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
@@ -54,7 +54,7 @@
{
ByteString bytePassword = ByteString.valueOfUtf8(password);
- Entry configEntry = DirectoryServer.getConfigEntry(
+ Entry configEntry = DirectoryServer.getEntry(
DN.valueOf("cn=Salted MD5,cn=Password Storage Schemes,cn=config"));
SaltedMD5PasswordStorageScheme scheme = InitializationUtils.initializePasswordStorageScheme(
--
Gitblit v1.10.0