1 files changed, 4 insertions, 23 deletions

diff --git a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/PayloadLoggingServletFilter.java b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/PayloadLoggingServletFilter.java
index 3e85b9d..fa8533a 100644
--- a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/PayloadLoggingServletFilter.java
+++ b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/PayloadLoggingServletFilter.java
@@ -29,7 +29,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
-import java.util.Enumeration;
 import java.util.zip.GZIPInputStream;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
@@ -45,12 +44,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
-import javax.ws.rs.core.HttpHeaders;
 
-public class PayloadLoggingServletFilter implements Filter {
+public class PayloadLoggingServletFilter extends AbstractServletFilter implements Filter {
 
     private static org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(PayloadLoggingServletFilter.class);
-    private static final String REDACTED = "***REDACTED***";
 
     private static class ByteArrayServletStream extends ServletOutputStream {
         ByteArrayOutputStream baos;
@@ -205,18 +202,7 @@ public class PayloadLoggingServletFilter implements Filter {
         requestHeaders.append(":");
         requestHeaders.append(httpRequest.getRequestURL().toString());
         requestHeaders.append("|");
-        String header;
-        for (Enumeration<String> e = httpRequest.getHeaderNames(); e.hasMoreElements();) {
-            header = e.nextElement();
-            requestHeaders.append(header);
-            requestHeaders.append(":");
-            if (header.equalsIgnoreCase(HttpHeaders.AUTHORIZATION)) {
-                requestHeaders.append(REDACTED);
-            } else {
-                requestHeaders.append(httpRequest.getHeader(header));
-            }
-            requestHeaders.append(";");
-        }
+        requestHeaders.append(getSecureRequestHeaders(httpRequest));
         log.info(requestHeaders.toString());
 
         log.info("REQUEST BODY|" + new String(bufferedRequest.getBuffer()));
@@ -259,13 +245,7 @@ public class PayloadLoggingServletFilter implements Filter {
             try {
                 byte[] bytes = baos.toByteArray();
                 StringBuilder responseHeaders = new StringBuilder("RESPONSE HEADERS|");
-
-                for (String headerName : response.getHeaderNames()) {
-                    responseHeaders.append(headerName);
-                    responseHeaders.append(":");
-                    responseHeaders.append(response.getHeader(headerName));
-                    responseHeaders.append(";");
-                }
+                responseHeaders.append(formatResponseHeaders(response));
                 responseHeaders.append("Status:");
                 responseHeaders.append(response.getStatus());
                 responseHeaders.append(";IsCommited:" + wrappedResp.isCommitted());
@@ -346,4 +326,5 @@ public class PayloadLoggingServletFilter implements Filter {
         }
         return str.toString();
     }
+
 }