From dd77a7d4e199d7678176398324957c2d45e28205 Mon Sep 17 00:00:00 2001
From: Fraser Tweedale <ftweedal@redhat.com>
Date: Wed, 22 Feb 2017 10:45:15 +1000
Subject: [PATCH 164/165] 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
---
 base/ca/src/org/dogtagpki/server/ca/rest/CertService.java |  3 +--
 .../com/netscape/certsrv/cert/CertRetrievalRequest.java   | 15 ++-------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java b/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java
index 54a349e2a60c6fd7571c2cb43a0504d96050c11a..2f9f467294322428620e2dc800618cde59faf28d 100644
--- a/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java
+++ b/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java
@@ -136,8 +136,7 @@ public class CertService extends PKIService implements CertResource {
             throw new BadRequestException("Unable to get certificate: Invalid id.");
         }
 
-        CertRetrievalRequest data = new CertRetrievalRequest();
-        data.setCertId(id);
+        CertRetrievalRequest data = new CertRetrievalRequest(id);
 
         CertData certData = null;
 
diff --git a/base/common/src/com/netscape/certsrv/cert/CertRetrievalRequest.java b/base/common/src/com/netscape/certsrv/cert/CertRetrievalRequest.java
index ac8ea079ac468ed7d819f1ce68e494882b5a86d6..7e653d7111202a0583dd8de93411e73bf111ede5 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;
-    }
-
 }
-- 
2.9.3