Switch defaults and model for logging sensitive data

rstoyanchev · rstoyanchev · commit 1b1bc7f5b53b · 2018-07-11T11:10:03.000-04:00
Issue: SPR-17029
diff --git a/spring-core/src/main/java/org/springframework/core/codec/ByteArrayEncoder.java b/spring-core/src/main/java/org/springframework/core/codec/ByteArrayEncoder.java
@@ -54,7 +54,7 @@ public Flux<DataBuffer> encode(Publisher<? extends byte[]> inputStream,
 
 		return Flux.from(inputStream).map(bytes -> {
 			DataBuffer dataBuffer = bufferFactory.wrap(bytes);
-			if (logger.isDebugEnabled() && !Hints.suppressLogging(hints)) {
+			if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {
 				String logPrefix = Hints.getLogPrefix(hints);
 				logger.debug(logPrefix + "Writing " + dataBuffer.readableByteCount() + " bytes");
 			}
diff --git a/spring-core/src/main/java/org/springframework/core/codec/ByteBufferEncoder.java b/spring-core/src/main/java/org/springframework/core/codec/ByteBufferEncoder.java
@@ -55,7 +55,7 @@ public Flux<DataBuffer> encode(Publisher<? extends ByteBuffer> inputStream,
 
 		return Flux.from(inputStream).map(byteBuffer -> {
 			DataBuffer dataBuffer = bufferFactory.wrap(byteBuffer);
-			if (logger.isDebugEnabled() && !Hints.suppressLogging(hints)) {
+			if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {
 				String logPrefix = Hints.getLogPrefix(hints);
 				logger.debug(logPrefix + "Writing " + dataBuffer.readableByteCount() + " bytes");
 			}
diff --git a/spring-core/src/main/java/org/springframework/core/codec/CharSequenceEncoder.java b/spring-core/src/main/java/org/springframework/core/codec/CharSequenceEncoder.java
@@ -68,7 +68,7 @@ public Flux<DataBuffer> encode(Publisher<? extends CharSequence> inputStream,
 		Charset charset = getCharset(mimeType);
 
 		return Flux.from(inputStream).map(charSequence -> {
-			if (logger.isDebugEnabled() && !Hints.suppressLogging(hints)) {
+			if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {
 				String logPrefix = Hints.getLogPrefix(hints);
 				logger.debug(logPrefix + "Writing '" + charSequence + "'");
 			}
diff --git a/spring-core/src/main/java/org/springframework/core/codec/DataBufferEncoder.java b/spring-core/src/main/java/org/springframework/core/codec/DataBufferEncoder.java
@@ -54,7 +54,7 @@ public Flux<DataBuffer> encode(Publisher<? extends DataBuffer> inputStream,
 
 		Flux<DataBuffer> flux = Flux.from(inputStream);
 
-		if (logger.isDebugEnabled() && !Hints.suppressLogging(hints)) {
+		if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {
 			flux = flux.doOnNext(buffer -> {
 				String logPrefix = Hints.getLogPrefix(hints);
 				logger.debug(logPrefix + "Writing " + buffer.readableByteCount() + " bytes");
diff --git a/spring-core/src/main/java/org/springframework/core/codec/Hints.java b/spring-core/src/main/java/org/springframework/core/codec/Hints.java
@@ -99,7 +99,7 @@ public static String getLogPrefix(@Nullable Map<String, Object> hints) {
 	 * @param hints the hints map
 	 * @return whether logging of data is allowed
 	 */
-	public static boolean suppressLogging(@Nullable Map<String, Object> hints) {
+	public static boolean isLoggingSuppressed(@Nullable Map<String, Object> hints) {
 		return hints != null && (boolean) hints.getOrDefault(SUPPRESS_LOGGING_HINT, false);
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/core/codec/ResourceEncoder.java b/spring-core/src/main/java/org/springframework/core/codec/ResourceEncoder.java
@@ -68,7 +68,7 @@ public boolean canEncode(ResolvableType elementType, @Nullable MimeType mimeType
 	protected Flux<DataBuffer> encode(Resource resource, DataBufferFactory dataBufferFactory,
 			ResolvableType type, @Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
 
-		if (logger.isDebugEnabled() && !Hints.suppressLogging(hints)) {
+		if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {
 			String logPrefix = Hints.getLogPrefix(hints);
 			logger.debug(logPrefix + "Writing [" + resource + "]");
 		}
diff --git a/spring-core/src/main/java/org/springframework/core/codec/ResourceRegionEncoder.java b/spring-core/src/main/java/org/springframework/core/codec/ResourceRegionEncoder.java
@@ -122,7 +122,7 @@ private Flux<DataBuffer> writeResourceRegion(
 		long position = region.getPosition();
 		long count = region.getCount();
 
-		if (logger.isDebugEnabled() && !Hints.suppressLogging(hints)) {
+		if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {
 			logger.debug(Hints.getLogPrefix(hints) +
 					"Writing region " + position + "-" + (position + count) + " of [" + resource + "]");
 		}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/CodecConfigurer.java b/spring-web/src/main/java/org/springframework/http/codec/CodecConfigurer.java
@@ -111,19 +111,13 @@ interface DefaultCodecs {
 		void jackson2JsonEncoder(Encoder<?> encoder);
 
 		/**
-		 * Whether to disable logging of request details for form and multipart
-		 * requests at any log level. By default such data is logged under
-		 * {@code "org.springframework.http.codec"} but may contain sensitive
-		 * information. Typically that's not an issue since DEBUG is used in
-		 * development, but this option may be used to explicitly disable any
-		 * logging of form and multipart data at any log level.
-		 * <p>By default this is set to {@code false} in which case form and
-		 * multipart data is logged at DEBUG or TRACE. When set to {@code true}
-		 * values will not be logged at any level.
-		 * @param disableLoggingRequestDetails whether to disable loggins
+		 * Whether to log form data at DEBUG level, and headers at TRACE level.
+		 * Both may contain sensitive information.
+		 * <p>By default set to {@code false} so that request details are not shown.
+		 * @param enable whether to enable or not
 		 * @since 5.1
 		 */
-		void disableLoggingRequestDetails(boolean disableLoggingRequestDetails);
+		void enableLoggingRequestDetails(boolean enable);
 	}
 
 
diff --git a/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageReader.java
@@ -108,8 +108,10 @@ public Mono<MultiValueMap<String, String>> readMono(ResolvableType elementType,
 					String body = charBuffer.toString();
 					DataBufferUtils.release(buffer);
 					MultiValueMap<String, String> formData = parseFormData(charset, body);
-					if (shouldLogRequestDetails()) {
-						logger.debug(Hints.getLogPrefix(hints) + "Decoded " + formData);
+					if (logger.isDebugEnabled()) {
+						String details = isEnableLoggingRequestDetails() ?
+								formData.toString() : "form fields " + formData.keySet() + " (content masked)";
+						logger.debug(Hints.getLogPrefix(hints) + "Read " + details);
 					}
 					return formData;
 				});
diff --git a/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.java
@@ -131,8 +131,10 @@ public Mono<Void> write(Publisher<? extends MultiValueMap<String, String>> input
 		Assert.notNull(charset, "No charset"); // should never occur
 
 		return Mono.from(inputStream).flatMap(form -> {
-			if (shouldLogRequestDetails()) {
-				logger.debug(Hints.getLogPrefix(hints) + "Encoding " + form);
+			if (logger.isDebugEnabled()) {
+				String details = isEnableLoggingRequestDetails() ?
+						form.toString() : "form fields " + form.keySet() + " (content masked)";
+				logger.debug(Hints.getLogPrefix(hints) + "Writing " + details);
 			}
 			String value = serializeForm(form, charset);
 			ByteBuffer byteBuffer = charset.encode(value);
diff --git a/spring-web/src/main/java/org/springframework/http/codec/LoggingCodecSupport.java b/spring-web/src/main/java/org/springframework/http/codec/LoggingCodecSupport.java
@@ -33,41 +33,26 @@ public class LoggingCodecSupport {
 
 	protected final Log logger = HttpLog.create(LogFactory.getLog(getClass()));
 
-	/** Do not log potentially sensitive information (params at DEBUG and headers at TRACE). */
-	private boolean disableLoggingRequestDetails = false;
+	/** Whether to log potentially sensitive info (form data at DEBUG and headers at TRACE). */
+	private boolean enableLoggingRequestDetails = false;
 
 
 	/**
-	 * Whether to disable any logging of request details by this codec.
-	 * By default values being encoded or decoded are logged at DEBUG and TRACE
-	 * level under {@code "org.springframework.http.codec"} which may show
-	 * sensitive data for form and multipart data. Typically that's not an issue
-	 * since DEBUG and TRACE are intended for development, but this property may
-	 * be used to explicitly disable any logging of such information regardless
-	 * of the log level.
-	 * <p>By default this is set to {@code false} in which case values encoded
-	 * or decoded are logged at DEBUG level. When set to {@code true} values
-	 * will not be logged at any level.
-	 * @param disableLoggingRequestDetails whether to disable
+	 * Whether to log form data at DEBUG level, and headers at TRACE level.
+	 * Both may contain sensitive information.
+	 * <p>By default set to {@code false} so that request details are not shown.
+	 * @param enable whether to enable or not
 	 */
-	public void setDisableLoggingRequestDetails(boolean disableLoggingRequestDetails) {
-		this.disableLoggingRequestDetails = disableLoggingRequestDetails;
+	public void setEnableLoggingRequestDetails(boolean enable) {
+		this.enableLoggingRequestDetails = enable;
 	}
 
 	/**
 	 * Whether any logging of values being encoded or decoded is explicitly
 	 * disabled regardless of log level.
 	 */
-	public boolean isDisableLoggingRequestDetails() {
-		return this.disableLoggingRequestDetails;
-	}
-
-	/**
-	 * Returns "true" if logger is at DEBUG level and the logging of values
-	 * being encoded or decoded is not explicitly disabled.
-	 */
-	protected boolean shouldLogRequestDetails() {
-		return !this.disableLoggingRequestDetails && logger.isDebugEnabled();
+	public boolean isEnableLoggingRequestDetails() {
+		return this.enableLoggingRequestDetails;
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/http/codec/ResourceHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/ResourceHttpMessageWriter.java
@@ -145,7 +145,7 @@ private static MediaType getResourceMediaType(
 			return mediaType;
 		}
 		mediaType = MediaTypeFactory.getMediaType(resource).orElse(MediaType.APPLICATION_OCTET_STREAM);
-		if (logger.isDebugEnabled()) {
+		if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {
 			logger.debug(Hints.getLogPrefix(hints) + "Resource associated with '" + mediaType + "'");
 		}
 		return mediaType;
diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java b/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java
@@ -112,7 +112,7 @@ private Flux<Object> decodeInternal(Flux<TokenBuffer> tokens, ResolvableType ele
 		return tokens.map(tokenBuffer -> {
 			try {
 				Object value = reader.readValue(tokenBuffer.asParser(getObjectMapper()));
-				if (logger.isDebugEnabled()) {
+				if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {
 					logger.debug(Hints.getLogPrefix(hints) +"Decoded [" + value + "]");
 				}
 				return value;
diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Encoder.java b/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Encoder.java
@@ -141,7 +141,7 @@ public Flux<DataBuffer> encode(Publisher<?> inputStream, DataBufferFactory buffe
 	private DataBuffer encodeValue(Object value, @Nullable MimeType mimeType, DataBufferFactory bufferFactory,
 			ResolvableType elementType, @Nullable Map<String, Object> hints, JsonEncoding encoding) {
 
-		if (logger.isDebugEnabled() && !Hints.suppressLogging(hints)) {
+		if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {
 			logger.debug(Hints.getLogPrefix(hints) + "Encoding [" + value + "]");
 		}
 
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageReader.java
@@ -27,9 +27,11 @@
 import reactor.core.publisher.Mono;
 
 import org.springframework.core.ResolvableType;
+import org.springframework.core.codec.Hints;
 import org.springframework.http.MediaType;
 import org.springframework.http.ReactiveHttpInputMessage;
 import org.springframework.http.codec.HttpMessageReader;
+import org.springframework.http.codec.LoggingCodecSupport;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.LinkedMultiValueMap;
@@ -46,7 +48,8 @@
  * @author Rossen Stoyanchev
  * @since 5.0
  */
-public class MultipartHttpMessageReader implements HttpMessageReader<MultiValueMap<String, Part>> {
+public class MultipartHttpMessageReader extends LoggingCodecSupport
+		implements HttpMessageReader<MultiValueMap<String, Part>> {
 
 	private static final ResolvableType MULTIPART_VALUE_TYPE = ResolvableType.forClassWithGenerics(
 			MultiValueMap.class, String.class, Part.class);
@@ -85,8 +88,19 @@ public Flux<MultiValueMap<String, Part>> read(ResolvableType elementType,
 	public Mono<MultiValueMap<String, Part>> readMono(ResolvableType elementType,
 			ReactiveHttpInputMessage inputMessage, Map<String, Object> hints) {
 
-		return this.partReader.read(elementType, inputMessage, hints)
-				.collectMultimap(Part::name).map(this::toMultiValueMap);
+
+		Map<String, Object> allHints = Hints.merge(hints, Hints.SUPPRESS_LOGGING_HINT, true);
+
+		return this.partReader.read(elementType, inputMessage, allHints)
+				.collectMultimap(Part::name)
+				.doOnNext(map -> {
+					if (logger.isDebugEnabled()) {
+						String details = isEnableLoggingRequestDetails() ?
+								map.toString() : "parts " + map.keySet() + " (content masked)";
+						logger.debug(Hints.getLogPrefix(hints) + "Parsed " + details);
+					}
+				})
+				.map(this::toMultiValueMap);
 	}
 
 	private LinkedMultiValueMap<String, Part> toMultiValueMap(Map<String, Collection<Part>> map) {
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java
@@ -225,8 +225,10 @@ private Mono<Void> writeMultipart(
 
 		outputMessage.getHeaders().setContentType(new MediaType(MediaType.MULTIPART_FORM_DATA, params));
 
-		if (shouldLogRequestDetails()) {
-			logger.debug(Hints.getLogPrefix(hints) + "Encoding " + map);
+		if (logger.isDebugEnabled()) {
+			String details = isEnableLoggingRequestDetails() ?
+					map.toString() : "parts " + map.keySet() + " (content masked)";
+			logger.debug(Hints.getLogPrefix(hints) + "Encoding " + details);
 		}
 
 		Flux<DataBuffer> body = Flux.fromIterable(map.entrySet())
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
@@ -95,8 +95,10 @@ public boolean canRead(ResolvableType elementType, @Nullable MediaType mediaType
 	public Flux<Part> read(ResolvableType elementType, ReactiveHttpInputMessage message, Map<String, Object> hints) {
 		return Flux.create(new SynchronossPartGenerator(message, this.bufferFactory, this.streamStorageFactory))
 				.doOnNext(part -> {
-					if (shouldLogRequestDetails()) {
-						logger.debug(Hints.getLogPrefix(hints) + "Decoded [" + part + "]");
+					if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {
+						String details = isEnableLoggingRequestDetails() ?
+								part.toString() : "parts '" + part.name() + "' (content masked)";
+						logger.debug(Hints.getLogPrefix(hints) + "Parsed " + details);
 					}
 				});
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/support/BaseDefaultCodecs.java b/spring-web/src/main/java/org/springframework/http/codec/support/BaseDefaultCodecs.java
@@ -74,7 +74,7 @@ class BaseDefaultCodecs implements CodecConfigurer.DefaultCodecs {
 	@Nullable
 	private Encoder<?> jackson2JsonEncoder;
 
-	private boolean disableLoggingRequestDetails = false;
+	private boolean enableLoggingRequestDetails = false;
 
 	private boolean registerDefaults = true;
 
@@ -90,12 +90,12 @@ public void jackson2JsonEncoder(Encoder<?> encoder) {
 	}
 
 	@Override
-	public void disableLoggingRequestDetails(boolean disableLoggingRequestDetails) {
-		this.disableLoggingRequestDetails = disableLoggingRequestDetails;
+	public void enableLoggingRequestDetails(boolean enable) {
+		this.enableLoggingRequestDetails = enable;
 	}
 
-	protected boolean isDisableLoggingRequestDetails() {
-		return this.disableLoggingRequestDetails;
+	protected boolean isEnableLoggingRequestDetails() {
+		return this.enableLoggingRequestDetails;
 	}
 
 	/**
@@ -121,7 +121,7 @@ final List<HttpMessageReader<?>> getTypedReaders() {
 		readers.add(new DecoderHttpMessageReader<>(StringDecoder.textPlainOnly()));
 
 		FormHttpMessageReader formReader = new FormHttpMessageReader();
-		formReader.setDisableLoggingRequestDetails(this.disableLoggingRequestDetails);
+		formReader.setEnableLoggingRequestDetails(this.enableLoggingRequestDetails);
 		readers.add(formReader);
 
 		extendTypedReaders(readers);
diff --git a/spring-web/src/main/java/org/springframework/http/codec/support/ClientDefaultCodecsImpl.java b/spring-web/src/main/java/org/springframework/http/codec/support/ClientDefaultCodecsImpl.java
@@ -88,10 +88,10 @@ private Decoder<?> getSseDecoder() {
 	protected void extendTypedWriters(List<HttpMessageWriter<?>> typedWriters) {
 
 		FormHttpMessageWriter formWriter = new FormHttpMessageWriter();
-		formWriter.setDisableLoggingRequestDetails(isDisableLoggingRequestDetails());
+		formWriter.setEnableLoggingRequestDetails(isEnableLoggingRequestDetails());
 
 		MultipartHttpMessageWriter multipartWriter = new MultipartHttpMessageWriter(getPartWriters(), formWriter);
-		multipartWriter.setDisableLoggingRequestDetails(isDisableLoggingRequestDetails());
+		multipartWriter.setEnableLoggingRequestDetails(isEnableLoggingRequestDetails());
 
 		typedWriters.add(multipartWriter);
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/support/ServerDefaultCodecsImpl.java b/spring-web/src/main/java/org/springframework/http/codec/support/ServerDefaultCodecsImpl.java
@@ -52,10 +52,15 @@ public void serverSentEventEncoder(Encoder<?> encoder) {
 	@Override
 	protected void extendTypedReaders(List<HttpMessageReader<?>> typedReaders) {
 		if (synchronossMultipartPresent) {
+			boolean enable = isEnableLoggingRequestDetails();
+
 			SynchronossPartHttpMessageReader partReader = new SynchronossPartHttpMessageReader();
-			partReader.setDisableLoggingRequestDetails(isDisableLoggingRequestDetails());
+			partReader.setEnableLoggingRequestDetails(enable);
 			typedReaders.add(partReader);
-			typedReaders.add(new MultipartHttpMessageReader(partReader));
+
+			MultipartHttpMessageReader reader = new MultipartHttpMessageReader(partReader);
+			reader.setEnableLoggingRequestDetails(enable);
+			typedReaders.add(reader);
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlEncoder.java b/spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlEncoder.java
@@ -74,7 +74,7 @@ public boolean canEncode(ResolvableType elementType, @Nullable MimeType mimeType
 	protected Flux<DataBuffer> encode(Object value, DataBufferFactory dataBufferFactory,
 			ResolvableType type, @Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
 		try {
-			if (logger.isDebugEnabled() && !Hints.suppressLogging(hints)) {
+			if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {
 				logger.debug(Hints.getLogPrefix(hints) + "Encoding [" + value + "]");
 			}
 			DataBuffer buffer = dataBufferFactory.allocateBuffer(1024);
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java
@@ -57,7 +57,7 @@ public Mono<Void> apply(HttpServerRequest reactorRequest, HttpServerResponse rea
 		NettyDataBufferFactory bufferFactory = new NettyDataBufferFactory(reactorResponse.alloc());
 		try {
 			ReactorServerHttpRequest request = new ReactorServerHttpRequest(reactorRequest, bufferFactory);
-			ServerHttpResponse response = new ReactorServerHttpResponse(reactorResponse, bufferFactory, request);
+			ServerHttpResponse response = new ReactorServerHttpResponse(reactorResponse, bufferFactory);
 
 			if (request.getMethod() == HttpMethod.HEAD) {
 				response = new HttpHeadResponseDecorator(response);
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
@@ -165,13 +165,7 @@ protected SslInfo initSslInfo() {
 
 	@Override
 	public Flux<DataBuffer> getBody() {
-		return this.request.receive().retain()
-				.doOnNext(buffer -> {
-					if (logger.isTraceEnabled()) {
-						logger.trace(getLogPrefix() + "Read " + buffer.readableBytes() + " bytes");
-					}
-				})
-				.map(this.bufferFactory::wrap);
+		return this.request.receive().retain().map(this.bufferFactory::wrap);
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java
@@ -45,16 +45,11 @@ class ReactorServerHttpResponse extends AbstractServerHttpResponse implements Ze
 
 	private final HttpServerResponse response;
 
-	private final ReactorServerHttpRequest request;
-
-
-	public ReactorServerHttpResponse(HttpServerResponse response, DataBufferFactory bufferFactory,
-			ReactorServerHttpRequest request) {
 
+	public ReactorServerHttpResponse(HttpServerResponse response, DataBufferFactory bufferFactory) {
 		super(bufferFactory);
 		Assert.notNull(response, "HttpServerResponse must not be null");
 		this.response = response;
-		this.request = request;
 	}
 
 
@@ -119,12 +114,7 @@ public Mono<Void> writeWith(Path file, long position, long count) {
 	}
 
 	private Publisher<ByteBuf> toByteBufs(Publisher<? extends DataBuffer> dataBuffers) {
-		return Flux.from(dataBuffers).map(NettyDataBufferFactory::toByteBuf)
-				.doOnNext(byteBuf -> {
-					if (logger.isTraceEnabled()) {
-						logger.trace("Writing " + byteBuf.readableBytes() + " bytes");
-					}
-				});
+		return Flux.from(dataBuffers).map(NettyDataBufferFactory::toByteBuf);
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java
diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/DefaultServerWebExchange.java b/spring-web/src/main/java/org/springframework/web/server/adapter/DefaultServerWebExchange.java
diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/HttpWebHandlerAdapter.java b/spring-web/src/main/java/org/springframework/web/server/adapter/HttpWebHandlerAdapter.java
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunctions.java
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestPartMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestPartMethodArgumentResolver.java
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartIntegrationTests.java
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public Flux<DataBuffer> encode(Publisher<? extends byte[]> inputStream,`
`54`	`54`
`55`	`55`	`return Flux.from(inputStream).map(bytes -> {`
`56`	`56`	`DataBuffer dataBuffer = bufferFactory.wrap(bytes);`
`57`		`- if (logger.isDebugEnabled() && !Hints.suppressLogging(hints)) {`
	`57`	`+ if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {`
`58`	`58`	`String logPrefix = Hints.getLogPrefix(hints);`
`59`	`59`	`logger.debug(logPrefix + "Writing " + dataBuffer.readableByteCount() + " bytes");`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public Flux<DataBuffer> encode(Publisher<? extends ByteBuffer> inputStream,`
`55`	`55`
`56`	`56`	`return Flux.from(inputStream).map(byteBuffer -> {`
`57`	`57`	`DataBuffer dataBuffer = bufferFactory.wrap(byteBuffer);`
`58`		`- if (logger.isDebugEnabled() && !Hints.suppressLogging(hints)) {`
	`58`	`+ if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {`
`59`	`59`	`String logPrefix = Hints.getLogPrefix(hints);`
`60`	`60`	`logger.debug(logPrefix + "Writing " + dataBuffer.readableByteCount() + " bytes");`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public Flux<DataBuffer> encode(Publisher<? extends CharSequence> inputStream,`
`68`	`68`	`Charset charset = getCharset(mimeType);`
`69`	`69`
`70`	`70`	`return Flux.from(inputStream).map(charSequence -> {`
`71`		`- if (logger.isDebugEnabled() && !Hints.suppressLogging(hints)) {`
	`71`	`+ if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {`
`72`	`72`	`String logPrefix = Hints.getLogPrefix(hints);`
`73`	`73`	`logger.debug(logPrefix + "Writing '" + charSequence + "'");`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public static String getLogPrefix(@Nullable Map<String, Object> hints) {`
`99`	`99`	`* @param hints the hints map`
`100`	`100`	`* @return whether logging of data is allowed`
`101`	`101`	`*/`
`102`		`- public static boolean suppressLogging(@Nullable Map<String, Object> hints) {`
	`102`	`+ public static boolean isLoggingSuppressed(@Nullable Map<String, Object> hints) {`
`103`	`103`	`return hints != null && (boolean) hints.getOrDefault(SUPPRESS_LOGGING_HINT, false);`
`104`	`104`	`}`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public boolean canEncode(ResolvableType elementType, @Nullable MimeType mimeType`
`68`	`68`	`protected Flux<DataBuffer> encode(Resource resource, DataBufferFactory dataBufferFactory,`
`69`	`69`	`ResolvableType type, @Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {`
`70`	`70`
`71`		`- if (logger.isDebugEnabled() && !Hints.suppressLogging(hints)) {`
	`71`	`+ if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {`
`72`	`72`	`String logPrefix = Hints.getLogPrefix(hints);`
`73`	`73`	`logger.debug(logPrefix + "Writing [" + resource + "]");`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ private Flux<DataBuffer> writeResourceRegion(`
`122`	`122`	`long position = region.getPosition();`
`123`	`123`	`long count = region.getCount();`
`124`	`124`
`125`		`- if (logger.isDebugEnabled() && !Hints.suppressLogging(hints)) {`
	`125`	`+ if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {`
`126`	`126`	`logger.debug(Hints.getLogPrefix(hints) +`
`127`	`127`	`"Writing region " + position + "-" + (position + count) + " of [" + resource + "]");`
`128`	`128`	`}`