Move current REST APIs to v1 package

The current rest APIs are moved to a subpackage named `v1`. The new implementation has moved to the subpackage `v1`. The new implementation has moved to the subpackage `v2`. This will simplify the selective building of REST implementation. Subsystems ACME and EST have not been modified because they use REST to implement the protocol and this requires extra effort.
dogtagpki · Jun 7, 2024 · 511a307 · 511a307
1 parent 5f60163
commit 511a307
Show file tree

Hide file tree

Showing 63 changed files with 134 additions and 132 deletions.
diff --git a/...rver/ca/rest/AgentCertRequestService.java → ...r/ca/rest/v1/AgentCertRequestService.java b/...rver/ca/rest/AgentCertRequestService.java → ...r/ca/rest/v1/AgentCertRequestService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import javax.ws.rs.core.Response;
 

diff --git a/...gpki/server/ca/rest/AgentCertService.java → ...i/server/ca/rest/v1/AgentCertService.java b/...gpki/server/ca/rest/AgentCertService.java → ...i/server/ca/rest/v1/AgentCertService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/...gpki/server/ca/rest/AuthorityService.java → ...i/server/ca/rest/v1/AuthorityService.java b/...gpki/server/ca/rest/AuthorityService.java → ...i/server/ca/rest/v1/AuthorityService.java
@@ -16,7 +16,7 @@
 //All rights reserved.
 //--- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/...gtagpki/server/ca/rest/CAApplication.java → ...gpki/server/ca/rest/v1/CAApplication.java b/...gtagpki/server/ca/rest/CAApplication.java → ...gpki/server/ca/rest/v1/CAApplication.java
