Browse Source

Apply formatValue to a few remaining places

Issue: SPR-17254
pull/1958/head
Rossen Stoyanchev 7 years ago
parent
commit
12240c7524
  1. 3
      spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.java
  2. 3
      spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageReader.java
  3. 3
      spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java
  4. 6
      spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java

3
spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.java

@ -134,7 +134,8 @@ public class FormHttpMessageWriter extends LoggingCodecSupport @@ -134,7 +134,8 @@ public class FormHttpMessageWriter extends LoggingCodecSupport
if (logger.isDebugEnabled()) {
String s = Hints.getLogPrefix(hints) + "Writing " +
(isEnableLoggingRequestDetails() ?
form.toString() : "form fields " + form.keySet() + " (content masked)");
formatValue(form, logger.isTraceEnabled()) :
"form fields " + form.keySet() + " (content masked)");
if (logger.isTraceEnabled()) {
logger.trace(s);
}

3
spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageReader.java

@ -97,7 +97,8 @@ public class MultipartHttpMessageReader extends LoggingCodecSupport @@ -97,7 +97,8 @@ public class MultipartHttpMessageReader extends LoggingCodecSupport
if (logger.isDebugEnabled()) {
String s = Hints.getLogPrefix(hints) + "Parsed " +
(isEnableLoggingRequestDetails() ?
map.toString() : "parts " + map.keySet() + " (content masked)");
formatValue(map, logger.isTraceEnabled()) :
"parts " + map.keySet() + " (content masked)");
if (logger.isTraceEnabled()) {
logger.trace(s);
}

3
spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java

@ -228,7 +228,8 @@ public class MultipartHttpMessageWriter extends LoggingCodecSupport @@ -228,7 +228,8 @@ public class MultipartHttpMessageWriter extends LoggingCodecSupport
if (logger.isDebugEnabled()) {
String s = Hints.getLogPrefix(hints) + "Encoding " +
(isEnableLoggingRequestDetails() ?
map.toString() : "parts " + map.keySet() + " (content masked)");
formatValue(map, logger.isTraceEnabled()) :
"parts " + map.keySet() + " (content masked)");
if (logger.isTraceEnabled()) {
logger.trace(s);
}

6
spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java

@ -96,8 +96,10 @@ public class SynchronossPartHttpMessageReader extends LoggingCodecSupport implem @@ -96,8 +96,10 @@ public class SynchronossPartHttpMessageReader extends LoggingCodecSupport implem
return Flux.create(new SynchronossPartGenerator(message, this.bufferFactory, this.streamStorageFactory))
.doOnNext(part -> {
if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {
String s = Hints.getLogPrefix(hints) + "Parsed " + (isEnableLoggingRequestDetails() ?
part.toString() : "parts '" + part.name() + "' (content masked)");
String s = Hints.getLogPrefix(hints) + "Parsed " +
(isEnableLoggingRequestDetails() ?
formatValue(part, logger.isTraceEnabled()) :
"parts '" + part.name() + "' (content masked)");
if (logger.isTraceEnabled()) {
logger.trace(s);
}

Loading…
Cancel
Save