Move RequestQueue.findRequestBySourceId() to RequestRepository

dogtagpki · Nov 13, 2023 · 6a47b03 · 6a47b03
1 parent 317e715
commit 6a47b03
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 22 deletions.
diff --git a/base/server/src/main/java/com/netscape/cms/servlet/connector/CloneServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/connector/CloneServlet.java
@@ -56,7 +56,6 @@
 import com.netscape.cmscore.connector.HttpRequestEncoder;
 import com.netscape.cmscore.request.Request;
 import com.netscape.cmscore.request.RequestQueue;
-import com.netscape.cmscore.request.RequestRepository;
 
 /**
  * Clone servlet - part of the Clone Authority (CLA)
@@ -303,14 +302,13 @@ protected IPKIMessage processRequest(
             throws EBaseException {
         IPKIMessage replymsg = null;
         CMSEngine engine = getCMSEngine();
-        RequestRepository requestRepository = engine.getRequestRepository();
         RequestQueue queue = engine.getRequestQueue();
         String srcid = source + ":" + msg.getReqId();
 
         logger.info("CloneServlet: processRequest");
 
         // find request in request queue and return result.
-        RequestId thisreqid = queue.findRequestBySourceId(srcid);
+        RequestId thisreqid = requestRepository.findRequestBySourceId(srcid);
         Request thisreq = null;
 
         if (thisreqid != null) {

diff --git a/base/server/src/main/java/com/netscape/cms/servlet/connector/ConnectorServlet.java b/base/server/src/main/java/com/netscape/cms/servlet/connector/ConnectorServlet.java
@@ -458,7 +458,7 @@ protected IPKIMessage processRequest(
             logger.debug(method + "srcid =" + srcid);
 
             // find request in request queue and return result.
-            RequestId thisreqid = queue.findRequestBySourceId(srcid);
+            RequestId thisreqid = requestRepository.findRequestBySourceId(srcid);
             Request thisreq = null;
 
             if (thisreqid != null) {

diff --git a/base/server/src/main/java/com/netscape/cmscore/request/RequestQueue.java b/base/server/src/main/java/com/netscape/cmscore/request/RequestQueue.java
@@ -415,24 +415,6 @@ public void markAsServiced(Request request) throws EBaseException {
         }
     }
 
-    /**
-     * Locates a request from the SourceId.
-     *
-     * @param id a unique identifier for the record that is based on the source
-     *  of the request, and possibly an identify assigned by the source.
-     * @return The requestid corresponding to this source id. null is
-     *  returned if the source id does not exist.
-     */
-    public RequestId findRequestBySourceId(String id) throws EBaseException {
-        Collection<RequestRecord> records = requestRepository.findRequestsBySourceId(id);
-
-        if (records.isEmpty())
-            return null;
-
-        RequestRecord record = records.iterator().next();
-        return record.getRequestId();
-    }
-
     /**
      * Protected access for setting the modification time of a request.
      *

diff --git a/base/server/src/main/java/com/netscape/cmscore/request/RequestRepository.java b/base/server/src/main/java/com/netscape/cmscore/request/RequestRepository.java
@@ -614,4 +614,22 @@ public Collection<RequestRecord> findRequestsBySourceId(String id) throws EBaseE
         String filter = "(" + RequestRecord.ATTR_SOURCE_ID + "=" + id + ")";
         return listRequestsByFilter(filter);
     }
+
+    /**
+     * Locates a request from the SourceId.
+     *
+     * @param id a unique identifier for the record that is based on the source
+     *  of the request, and possibly an identify assigned by the source.
+     * @return The requestid corresponding to this source id. null is
+     *  returned if the source id does not exist.
+     */
+    public RequestId findRequestBySourceId(String id) throws EBaseException {
+        Collection<RequestRecord> records = findRequestsBySourceId(id);
+
+        if (records.isEmpty())
+            return null;
+
+        RequestRecord record = records.iterator().next();
+        return record.getRequestId();
+    }
 }