From 1cb42cbce8cab262249258b624bf729a9d79a489 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Fri, 5 May 2023 18:08:03 -0500
Subject: [PATCH] Move CertUtils.printRequestContent() into Request

---
 .../com/netscape/cmscore/cert/CertUtils.java   | 16 ----------------
 .../com/netscape/cmscore/request/Request.java  | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/base/server/src/main/java/com/netscape/cmscore/cert/CertUtils.java b/base/server/src/main/java/com/netscape/cmscore/cert/CertUtils.java
index 56db5ff1c96..c97025c0715 100644
--- a/base/server/src/main/java/com/netscape/cmscore/cert/CertUtils.java
+++ b/base/server/src/main/java/com/netscape/cmscore/cert/CertUtils.java
@@ -61,7 +61,6 @@
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.profile.EProfileException;
 import com.netscape.cmscore.apps.CMS;
-import com.netscape.cmscore.request.Request;
 
 /**
  * Utility class with assorted methods to check for
@@ -959,21 +958,6 @@ else if (certusage.equalsIgnoreCase("EmailRecipient"))
         return cu;
     }
 
-    public static void printRequestContent(Request request) {
-        String method = "CertUtils.printRequestContent: ";
-        logger.debug(method + "Content of request: ");
-        Enumeration<String> ereq = request.getExtDataKeys();
-        while (ereq.hasMoreElements()) {
-            String reqKey = ereq.nextElement();
-            String reqVal = request.getExtDataInString(reqKey);
-            if (reqVal != null) {
-                logger.debug("  req entry - " + reqKey + ": " + reqVal);
-            } else {
-                logger.debug("  req entry - " + reqKey + ": no value");
-            }
-        }
-    }
-
     /*
      * addCTpoisonExt adds the Certificate Transparency V1 poison extension
      * to the Ceritificate Info
diff --git a/base/server/src/main/java/com/netscape/cmscore/request/Request.java b/base/server/src/main/java/com/netscape/cmscore/request/Request.java
index 3416b9328b6..9d0a236cf24 100644
--- a/base/server/src/main/java/com/netscape/cmscore/request/Request.java
+++ b/base/server/src/main/java/com/netscape/cmscore/request/Request.java
@@ -1040,4 +1040,22 @@ public String getRealm() {
     public void setRealm(String realm) {
         this.realm = realm;
     }
+
+    public void printContent() {
+
+        String method = "Request.printContent: ";
+        logger.debug(method + "Content of request: ");
+
+        Enumeration<String> ereq = getExtDataKeys();
+        while (ereq.hasMoreElements()) {
+            String reqKey = ereq.nextElement();
+            String reqVal = getExtDataInString(reqKey);
+
+            if (reqVal != null) {
+                logger.debug("  req entry - " + reqKey + ": " + reqVal);
+            } else {
+                logger.debug("  req entry - " + reqKey + ": no value");
+            }
+        }
+    }
 }