Polishing

Author: jhoeller

spring-r2dbc/src/main/java/org/springframework/r2dbc/core/BeanPropertyRowMapper.java

@@ -330,7 +330,7 @@ private <R extends Readable> T mapForReadable(R readable, List<? extends Readabl
 					bw.setPropertyValue(pd.getName(), value);
 				}
 				catch (TypeMismatchException ex) {
-					if (value == null && this.primitivesDefaultedForNullValue) {
+					if (value == null && isPrimitivesDefaultedForNullValue()) {
 						if (logger.isDebugEnabled()) {
 							String propertyType = ClassUtils.getQualifiedName(pd.getPropertyType());
 							//here too, we miss the rowNumber information

spring-web/src/main/java/org/springframework/http/client/JdkClientHttpRequest.java

@@ -51,25 +51,6 @@ class JdkClientHttpRequest extends AbstractStreamingClientHttpRequest {
 
 	private static final Set<String> DISALLOWED_HEADERS = disallowedHeaders();
 
-	/**
-	 * By default, {@link HttpRequest} does not allow {@code Connection},
-	 * {@code Content-Length}, {@code Expect}, {@code Host}, or {@code Upgrade}
-	 * headers to be set, but this can be overriden with the
-	 * {@code jdk.httpclient.allowRestrictedHeaders} system property.
-	 * @see jdk.internal.net.http.common.Utils#getDisallowedHeaders()
-	 */
-	private static Set<String> disallowedHeaders() {
-		TreeSet<String> headers = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
-		headers.addAll(Set.of("connection", "content-length", "expect", "host", "upgrade"));
-
-		String headersToAllow = System.getProperty("jdk.httpclient.allowRestrictedHeaders");
-		if (headersToAllow != null) {
-			Set<String> toAllow = StringUtils.commaDelimitedListToSet(headersToAllow);
-			headers.removeAll(toAllow);
-		}
-		return Collections.unmodifiableSet(headers);
-	}
-
 
 	private final HttpClient httpClient;
 
@@ -85,13 +66,15 @@ private static Set<String> disallowedHeaders() {
 
 	public JdkClientHttpRequest(HttpClient httpClient, URI uri, HttpMethod method, Executor executor,
 			@Nullable Duration readTimeout) {
+
 		this.httpClient = httpClient;
 		this.uri = uri;
 		this.method = method;
 		this.executor = executor;
 		this.timeout = readTimeout;
 	}
 
+
 	@Override
 	public HttpMethod getMethod() {
 		return this.method;
@@ -107,7 +90,8 @@ public URI getURI() {
 	protected ClientHttpResponse executeInternal(HttpHeaders headers, @Nullable Body body) throws IOException {
 		try {
 			HttpRequest request = buildRequest(headers, body);
-			HttpResponse<InputStream> response = this.httpClient.send(request, HttpResponse.BodyHandlers.ofInputStream());
+			HttpResponse<InputStream> response =
+					this.httpClient.send(request, HttpResponse.BodyHandlers.ofInputStream());
 			return new JdkClientHttpResponse(response);
 		}
 		catch (UncheckedIOException ex) {
@@ -121,9 +105,7 @@ protected ClientHttpResponse executeInternal(HttpHeaders headers, @Nullable Body
 
 
 	private HttpRequest buildRequest(HttpHeaders headers, @Nullable Body body) {
-		HttpRequest.Builder builder = HttpRequest.newBuilder()
-				.uri(this.uri);
-
+		HttpRequest.Builder builder = HttpRequest.newBuilder().uri(this.uri);
 		if (this.timeout != null) {
 			builder.timeout(this.timeout);
 		}
@@ -144,8 +126,7 @@ private HttpRequest.BodyPublisher bodyPublisher(HttpHeaders headers, @Nullable B
 		if (body != null) {
 			Flow.Publisher<ByteBuffer> outputStreamPublisher = OutputStreamPublisher.create(
 					outputStream -> body.writeTo(StreamUtils.nonClosing(outputStream)),
-					BYTE_MAPPER,
-					this.executor);
+					BYTE_MAPPER, this.executor);
 
 			long contentLength = headers.getContentLength();
 			if (contentLength != -1) {
@@ -160,6 +141,25 @@ private HttpRequest.BodyPublisher bodyPublisher(HttpHeaders headers, @Nullable B
 		}
 	}
 
+	/**
+	 * By default, {@link HttpRequest} does not allow {@code Connection},
+	 * {@code Content-Length}, {@code Expect}, {@code Host}, or {@code Upgrade}
+	 * headers to be set, but this can be overriden with the
+	 * {@code jdk.httpclient.allowRestrictedHeaders} system property.
+	 * @see jdk.internal.net.http.common.Utils#getDisallowedHeaders()
+	 */
+	private static Set<String> disallowedHeaders() {
+		TreeSet<String> headers = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+		headers.addAll(Set.of("connection", "content-length", "expect", "host", "upgrade"));
+
+		String headersToAllow = System.getProperty("jdk.httpclient.allowRestrictedHeaders");
+		if (headersToAllow != null) {
+			Set<String> toAllow = StringUtils.commaDelimitedListToSet(headersToAllow);
+			headers.removeAll(toAllow);
+		}
+		return Collections.unmodifiableSet(headers);
+	}
+
 
 	private static final class ByteBufferMapper implements OutputStreamPublisher.ByteMapper<ByteBuffer> {
 
@@ -178,7 +178,6 @@ public ByteBuffer map(byte[] b, int off, int len) {
 			byteBuffer.flip();
 			return byteBuffer;
 		}
-
 	}
 
 }

spring-web/src/main/java/org/springframework/http/client/JdkClientHttpRequestFactory.java

@@ -27,7 +27,6 @@
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
-
 /**
  * {@link ClientHttpRequestFactory} implementation based on the Java
  * {@link HttpClient}.

spring-web/src/main/java/org/springframework/http/client/JdkClientHttpResponse.java

@@ -52,7 +52,7 @@ public JdkClientHttpResponse(HttpResponse<InputStream> response) {
 		this.response = response;
 		this.headers = adaptHeaders(response);
 		InputStream inputStream = response.body();
-		this.body = (inputStream != null) ? inputStream : InputStream.nullInputStream();
+		this.body = (inputStream != null ? inputStream : InputStream.nullInputStream());
 	}
 
 	private static HttpHeaders adaptHeaders(HttpResponse<?> response) {
@@ -103,4 +103,5 @@ public void close() {
 		catch (IOException ignored) {
 		}
 	}
+
 }

spring-web/src/main/java/org/springframework/http/client/ReactorNettyClientRequest.java

@@ -141,12 +141,10 @@ private static final class ByteBufMapper implements OutputStreamPublisher.ByteMa
 
 		private final ByteBufAllocator allocator;
 
-
 		public ByteBufMapper(ByteBufAllocator allocator) {
 			this.allocator = allocator;
 		}
 
-
 		@Override
 		public ByteBuf map(int b) {
 			ByteBuf byteBuf = this.allocator.buffer(1);
@@ -161,4 +159,5 @@ public ByteBuf map(byte[] b, int off, int len) {
 			return byteBuf;
 		}
 	}
+
 }

spring-web/src/main/java/org/springframework/http/client/ReactorNettyClientRequestFactory.java

@@ -36,13 +36,11 @@ public class ReactorNettyClientRequestFactory implements ClientHttpRequestFactor
 
 	private final HttpClient httpClient;
 
-
 	private Duration exchangeTimeout = Duration.ofSeconds(5);
 
 	private Duration readTimeout = Duration.ofSeconds(10);
 
 
-
 	/**
 	 * Create a new instance of the {@code ReactorNettyClientRequestFactory}
 	 * with a default {@link HttpClient} that has compression enabled.
@@ -61,6 +59,7 @@ public ReactorNettyClientRequestFactory(HttpClient httpClient) {
 		this.httpClient = httpClient;
 	}
 
+
 	/**
 	 * Set the underlying connect timeout in milliseconds.
 	 * A value of 0 specifies an infinite timeout.
@@ -125,9 +124,9 @@ public void setExchangeTimeout(Duration exchangeTimeout) {
 	}
 
 
-
 	@Override
 	public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
 		return new ReactorNettyClientRequest(this.httpClient, uri, httpMethod, this.exchangeTimeout, this.readTimeout);
 	}
+
 }

spring-web/src/main/java/org/springframework/http/client/ReactorNettyClientResponse.java

@@ -48,14 +48,14 @@ final class ReactorNettyClientResponse implements ClientHttpResponse {
 	private volatile InputStream body;
 
 
-
 	public ReactorNettyClientResponse(HttpClientResponse response, Connection connection, Duration readTimeout) {
 		this.response = response;
 		this.connection = connection;
 		this.readTimeout = readTimeout;
 		this.headers = HttpHeaders.readOnlyHttpHeaders(new Netty4HeadersAdapter(response.responseHeaders()));
 	}
 
+
 	@Override
 	public HttpStatusCode getStatusCode() {
 		return HttpStatusCode.valueOf(this.response.status().code());
@@ -73,21 +73,23 @@ public HttpHeaders getHeaders() {
 
 	@Override
 	public InputStream getBody() throws IOException {
-		if (this.body == null) {
-			InputStream body = this.connection.inbound().receive()
-					.aggregate().asInputStream().block(this.readTimeout);
-			if (body != null) {
-				this.body = body;
-			}
-			else {
-				throw new IOException("Could not receive body");
-			}
+		InputStream body = this.body;
+		if (body != null) {
+			return body;
 		}
-		return this.body;
+
+		body = this.connection.inbound().receive()
+				.aggregate().asInputStream().block(this.readTimeout);
+		if (body == null) {
+			throw new IOException("Could not receive body");
+		}
+		this.body = body;
+		return body;
 	}
 
 	@Override
 	public void close() {
 		this.connection.dispose();
 	}
+
 }