Polish "Add auto-configuration for WebServiceTemplate"

Closes gh-1270

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/client/WebServiceTemplateAutoConfiguration.java

@@ -37,10 +37,10 @@ import org.springframework.ws.client.core.WebServiceTemplate;
  * {@link EnableAutoConfiguration Auto-configuration} for {@link WebServiceTemplate}.
  *
  * @author Dmytro Nosan
+ * @since 2.1.0
  */
 @Configuration
-@ConditionalOnClass({ WebServiceTemplateBuilder.class, WebServiceTemplate.class,
-		Unmarshaller.class, Marshaller.class })
+@ConditionalOnClass({ WebServiceTemplate.class, Unmarshaller.class, Marshaller.class })
 public class WebServiceTemplateAutoConfiguration {
 
 	private final ObjectProvider<List<WebServiceTemplateCustomizer>> webServiceTemplateCustomizers;
@@ -59,7 +59,7 @@ public class WebServiceTemplateAutoConfiguration {
 		if (!CollectionUtils.isEmpty(customizers)) {
 			customizers = new ArrayList<>(customizers);
 			AnnotationAwareOrderComparator.sort(customizers);
-			builder = builder.setCustomizers(customizers);
+			builder = builder.customizers(customizers);
 		}
 		return builder;
 	}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/client/WebServiceTemplateAutoConfigurationTests.java

@@ -16,82 +16,94 @@
 
 package org.springframework.boot.autoconfigure.webservices.client;
 
-import org.junit.After;
+import java.util.function.Consumer;
+
 import org.junit.Test;
 
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.test.context.runner.ContextConsumer;
 import org.springframework.boot.webservices.client.WebServiceTemplateBuilder;
 import org.springframework.boot.webservices.client.WebServiceTemplateCustomizer;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.oxm.Marshaller;
+import org.springframework.oxm.Unmarshaller;
 import org.springframework.oxm.jaxb.Jaxb2Marshaller;
 import org.springframework.ws.client.core.WebServiceTemplate;
+import org.springframework.ws.transport.WebServiceMessageSender;
+import org.springframework.ws.transport.http.ClientHttpRequestMessageSender;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link WebServiceTemplateAutoConfiguration
- * WebServiceTemplateAutoConfiguration}.
+ * Tests for {@link WebServiceTemplateAutoConfiguration}.
  *
