Fail when setReadTimeout on httpclient5 request factory

Prior to this commit, the `RestTemplateBuilder` would offer a generic
`setReadTimeout` method to configure the read timeout on the underlying
`ClientHttpRequestFactory`. This would be done in a reflective fashion,
considering that all implementations align with this behavior.

This option cannot be provided for HttpClient5 at the
`ClientHttpRequestFactory` level anymore, so this has been deprecated
in Spring Framework 6.0 and will log a warning. In order to align with
our existing behavior (throwing exceptions if the option cannot be set),
this commit ensures that exceptions are also thrown if the method is
marked as deprecated.

See gh-32461

Author: bclozel

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java

@@ -783,11 +783,15 @@ private void setBufferRequestBody(ClientHttpRequestFactory factory) {
 
 		private Method findMethod(ClientHttpRequestFactory requestFactory, String methodName, Class<?>... parameters) {
 			Method method = ReflectionUtils.findMethod(requestFactory.getClass(), methodName, parameters);
-			if (method != null) {
-				return method;
+			if (method == null) {
+				throw new IllegalStateException("Request factory " + requestFactory.getClass()
+						+ " does not have a suitable " + methodName + " method");
 			}
-			throw new IllegalStateException("Request factory " + requestFactory.getClass()
-					+ " does not have a suitable " + methodName + " method");
+			else if (method.isAnnotationPresent(Deprecated.class)) {
+				throw new IllegalStateException("Request factory " + requestFactory.getClass() + " has the "
+						+ methodName + " method marked as deprecated");
+			}
+			return method;
 		}
 
 		private void invoke(ClientHttpRequestFactory requestFactory, Method method, Object... parameters) {

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java

@@ -25,7 +25,6 @@
 import java.util.function.Supplier;
 
 import okhttp3.OkHttpClient;
-import org.apache.http.client.config.RequestConfig;
 import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -63,6 +62,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.entry;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.then;
@@ -81,6 +81,7 @@
  * @author Dmytro Nosan
  * @author Kevin Strijbos
  * @author Ilya Lukyanovich
+ * @author Brian Clozel
  */
 @ExtendWith(MockitoExtension.class)
 class RestTemplateBuilderTests {
@@ -477,17 +478,14 @@ void connectTimeoutCanBeConfiguredOnHttpComponentsRequestFactory() {
 		ClientHttpRequestFactory requestFactory = this.builder
 				.requestFactory(HttpComponentsClientHttpRequestFactory.class).setConnectTimeout(Duration.ofMillis(1234))
 				.build().getRequestFactory();
-		assertThat(((RequestConfig) ReflectionTestUtils.getField(requestFactory, "requestConfig")).getConnectTimeout())
-				.isEqualTo(1234);
+		assertThat(((int) ReflectionTestUtils.getField(requestFactory, "connectTimeout"))).isEqualTo(1234);
 	}
 
 	@Test
-	void readTimeoutCanBeConfiguredOnHttpComponentsRequestFactory() {
-		ClientHttpRequestFactory requestFactory = this.builder
-				.requestFactory(HttpComponentsClientHttpRequestFactory.class).setReadTimeout(Duration.ofMillis(1234))
-				.build().getRequestFactory();
-		assertThat(((RequestConfig) ReflectionTestUtils.getField(requestFactory, "requestConfig")).getSocketTimeout())
-				.isEqualTo(1234);
+	void readTimeoutConfigurationFailsOnHttpComponentsRequestFactory() {
+		assertThatThrownBy(() -> this.builder.requestFactory(HttpComponentsClientHttpRequestFactory.class)
+				.setReadTimeout(Duration.ofMillis(1234)).build()).isInstanceOf(IllegalStateException.class)
+						.hasMessageContaining("setReadTimeout method marked as deprecated");
 	}
 
 	@Test