Add TKS TPSConnectorService to v2 APIs

dogtagpki · Aug 13, 2024 · 1468004 · 1468004
1 parent fcc9256
commit 1468004
Show file tree

Hide file tree

Showing 6 changed files with 738 additions and 1 deletion.
diff --git a/base/common/src/main/java/com/netscape/certsrv/system/TPSConnectorCollection.java b/base/common/src/main/java/com/netscape/certsrv/system/TPSConnectorCollection.java
@@ -6,10 +6,11 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.netscape.certsrv.base.DataCollection;
+import com.netscape.certsrv.util.JSONSerializer;
 
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown=true)
-public class TPSConnectorCollection extends DataCollection<TPSConnectorData> {
+public class TPSConnectorCollection extends DataCollection<TPSConnectorData> implements JSONSerializer{
 
     @Override
     public Collection<TPSConnectorData> getEntries() {

diff --git a/base/tks/src/main/java/org/dogtagpki/server/tks/rest/v2/TKSServlet.java b/base/tks/src/main/java/org/dogtagpki/server/tks/rest/v2/TKSServlet.java
@@ -6,6 +6,7 @@
 package org.dogtagpki.server.tks.rest.v2;
 
 import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
 
 import org.dogtagpki.server.rest.v2.PKIServlet;
 import org.dogtagpki.server.tks.TKSEngine;
@@ -16,6 +17,16 @@
 public class TKSServlet extends PKIServlet {
     public static final long serialVersionUID = 1L;
 
+    protected TKSEngine engine;
+
+    @Override
+    public void init() throws ServletException {
+        super.init();
+
+        engine = getTKSEngine();
+    }
+
+
     public TKSEngine getTKSEngine() {
         ServletContext servletContext = getServletContext();
         return (TKSEngine) servletContext.getAttribute("engine");