Clone RestTestClientBuilder in mutate()

See gh-35698

Signed-off-by: Thomas Recloux <[email protected]>

Author: trecloux

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

@@ -132,7 +132,7 @@ private RequestBodyUriSpec methodInternal(HttpMethod httpMethod) {
 	@SuppressWarnings("unchecked")
 	@Override
 	public <B extends Builder<B>> Builder<B> mutate() {
-		return (Builder<B>) this.restTestClientBuilder;
+		return new DefaultRestTestClientBuilder<>((DefaultRestTestClientBuilder<B>) this.restTestClientBuilder);
 	}
 
 

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

@@ -166,7 +166,7 @@ public RestTestClient build() {
 		}
 
 		return new DefaultRestTestClient(
-				this.restClientBuilder, this.entityResultConsumer, new DefaultRestTestClientBuilder<>(this));
+				this.restClientBuilder, this.entityResultConsumer, this);
 	}
 
 

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

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2002-present 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.web.servlet.client;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class DefaultRestTestClientBuilderTests {
+
+	@Test
+	void testMutateHasNoSideEffects() {
+		RestTestClient baseTestClient = new DefaultRestTestClientBuilder().baseUrl("http://localhost").build();
+		baseTestClient.mutate().defaultHeader("foo", "bar").build();
+		baseTestClient.mutate().defaultHeaders(headers -> assertThat(headers.containsHeader("foo")).isFalse());
+	}
+
+}