Move KeyRecoveryAuthority.mReplicaRepot to KRAEngine

dogtagpki · Apr 2, 2024 · f2bb97b · f2bb97b
1 parent 816d40f
commit f2bb97b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateNumberRange.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateNumberRange.java
@@ -24,7 +24,6 @@
 
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.cmscore.dbs.Repository;
-import com.netscape.kra.KeyRecoveryAuthority;
 
 @WebServlet(
         name = "kraUpdateNumberRange",
@@ -47,7 +46,6 @@ public class KRAUpdateNumberRange extends UpdateNumberRange {
     public Repository getRepository(String type) throws EBaseException {
 
         KRAEngine engine = KRAEngine.getInstance();
-        KeyRecoveryAuthority kra = (KeyRecoveryAuthority) engine.getSubsystem(KeyRecoveryAuthority.ID);
 
         if (type.equals("request")) {
             return engine.getKeyRequestRepository();
@@ -56,7 +54,7 @@ public Repository getRepository(String type) throws EBaseException {
             return engine.getKeyRepository();
 
         } else if (type.equals("replicaId")) {
-            return kra.getReplicaRepository();
+            return engine.getReplicaIDRepository();
         }
 
         throw new EBaseException("Unsupported repository: " + type);

diff --git a/base/kra/src/main/java/com/netscape/kra/KeyRecoveryAuthority.java b/base/kra/src/main/java/com/netscape/kra/KeyRecoveryAuthority.java
@@ -79,7 +79,6 @@
 import com.netscape.cmscore.dbs.KeyRecord;
 import com.netscape.cmscore.dbs.KeyRepository;
 import com.netscape.cmscore.dbs.KeyStatusUpdateTask;
-import com.netscape.cmscore.dbs.ReplicaIDRepository;
 import com.netscape.cmscore.logging.Auditor;
 import com.netscape.cmscore.request.KeyRequestRepository;
 import com.netscape.cmscore.request.Request;
@@ -141,7 +140,6 @@ public class KeyRecoveryAuthority extends Subsystem implements IAuthority {
     protected StorageKeyUnit mStorageKeyUnit = null;
     protected Hashtable<String, Credential[]> mAutoRecovery = new Hashtable<>();
     protected boolean mAutoRecoveryOn = false;
-    protected ReplicaIDRepository mReplicaRepot = null;
     protected int mRecoveryIDCounter = 0;
     protected Hashtable<String, Hashtable<String, Object>> mRecoveryParams =
             new Hashtable<>();
@@ -444,13 +442,6 @@ public void init(ConfigStore config) throws Exception {
             }
         }
         initNotificationListeners();
-
-        mReplicaRepot = new ReplicaIDRepository(dbSubsystem);
-        mReplicaRepot.setCMSEngine(engine);
-        mReplicaRepot.init();
-
-        logger.debug("Replica Repot inited");
-
     }
 
     /**
@@ -1529,15 +1520,6 @@ public IPolicy getPolicy() {
         return mPolicy;
     }
 
-    /**
-     * Retrieves replica ID repository.
-     *
-     * @return replica ID repository
-     */
-    public ReplicaIDRepository getReplicaRepository() {
-        return mReplicaRepot;
-    }
-
     /**
      * Retrieves the DN of this escrow authority.
      * <P>

diff --git a/base/kra/src/main/java/org/dogtagpki/server/kra/KRAEngine.java b/base/kra/src/main/java/org/dogtagpki/server/kra/KRAEngine.java
@@ -25,6 +25,7 @@
 import com.netscape.cmscore.base.ConfigStorage;
 import com.netscape.cmscore.base.ConfigStore;
 import com.netscape.cmscore.dbs.KeyRepository;
+import com.netscape.cmscore.dbs.ReplicaIDRepository;
 import com.netscape.cmscore.request.KeyRequestRepository;
 import com.netscape.kra.KeyRecoveryAuthority;
 
@@ -33,6 +34,7 @@ public class KRAEngine extends CMSEngine {
     static KRAEngine instance;
 
     protected KeyRepository keyRepository;
+    protected ReplicaIDRepository replicaIDRepository;
 
     public KRAEngine() {
         super("KRA");
@@ -65,6 +67,10 @@ public KeyRepository getKeyRepository() {
         return keyRepository;
     }
 
+    public ReplicaIDRepository getReplicaIDRepository() {
+        return replicaIDRepository;
+    }
+
     public void initKeyRepository() throws Exception {
 
         logger.info("KRAEngine: Initializing key repository");
@@ -80,9 +86,19 @@ public void initKeyRepository() throws Exception {
         keyRepository.init();
     }
 
+    public void initReplicaIDRepository() throws Exception {
+
+        logger.info("KRAEngine: Initializing replica ID repository");
+
+        replicaIDRepository = new ReplicaIDRepository(dbSubsystem);
+        replicaIDRepository.setCMSEngine(this);
+        replicaIDRepository.init();
+    }
+
     @Override
     public void init() throws Exception {
         initKeyRepository();
+        initReplicaIDRepository();
         super.init();
     }