+ * @author Stephane Nicoll
  * @author Dmytro Nosan
  */
 public class WebServiceTemplateAutoConfigurationTests {
 
-	private AnnotationConfigApplicationContext context;
+	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+			.withConfiguration(
+					AutoConfigurations.of(WebServiceTemplateAutoConfiguration.class));
 
-	@After
-	public void close() {
-		if (this.context != null) {
-			this.context.close();
-		}
+	@Test
+	public void autoConfiguredBuilderShouldNotHaveMarshallerAndUnmarshaller() {
+		this.contextRunner.run(assertWebServiceTemplateBuilder((builder) -> {
+			WebServiceTemplate webServiceTemplate = builder.build();
+			assertThat(webServiceTemplate.getUnmarshaller()).isNull();
+			assertThat(webServiceTemplate.getMarshaller()).isNull();
+		}));
 	}
 
 	@Test
-	public void webServiceTemplateShouldNotHaveMarshallerAndUnmarshaller() {
-		load(WebServiceTemplateConfig.class);
-		WebServiceTemplate webServiceTemplate = this.context
-				.getBean(WebServiceTemplate.class);
-		assertThat(webServiceTemplate.getUnmarshaller()).isNull();
-		assertThat(webServiceTemplate.getMarshaller()).isNull();
+	public void autoConfiguredBuilderShouldHaveHttpMessageSenderByDefault() {
+		this.contextRunner.run(assertWebServiceTemplateBuilder((builder) -> {
+			WebServiceTemplate webServiceTemplate = builder.build();
+			assertThat(webServiceTemplate.getMessageSenders()).hasSize(1);
+			WebServiceMessageSender messageSender = webServiceTemplate
+					.getMessageSenders()[0];
+			assertThat(messageSender).isInstanceOf(ClientHttpRequestMessageSender.class);
+		}));
 	}
 
 	@Test
-	public void webServiceTemplateShouldUserCustomBuilder() {
-		load(CustomWebServiceTemplateBuilderConfig.class, WebServiceTemplateConfig.class);
-		WebServiceTemplate webServiceTemplate = this.context
-				.getBean(WebServiceTemplate.class);
-		assertThat(webServiceTemplate.getMarshaller()).isNotNull();
+	public void webServiceTemplateWhenHasCustomBuilderShouldUseCustomBuilder() {
+		this.contextRunner
+				.withUserConfiguration(CustomWebServiceTemplateBuilderConfig.class)
+				.run(assertWebServiceTemplateBuilder((builder) -> {
+					WebServiceTemplate webServiceTemplate = builder.build();
+					assertThat(webServiceTemplate.getMarshaller())
+							.isSameAs(CustomWebServiceTemplateBuilderConfig.marshaller);
+				}));
 	}
 
 	@Test
 	public void webServiceTemplateShouldApplyCustomizer() {
-		load(WebServiceTemplateCustomizerConfig.class, WebServiceTemplateConfig.class);
-		WebServiceTemplate webServiceTemplate = this.context
-				.getBean(WebServiceTemplate.class);
-		assertThat(webServiceTemplate.getUnmarshaller()).isNotNull();
+		this.contextRunner.withUserConfiguration(WebServiceTemplateCustomizerConfig.class)
+				.run(assertWebServiceTemplateBuilder((builder) -> {
+					WebServiceTemplate webServiceTemplate = builder.build();
+					assertThat(webServiceTemplate.getUnmarshaller())
+							.isSameAs(WebServiceTemplateCustomizerConfig.unmarshaller);
+				}));
 	}
 
 	@Test
 	public void builderShouldBeFreshForEachUse() {
-		load(DirtyWebServiceTemplateConfig.class);
+		this.contextRunner.withUserConfiguration(DirtyWebServiceTemplateConfig.class)
+				.run((context) -> {
+					assertThat(context).hasNotFailed();
+				});
 	}
 
-	private void load(Class<?>... config) {
-		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
-		ctx.register(config);
-		ctx.register(WebServiceTemplateAutoConfiguration.class);
-		ctx.refresh();
-		this.context = ctx;
-	}
-
-	@Configuration
-	static class WebServiceTemplateConfig {
-
-		@Bean
-		public WebServiceTemplate webServiceTemplate(WebServiceTemplateBuilder builder) {
-			return builder.build();
-		}
-
+	private ContextConsumer<AssertableApplicationContext> assertWebServiceTemplateBuilder(
+			Consumer<WebServiceTemplateBuilder> builder) {
+		return (context) -> {
+			assertThat(context).hasSingleBean(WebServiceTemplateBuilder.class);
+			builder.accept(context.getBean(WebServiceTemplateBuilder.class));
+		};
 	}
 
 	@Configuration
@@ -120,7 +132,7 @@ public class WebServiceTemplateAutoConfigurationTests {
 		}
 
 		private void breakBuilderOnNextCall(WebServiceTemplateBuilder builder) {
-			builder.addCustomizers((webServiceTemplate) -> {
+			builder.additionalCustomizers((webServiceTemplate) -> {
 				throw new IllegalStateException();
 			});
 		}
@@ -130,9 +142,11 @@ public class WebServiceTemplateAutoConfigurationTests {
 	@Configuration
 	static class CustomWebServiceTemplateBuilderConfig {
 
+		private static final Marshaller marshaller = new Jaxb2Marshaller();
+
 		@Bean
 		public WebServiceTemplateBuilder webServiceTemplateBuilder() {
-			return new WebServiceTemplateBuilder().setMarshaller(new Jaxb2Marshaller());
+			return new WebServiceTemplateBuilder().setMarshaller(marshaller);
 		}
 
 	}
@@ -140,9 +154,11 @@ public class WebServiceTemplateAutoConfigurationTests {
 	@Configuration
 	static class WebServiceTemplateCustomizerConfig {
 
+		private static final Unmarshaller unmarshaller = new Jaxb2Marshaller();
+
 		@Bean
 		public WebServiceTemplateCustomizer webServiceTemplateCustomizer() {
-			return (ws) -> ws.setUnmarshaller(new Jaxb2Marshaller());
+			return (ws) -> ws.setUnmarshaller(unmarshaller);
 		}
 
 	}

spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -5634,6 +5634,7 @@ The following code shows a typical example:
 ----
 
 
+
 [[boot-features-webclient-customization]]
 === WebClient Customization
 There are three main approaches to `WebClient` customization, depending on how broadly you
@@ -5652,35 +5653,6 @@ the point of injection.
 Finally, you can fall back to the original API and use `WebClient.create()`. In that case,
 no auto-configuration or `WebClientCustomizer` is applied.
 
-[[boot-features-webservicetemplate]]
-== Calling Web Services with `WebServiceTemplate`
-If you need to call remote WEB services from your application, you can use the Spring
-Framework's {spring-webservices-reference}#client-web-service-template[`WebServiceTemplate`] class. Since
-`WebServiceTemplate` instances often need to be customized before being used, Spring Boot does
-not provide any single auto-configured `WebServiceTemplate` bean. It does, however,
-auto-configure a `WebServiceTemplateBuilder`, which can be used to create `WebServiceTemplate`
-instances when needed.
-
-The following code shows a typical example:
-
-[source,java,indent=0]
-----
-	@Service
-	public class MyService {
-
-		private final WebServiceTemplate webServiceTemplate;
-
-		public MyService(WebServiceTemplateBuilder webServiceTemplateBuilder) {
-			this.webServiceTemplate = webServiceTemplateBuilder.build();
-		}
-
-		public DetailsResp someCall(DetailsReq detailsReq) {
-			 return (DetailsResp) this.webServiceTemplate.marshalSendAndReceive(detailsReq, new SoapActionCallback(ACTION));
-
-		}
-
-	}
-----
 
 
 [[boot-features-validation]]
@@ -7416,6 +7388,51 @@ following example:
 
 
 
+[[boot-features-webservices-template]]
+== Calling Web Services with `WebServiceTemplate`
+If you need to call remote Web services from your application, you can use the
+{spring-webservices-reference}#client-web-service-template[`WebServiceTemplate`] class.
+Since `WebServiceTemplate` instances often need to be customized before being used, Spring
+Boot does not provide any single auto-configured `WebServiceTemplate` bean. It does,
+however, auto-configure a `WebServiceTemplateBuilder`, which can be used to create
+`WebServiceTemplate` instances when needed.
+
+The following code shows a typical example:
+
+[source,java,indent=0]
+----
+	@Service
+	public class MyService {
+
+		private final WebServiceTemplate webServiceTemplate;
+
+		public MyService(WebServiceTemplateBuilder webServiceTemplateBuilder) {
+			this.webServiceTemplate = webServiceTemplateBuilder.build();
+		}
+
+		public DetailsResp someWsCall(DetailsReq detailsReq) {
+			 return (DetailsResp) this.webServiceTemplate.marshalSendAndReceive(detailsReq, new SoapActionCallback(ACTION));
+
+		}
+
+	}
+----
+
+By default, `WebServiceTemplateBuilder` detects a suitable HTTP-based
+`WebServiceMessageSender` using the available HTTP client libraries on the classpath. You
+can also customize read and connection timeouts as follows:
+
+[source,java,indent=0]
+----
+	@Bean
+	public WebServiceTemplate webServiceTemplate(WebServiceTemplateBuilder builder) {
+		return builder.messageSenders(new HttpWebServiceMessageSenderBuilder()
+				.setReadTimeout(5000).setConnectionTimeout(2000).build()).build();
+	}
+----
+
+
+
 [[boot-features-developing-auto-configuration]]
 == Creating Your Own Auto-configuration
 If you work in a company that develops shared libraries, or if you work on an open-source

spring-boot-project/spring-boot/pom.xml

@@ -245,11 +245,6 @@
 			<artifactId>spring-orm</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.ws</groupId>
-			<artifactId>spring-ws-core</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-oxm</artifactId>
@@ -280,6 +275,11 @@
 			<artifactId>spring-security-web</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.ws</groupId>
+			<artifactId>spring-ws-core</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.yaml</groupId>
 			<artifactId>snakeyaml</artifactId>

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilder.java

+/*
+ * Copyright 2012-2018 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
+ *
+ *      http://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.boot.webservices.client;
+
+import java.lang.reflect.Method;
+import java.util.function.Supplier;
+
+import org.springframework.boot.web.client.ClientHttpRequestFactorySupplier;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.util.Assert;
+import org.springframework.util.ReflectionUtils;
+import org.springframework.ws.transport.WebServiceMessageSender;
+import org.springframework.ws.transport.http.ClientHttpRequestMessageSender;
+
+/**
+ * {@link WebServiceMessageSender} builder that can detect a suitable HTTP library based
+ * on the classpath.
+ *
+ * @author Stephane Nicoll
+ * @since 2.1.0
+ */
+public class HttpWebServiceMessageSenderBuilder {
+
+	private Integer connectionTimeout;
+
+	private Integer readTimeout;
+
+	private Supplier<ClientHttpRequestFactory> requestFactorySupplier;
+
+	/**
+	 * Set the connection timeout in milliseconds.
+	 * @param connectionTimeout the connection timeout in milliseconds
+	 * @return a new builder instance
+	 */
+	public HttpWebServiceMessageSenderBuilder setConnectionTimeout(
+			int connectionTimeout) {
+		this.connectionTimeout = connectionTimeout;
+		return this;
+	}
+
+	/**
+	 * Set the read timeout in milliseconds.
+	 * @param readTimeout the read timeout in milliseconds
+	 * @return a new builder instance
+	 */
+	public HttpWebServiceMessageSenderBuilder setReadTimeout(int readTimeout) {
+		this.readTimeout = readTimeout;
+		return this;
+	}
+
+	/**
+	 * Set the {@code Supplier} of {@link ClientHttpRequestFactory} that should be called
+	 * to create the HTTP-based {@link WebServiceMessageSender}.
+	 * @param requestFactorySupplier the supplier for the request factory
+	 * @return a new builder instance
+	 */
+	public HttpWebServiceMessageSenderBuilder requestFactory(
+			Supplier<ClientHttpRequestFactory> requestFactorySupplier) {
+		Assert.notNull(requestFactorySupplier,
+				"RequestFactory Supplier must not be null");
+		this.requestFactorySupplier = requestFactorySupplier;
+		return this;
+	}
+
+	public WebServiceMessageSender build() {
+		ClientHttpRequestFactory requestFactory = (this.requestFactorySupplier != null
+				? this.requestFactorySupplier.get()
+				: new ClientHttpRequestFactorySupplier().get());
+		if (this.connectionTimeout != null) {
+			new TimeoutRequestFactoryCustomizer(this.connectionTimeout,
+					"setConnectTimeout").customize(requestFactory);
+		}
+		if (this.readTimeout != null) {
+			new TimeoutRequestFactoryCustomizer(this.readTimeout, "setReadTimeout")
+					.customize(requestFactory);
+		}
+		return new ClientHttpRequestMessageSender(requestFactory);
+	}
+
+	/**
+	 * {@link ClientHttpRequestFactory} customizer to call a "set timeout" method.
+	 */
+	private static class TimeoutRequestFactoryCustomizer {
+
+		private final int timeout;
+
+		private final String methodName;
+
+		TimeoutRequestFactoryCustomizer(int timeout, String methodName) {
+			this.timeout = timeout;
+			this.methodName = methodName;
+		}
+
+		public void customize(ClientHttpRequestFactory factory) {
+			ReflectionUtils.invokeMethod(findMethod(factory), factory, this.timeout);
+		}
+
+		private Method findMethod(ClientHttpRequestFactory factory) {
+			Method method = ReflectionUtils.findMethod(factory.getClass(),
+					this.methodName, int.class);
+			if (method != null) {
+				return method;
+			}
+			throw new IllegalStateException("Request factory " + factory.getClass()
+					+ " does not have a " + this.methodName + "(int) method");
+		}
+
+	}
+
+}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateCustomizer.java

@@ -22,6 +22,7 @@ import org.springframework.ws.client.core.WebServiceTemplate;
  * Callback interface that can be used to customize a {@link WebServiceTemplate}.
  *
  * @author Dmytro Nosan
+ * @since 2.1.0
  */
 public interface WebServiceTemplateCustomizer {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/package-info.java

@@ -17,5 +17,4 @@
 /**
  * Web Services client utilities.
  */
-
 package org.springframework.boot.webservices.client;

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderOkHttp3ClientHttpRequestFactoryTests.java → spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderOkHttp3IntegrationTests.java

@@ -22,61 +22,52 @@ import org.junit.runner.RunWith;
 
 import org.springframework.boot.testsupport.runner.classpath.ClassPathExclusions;
 import org.springframework.boot.testsupport.runner.classpath.ModifiedClassPathRunner;
-import org.springframework.http.client.BufferingClientHttpRequestFactory;
+import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.OkHttp3ClientHttpRequestFactory;
 import org.springframework.test.util.ReflectionTestUtils;
-import org.springframework.ws.client.core.WebServiceTemplate;
+import org.springframework.ws.transport.WebServiceMessageSender;
 import org.springframework.ws.transport.http.ClientHttpRequestMessageSender;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link WebServiceTemplateBuilder}. This test class check that builder will
- * create ClientHttpRequestMessageSender (OkHttp3ClientHttpRequestFactory) if apache
- * client is not present in the classpath
+ * Tests for {@link HttpWebServiceMessageSenderBuilder} when Http Components is not
+ * available.
  *
- * @author Dmytro Nosan
+ * @author Stephane Nicoll
  */
 @RunWith(ModifiedClassPathRunner.class)
 @ClassPathExclusions("httpclient-*.jar")
-public class WebServiceTemplateBuilderOkHttp3ClientHttpRequestFactoryTests {
+public class HttpWebServiceMessageSenderBuilderOkHttp3IntegrationTests {
 
-	private WebServiceTemplateBuilder builder = new WebServiceTemplateBuilder();
+	private final HttpWebServiceMessageSenderBuilder builder = new HttpWebServiceMessageSenderBuilder();
 
 	@Test
-	public void build() {
-
-		WebServiceTemplate webServiceTemplate = this.builder.build();
-
-		assertThat(webServiceTemplate.getMessageSenders()).hasSize(1);
-		assertThat(webServiceTemplate.getMessageSenders()[0])
-				.isInstanceOf(ClientHttpRequestMessageSender.class);
-
-		ClientHttpRequestMessageSender sender = (ClientHttpRequestMessageSender) webServiceTemplate
-				.getMessageSenders()[0];
-
-		assertThat(sender.getRequestFactory())
-				.isInstanceOf(OkHttp3ClientHttpRequestFactory.class);
-
+	public void buildUseOkHttp3ByDefault() {
+		WebServiceMessageSender messageSender = this.builder.build();
+		assertOkHttp3RequestFactory(messageSender);
 	}
 
 	@Test
-	public void setTimeout() {
-		OkHttp3ClientHttpRequestFactory factory = new OkHttp3ClientHttpRequestFactory();
-		ClientHttpRequestMessageSender sender = new ClientHttpRequestMessageSender(
-				new BufferingClientHttpRequestFactory(factory));
-
-		this.builder.setConnectionTimeout(5000).setReadTimeout(2000)
-				.setWebServiceMessageSender(() -> sender).build();
-
+	public void buildWithCustomTimeouts() {
+		WebServiceMessageSender messageSender = this.builder.setConnectionTimeout(5000)
+				.setReadTimeout(2000).build();
+		OkHttp3ClientHttpRequestFactory factory = assertOkHttp3RequestFactory(
+				messageSender);
 		OkHttpClient client = (OkHttpClient) ReflectionTestUtils.getField(factory,
 				"client");
-
 		assertThat(client).isNotNull();
-
 		assertThat(client.connectTimeoutMillis()).isEqualTo(5000);
 		assertThat(client.readTimeoutMillis()).isEqualTo(2000);
+	}
 
+	private OkHttp3ClientHttpRequestFactory assertOkHttp3RequestFactory(
+			WebServiceMessageSender messageSender) {
+		assertThat(messageSender).isInstanceOf(ClientHttpRequestMessageSender.class);
+		ClientHttpRequestMessageSender sender = (ClientHttpRequestMessageSender) messageSender;
+		ClientHttpRequestFactory requestFactory = sender.getRequestFactory();
+		assertThat(requestFactory).isInstanceOf(OkHttp3ClientHttpRequestFactory.class);
+		return (OkHttp3ClientHttpRequestFactory) requestFactory;
 	}
 
 }

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderHttpUrlConnectionMessageSenderTests.java → spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderSimpleIntegrationTests.java

@@ -16,55 +16,56 @@
 
 package org.springframework.boot.webservices.client;
 
-import java.time.Duration;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.boot.testsupport.runner.classpath.ClassPathExclusions;
 import org.springframework.boot.testsupport.runner.classpath.ModifiedClassPathRunner;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.test.util.ReflectionTestUtils;
-import org.springframework.ws.client.core.WebServiceTemplate;
-import org.springframework.ws.transport.http.HttpUrlConnectionMessageSender;
+import org.springframework.ws.transport.WebServiceMessageSender;
+import org.springframework.ws.transport.http.ClientHttpRequestMessageSender;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link WebServiceTemplateBuilder}. This test class check that builder will
- * create HttpUrlConnectionMessageSender If Ok-http and Apache client are not present in
- * the classpath.
+ * Tests for {@link HttpWebServiceMessageSenderBuilder} when no preferred HTTP clients are
+ * available
  *
- * @author Dmytro Nosan
+ * @author Stephane Nicoll
  */
 @RunWith(ModifiedClassPathRunner.class)
-@ClassPathExclusions({ "httpclient-*.jar", "okhttp-*.jar" })
-public class WebServiceTemplateBuilderHttpUrlConnectionMessageSenderTests {
+@ClassPathExclusions({ "httpclient-*.jar", "okhttp*.jar" })
+public class HttpWebServiceMessageSenderBuilderSimpleIntegrationTests {
 
-	private WebServiceTemplateBuilder builder = new WebServiceTemplateBuilder();
+	private final HttpWebServiceMessageSenderBuilder builder = new HttpWebServiceMessageSenderBuilder();
 
 	@Test
-	public void build() {
-		WebServiceTemplate webServiceTemplate = this.builder.build();
-
-		assertThat(webServiceTemplate.getMessageSenders()).hasSize(1);
-
-		assertThat(webServiceTemplate.getMessageSenders()[0])
-				.isInstanceOf(HttpUrlConnectionMessageSender.class);
-
+	public void buildUseUseSimpleClientByDefault() {
+		WebServiceMessageSender messageSender = this.builder.build();
+		assertSimpleClientRequestFactory(messageSender);
 	}
 
 	@Test
-	public void setTimeout() {
-		HttpUrlConnectionMessageSender sender = new HttpUrlConnectionMessageSender();
-
-		this.builder.setConnectionTimeout(5000).setReadTimeout(2000)
-				.setWebServiceMessageSender(() -> sender).build();
-
-		assertThat(ReflectionTestUtils.getField(sender, "connectionTimeout"))
-				.isEqualTo(Duration.ofMillis(5000));
-		assertThat(ReflectionTestUtils.getField(sender, "readTimeout"))
-				.isEqualTo(Duration.ofMillis(2000));
+	public void buildWithCustomTimeouts() {
+		WebServiceMessageSender messageSender = this.builder.setConnectionTimeout(5000)
+				.setReadTimeout(2000).build();
+		SimpleClientHttpRequestFactory requestFactory = assertSimpleClientRequestFactory(
+				messageSender);
+		assertThat(ReflectionTestUtils.getField(requestFactory, "connectTimeout"))
+				.isEqualTo(5000);
+		assertThat(ReflectionTestUtils.getField(requestFactory, "readTimeout"))
+				.isEqualTo(2000);
+	}
 
+	private SimpleClientHttpRequestFactory assertSimpleClientRequestFactory(
+			WebServiceMessageSender messageSender) {
+		assertThat(messageSender).isInstanceOf(ClientHttpRequestMessageSender.class);
+		ClientHttpRequestMessageSender sender = (ClientHttpRequestMessageSender) messageSender;
+		ClientHttpRequestFactory requestFactory = sender.getRequestFactory();
+		assertThat(requestFactory).isInstanceOf(SimpleClientHttpRequestFactory.class);
+		return (SimpleClientHttpRequestFactory) requestFactory;
 	}
 
 }

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderHttpComponentsClientHttpRequestFactoryTests.java → spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderTests.java

@@ -19,37 +19,66 @@ package org.springframework.boot.webservices.client;
 import org.apache.http.client.config.RequestConfig;
 import org.junit.Test;
 
-import org.springframework.http.client.BufferingClientHttpRequestFactory;
+import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.ws.transport.WebServiceMessageSender;
 import org.springframework.ws.transport.http.ClientHttpRequestMessageSender;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link WebServiceTemplateBuilder}.
+ * Tests for {@link HttpWebServiceMessageSenderBuilder}.
  *
- * @author Dmytro Nosan
+ * @author Stephane Nicoll
  */
-public class WebServiceTemplateBuilderHttpComponentsClientHttpRequestFactoryTests {
-
-	private WebServiceTemplateBuilder builder = new WebServiceTemplateBuilder();
+public class HttpWebServiceMessageSenderBuilderTests {
 
 	@Test
-	public void setTimeout() {
-		HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory();
-		ClientHttpRequestMessageSender sender = new ClientHttpRequestMessageSender(
-				new BufferingClientHttpRequestFactory(factory));
+	public void buildWithRequestFactorySupplier() {
+		ClientHttpRequestFactory requestFactory = mock(ClientHttpRequestFactory.class);
+		ClientHttpRequestMessageSender messageSender = build(
+				new HttpWebServiceMessageSenderBuilder()
+						.requestFactory(() -> requestFactory));
+		assertThat(messageSender.getRequestFactory()).isSameAs(requestFactory);
+	}
 
-		this.builder.setConnectionTimeout(5000).setReadTimeout(2000)
-				.setWebServiceMessageSender(() -> sender).build();
+	@Test
+	public void buildWithReadAndConnectTimeout() {
+		ClientHttpRequestMessageSender messageSender = build(
+				new HttpWebServiceMessageSenderBuilder()
+						.requestFactory(SimpleClientHttpRequestFactory::new)
+						.setConnectionTimeout(5000).setReadTimeout(2000));
+		SimpleClientHttpRequestFactory requestFactory = (SimpleClientHttpRequestFactory) messageSender
+				.getRequestFactory();
+		assertThat(ReflectionTestUtils.getField(requestFactory, "connectTimeout"))
+				.isEqualTo(5000);
+		assertThat(ReflectionTestUtils.getField(requestFactory, "readTimeout"))
+				.isEqualTo(2000);
+	}
 
+	@Test
+	public void buildUsesHttpComponentsBydefault() {
+		ClientHttpRequestMessageSender messageSender = build(
+				new HttpWebServiceMessageSenderBuilder().setConnectionTimeout(5000)
+						.setReadTimeout(2000));
+		ClientHttpRequestFactory requestFactory = messageSender.getRequestFactory();
+		assertThat(requestFactory)
+				.isInstanceOf(HttpComponentsClientHttpRequestFactory.class);
 		RequestConfig requestConfig = (RequestConfig) ReflectionTestUtils
-				.getField(factory, "requestConfig");
+				.getField(requestFactory, "requestConfig");
 		assertThat(requestConfig).isNotNull();
 		assertThat(requestConfig.getConnectTimeout()).isEqualTo(5000);
 		assertThat(requestConfig.getSocketTimeout()).isEqualTo(2000);
+	}
 
+	private ClientHttpRequestMessageSender build(
+			HttpWebServiceMessageSenderBuilder builder) {
+		WebServiceMessageSender messageSender = builder.build();
+		assertThat(messageSender).isInstanceOf(ClientHttpRequestMessageSender.class);
+		return ((ClientHttpRequestMessageSender) messageSender);
 	}
 
 }

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderCustomsMessageSenderTests.java

-/*
- * Copyright 2012-2018 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
- *
- *      http://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.boot.webservices.client;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.mockito.Mockito;
-
-import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.ws.transport.WebServiceMessageSender;
-import org.springframework.ws.transport.http.ClientHttpRequestMessageSender;
-
-/**
- * Tests for
- * {@link org.springframework.boot.webservices.client.WebServiceTemplateBuilder}.
- *
- * @author Dmytro Nosan
- */
-public class WebServiceTemplateBuilderCustomsMessageSenderTests {
-
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
-	private WebServiceTemplateBuilder builder = new WebServiceTemplateBuilder();
-
-	@Test
-	public void unknownSenderReadTimeout() {
-		this.thrown.expect(IllegalStateException.class);
-		this.thrown.expectMessage("with 'readTimeout'. Please use a custom customizer.");
-		this.thrown.expectMessage("There is no way to customize");
-
-		this.builder.setReadTimeout(3000).setWebServiceMessageSender(
-				() -> Mockito.mock(WebServiceMessageSender.class)).build();
-	}
-
-	@Test
-	public void unknownSenderConnectionTimeout() {
-		this.thrown.expect(IllegalStateException.class);
-		this.thrown.expectMessage(
-				"with 'connectionTimeout'. Please use a custom customizer.");
-		this.thrown.expectMessage("There is no way to customize");
-
-		this.builder.setConnectionTimeout(3000).setWebServiceMessageSender(
-				() -> Mockito.mock(WebServiceMessageSender.class)).build();
-	}
-
-	@Test
-	public void unknownRequestFactoryReadTimeout() {
-		this.thrown.expect(IllegalStateException.class);
-		this.thrown.expectMessage("with 'readTimeout'. Please use a custom customizer.");
-		this.thrown.expectMessage("There is no way to customize");
-
-		this.builder.setReadTimeout(3000)
-				.setWebServiceMessageSender(() -> new ClientHttpRequestMessageSender(
-						Mockito.mock(ClientHttpRequestFactory.class)))
-				.build();
-	}
-
-	@Test
-	public void unknownRequestFactoryConnectionTimeout() {
-		this.thrown.expect(IllegalStateException.class);
-		this.thrown.expectMessage(
-				"with 'connectionTimeout'. Please use a custom customizer.");
-		this.thrown.expectMessage("There is no way to customize");
-
-		this.builder.setConnectionTimeout(3000)
-				.setWebServiceMessageSender(() -> new ClientHttpRequestMessageSender(
-						Mockito.mock(ClientHttpRequestFactory.class)))
-				.build();
-	}
-
-	@Test
-	public void shouldBuildWithoutTimeouts() {
-		this.builder.setWebServiceMessageSender(
-				() -> Mockito.mock(WebServiceMessageSender.class)).build();
-	}
-
-}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderHttpComponentsMessageSenderTests.java

-/*
- * Copyright 2012-2018 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
- *
- *      http://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.boot.webservices.client;
-
-import org.apache.http.client.HttpClient;
-import org.apache.http.params.HttpConnectionParams;
-import org.junit.Test;
-
-import org.springframework.ws.client.core.WebServiceTemplate;
-import org.springframework.ws.transport.http.HttpComponentsMessageSender;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests for
- * {@link org.springframework.boot.webservices.client.WebServiceTemplateBuilder}. This
- * test class check that builder will create HttpComponents by default if apache client is
- * present in the classpath.
- *
- * @author Dmytro Nosan
- */
-@SuppressWarnings("deprecation")
-public class WebServiceTemplateBuilderHttpComponentsMessageSenderTests {
-
-	private WebServiceTemplateBuilder builder = new WebServiceTemplateBuilder();
-
-	@Test
-	public void build() {
-		WebServiceTemplate webServiceTemplate = new WebServiceTemplateBuilder().build();
-
-		assertThat(webServiceTemplate.getMessageSenders()).hasSize(1);
-
-		assertThat(webServiceTemplate.getMessageSenders()[0])
-				.isInstanceOf(HttpComponentsMessageSender.class);
-
-	}
-
-	@Test
-	public void setTimeout() {
-		HttpComponentsMessageSender sender = new HttpComponentsMessageSender();
-		HttpClient httpClient = sender.getHttpClient();
-
-		this.builder.setConnectionTimeout(5000).setReadTimeout(2000)
-				.setWebServiceMessageSender(() -> sender).build();
-
-		assertThat(HttpConnectionParams.getConnectionTimeout(httpClient.getParams()))
-				.isEqualTo(5000);
-		assertThat(HttpConnectionParams.getSoTimeout(httpClient.getParams()))
-				.isEqualTo(2000);
-
-	}
-
-}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderSimpleClientHttpRequestFactoryTests.java

-/*
- * Copyright 2012-2018 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
- *
- *      http://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.boot.webservices.client;
-
-import org.junit.Test;
-
-import org.springframework.http.client.BufferingClientHttpRequestFactory;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
-import org.springframework.test.util.ReflectionTestUtils;
-import org.springframework.ws.transport.http.ClientHttpRequestMessageSender;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests for {@link WebServiceTemplateBuilder}.
- *
- * @author Dmytro Nosan
- */
-public class WebServiceTemplateBuilderSimpleClientHttpRequestFactoryTests {
-
-	private WebServiceTemplateBuilder builder = new WebServiceTemplateBuilder();
-
-	@Test
-	public void setTimeout() {
-		SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
-		ClientHttpRequestMessageSender sender = new ClientHttpRequestMessageSender(
-				new BufferingClientHttpRequestFactory(factory));
-
-		this.builder.setConnectionTimeout(5000).setReadTimeout(2000)
-				.setWebServiceMessageSender(() -> sender).build();
-
-		assertThat(ReflectionTestUtils.getField(factory, "connectTimeout"))
-				.isEqualTo(5000);
-		assertThat(ReflectionTestUtils.getField(factory, "readTimeout")).isEqualTo(2000);
-
-	}
-
-}