From aaf1f09351c43d52009c6b53b93eb153ace8428e Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 07 Nov 2016 15:05:30 +0000
Subject: [PATCH] OPENDJ-3417 Remove several backend-related methods from DirectoryServer class
---
opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
index a2da17d..0fd9c4d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
@@ -88,6 +88,7 @@
import org.opends.server.backends.pluggable.EntryContainer;
import org.opends.server.backends.pluggable.RootContainer;
import org.opends.server.core.AddOperation;
+import org.opends.server.core.BackendConfigManager;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
@@ -629,7 +630,7 @@
private static void clearJEBackends() throws Exception
{
- for (LocalBackend<?> backend : DirectoryServer.getBackends())
+ for (LocalBackend<?> backend : getServerContext().getBackendConfigManager().getLocalBackends())
{
if (backend instanceof BackendImpl) {
clearBackend(backend.getBackendID());
@@ -889,8 +890,8 @@
// is re-enabled, a new backend object is in fact created and old reference
// to memory backend must be invalidated. So to prevent this problem, we
// retrieve the memory backend reference each time before cleaning it.
- MemoryBackend memoryBackend = (MemoryBackend) getServerContext().getBackendConfigManager()
- .getLocalBackend(backendID);
+ BackendConfigManager backendConfigManager = getServerContext().getBackendConfigManager();
+ MemoryBackend memoryBackend = (MemoryBackend) backendConfigManager.getLocalBackend(backendID);
if (memoryBackend == null)
{
@@ -899,7 +900,7 @@
memoryBackend.setBaseDNs(baseDN);
memoryBackend.configureBackend(null, getServerContext());
memoryBackend.openBackend();
- DirectoryServer.registerBackend(memoryBackend);
+ backendConfigManager.registerLocalBackend(memoryBackend);
}
memoryBackend.clearMemoryBackend();
@@ -914,7 +915,8 @@
/** Clears a memory-based backend. */
public static void clearMemoryBackend(String backendID) throws Exception
{
- MemoryBackend memoryBackend = (MemoryBackend) DirectoryServer.getBackend(backendID);
+ MemoryBackend memoryBackend =
+ (MemoryBackend) getServerContext().getBackendConfigManager().getLocalBackend(backendID);
// FIXME JNR I suspect we could call finalizeBackend() here (but also in other
// places in this class), because finalizeBackend() calls clearMemoryBackend().
if (memoryBackend != null)
@@ -942,11 +944,11 @@
*/
public static void clearBackend(String backendId, String baseDN) throws Exception
{
- LocalBackend<?> b = DirectoryServer.getBackend(backendId);
+ LocalBackend<?> b = getServerContext().getBackendConfigManager().getLocalBackend(backendId);
if (clearBackend(b) && baseDN != null)
{
Entry e = createEntry(DN.valueOf(baseDN));
- DirectoryServer.getBackend(backendId).addEntry(e, mock(AddOperation.class));
+ b.addEntry(e, mock(AddOperation.class));
}
}
--
Gitblit v1.10.0