1 files changed, 41 insertions, 39 deletions

diff --git a/base/common/src/com/netscape/cms/servlet/request/model/CertRequestInfoFactory.java b/base/common/src/com/netscape/cms/servlet/request/model/CertRequestInfoFactory.java
index 7045f3366..c21ea35c9 100644
--- a/base/common/src/com/netscape/cms/servlet/request/model/CertRequestInfoFactory.java
+++ b/base/common/src/com/netscape/cms/servlet/request/model/CertRequestInfoFactory.java
@@ -1,20 +1,21 @@
-//--- BEGIN COPYRIGHT BLOCK ---
-//This program is free software; you can redistribute it and/or modify
-//it under the terms of the GNU General Public License as published by
-//the Free Software Foundation; version 2 of the License.
+// --- BEGIN COPYRIGHT BLOCK ---
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
 //
-//This program is distributed in the hope that it will be useful,
-//but WITHOUT ANY WARRANTY; without even the implied warranty of
-//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-//You should have received a copy of the GNU General Public License along
-//with this program; if not, write to the Free Software Foundation, Inc.,
-//51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
-//(C) 2012 Red Hat, Inc.
-//All rights reserved.
-//--- END COPYRIGHT BLOCK ---
+// (C) 2012 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+
 package com.netscape.cms.servlet.request.model;
 
 import java.math.BigInteger;
@@ -25,57 +26,58 @@ import javax.ws.rs.core.UriInfo;
 
 import netscape.security.x509.X509CertImpl;
 
+import org.apache.commons.lang.StringUtils;
+
 import com.netscape.certsrv.profile.IEnrollProfile;
 import com.netscape.certsrv.request.IRequest;
 import com.netscape.certsrv.request.RequestId;
+import com.netscape.certsrv.request.RequestStatus;
 import com.netscape.cms.servlet.cert.CertResource;
 import com.netscape.cms.servlet.request.CertRequestResource;
 
 public class CertRequestInfoFactory {
 
-    public static final String REQ_COMPLETE = "complete";
-
     public static CertRequestInfo create(IRequest request, UriInfo uriInfo) {
-        CertRequestInfo ret = new CertRequestInfo();
+
+        CertRequestInfo info = new CertRequestInfo();
+
         String requestType = request.getRequestType();
-        String requestStatus = request.getRequestStatus().toString();
+        RequestStatus requestStatus = request.getRequestStatus();
 
-        ret.setRequestType(requestType);
-        ret.setRequestStatus(requestStatus);
+        info.setRequestType(requestType);
+        info.setRequestStatus(requestStatus);
 
-        ret.setCertRequestType(request.getExtDataInString("cert_request_type"));
+        info.setCertRequestType(request.getExtDataInString("cert_request_type"));
 
         Path certRequestPath = CertRequestResource.class.getAnnotation(Path.class);
-        RequestId rid = request.getRequestId();
+        RequestId requestId = request.getRequestId();
 
         UriBuilder reqBuilder = uriInfo.getBaseUriBuilder();
-        reqBuilder.path(certRequestPath.value() + "/" + rid);
-        ret.setRequestURL(reqBuilder.build().toString());
+        reqBuilder.path(certRequestPath.value() + "/" + requestId);
+        info.setRequestURL(reqBuilder.build().toString());
+
+        //Get Cert info if issued.
 
-        //Get cert info if issued.
         String serialNoStr = null;
 
-        if ((requestType != null) && (requestStatus != null)) {
-            if (requestStatus.equals(REQ_COMPLETE)) {
-                X509CertImpl impl[] = new X509CertImpl[1];
-                impl[0] = request.getExtDataInCert(IEnrollProfile.REQUEST_ISSUED_CERT);
+        if (requestType != null && requestStatus == RequestStatus.COMPLETE) {
+            X509CertImpl impl[] = new X509CertImpl[1];
+            impl[0] = request.getExtDataInCert(IEnrollProfile.REQUEST_ISSUED_CERT);
 
-                BigInteger serialNo;
-                if (impl[0] != null) {
-                    serialNo = impl[0].getSerialNumber();
-                    serialNoStr = serialNo.toString();
-                }
+            BigInteger serialNo;
+            if (impl[0] != null) {
+                serialNo = impl[0].getSerialNumber();
+                serialNoStr = serialNo.toString();
             }
-
         }
 
-        if (serialNoStr != null && !serialNoStr.equals("")) {
+        if (!StringUtils.isEmpty(serialNoStr)) {
             Path certPath = CertResource.class.getAnnotation(Path.class);
             UriBuilder certBuilder = uriInfo.getBaseUriBuilder();
             certBuilder.path(certPath.value() + "/" + serialNoStr);
-            ret.setCertURL(certBuilder.build().toString());
+            info.setCertURL(certBuilder.build().toString());
         }
-        return ret;
-    }
 
+        return info;
+    }
 }