Move or delete resteasy dependency

fmarco76 · fmarco76 · commit bca84994d798 · 2026-03-26T11:25:00.000+01:00
Remove the use of MultivaluedMap and UriInfo because they were not actually used outside of v1 APIs. Replace Response status with HttpStatus in the check and resteasy MediaType with internal MimeType. Finally some static values have been duplicated outside of Resource classes.
diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertReviewResponseFactory.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertReviewResponseFactory.java
@@ -21,8 +21,6 @@
 import java.util.Locale;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.UriInfo;
-
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.cert.CertReviewResponse;
 import com.netscape.certsrv.profile.EProfileException;
@@ -45,7 +43,7 @@ public class CertReviewResponseFactory {
 
     public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(CertReviewResponseFactory.class);
 
-    public static CertReviewResponse create(Request request, Profile profile, UriInfo uriInfo, Locale locale) throws EBaseException {
+    public static CertReviewResponse create(Request request, Profile profile, Locale locale) throws EBaseException {
         CertReviewResponse ret = new CertReviewResponse();
 
         if (request.getRequestType().equals("renewal")) {
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertRequestDAO.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertRequestDAO.java
@@ -165,7 +165,7 @@ public CertReviewResponse reviewRequest(HttpServletRequest servletRequest, Reque
 
         CAEngine engine = CAEngine.getInstance();
         Profile profile = ps.getProfile(profileId);
-        CertReviewResponse info = CertReviewResponseFactory.create(request, profile, uriInfo, locale);
+        CertReviewResponse info = CertReviewResponseFactory.create(request, profile, locale);
 
         if (engine.getEnableNonces()) {
             // generate nonce
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/AgentCertRequestServlet.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/AgentCertRequestServlet.java
@@ -221,7 +221,7 @@ private CertReviewResponse getRequestData(HttpServletRequest servletRequest, Req
         String profileId = request.getExtDataInString(Request.PROFILE_ID);
 
         Profile profile = ps.getProfile(profileId);
-        info = CertReviewResponseFactory.create(request, profile, null, servletRequest.getLocale());
+        info = CertReviewResponseFactory.create(request, profile, servletRequest.getLocale());
 
         if (random != null) {
             // generate nonce
diff --git a/base/common/src/main/java/com/netscape/certsrv/cert/CertEnrollmentRequest.java b/base/common/src/main/java/com/netscape/certsrv/cert/CertEnrollmentRequest.java
@@ -27,7 +27,6 @@
 import java.util.Collection;
 import java.util.HashMap;
 
-import javax.ws.rs.core.MultivaluedMap;
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -94,15 +93,6 @@ public class CertEnrollmentRequest extends RESTMessage {
     public CertEnrollmentRequest() {
     }
 
-    public CertEnrollmentRequest(MultivaluedMap<String, String> form) {
-        profileId = form.getFirst(PROFILE_ID);
-        String renewalStr = form.getFirst(RENEWAL);
-        serialNum = new CertId(form.getFirst(SERIAL_NUM));
-        renewal = Boolean.valueOf(renewalStr);
-
-        serverSideKeygenP12Passwd = form.getFirst(SERVERSIDE_KEYGEN_P12_PASSWD);
-    }
-
     /**
      * @return the profileId
      */
diff --git a/base/common/src/main/java/com/netscape/certsrv/key/AsymKeyGenerationRequest.java b/base/common/src/main/java/com/netscape/certsrv/key/AsymKeyGenerationRequest.java
@@ -22,7 +22,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.ws.rs.core.MultivaluedMap;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
@@ -55,21 +54,6 @@ public AsymKeyGenerationRequest() {
         setClassName(getClass().getName());
     }
 
-    public AsymKeyGenerationRequest(MultivaluedMap<String, String> form) {
-        attributes.put(CLIENT_KEY_ID, form.getFirst(CLIENT_KEY_ID));
-        attributes.put(KEY_SIZE, form.getFirst(KEY_SIZE));
-        attributes.put(KEY_ALGORITHM, form.getFirst(KEY_ALGORITHM));
-        attributes.put(KEY_USAGE, form.getFirst(KEY_USAGE));
-        attributes.put(TRANS_WRAPPED_SESSION_KEY, form.getFirst(TRANS_WRAPPED_SESSION_KEY));
-        attributes.put(REALM,  form.getFirst(REALM));
-
-        String usageString = attributes.get(KEY_USAGE);
-        if (!StringUtils.isBlank(usageString)) {
-            setUsages(new ArrayList<>(Arrays.asList(usageString.split(","))));
-        }
-        setClassName(getClass().getName());
-    }
-
     public AsymKeyGenerationRequest(RESTMessage data) {
         attributes.putAll(data.getAttributes());
         setClassName(getClass().getName());
diff --git a/base/common/src/main/java/com/netscape/certsrv/key/KeyRecoveryRequest.java b/base/common/src/main/java/com/netscape/certsrv/key/KeyRecoveryRequest.java
@@ -23,8 +23,6 @@
 
 import java.util.Map;
 
-import javax.ws.rs.core.MultivaluedMap;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -55,21 +53,6 @@ public KeyRecoveryRequest() {
         setClassName(getClass().getName());
     }
 
-    public KeyRecoveryRequest(MultivaluedMap<String, String> form) {
-        if (form.containsKey(KEY_ID)) {
-            attributes.put(KEY_ID, form.getFirst(KEY_ID));
-        }
-        if (form.containsKey(REQUEST_ID)) {
-            attributes.put(REQUEST_ID, form.getFirst(REQUEST_ID));
-        }
-        attributes.put(TRANS_WRAPPED_SESSION_KEY, form.getFirst(TRANS_WRAPPED_SESSION_KEY));
-        attributes.put(SESSION_WRAPPED_PASSPHRASE, form.getFirst(SESSION_WRAPPED_PASSPHRASE));
-        attributes.put(NONCE_DATA, form.getFirst(NONCE_DATA));
-        attributes.put(CERTIFICATE, form.getFirst(CERTIFICATE));
-        attributes.put(PASSPHRASE, form.getFirst(PASSPHRASE));
-        setClassName(getClass().getName());
-    }
-
     public KeyRecoveryRequest(RESTMessage data) {
         attributes.putAll(data.getAttributes());
         setClassName(getClass().getName());
diff --git a/base/common/src/main/java/com/netscape/certsrv/system/KRAConnectorInfo.java b/base/common/src/main/java/com/netscape/certsrv/system/KRAConnectorInfo.java
@@ -17,8 +17,6 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.certsrv.system;
 
-import javax.ws.rs.core.MultivaluedMap;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
@@ -54,18 +52,6 @@ public class KRAConnectorInfo implements JSONSerializer {
     public KRAConnectorInfo() {
     }
 
-    public KRAConnectorInfo(MultivaluedMap<String, String> form) {
-        host = form.getFirst(HOST);
-        port = form.getFirst(PORT);
-        subsystemCert = form.getFirst(SUBSYSTEM_CERT);
-        transportCert = form.getFirst(TRANSPORT_CERT);
-        uri = form.getFirst(URI);
-        timeout = form.getFirst(TIMEOUT);
-        local = form.getFirst(LOCAL);
-        enable = form.getFirst(ENABLE);
-        transportCertNickname = form.getFirst(TRANSPORT_CERT_NICKNAME);
-    }
-
     public String getHost() {
         return host;
     }
diff --git a/base/common/src/main/java/org/dogtagpki/ca/CASystemCertClient.java b/base/common/src/main/java/org/dogtagpki/ca/CASystemCertClient.java
@@ -20,7 +20,7 @@
 import java.io.ByteArrayInputStream;
 import java.security.cert.X509Certificate;
 
-import javax.ws.rs.core.Response;
+import org.apache.http.HttpStatus;
 
 import org.mozilla.jss.netscape.security.pkcs.ContentInfo;
 import org.mozilla.jss.netscape.security.pkcs.PKCS7;
@@ -57,7 +57,7 @@ public CertData getSigningCert() throws Exception {
             certData = get("signing", CertData.class);
 
         } catch (PKIException e) {
-            if (e.getCode() != Response.Status.NOT_FOUND.getStatusCode()) {
+            if (e.getCode() != HttpStatus.SC_NOT_FOUND) {
                 throw e;
             }
             logger.warn("Unable to get CA signing certificate: " + e.getMessage());
diff --git a/base/common/src/main/java/org/dogtagpki/common/CAInfoClient.java b/base/common/src/main/java/org/dogtagpki/common/CAInfoClient.java
@@ -28,6 +28,7 @@
  * @author Ade Lee
  */
 public class CAInfoClient extends Client {
+    public static final String KEYWRAP_MECHANISM = "keywrap";
 
     public CAInfoClient(PKIClient client, String subsystem) throws Exception {
         super(client, subsystem, "v2", "info");
@@ -39,7 +40,7 @@ public CAInfo getInfo() throws Exception {
 
     public String getKeyWrapAlgotihm() throws Exception {
 
-        String archivalMechanism = KRAInfoResource.KEYWRAP_MECHANISM;
+        String archivalMechanism = KEYWRAP_MECHANISM;
         String kwAlg = null;
 
         try {
@@ -50,7 +51,7 @@ public String getKeyWrapAlgotihm() throws Exception {
         } catch (PKIException e) {
             if (e.getCode() == 404) {
                 // assume this is an older server
-                archivalMechanism = KRAInfoResource.KEYWRAP_MECHANISM;
+                archivalMechanism = KEYWRAP_MECHANISM;
                 kwAlg = KeyWrapAlgorithm.DES3_CBC_PAD.toString();
 
             } else {
@@ -61,7 +62,7 @@ public String getKeyWrapAlgotihm() throws Exception {
             throw new Exception("Failed to retrieve archive wrapping information from the CA: " + e, e);
         }
 
-        if (!archivalMechanism.equals(KRAInfoResource.KEYWRAP_MECHANISM)) {
+        if (!archivalMechanism.equals(KEYWRAP_MECHANISM)) {
             // new server with encryption set.  Use something we know will
             // work.  AES-128-CBC
             kwAlg = KeyWrapAlgorithm.AES_CBC_PAD.toString();
diff --git a/base/common/src/main/java/org/dogtagpki/common/ConfigClient.java b/base/common/src/main/java/org/dogtagpki/common/ConfigClient.java
@@ -43,7 +43,10 @@
  */
 public class ConfigClient extends Client {
 
-    public final static Logger logger = LoggerFactory.getLogger(ConfigClient.class);
+    public static final String SUCCESS = "0";
+    public static final String FAILURE = "1";
+    public static final String AUTH_FAILURE = "2";
+    public static final Logger logger = LoggerFactory.getLogger(ConfigClient.class);
 
     public ConfigClient(PKIClient client, String subsystem) throws Exception {
         super(client, subsystem, "config");
@@ -84,11 +87,11 @@ public ConfigData getConfig(
         String status = parser.getValue("Status");
         logger.debug("Status: " + status);
 
-        if (status.equals(ConfigResource.AUTH_FAILURE)) {
+        if (AUTH_FAILURE.equals(status)) {
             throw new EAuthException("Authentication failed");
         }
 
-        if (!status.equals(ConfigResource.SUCCESS)) {
+        if (!SUCCESS.equals(status)) {
             String error = parser.getValue("Error");
             throw new IOException(error);
         }
diff --git a/base/common/src/test/java/com/netscape/certsrv/base/DataTest.java b/base/common/src/test/java/com/netscape/certsrv/base/DataTest.java
@@ -2,7 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import javax.ws.rs.core.Response;
+import org.apache.http.HttpStatus;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -17,7 +17,7 @@ public class DataTest {
     @BeforeAll
     public static void setUpBefore() {
         before.className = PKIException.class.getName();
-        before.code = Response.Status.INTERNAL_SERVER_ERROR.getStatusCode();
+        before.code = HttpStatus.SC_INTERNAL_SERVER_ERROR;
         before.message = "An error has occured";
         before.setAttribute("attr1", "value1");
         before.setAttribute("attr2", "value2");
diff --git a/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KeyService.java b/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KeyService.java
@@ -25,8 +25,10 @@
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.ws.rs.Path;
 import javax.ws.rs.core.MultivaluedMap;
@@ -302,7 +304,17 @@ public Response retrieveKeyImpl(KeyRecoveryRequest data) throws Exception {
     @Override
     public Response retrieveKey(MultivaluedMap<String, String> form) {
         logger.debug("KeyService.retrieveKey with form: begins.");
-        KeyRecoveryRequest data = new KeyRecoveryRequest(form);
+        if (form == null) {
+            throw new BadRequestException("Missing key recovery request");
+        }
+        Map<String, String[]> formMap = new HashMap<>(form.size());
+        form.forEach((k, v) -> {
+                String[] s = (v == null || v.isEmpty()) ?
+                    new String[] {null} :
+                    v.toArray(new String[0]);
+                formMap.put(k, s);
+            });
+        KeyRecoveryRequest data = new KeyRecoveryRequest(formMap);
         return retrieveKey(data);
     }
 
diff --git a/base/server/src/main/java/com/netscape/cms/servlet/admin/GroupMemberProcessor.java b/base/server/src/main/java/com/netscape/cms/servlet/admin/GroupMemberProcessor.java
@@ -23,8 +23,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.ws.rs.core.UriInfo;
-
 import com.netscape.certsrv.base.BadRequestException;
 import com.netscape.certsrv.base.ConflictingOperationException;
 import com.netscape.certsrv.base.PKIException;
@@ -59,20 +57,10 @@ public class GroupMemberProcessor extends Processor {
 
     public static String[] multiRoleGroupEnforceList;
 
-    protected UriInfo uriInfo;
-
     public GroupMemberProcessor(Locale locale) {
         super("group", locale);
     }
 
-    public UriInfo getUriInfo() {
-        return uriInfo;
-    }
-
-    public void setUriInfo(UriInfo uriInfo) {
-        this.uriInfo = uriInfo;
-    }
-
     public GroupMemberData createGroupMemberData(String groupID, String memberID) throws Exception {
 
         GroupMemberData groupMemberData = new GroupMemberData();
diff --git a/base/server/src/main/java/org/dogtagpki/server/cli/PKIServerCLI.java b/base/server/src/main/java/org/dogtagpki/server/cli/PKIServerCLI.java
@@ -18,8 +18,6 @@
 
 package org.dogtagpki.server.cli;
 
-import javax.ws.rs.ProcessingException;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.UnrecognizedOptionException;
@@ -136,11 +134,6 @@ public void handleException(Throwable t) {
             // display only the error message
             System.err.println(t.getMessage());
 
-        } else if (t instanceof ProcessingException) {
-            // display the cause of the exception
-            t = t.getCause();
-            System.err.println(t.getClass().getSimpleName() + ": " + t.getMessage());
-
         } else {
             // display the actual Exception
             System.err.println(t.getClass().getSimpleName() + ": " + t.getMessage());
diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v1/GroupService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/GroupService.java
@@ -346,7 +346,6 @@ public Response findGroupMembers(String groupID, String filter, Integer start, I
             processor.setCMSEngine(getCMSEngine());
             processor.init();
 
-            processor.setUriInfo(uriInfo);
             return createOKResponse(processor.findGroupMembers(groupID, filter, start, size));
 
         } catch (PKIException e) {
@@ -369,7 +368,6 @@ public Response getGroupMember(String groupID, String memberID) {
             processor.setCMSEngine(getCMSEngine());
             processor.init();
 
-            processor.setUriInfo(uriInfo);
             return createOKResponse(processor.getGroupMember(groupID, memberID));
 
         } catch (PKIException e) {
@@ -392,7 +390,6 @@ public Response addGroupMember(String groupID, GroupMemberData groupMemberData)
             processor.setCMSEngine(getCMSEngine());
             processor.init();
 
-            processor.setUriInfo(uriInfo);
             groupMemberData = processor.addGroupMember(groupMemberData);
 
             String encodedGroupID = URLEncoder.encode(groupID, "UTF-8");
@@ -423,7 +420,6 @@ public Response removeGroupMember(String groupID, String memberID) {
             processor.setCMSEngine(getCMSEngine());
             processor.init();
 
-            processor.setUriInfo(uriInfo);
             processor.removeGroupMember(groupID, memberID);
 
             return createNoContentResponse();
diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/v1/UserService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/UserService.java
@@ -1072,7 +1072,6 @@ public Response addUserMembership(String userID, String groupID) {
             processor.setCMSEngine(engine);
             processor.init();
 
-            processor.setUriInfo(uriInfo);
             processor.addGroupMember(groupMemberData);
 
             UserMembershipData userMembershipData = createUserMembershipData(userID, groupID);
@@ -1105,7 +1104,6 @@ public Response removeUserMembership(String userID, String groupID) {
             processor.setCMSEngine(getCMSEngine());
             processor.init();
 
-            processor.setUriInfo(uriInfo);
             processor.removeGroupMember(groupID, userID);
 
             return createNoContentResponse();
diff --git a/base/tomcat-10.1/src/main/java/com/netscape/cms/tomcat/AbstractPKIAuthenticator.java b/base/tomcat-10.1/src/main/java/com/netscape/cms/tomcat/AbstractPKIAuthenticator.java
diff --git a/base/tomcat-10.1/src/main/java/com/netscape/cms/tomcat/ProxyRealm.java b/base/tomcat-10.1/src/main/java/com/netscape/cms/tomcat/ProxyRealm.java
diff --git a/base/tomcat-9.0/src/main/java/com/netscape/cms/tomcat/AbstractPKIAuthenticator.java b/base/tomcat-9.0/src/main/java/com/netscape/cms/tomcat/AbstractPKIAuthenticator.java
diff --git a/base/tomcat-9.0/src/main/java/com/netscape/cms/tomcat/ProxyRealm.java b/base/tomcat-9.0/src/main/java/com/netscape/cms/tomcat/ProxyRealm.java
diff --git a/base/tools/src/main/java/com/netscape/cmstools/acme/ACMEInfoCLI.java b/base/tools/src/main/java/com/netscape/cmstools/acme/ACMEInfoCLI.java
diff --git a/base/tools/src/main/java/com/netscape/cmstools/cli/MainCLI.java b/base/tools/src/main/java/com/netscape/cmstools/cli/MainCLI.java
diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/cms/ConnectionManager.java b/base/tps/src/main/java/org/dogtagpki/server/tps/cms/ConnectionManager.java
