[cxf] branch feature/CXF-8099_mask_sensitive_logging_elements updated: CXF-8099: names refactoring

[ashakirin]

This is an automated email from the ASF dual-hosted git repository.

ashakirin pushed a commit to branch 
feature/CXF-8099_mask_sensitive_logging_elements
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to 
refs/heads/feature/CXF-8099_mask_sensitive_logging_elements by this push:
     new 218fec0  CXF-8099: names refactoring
218fec0 is described below

commit 218fec091a7626adc6dba9e25454c2b080576ea6
Author: ashakirin <49843238+ashakirin-tal...@users.noreply.github.com>
AuthorDate: Sat Jul 18 23:30:39 2020 +0200

    CXF-8099: names refactoring
---
 .../java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java
 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java
index 78a6d39..627cfcf 100644
--- 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java
+++ 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java
@@ -27,8 +27,8 @@ public class MaskSensitiveHelper {
     private static final String ELEMENT_NAME_TEMPLATE = "-ELEMENT_NAME-";
     private static final String MATCH_PATTERN_XML_TEMPLATE = 
"<-ELEMENT_NAME->(.*?)</-ELEMENT_NAME->";
     private static final String MATCH_PATTERN_JSON_TEMPLATE = 
"\"-ELEMENT_NAME-\"[ \\t]*:[ \\t]*\"(.*?)\"";
-    private static final String REPLACEMENT_PATTERN_XML_TEMPLATE = 
"<-ELEMENT_NAME->XXX</-ELEMENT_NAME->";
-    private static final String REPLACEMENT_PATTERN_JSON_TEMPLATE = 
"\"-ELEMENT_NAME-\": \"XXX\"";
+    private static final String REPLACEMENT_XML_TEMPLATE = 
"<-ELEMENT_NAME->XXX</-ELEMENT_NAME->";
+    private static final String REPLACEMENT_JSON_TEMPLATE = 
"\"-ELEMENT_NAME-\": \"XXX\"";
 
     private static final String XML_CONTENT = "xml";
     private static final String HTML_CONTENT = "html";
@@ -51,18 +51,18 @@ public class MaskSensitiveHelper {
         final String contentType = (String) message.get(Message.CONTENT_TYPE);
         if (contentType.toLowerCase().contains(XML_CONTENT)
                 || contentType.toLowerCase().contains(HTML_CONTENT)) {
-            return applyMasks(originalLogString, MATCH_PATTERN_XML_TEMPLATE, 
REPLACEMENT_PATTERN_XML_TEMPLATE);
+            return applyMasks(originalLogString, MATCH_PATTERN_XML_TEMPLATE, 
REPLACEMENT_XML_TEMPLATE);
         } else if (contentType.toLowerCase().contains(JSON_CONTENT)) {
-            return applyMasks(originalLogString, MATCH_PATTERN_JSON_TEMPLATE, 
REPLACEMENT_PATTERN_JSON_TEMPLATE);
+            return applyMasks(originalLogString, MATCH_PATTERN_JSON_TEMPLATE, 
REPLACEMENT_JSON_TEMPLATE);
         }
         return originalLogString;
     }
 
-    private String applyMasks(String originalLogString, String 
matchElementPattern, String replacementElementPattern) {
+    private String applyMasks(String originalLogString, String 
matchElementPattern, String replacementElementTemplate) {
         String resultString = originalLogString;
         for (final String sensitiveName : sensitiveElementNames) {
             final String matchPattern = 
matchElementPattern.replaceAll(ELEMENT_NAME_TEMPLATE, sensitiveName);
-            final String replacement = 
replacementElementPattern.replaceAll(ELEMENT_NAME_TEMPLATE, sensitiveName);
+            final String replacement = 
replacementElementTemplate.replaceAll(ELEMENT_NAME_TEMPLATE, sensitiveName);
             resultString = resultString.replaceAll(matchPattern, replacement);
         }
         return resultString;