@@ -1,25 +1,24 @@
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
 
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-import org.dogtagpki.server.rest.ACLInterceptor;
-import org.dogtagpki.server.rest.AccountService;
-import org.dogtagpki.server.rest.AuditService;
-import org.dogtagpki.server.rest.AuthMethodInterceptor;
-import org.dogtagpki.server.rest.CAInfoService;
-import org.dogtagpki.server.rest.FeatureService;
-import org.dogtagpki.server.rest.GroupService;
-import org.dogtagpki.server.rest.JobService;
-import org.dogtagpki.server.rest.MessageFormatInterceptor;
-import org.dogtagpki.server.rest.PKIExceptionMapper;
-import org.dogtagpki.server.rest.SecurityDomainService;
-import org.dogtagpki.server.rest.SelfTestService;
-import org.dogtagpki.server.rest.SessionContextInterceptor;
-import org.dogtagpki.server.rest.UserService;
+import org.dogtagpki.server.rest.v1.ACLInterceptor;
+import org.dogtagpki.server.rest.v1.AccountService;
+import org.dogtagpki.server.rest.v1.AuditService;
+import org.dogtagpki.server.rest.v1.AuthMethodInterceptor;
+import org.dogtagpki.server.rest.v1.FeatureService;
+import org.dogtagpki.server.rest.v1.GroupService;
+import org.dogtagpki.server.rest.v1.JobService;
+import org.dogtagpki.server.rest.v1.MessageFormatInterceptor;
+import org.dogtagpki.server.rest.v1.PKIExceptionMapper;
+import org.dogtagpki.server.rest.v1.SecurityDomainService;
+import org.dogtagpki.server.rest.v1.SelfTestService;
+import org.dogtagpki.server.rest.v1.SessionContextInterceptor;
+import org.dogtagpki.server.rest.v1.UserService;
 
 @ApplicationPath("/v1")
 public class CAApplication extends Application {

diff --git a/.../dogtagpki/server/rest/CAInfoService.java → ...gpki/server/ca/rest/v1/CAInfoService.java b/.../dogtagpki/server/rest/CAInfoService.java → ...gpki/server/ca/rest/v1/CAInfoService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import javax.servlet.http.HttpSession;
 import javax.ws.rs.core.Response;

diff --git a/...ki/server/ca/rest/CAInstallerService.java → ...server/ca/rest/v1/CAInstallerService.java b/...ki/server/ca/rest/CAInstallerService.java → ...server/ca/rest/v1/CAInstallerService.java
@@ -15,7 +15,7 @@
 // (C) 2014 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import java.math.BigInteger;
 

diff --git a/...i/server/ca/rest/CASystemCertService.java → ...erver/ca/rest/v1/CASystemCertService.java b/...i/server/ca/rest/CASystemCertService.java → ...erver/ca/rest/v1/CASystemCertService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import javax.ws.rs.core.Response;
 

diff --git a/...tagpki/server/ca/rest/CertRequestDAO.java → ...pki/server/ca/rest/v1/CertRequestDAO.java b/...tagpki/server/ca/rest/CertRequestDAO.java → ...pki/server/ca/rest/v1/CertRequestDAO.java
@@ -15,7 +15,7 @@
 // (C) 2011 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import java.security.Principal;
 import java.security.SecureRandom;

diff --git a/...ki/server/ca/rest/CertRequestService.java → ...server/ca/rest/v1/CertRequestService.java b/...ki/server/ca/rest/CertRequestService.java → ...server/ca/rest/v1/CertRequestService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...dogtagpki/server/ca/rest/CertService.java → ...tagpki/server/ca/rest/v1/CertService.java b/...dogtagpki/server/ca/rest/CertService.java → ...tagpki/server/ca/rest/v1/CertService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import java.io.ByteArrayOutputStream;
 import java.security.InvalidKeyException;

diff --git a/...i/server/ca/rest/KRAConnectorService.java → ...erver/ca/rest/v1/KRAConnectorService.java b/...i/server/ca/rest/KRAConnectorService.java → ...erver/ca/rest/v1/KRAConnectorService.java
@@ -15,7 +15,7 @@
 // (C) 2013 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import javax.ws.rs.core.Response;
 

diff --git a/...tagpki/server/ca/rest/ProfileService.java → ...pki/server/ca/rest/v1/ProfileService.java b/...tagpki/server/ca/rest/ProfileService.java → ...pki/server/ca/rest/v1/ProfileService.java
@@ -16,7 +16,7 @@
 //All rights reserved.
 //--- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

diff --git a/...server/ca/v2/AgentCertRequestServlet.java → ...r/ca/rest/v2/AgentCertRequestServlet.java b/...server/ca/v2/AgentCertRequestServlet.java → ...r/ca/rest/v2/AgentCertRequestServlet.java
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2;
+package org.dogtagpki.server.ca.rest.v2;
 
 import java.io.BufferedReader;
 import java.io.PrintWriter;

diff --git a/...tagpki/server/ca/v2/AgentCertServlet.java → ...i/server/ca/rest/v2/AgentCertServlet.java b/...tagpki/server/ca/v2/AgentCertServlet.java → ...i/server/ca/rest/v2/AgentCertServlet.java
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2;
+package org.dogtagpki.server.ca.rest.v2;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;

diff --git a/...dogtagpki/server/ca/v2/CAInfoServlet.java → ...gpki/server/ca/rest/v2/CAInfoServlet.java b/...dogtagpki/server/ca/v2/CAInfoServlet.java → ...gpki/server/ca/rest/v2/CAInfoServlet.java
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2;
+package org.dogtagpki.server.ca.rest.v2;
 
 import java.io.PrintWriter;
 

diff --git a/...org/dogtagpki/server/ca/v2/CAServlet.java → ...ogtagpki/server/ca/rest/v2/CAServlet.java b/...org/dogtagpki/server/ca/v2/CAServlet.java → ...ogtagpki/server/ca/rest/v2/CAServlet.java
@@ -3,14 +3,14 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2;
+package org.dogtagpki.server.ca.rest.v2;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.dogtagpki.server.ca.CAEngine;
-import org.dogtagpki.server.rest.PKIServlet;
+import org.dogtagpki.server.rest.v2.PKIServlet;
 
 /**
  * @author Marco Fargetta {@literal <[email protected]>}

diff --git a/...gpki/server/ca/v2/CertRequestServlet.java → ...server/ca/rest/v2/CertRequestServlet.java b/...gpki/server/ca/v2/CertRequestServlet.java → ...server/ca/rest/v2/CertRequestServlet.java
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2;
+package org.dogtagpki.server.ca.rest.v2;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -21,7 +21,7 @@
 import javax.servlet.http.HttpSession;
 
 import org.dogtagpki.server.ca.CAEngine;
-import org.dogtagpki.server.ca.rest.ProfileService;
+import org.dogtagpki.server.ca.rest.v1.ProfileService;
 import org.mozilla.jss.netscape.security.x509.X500Name;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...g/dogtagpki/server/ca/v2/CertServlet.java → ...tagpki/server/ca/rest/v2/CertServlet.java b/...g/dogtagpki/server/ca/v2/CertServlet.java → ...tagpki/server/ca/rest/v2/CertServlet.java
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2;
+package org.dogtagpki.server.ca.rest.v2;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;

diff --git a/...ki/server/ca/v2/filters/AgentCertACL.java → ...rver/ca/rest/v2/filters/AgentCertACL.java b/...ki/server/ca/v2/filters/AgentCertACL.java → ...rver/ca/rest/v2/filters/AgentCertACL.java
@@ -3,12 +3,12 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2.filters;
+package org.dogtagpki.server.ca.rest.v2.filters;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebFilter;
 
-import org.dogtagpki.server.v2.ACLFilter;
+import org.dogtagpki.server.rest.v2.ACLFilter;
 
 @WebFilter(servletNames = "caCert-agent")
 public class AgentCertACL extends ACLFilter {

diff --git a/...er/ca/v2/filters/AgentCertAuthMethod.java → .../rest/v2/filters/AgentCertAuthMethod.java b/...er/ca/v2/filters/AgentCertAuthMethod.java → .../rest/v2/filters/AgentCertAuthMethod.java
@@ -3,12 +3,12 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2.filters;
+package org.dogtagpki.server.ca.rest.v2.filters;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebFilter;
 
-import org.dogtagpki.server.v2.AuthMethodFilter;
+import org.dogtagpki.server.rest.v2.AuthMethodFilter;
 
 @WebFilter(servletNames = "caCert-agent")
 public class AgentCertAuthMethod extends AuthMethodFilter {

diff --git a/...er/ca/v2/filters/AgentCertRequestACL.java → .../rest/v2/filters/AgentCertRequestACL.java b/...er/ca/v2/filters/AgentCertRequestACL.java → .../rest/v2/filters/AgentCertRequestACL.java
@@ -3,12 +3,12 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2.filters;
+package org.dogtagpki.server.ca.rest.v2.filters;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebFilter;
 
-import org.dogtagpki.server.v2.ACLFilter;
+import org.dogtagpki.server.rest.v2.ACLFilter;
 
 @WebFilter(servletNames = "caCertRequest-agent")
 public class AgentCertRequestACL extends ACLFilter {

diff --git a/...2/filters/AgentCertRequestAuthMethod.java → ...2/filters/AgentCertRequestAuthMethod.java b/...2/filters/AgentCertRequestAuthMethod.java → ...2/filters/AgentCertRequestAuthMethod.java
@@ -3,12 +3,12 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2.filters;
+package org.dogtagpki.server.ca.rest.v2.filters;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebFilter;
 
-import org.dogtagpki.server.v2.AuthMethodFilter;
+import org.dogtagpki.server.rest.v2.AuthMethodFilter;
 
 @WebFilter(servletNames = "caCertRequest-agent")
 public class AgentCertRequestAuthMethod extends AuthMethodFilter {

diff --git a/...tagpki/server/ca/v2/filters/EmptyACL.java → ...i/server/ca/rest/v2/filters/EmptyACL.java b/...tagpki/server/ca/v2/filters/EmptyACL.java → ...i/server/ca/rest/v2/filters/EmptyACL.java
@@ -3,11 +3,11 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2.filters;
+package org.dogtagpki.server.ca.rest.v2.filters;
 
 import javax.servlet.annotation.WebFilter;
 
-import org.dogtagpki.server.v2.ACLFilter;
+import org.dogtagpki.server.rest.v2.ACLFilter;
 
 @WebFilter(servletNames = {"caInfo", "caCert", "caCertRequest"})
 public class EmptyACL extends ACLFilter {

diff --git a/...server/ca/v2/filters/EmptyAuthMethod.java → ...r/ca/rest/v2/filters/EmptyAuthMethod.java b/...server/ca/v2/filters/EmptyAuthMethod.java → ...r/ca/rest/v2/filters/EmptyAuthMethod.java
@@ -3,11 +3,11 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2.filters;
+package org.dogtagpki.server.ca.rest.v2.filters;
 
 import javax.servlet.annotation.WebFilter;
 
-import org.dogtagpki.server.v2.AuthMethodFilter;
+import org.dogtagpki.server.rest.v2.AuthMethodFilter;
 
 @WebFilter(servletNames = {"caInfo", "caCert", "caCertRequest"})
 public class EmptyAuthMethod extends AuthMethodFilter {

diff --git a/base/est/src/main/java/org/dogtagpki/est/ESTApplication.java b/base/est/src/main/java/org/dogtagpki/est/ESTApplication.java
@@ -11,7 +11,7 @@
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-import org.dogtagpki.server.rest.PKIExceptionMapper;
+import org.dogtagpki.server.rest.v1.PKIExceptionMapper;
 
 @ApplicationPath("/v1")
 public class ESTApplication extends Application {

diff --git a/base/kra/src/main/java/com/netscape/kra/SecurityDataProcessor.java b/base/kra/src/main/java/com/netscape/kra/SecurityDataProcessor.java
@@ -13,7 +13,7 @@
 
 import org.dogtagpki.server.kra.KRAEngine;
 import org.dogtagpki.server.kra.KRAEngineConfig;
-import org.dogtagpki.server.kra.rest.KeyRequestService;
+import org.dogtagpki.server.kra.rest.v1.KeyRequestService;
 import org.mozilla.jss.asn1.OBJECT_IDENTIFIER;
 import org.mozilla.jss.asn1.OCTET_STRING;
 import org.mozilla.jss.crypto.CryptoToken;

diff --git a/...agpki/server/kra/rest/KRAApplication.java → ...ki/server/kra/rest/v1/KRAApplication.java b/...agpki/server/kra/rest/KRAApplication.java → ...ki/server/kra/rest/v1/KRAApplication.java
@@ -1,24 +1,24 @@
-package org.dogtagpki.server.kra.rest;
+package org.dogtagpki.server.kra.rest.v1;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
 
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-import org.dogtagpki.server.rest.ACLInterceptor;
-import org.dogtagpki.server.rest.AccountService;
-import org.dogtagpki.server.rest.AuditService;
-import org.dogtagpki.server.rest.AuthMethodInterceptor;
-import org.dogtagpki.server.rest.GroupService;
-import org.dogtagpki.server.rest.JobService;
 import org.dogtagpki.server.rest.KRAInfoService;
-import org.dogtagpki.server.rest.MessageFormatInterceptor;
-import org.dogtagpki.server.rest.PKIExceptionMapper;
-import org.dogtagpki.server.rest.SecurityDomainService;
-import org.dogtagpki.server.rest.SelfTestService;
-import org.dogtagpki.server.rest.SessionContextInterceptor;
-import org.dogtagpki.server.rest.UserService;
+import org.dogtagpki.server.rest.v1.ACLInterceptor;
+import org.dogtagpki.server.rest.v1.AccountService;
+import org.dogtagpki.server.rest.v1.AuditService;
+import org.dogtagpki.server.rest.v1.AuthMethodInterceptor;
+import org.dogtagpki.server.rest.v1.GroupService;
+import org.dogtagpki.server.rest.v1.JobService;
+import org.dogtagpki.server.rest.v1.MessageFormatInterceptor;
+import org.dogtagpki.server.rest.v1.PKIExceptionMapper;
+import org.dogtagpki.server.rest.v1.SecurityDomainService;
+import org.dogtagpki.server.rest.v1.SelfTestService;
+import org.dogtagpki.server.rest.v1.SessionContextInterceptor;
+import org.dogtagpki.server.rest.v1.UserService;
 
 @ApplicationPath("/v1")
 public class KRAApplication extends Application {

diff --git a/...server/kra/rest/KRASystemCertService.java → ...ver/kra/rest/v1/KRASystemCertService.java b/...server/kra/rest/KRASystemCertService.java → ...ver/kra/rest/v1/KRASystemCertService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.kra.rest;
+package org.dogtagpki.server.kra.rest.v1;
 
 import javax.ws.rs.core.Response;
 

diff --git a/...ki/server/kra/rest/KeyRequestService.java → ...server/kra/rest/v1/KeyRequestService.java b/...ki/server/kra/rest/KeyRequestService.java → ...server/kra/rest/v1/KeyRequestService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.kra.rest;
+package org.dogtagpki.server.kra.rest.v1;
 
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;

diff --git a/...dogtagpki/server/kra/rest/KeyService.java → ...tagpki/server/kra/rest/v1/KeyService.java b/...dogtagpki/server/kra/rest/KeyService.java → ...tagpki/server/kra/rest/v1/KeyService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.kra.rest;
+package org.dogtagpki.server.kra.rest.v1;
 
 
 import java.math.BigInteger;