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 a99ff2c CXF-8099: updated method names, removed unused optional
a99ff2c is described below
commit a99ff2c787ae6fa56a51113a13a6d20ae6b8e65c
Author: ashakirin <49843238+ashakirin-tal...@users.noreply.github.com>
AuthorDate: Fri Jul 10 00:54:36 2020 +0200
CXF-8099: updated method names, removed unused optional
---
.../apache/cxf/ext/logging/AbstractLoggingInterceptor.java | 11 ++++-------
.../main/java/org/apache/cxf/ext/logging/LoggingFeature.java | 12 ++++++------
.../org/apache/cxf/ext/logging/LoggingInInterceptor.java | 2 +-
.../org/apache/cxf/ext/logging/LoggingOutInterceptor.java | 4 ++--
4 files changed, 13 insertions(+), 16 deletions(-)
diff --git
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/AbstractLoggingInterceptor.java
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/AbstractLoggingInterceptor.java
index f283fb2..104b6b4 100644
---
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/AbstractLoggingInterceptor.java
+++
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/AbstractLoggingInterceptor.java
@@ -21,7 +21,6 @@ package org.apache.cxf.ext.logging;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.UUID;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -52,7 +51,7 @@ public abstract class AbstractLoggingInterceptor extends
AbstractPhaseIntercepto
protected final MaskSensitiveHelper maskSensitiveHelper = new
MaskSensitiveHelper();
- protected Map<String, Boolean> sensitiveHeaderMap = new HashMap();
+ protected Map<String, Boolean> sensitiveProtocolHeaderMap = new HashMap();
public AbstractLoggingInterceptor(String phase, LogEventSender sender) {
super(phase);
@@ -88,8 +87,8 @@ public abstract class AbstractLoggingInterceptor extends
AbstractPhaseIntercepto
maskSensitiveHelper.addSensitiveElementNames(sensitiveElementNames);
}
- public void addSensitiveHeaderNames(final List<String>
sensitiveHeaderNames) {
- sensitiveHeaderMap = sensitiveHeaderNames.stream()
+ public void addSensitiveProtocolHeaderNames(final List<String>
sensitiveProtocolHeaderNames) {
+ sensitiveProtocolHeaderMap = sensitiveProtocolHeaderNames.stream()
.collect(Collectors.toMap(Function.identity(), name ->
Boolean.TRUE));
}
@@ -127,8 +126,6 @@ public abstract class AbstractLoggingInterceptor extends
AbstractPhaseIntercepto
}
protected String maskSensitiveElements(final Message message, String
originalLogString) {
- return Optional.of(maskSensitiveHelper)
- .map(h -> h.maskSensitiveElements(message, originalLogString))
- .orElse(originalLogString);
+ return maskSensitiveHelper.maskSensitiveElements(message,
originalLogString);
}
}
diff --git
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
index 321c00f..4d14f31 100644
---
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
+++
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
@@ -161,10 +161,10 @@ public class LoggingFeature extends
DelegatingFeature<LoggingFeature.Portable> {
* Initial logging statement: {Authorization=Basic
QWxhZGRpbjpPcGVuU2VzYW1l}
* Result logging statement: {Authorization=XXX}
* </pre>
- * @param sensitiveHeaders list of sensitive element names to be replaced
+ * @param sensitiveProtocolHeaderNames list of sensitive element names to
be replaced
*/
- public void addSensitiveHeaders(final List<String> sensitiveHeaders) {
- delegate.addSensitiveHeaders(sensitiveHeaders);
+ public void addSensitiveProtocolHeaderNames(final List<String>
sensitiveProtocolHeaderNames) {
+ delegate.addSensitiveProtocolHeaderNames(sensitiveProtocolHeaderNames);
}
public static class Portable implements AbstractPortableFeature {
@@ -257,9 +257,9 @@ public class LoggingFeature extends
DelegatingFeature<LoggingFeature.Portable> {
out.addSensitiveElementNames(sensitiveElementNames);
}
- public void addSensitiveHeaders(final List<String> sensitiveHeaders) {
- in.addSensitiveHeaderNames(sensitiveHeaders);
- out.addSensitiveHeaderNames(sensitiveHeaders);
+ public void addSensitiveProtocolHeaderNames(final List<String>
sensitiveProtocolHeaderNames) {
+ in.addSensitiveProtocolHeaderNames(sensitiveProtocolHeaderNames);
+ out.addSensitiveProtocolHeaderNames(sensitiveProtocolHeaderNames);
}
}
}
diff --git
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
index 15e7f36..c5da59d 100644
---
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
+++
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
@@ -66,7 +66,7 @@ public class LoggingInInterceptor extends
AbstractLoggingInterceptor {
return;
}
createExchangeId(message);
- final LogEvent event = eventMapper.map(message, sensitiveHeaderMap);
+ final LogEvent event = eventMapper.map(message,
sensitiveProtocolHeaderMap);
if (shouldLogContent(event)) {
addContent(message, event);
} else {
diff --git
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
index aed501b..cb67c19 100644
---
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
+++
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
@@ -139,7 +139,7 @@ public class LoggingOutInterceptor extends
AbstractLoggingInterceptor {
}
public void close() throws IOException {
- final LogEvent event = eventMapper.map(message,
sensitiveHeaderMap);
+ final LogEvent event = eventMapper.map(message,
sensitiveProtocolHeaderMap);
StringWriter w2 = out2;
if (w2 == null) {
w2 = (StringWriter) out;
@@ -190,7 +190,7 @@ public class LoggingOutInterceptor extends
AbstractLoggingInterceptor {
}
public void onClose(CachedOutputStream cos) {
- final LogEvent event = eventMapper.map(message,
sensitiveHeaderMap);
+ final LogEvent event = eventMapper.map(message,
sensitiveProtocolHeaderMap);
if (shouldLogContent(event)) {
copyPayload(cos, event);
} else {
