Remove applyAttributes flag from contribution

See gh-29958

Author: rstoyanchev

spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClientBuilder.java

@@ -94,8 +94,6 @@ class DefaultWebTestClientBuilder implements WebTestClient.Builder {
 	@Nullable
 	private MultiValueMap<String, String> defaultCookies;
 
-	private boolean applyAttributes;
-
 	@Nullable
 	private List<ExchangeFilterFunction> filters;
 
@@ -157,7 +155,6 @@ class DefaultWebTestClientBuilder implements WebTestClient.Builder {
 		}
 		this.defaultCookies = (other.defaultCookies != null ?
 				new LinkedMultiValueMap<>(other.defaultCookies) : null);
-		this.applyAttributes = other.applyAttributes;
 		this.filters = (other.filters != null ? new ArrayList<>(other.filters) : null);
 		this.entityResultConsumer = other.entityResultConsumer;
 		this.strategies = other.strategies;
@@ -216,12 +213,6 @@ private MultiValueMap<String, String> initCookies() {
 		return this.defaultCookies;
 	}
 
-	@Override
-	public WebTestClient.Builder applyAttributes(boolean applyAttributes) {
-		this.applyAttributes = applyAttributes;
-		return this;
-	}
-
 	@Override
 	public WebTestClient.Builder filter(ExchangeFilterFunction filter) {
 		Assert.notNull(filter, "ExchangeFilterFunction is required");
@@ -321,25 +312,22 @@ public WebTestClient build() {
 				this.entityResultConsumer, this.responseTimeout, new DefaultWebTestClientBuilder(this));
 	}
 
-	private ClientHttpConnector initConnector() {
-		final ClientHttpConnector connector;
+	private static ClientHttpConnector initConnector() {
 		if (reactorNettyClientPresent) {
-			connector = new ReactorClientHttpConnector();
+			return new ReactorClientHttpConnector();
 		}
 		else if (reactorNetty2ClientPresent) {
 			return new ReactorNetty2ClientHttpConnector();
 		}
 		else if (jettyClientPresent) {
-			connector = new JettyClientHttpConnector();
+			return new JettyClientHttpConnector();
 		}
 		else if (httpComponentsClientPresent) {
-			connector = new HttpComponentsClientHttpConnector();
+			return new HttpComponentsClientHttpConnector();
 		}
 		else {
-			connector = new JdkClientHttpConnector();
+			return new JdkClientHttpConnector();
 		}
-		connector.setApplyAttributes(this.applyAttributes);
-		return connector;
 	}
 
 	private ExchangeStrategies initExchangeStrategies() {

spring-test/src/main/java/org/springframework/test/web/reactive/server/HttpHandlerConnector.java

@@ -64,8 +64,6 @@ public class HttpHandlerConnector implements ClientHttpConnector {
 
 	private final HttpHandler handler;
 
-	private boolean applyAttributes = true;
-
 
 	/**
 	 * Constructor with the {@link HttpHandler} to handle requests with.
@@ -84,16 +82,6 @@ public Mono<ClientHttpResponse> connect(HttpMethod httpMethod, URI uri,
 				.subscribeOn(Schedulers.parallel());
 	}
 
-	@Override
-	public void setApplyAttributes(boolean applyAttributes) {
-		this.applyAttributes = applyAttributes;
-	}
-
-	@Override
-	public boolean getApplyAttributes() {
-		return this.applyAttributes;
-	}
-
 	private Mono<ClientHttpResponse> doConnect(
 			HttpMethod httpMethod, URI uri, Function<? super ClientHttpRequest, Mono<Void>> requestCallback) {
 

spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java

@@ -425,13 +425,6 @@ interface Builder {
 		 */
 		Builder defaultCookies(Consumer<MultiValueMap<String, String>> cookiesConsumer);
 
-		/**
-		 * Global option to specify whether or not attributes should be applied to every request,
-		 * if the used {@link ClientHttpConnector} allows it.
-		 * @param applyAttributes whether or not to apply attributes
-		 */
-		Builder applyAttributes(boolean applyAttributes);
-
 		/**
 		 * Add the given filter to the filter chain.
 		 * @param filter the filter to be added to the chain

spring-test/src/main/java/org/springframework/test/web/reactive/server/WiretapConnector.java

@@ -55,8 +55,6 @@ class WiretapConnector implements ClientHttpConnector {
 
 	private final Map<String, ClientExchangeInfo> exchanges = new ConcurrentHashMap<>();
 
-	private boolean applyAttributes = true;
-
 
 	WiretapConnector(ClientHttpConnector delegate) {
 		this.delegate = delegate;
@@ -86,16 +84,6 @@ public Mono<ClientHttpResponse> connect(HttpMethod method, URI uri,
 				});
 	}
 
-	@Override
-	public void setApplyAttributes(boolean applyAttributes) {
-		this.applyAttributes = applyAttributes;
-	}
-
-	@Override
-	public boolean getApplyAttributes() {
-		return this.applyAttributes;
-	}
-
 	/**
 	 * Create the {@link ExchangeResult} for the given "request-id" header value.
 	 */

spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcHttpConnector.java

@@ -86,8 +86,6 @@ public class MockMvcHttpConnector implements ClientHttpConnector {
 
 	private final List<RequestPostProcessor> requestPostProcessors;
 
-	private boolean applyAttributes = true;
-
 
 	public MockMvcHttpConnector(MockMvc mockMvc) {
 		this(mockMvc, Collections.emptyList());
@@ -117,16 +115,6 @@ public Mono<ClientHttpResponse> connect(
 		}
 	}
 
-	@Override
-	public void setApplyAttributes(boolean applyAttributes) {
-		this.applyAttributes = applyAttributes;
-	}
-
-	@Override
-	public boolean getApplyAttributes() {
-		return this.applyAttributes;
-	}
-
 	private RequestBuilder adaptRequest(
 			HttpMethod httpMethod, URI uri, Function<? super ClientHttpRequest, Mono<Void>> requestCallback) {
 

spring-test/src/test/java/org/springframework/test/web/reactive/server/WiretapConnectorTests.java

@@ -18,7 +18,6 @@
 
 import java.net.URI;
 import java.time.Duration;
-import java.util.function.Function;
 
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
@@ -49,22 +48,7 @@ public class WiretapConnectorTests {
 	public void captureAndClaim() {
 		ClientHttpRequest request = new MockClientHttpRequest(HttpMethod.GET, "/test");
 		ClientHttpResponse response = new MockClientHttpResponse(HttpStatus.OK);
-		ClientHttpConnector connector = new ClientHttpConnector() {
-			@Override
-			public Mono<ClientHttpResponse> connect(HttpMethod method, URI uri, Function<? super ClientHttpRequest, Mono<Void>> requestCallback) {
-				return requestCallback.apply(request).then(Mono.just(response));
-			}
-
-			@Override
-			public void setApplyAttributes(boolean applyAttributes) {
-
-			}
-
-			@Override
-			public boolean getApplyAttributes() {
-				return false;
-			}
-		};
+		ClientHttpConnector connector = (method, uri, fn) -> fn.apply(request).then(Mono.just(response));
 
 		ClientRequest clientRequest = ClientRequest.create(HttpMethod.GET, URI.create("/test"))
 				.header(WebTestClient.WEBTESTCLIENT_REQUEST_ID, "1").build();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,8 +60,6 @@ private enum State {NEW, COMMITTING, COMMITTED}
 
 	private final Map<String, Object> attributes;
 
-	private final boolean applyAttributes;
-
 	private final AtomicReference<State> state = new AtomicReference<>(State.NEW);
 
 	private final List<Supplier<? extends Publisher<Void>>> commitActions = new ArrayList<>(4);
@@ -71,19 +69,14 @@ private enum State {NEW, COMMITTING, COMMITTED}
 
 
 	public AbstractClientHttpRequest() {
-		this(new HttpHeaders(), false);
-	}
-
-	public AbstractClientHttpRequest(boolean applyAttributes) {
-		this(new HttpHeaders(), applyAttributes);
+		this(new HttpHeaders());
 	}
 
-	public AbstractClientHttpRequest(HttpHeaders headers, boolean applyAttributes) {
+	public AbstractClientHttpRequest(HttpHeaders headers) {
 		Assert.notNull(headers, "HttpHeaders must not be null");
 		this.headers = headers;
 		this.cookies = new LinkedMultiValueMap<>();
 		this.attributes = new LinkedHashMap<>();
-		this.applyAttributes = applyAttributes;
 	}
 
 
@@ -161,9 +154,7 @@ protected Mono<Void> doCommit(@Nullable Supplier<? extends Publisher<Void>> writ
 				Mono.fromRunnable(() -> {
 					applyHeaders();
 					applyCookies();
-					if (this.applyAttributes) {
-						applyAttributes();
-					}
+					applyAttributes();
 					this.state.set(State.COMMITTED);
 				}));
 
@@ -193,9 +184,11 @@ protected Mono<Void> doCommit(@Nullable Supplier<? extends Publisher<Void>> writ
 	protected abstract void applyCookies();
 
 	/**
-	 * Add additional attributes from {@link #getAttributes()} to the underlying request.
+	 * Add attributes from {@link #getAttributes()} to the underlying request.
 	 * This method is called once only.
+	 * @since 6.2
 	 */
-	protected abstract void applyAttributes();
+	protected void applyAttributes() {
+	}
 
 }

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

@@ -48,14 +48,4 @@ public interface ClientHttpConnector {
 	Mono<ClientHttpResponse> connect(HttpMethod method, URI uri,
 			Function<? super ClientHttpRequest, Mono<Void>> requestCallback);
 
-	/**
-	 * Set whether or not attributes should be applied to the underlying http-client library request.
-	 */
-	void setApplyAttributes(boolean applyAttributes);
-
-	/**
-	 * Whether or not attributes should be applied to the underlying http-client library request.
-	 */
-	boolean getApplyAttributes();
-
 }

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

@@ -59,7 +59,6 @@ public class HttpComponentsClientHttpConnector implements ClientHttpConnector, C
 
 	private DataBufferFactory dataBufferFactory = DefaultDataBufferFactory.sharedInstance;
 
-	private boolean applyAttributes = true;
 
 	/**
 	 * Default constructor that creates and starts a new instance of {@link CloseableHttpAsyncClient}.
@@ -68,7 +67,6 @@ public HttpComponentsClientHttpConnector() {
 		this(HttpAsyncClients.createDefault());
 	}
 
-
 	/**
 	 * Constructor with a pre-configured {@link CloseableHttpAsyncClient} instance.
 	 * @param client the client to use
@@ -113,22 +111,11 @@ public Mono<ClientHttpResponse> connect(HttpMethod method, URI uri,
 			context.setCookieStore(new BasicCookieStore());
 		}
 
-		HttpComponentsClientHttpRequest request = new HttpComponentsClientHttpRequest(
-				method, uri, context, this.dataBufferFactory, this.applyAttributes);
-
+		HttpComponentsClientHttpRequest request =
+				new HttpComponentsClientHttpRequest(method, uri, context, this.dataBufferFactory);
 		return requestCallback.apply(request).then(Mono.defer(() -> execute(request, context)));
 	}
 
-	@Override
-	public void setApplyAttributes(boolean applyAttributes) {
-		this.applyAttributes = applyAttributes;
-	}
-
-	@Override
-	public boolean getApplyAttributes() {
-		return this.applyAttributes;
-	}
-
 	private Mono<ClientHttpResponse> execute(HttpComponentsClientHttpRequest request, HttpClientContext context) {
 		AsyncRequestProducer requestProducer = request.toRequestProducer();
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,8 +66,8 @@ class HttpComponentsClientHttpRequest extends AbstractClientHttpRequest {
 
 
 	public HttpComponentsClientHttpRequest(HttpMethod method, URI uri, HttpClientContext context,
-			DataBufferFactory dataBufferFactory, boolean applyAttributes) {
-		super(applyAttributes);
+			DataBufferFactory dataBufferFactory) {
+
 		this.context = context;
 		this.httpRequest = new BasicHttpRequest(method.name(), uri);
 		this.dataBufferFactory = dataBufferFactory;

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

@@ -96,7 +96,7 @@ public void setBufferFactory(DataBufferFactory bufferFactory) {
 	public Mono<ClientHttpResponse> connect(
 			HttpMethod method, URI uri, Function<? super ClientHttpRequest, Mono<Void>> requestCallback) {
 
-		JdkClientHttpRequest jdkClientHttpRequest = new JdkClientHttpRequest(method, uri, this.bufferFactory, getApplyAttributes());
+		JdkClientHttpRequest jdkClientHttpRequest = new JdkClientHttpRequest(method, uri, this.bufferFactory);
 
 		return requestCallback.apply(jdkClientHttpRequest).then(Mono.defer(() -> {
 			HttpRequest httpRequest = jdkClientHttpRequest.getNativeRequest();
@@ -109,19 +109,4 @@ public Mono<ClientHttpResponse> connect(
 		}));
 	}
 
-	/**
-	 * Sets nothing, since {@link JdkClientHttpConnector} does not offer any possibility to add attributes.
-	 */
-	@Override
-	public void setApplyAttributes(boolean applyAttributes) {
-	}
-
-	/**
-	 * Returns false, since {@link JdkClientHttpConnector} does not offer any possibility to add attributes.
-	 */
-	@Override
-	public boolean getApplyAttributes() {
-		return false;
-	}
-
 }

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

@@ -56,8 +56,7 @@ class JdkClientHttpRequest extends AbstractClientHttpRequest {
 	private final HttpRequest.Builder builder;
 
 
-	public JdkClientHttpRequest(HttpMethod httpMethod, URI uri, DataBufferFactory bufferFactory, boolean applyAttributes) {
-		super(applyAttributes);
+	public JdkClientHttpRequest(HttpMethod httpMethod, URI uri, DataBufferFactory bufferFactory) {
 		Assert.notNull(httpMethod, "HttpMethod is required");
 		Assert.notNull(uri, "URI is required");
 		Assert.notNull(bufferFactory, "DataBufferFactory is required");
@@ -113,15 +112,6 @@ protected void applyCookies() {
 				.flatMap(List::stream).map(HttpCookie::toString).collect(Collectors.joining(";")));
 	}
 
-	/**
-	 * Not implemented, since {@link HttpRequest} does not offer any possibility to add request attributes.
-	 */
-	@Override
-	protected void applyAttributes() {
-		// TODO
-		throw new RuntimeException(String.format("Using attributes is not available for %s", HttpRequest.class.getName()));
-	}
-
 	@Override
 	public Mono<Void> writeWith(Publisher<? extends DataBuffer> body) {
 		return doCommit(() -> {