From 58df6f18fee34844ed7a92a84379e3ec2bebed6d Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 21 Nov 2016 13:58:14 +0000
Subject: [PATCH] OPENDJ-3476 Remove getters for core configuration from DirectoryServer class

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
index 8a4d621..f5404d3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
@@ -18,7 +18,6 @@
 
 import static org.forgerock.util.Reject.*;
 import static org.opends.messages.BackendMessages.*;
-import static org.opends.server.core.DirectoryServer.*;
 import static org.opends.server.util.ServerConstants.*;
 import static org.opends.server.util.StaticUtils.*;
 
@@ -369,7 +368,8 @@
     }
     catch (Exception e)
     {
-      throw new DirectoryException(getServerErrorResultCode(), LocalizableMessage.raw(e.getMessage()), e);
+      throw new DirectoryException(
+          serverContext.getCoreConfigManager().getServerErrorResultCode(), LocalizableMessage.raw(e.getMessage()), e);
     }
     finally
     {
@@ -580,7 +580,7 @@
     if (rootContainer == null)
     {
       LocalizableMessage msg = ERR_ROOT_CONTAINER_NOT_INITIALIZED.get(getBackendID());
-      throw new DirectoryException(getServerErrorResultCode(), msg);
+      throw new DirectoryException(serverContext.getCoreConfigManager().getServerErrorResultCode(), msg);
     }
   }
 
@@ -603,7 +603,8 @@
     }
     catch (IOException ioe)
     {
-      throw new DirectoryException(getServerErrorResultCode(), ERR_EXPORT_IO_ERROR.get(ioe.getMessage()), ioe);
+      throw new DirectoryException(serverContext.getCoreConfigManager()
+          .getServerErrorResultCode(), ERR_EXPORT_IO_ERROR.get(ioe.getMessage()), ioe);
     }
     catch (StorageRuntimeException de)
     {
@@ -611,7 +612,8 @@
     }
     catch (ConfigException | InitializationException | LDIFException e)
     {
-      throw new DirectoryException(getServerErrorResultCode(), e.getMessageObject(), e);
+      throw new DirectoryException(
+          serverContext.getCoreConfigManager().getServerErrorResultCode(), e.getMessageObject(), e);
     }
     finally
     {
@@ -634,7 +636,8 @@
     // We can't do import while the backend is online.
     if (rootContainer != null)
     {
-      throw new DirectoryException(getServerErrorResultCode(), ERR_IMPORT_BACKEND_ONLINE.get());
+      throw new DirectoryException(
+          serverContext.getCoreConfigManager().getServerErrorResultCode(), ERR_IMPORT_BACKEND_ONLINE.get());
     }
 
     try
@@ -649,7 +652,8 @@
       }
       catch (Exception e)
       {
-        throw new DirectoryException(getServerErrorResultCode(), ERR_REMOVE_FAIL.get(e.getMessage()), e);
+        throw new DirectoryException(
+            serverContext.getCoreConfigManager().getServerErrorResultCode(), ERR_REMOVE_FAIL.get(e.getMessage()), e);
       }
       rootContainer = newRootContainer(AccessMode.READ_WRITE);
       rootContainer.getStorage().close();
@@ -746,7 +750,8 @@
      */
     if (!openRootContainer && rebuildConfig.includesSystemIndex())
     {
-      throw new DirectoryException(getServerErrorResultCode(), ERR_REBUILD_BACKEND_ONLINE.get());
+      throw new DirectoryException(
+          serverContext.getCoreConfigManager().getServerErrorResultCode(), ERR_REBUILD_BACKEND_ONLINE.get());
     }
 
     try
@@ -849,7 +854,7 @@
     }
     catch (Exception e)
     {
-      ccr.setResultCode(getServerErrorResultCode());
+      ccr.setResultCode(serverContext.getCoreConfigManager().getServerErrorResultCode());
       ccr.addMessage(LocalizableMessage.raw(stackTraceToSingleLineString(e)));
     }
     return ccr;
@@ -887,7 +892,7 @@
         {
           logger.traceException(e);
 
-          ccr.setResultCode(getServerErrorResultCode());
+          ccr.setResultCode(serverContext.getCoreConfigManager().getServerErrorResultCode());
           ccr.addMessage(ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(baseDN, e));
           return false;
         }
@@ -944,9 +949,11 @@
     }
     if (e instanceof LocalizableException)
     {
-      return new DirectoryException(getServerErrorResultCode(), ((LocalizableException) e).getMessageObject());
+      return new DirectoryException(serverContext
+          .getCoreConfigManager().getServerErrorResultCode(), ((LocalizableException) e).getMessageObject());
     }
-    return new DirectoryException(getServerErrorResultCode(), LocalizableMessage.raw(e.getMessage()), e);
+    return new DirectoryException(serverContext
+        .getCoreConfigManager().getServerErrorResultCode(), LocalizableMessage.raw(e.getMessage()), e);
   }
 
   private RootContainer newRootContainer(AccessMode accessMode)

--
Gitblit v1.10.0