Added CertRequestProcessedEvent constructor for IRequest.

A new CertRequestProcessedEvent constructor has been added to
encapsulate CERT_REQUEST_PROCESSED events that takes an IRequest
object.

The auditInfoValue() method in CAProcessor has been moved into
CertRequestProcessedEvent.

https://pagure.io/dogtagpki/issue/2636

Change-Id: I892f1476835b45910fdc3e64bd9f6fc9e2f016fb

2 files changed, 2 insertions, 44 deletions

diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/RequestProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RequestProcessor.java
index b66aec27e..4494d2cd3 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/cert/RequestProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/RequestProcessor.java
@@ -277,8 +277,6 @@ public class RequestProcessor extends CertProcessor {
     private void cancelRequest(IRequest req) throws EProfileException {
         String auditSubjectID = auditSubjectID();
         String auditRequesterID = auditRequesterID(req);
-        String auditInfoValue = auditInfoValue(req);
-
         req.setRequestStatus(RequestStatus.CANCELED);
 
         audit(new CertRequestProcessedEvent(
@@ -286,7 +284,7 @@ public class RequestProcessor extends CertProcessor {
                 ILogger.SUCCESS,
                 auditRequesterID,
                 ILogger.SIGNED_AUDIT_CANCELLATION,
-                auditInfoValue));
+                req));
     }
 
     /**
@@ -308,7 +306,6 @@ public class RequestProcessor extends CertProcessor {
     private void rejectRequest(IRequest req) throws EProfileException {
         String auditSubjectID = auditSubjectID();
         String auditRequesterID = auditRequesterID(req);
-        String auditInfoValue = auditInfoValue(req);
 
         req.setRequestStatus(RequestStatus.REJECTED);
 
@@ -317,7 +314,7 @@ public class RequestProcessor extends CertProcessor {
                 ILogger.SUCCESS,
                 auditRequesterID,
                 ILogger.SIGNED_AUDIT_REJECTION,
-                auditInfoValue));
+                req));
     }
 
     /**
diff --git a/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java
index 25f7bb3e1..bc5b9b5a1 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java
@@ -120,9 +120,6 @@ public class CAProcessor extends Processor {
     public static final String ACL_INFO = "ACLinfo";
     public static final String PROFILE_SUB_ID = "profileSubId";
 
-    public final static String SIGNED_AUDIT_CERT_REQUEST_REASON =
-            "requestNotes";
-
     protected String profileID;
     protected String profileSubId;
     protected String aclMethod;
@@ -1003,42 +1000,6 @@ public class CAProcessor extends Processor {
     }
 
     /**
-     * Signed Audit Log Info Value
-     *
-     * This method is called to obtain the "reason" for
-     * a signed audit log message.
-     * <P>
-     *
-     * @param request the actual request
-     * @return reason string containing the signed audit log message reason
-     */
-    protected String auditInfoValue(IRequest request) {
-        // if no signed audit object exists, bail
-        if (signedAuditLogger == null) {
-            return null;
-        }
-
-        String reason = ILogger.SIGNED_AUDIT_EMPTY_VALUE;
-
-        if (request != null) {
-            // overwrite "reason" if and only if "info" != null
-            String info =
-                    request.getExtDataInString(SIGNED_AUDIT_CERT_REQUEST_REASON);
-
-            if (info != null) {
-                reason = info.trim();
-
-                // overwrite "reason" if and only if "reason" is empty
-                if (reason.equals("")) {
-                    reason = ILogger.SIGNED_AUDIT_EMPTY_VALUE;
-                }
-            }
-        }
-
-        return reason;
-    }
-
-    /**
      * Signed Audit Groups
      *
      * This method is called to extract all "groups" associated