Minor code and doc polishment

Author: martin-tarjanyi

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

@@ -33,6 +33,7 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
 import org.springframework.http.HttpMethod;
 import org.springframework.lang.Nullable;
@@ -47,7 +48,7 @@
 public class ApacheClientHttpConnector implements ClientHttpConnector {
 	private final CloseableHttpAsyncClient client;
 
-	private final DefaultDataBufferFactory dataBufferFactory;
+	private final DataBufferFactory dataBufferFactory;
 
 	/**
 	 * Default constructor that creates and starts a new instance of {@link CloseableHttpAsyncClient}.

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

@@ -18,9 +18,9 @@
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.hc.client5.http.cookie.Cookie;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpResponse;
@@ -29,7 +29,7 @@
 import reactor.core.publisher.Flux;
 
 import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.DefaultDataBufferFactory;
+import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseCookie;
@@ -54,7 +54,7 @@ class ApacheClientHttpResponse implements ClientHttpResponse {
 
 	private final AtomicBoolean rejectSubscribers = new AtomicBoolean();
 
-	public ApacheClientHttpResponse(DefaultDataBufferFactory dataBufferFactory,
+	public ApacheClientHttpResponse(DataBufferFactory dataBufferFactory,
 			Message<HttpResponse, Publisher<ByteBuffer>> message,
 			HttpClientContext context) {
 
@@ -87,7 +87,7 @@ public MultiValueMap<String, ResponseCookie> getCookies() {
 				result.add(cookie.getName(), ResponseCookie.from(cookie.getName(), cookie.getValue())
 						.domain(cookie.getDomain())
 						.path(cookie.getPath())
-						.maxAge(Long.parseLong(Objects.toString(cookie.getAttribute(MAX_AGE_ATTR), "-1")))
+						.maxAge(getMaxAgeSeconds(cookie))
 						.secure(cookie.isSecure())
 						.httpOnly(cookie.containsAttribute("httponly"))
 						.build()));
@@ -108,4 +108,10 @@ public HttpHeaders getHeaders() {
 	private void addHeader(HttpHeaders httpHeaders, Header header) {
 		httpHeaders.add(header.getName(), header.getValue());
 	}
+
+	private long getMaxAgeSeconds(Cookie cookie) {
+		String maxAgeAttribute = cookie.getAttribute(MAX_AGE_ATTR);
+
+		return maxAgeAttribute == null ? -1 : Long.parseLong(maxAgeAttribute);
+	}
 }

src/docs/asciidoc/web/webflux-webclient.adoc

@@ -391,7 +391,7 @@ The following example shows how to customize Apache `HttpClient` settings:
 	val client = HttpAsyncClients.custom().apply {
 		setDefaultRequestConfig(...)
 	}.build()
-	val connector: ClientHttpConnector = ApacheClientHttpConnector(client)
+	val connector = ApacheClientHttpConnector(client)
 	val webClient = WebClient.builder().clientConnector(connector).build()
 ----
 

src/docs/asciidoc/web/webflux.adoc

@@ -312,9 +312,9 @@ request handling, on top of which concrete programming models such as annotated
 controllers and functional endpoints are built.
 * For the client side, there is a basic `ClientHttpConnector` contract to perform HTTP
 requests with non-blocking I/O and Reactive Streams back pressure, along with adapters for
-https://github.com/reactor/reactor-netty[Reactor Netty] and for the reactive
-https://github.com/jetty-project/jetty-reactive-httpclient[Jetty HttpClient].
-https://hc.apache.org/[Apache HttpComponents].
+https://github.com/reactor/reactor-netty[Reactor Netty], reactive
+https://github.com/jetty-project/jetty-reactive-httpclient[Jetty HttpClient]
+and https://hc.apache.org/[Apache HttpComponents].
 The higher level <<web-reactive.adoc#webflux-client, WebClient>> used in applications
 builds on this basic contract.
 * For client and server, <<webflux-codecs, codecs>> to use to serialize and