diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-07-05 10:22:37 -0400 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-07-10 14:23:18 -0500 |
commit | f65eae145ca6720fab774600ddda2b04f364dda0 (patch) | |
tree | 05b90f929c4a1b8193a64a3c79cbda09e1b85492 /base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java | |
parent | a3c83b5f63c9ced5c527cb3b9306d390c3d192ec (diff) | |
download | pki-f65eae145ca6720fab774600ddda2b04f364dda0.tar.gz pki-f65eae145ca6720fab774600ddda2b04f364dda0.tar.xz pki-f65eae145ca6720fab774600ddda2b04f364dda0.zip |
Refactored RequestStatus.
The RequestStatus has been modified to use a map to convert string
into RequestStatus instance. The string constants in RequestStatus
are no longer needed because instances can be compared using
equal sign directly or equals().
Ticket #161
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java')
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java index b7120010a..b45f46d12 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java @@ -374,7 +374,7 @@ public class CMCRevReqServlet extends CMSServlet { String auditRequesterID = auditRequesterID(req); String auditSerialNumber = auditSerialNumber(eeSerialNumber); String auditRequestType = auditRequestType(reason); - String auditApprovalStatus = ILogger.SIGNED_AUDIT_EMPTY_VALUE; + RequestStatus auditApprovalStatus = null; String auditReasonNum = String.valueOf(reason); try { @@ -576,7 +576,7 @@ public class CMCRevReqServlet extends CMSServlet { mQueue.processRequest(revReq); // retrieve the request status - auditApprovalStatus = revReq.getRequestStatus().toString(); + auditApprovalStatus = revReq.getRequestStatus(); RequestStatus stat = revReq.getRequestStatus(); @@ -810,9 +810,9 @@ public class CMCRevReqServlet extends CMSServlet { // store a message in the signed audit log file // if and only if "auditApprovalStatus" is // "complete", "revoked", or "canceled" - if ((auditApprovalStatus.equals(RequestStatus.COMPLETE_STRING)) - || (auditApprovalStatus.equals(RequestStatus.REJECTED_STRING)) - || (auditApprovalStatus.equals(RequestStatus.CANCELED_STRING))) { + if (auditApprovalStatus == RequestStatus.COMPLETE || + auditApprovalStatus == RequestStatus.REJECTED || + auditApprovalStatus == RequestStatus.CANCELED) { auditMessage = CMS.getLogMessage( LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED, auditSubjectID, @@ -821,7 +821,7 @@ public class CMCRevReqServlet extends CMSServlet { auditSerialNumber, auditRequestType, auditReasonNum, - auditApprovalStatus); + auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString()); audit(auditMessage); } @@ -844,9 +844,9 @@ public class CMCRevReqServlet extends CMSServlet { // message in the signed audit log file // if and only if "auditApprovalStatus" is // "complete", "revoked", or "canceled" - if ((auditApprovalStatus.equals(RequestStatus.COMPLETE_STRING)) - || (auditApprovalStatus.equals(RequestStatus.REJECTED_STRING)) - || (auditApprovalStatus.equals(RequestStatus.CANCELED_STRING))) { + if (auditApprovalStatus == RequestStatus.COMPLETE || + auditApprovalStatus == RequestStatus.REJECTED || + auditApprovalStatus == RequestStatus.CANCELED) { auditMessage = CMS.getLogMessage( LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED, auditSubjectID, @@ -855,7 +855,7 @@ public class CMCRevReqServlet extends CMSServlet { auditSerialNumber, auditRequestType, auditReasonNum, - auditApprovalStatus); + auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString()); audit(auditMessage); } @@ -882,9 +882,9 @@ public class CMCRevReqServlet extends CMSServlet { // message in the signed audit log file // if and only if "auditApprovalStatus" is // "complete", "revoked", or "canceled" - if ((auditApprovalStatus.equals(RequestStatus.COMPLETE_STRING)) - || (auditApprovalStatus.equals(RequestStatus.REJECTED_STRING)) - || (auditApprovalStatus.equals(RequestStatus.CANCELED_STRING))) { + if (auditApprovalStatus == RequestStatus.COMPLETE || + auditApprovalStatus == RequestStatus.REJECTED || + auditApprovalStatus == RequestStatus.CANCELED) { auditMessage = CMS.getLogMessage( LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED, auditSubjectID, @@ -893,7 +893,7 @@ public class CMCRevReqServlet extends CMSServlet { auditSerialNumber, auditRequestType, auditReasonNum, - auditApprovalStatus); + auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString()); audit(auditMessage); } @@ -921,9 +921,9 @@ public class CMCRevReqServlet extends CMSServlet { // message in the signed audit log file // if and only if "auditApprovalStatus" is // "complete", "revoked", or "canceled" - if ((auditApprovalStatus.equals(RequestStatus.COMPLETE_STRING)) - || (auditApprovalStatus.equals(RequestStatus.REJECTED_STRING)) - || (auditApprovalStatus.equals(RequestStatus.CANCELED_STRING))) { + if (auditApprovalStatus == RequestStatus.COMPLETE || + auditApprovalStatus == RequestStatus.REJECTED || + auditApprovalStatus == RequestStatus.CANCELED) { auditMessage = CMS.getLogMessage( LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED, auditSubjectID, @@ -932,7 +932,7 @@ public class CMCRevReqServlet extends CMSServlet { auditSerialNumber, auditRequestType, auditReasonNum, - auditApprovalStatus); + auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString()); audit(auditMessage); } @@ -957,9 +957,9 @@ public class CMCRevReqServlet extends CMSServlet { // message in the signed audit log file // if and only if "auditApprovalStatus" is // "complete", "revoked", or "canceled" - if ((auditApprovalStatus.equals(RequestStatus.COMPLETE_STRING)) - || (auditApprovalStatus.equals(RequestStatus.REJECTED_STRING)) - || (auditApprovalStatus.equals(RequestStatus.CANCELED_STRING))) { + if (auditApprovalStatus == RequestStatus.COMPLETE || + auditApprovalStatus == RequestStatus.REJECTED || + auditApprovalStatus == RequestStatus.CANCELED) { auditMessage = CMS.getLogMessage( LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED, auditSubjectID, @@ -968,7 +968,7 @@ public class CMCRevReqServlet extends CMSServlet { auditSerialNumber, auditRequestType, auditReasonNum, - auditApprovalStatus); + auditApprovalStatus == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : auditApprovalStatus.toString()); audit(auditMessage); } |