Refactor CertRetrievalRequest construction

Remove an unused constructor from CertRetrievalRequest, and add a
constructor that receives the CertId, simplifying usage.

Part of: https://fedorahosted.org/pki/ticket/2601

1 files changed, 2 insertions, 13 deletions

diff --git a/base/common/src/com/netscape/certsrv/cert/CertRetrievalRequest.java b/base/common/src/com/netscape/certsrv/cert/CertRetrievalRequest.java
index ac8ea079a..7e653d711 100644
--- a/base/common/src/com/netscape/certsrv/cert/CertRetrievalRequest.java
+++ b/base/common/src/com/netscape/certsrv/cert/CertRetrievalRequest.java
@@ -41,8 +41,6 @@ import com.netscape.certsrv.request.RequestIdAdapter;
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CertRetrievalRequest {
 
-    private static final String CERT_ID = "certId";
-
     @XmlElement
     @XmlJavaTypeAdapter(CertIdAdapter.class)
     protected CertId certId;
@@ -55,10 +53,8 @@ public class CertRetrievalRequest {
         // required for JAXB (defaults)
     }
 
-    public CertRetrievalRequest(MultivaluedMap<String, String> form) {
-        if (form.containsKey(CERT_ID)) {
-            certId = new CertId(form.getFirst(CERT_ID));
-        }
+    public CertRetrievalRequest(CertId certId) {
+        this.certId = certId;
     }
 
     /**
@@ -68,11 +64,4 @@ public class CertRetrievalRequest {
         return certId;
     }
 
-    /**
-     * @param CertId the CertId to set
-     */
-    public void setCertId(CertId certId) {
-        this.certId = certId;
-    }
-
 }