Merge branch '1.5.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/HttpClientConfigBuilderCustomizer.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2012-2016 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.autoconfigure.elasticsearch.jest;
+
+import io.searchbox.client.config.HttpClientConfig;
+
+/**
+ * Callback interface that can be implemented by beans wishing to further customize the
+ * {@link HttpClientConfig} via {@link HttpClientConfig.Builder} retaining its default
+ * auto-configuration.
+ *
+ * @author Stephane Nicoll
+ * @since 1.5.0
+ */
+public interface HttpClientConfigBuilderCustomizer {
+
+	/**
+	 * Customize the {@link HttpClientConfig.Builder}.
+	 * @param builder the builder to customize
+	 */
+	void customize(HttpClientConfig.Builder builder);
+
+}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfiguration.java

@@ -16,6 +16,8 @@
 
 package org.springframework.boot.autoconfigure.elasticsearch.jest;
 
+import java.util.List;
+
 import com.google.gson.Gson;
 import io.searchbox.client.JestClient;
 import io.searchbox.client.JestClientFactory;
@@ -50,10 +52,14 @@ public class JestAutoConfiguration {
 
 	private final ObjectProvider<Gson> gsonProvider;
 
+	private final List<HttpClientConfigBuilderCustomizer> builderCustomizers;
+
 	public JestAutoConfiguration(JestProperties properties,
-			ObjectProvider<Gson> gsonProvider) {
+			ObjectProvider<Gson> gsonProvider,
+			ObjectProvider<List<HttpClientConfigBuilderCustomizer>> builderCustomizersProvider) {
 		this.properties = properties;
 		this.gsonProvider = gsonProvider;
+		this.builderCustomizers = builderCustomizersProvider.getIfAvailable();
 	}
 
 	@Bean(destroyMethod = "shutdownClient")
@@ -81,8 +87,19 @@ public class JestAutoConfiguration {
 		if (gson != null) {
 			builder.gson(gson);
 		}
-		return builder.connTimeout(this.properties.getConnectionTimeout())
-				.readTimeout(this.properties.getReadTimeout()).build();
+		builder.multiThreaded(this.properties.isMultiThreaded());
+		builder.connTimeout(this.properties.getConnectionTimeout())
+				.readTimeout(this.properties.getReadTimeout());
+		customize(builder);
+		return builder.build();
+	}
+
+	private void customize(HttpClientConfig.Builder builder) {
+		if (this.builderCustomizers != null) {
+			for (HttpClientConfigBuilderCustomizer customizer : this.builderCustomizers) {
+				customizer.customize(builder);
+			}
+		}
 	}
 
 }

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java

@@ -45,6 +45,11 @@ public class JestProperties {
 	 */
 	private String password;
 
+	/**
+	 * Enable connection requests from multiple execution threads.
+	 */
+	private boolean multiThreaded = true;
+
 	/**
 	 * Connection timeout in milliseconds.
 	 */
@@ -84,6 +89,14 @@ public class JestProperties {
 		this.password = password;
 	}
 
+	public boolean isMultiThreaded() {
+		return this.multiThreaded;
+	}
+
+	public void setMultiThreaded(boolean multiThreaded) {
+		this.multiThreaded = multiThreaded;
+	}
+
 	public int getConnectionTimeout() {
 		return this.connectionTimeout;
 	}

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java

@@ -22,6 +22,7 @@ import java.util.Map;
 
 import com.google.gson.Gson;
 import io.searchbox.client.JestClient;
+import io.searchbox.client.config.HttpClientConfig;
 import io.searchbox.client.http.JestHttpClient;
 import io.searchbox.core.Index;
 import io.searchbox.core.Search;
@@ -39,6 +40,7 @@ import org.springframework.boot.test.util.EnvironmentTestUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.util.SocketUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -84,6 +86,14 @@ public class JestAutoConfigurationTests {
 		assertThat(client.getGson()).isSameAs(this.context.getBean("customGson"));
 	}
 
+	@Test
+	public void customizerOverridesAutoConfig() {
+		load(BuilderCustomizer.class, "spring.elasticsearch.jest.uris=http://localhost:9200");
+		JestHttpClient client = (JestHttpClient) this.context.getBean(JestClient.class);
+		assertThat(client.getGson()).isSameAs(
+				this.context.getBean(BuilderCustomizer.class).getGson());
+	}
+
 	@Test
 	public void proxyHostWithoutPort() {
 		this.thrown.expect(BeanCreationException.class);
@@ -147,4 +157,26 @@ public class JestAutoConfigurationTests {
 
 	}
 
+	@Configuration
+	@Import(CustomGson.class)
+	static class BuilderCustomizer {
+
+		private final Gson gson = new Gson();
+
+		@Bean
+		public HttpClientConfigBuilderCustomizer customizer() {
+			return new HttpClientConfigBuilderCustomizer() {
+				@Override
+				public void customize(HttpClientConfig.Builder builder) {
+					builder.gson(BuilderCustomizer.this.gson);
+				}
+			};
+		}
+
+		Gson getGson() {
+			return this.gson;
+		}
+
+	}
+
 }

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -630,6 +630,7 @@ content into your application; rather pick only the properties that you need.
 
 	# JEST (Elasticsearch HTTP client) ({sc-spring-boot-autoconfigure}/jest/JestProperties.{sc-ext}[JestProperties])
 	spring.elasticsearch.jest.connection-timeout=3000 # Connection timeout in milliseconds.
+	spring.elasticsearch.jest.multi-threaded=true # Enable connection requests from multiple execution threads.
 	spring.elasticsearch.jest.password= # Login password.
 	spring.elasticsearch.jest.proxy.host= # Proxy host the HTTP client should use.
 	spring.elasticsearch.jest.proxy.port= # Proxy port the HTTP client should use.

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

@@ -3604,6 +3604,15 @@ configured:
 	spring.elasticsearch.jest.password=secret
 ----
 
+You can also register an arbitrary number of beans implementing
+`HttpClientConfigBuilderCustomizer` for more advanced customizations. The example below
+tunes additional HTTP settings:
+
+[source,java,indent=0]
+----
+include::{code-examples}/elasticsearch/jest/JestClientCustomizationExample.java[tag=customizer]
+----
+
 To take full control over the registration, define a `JestClient` bean.
 
 

spring-boot-docs/src/main/java/org/springframework/boot/elasticsearch/jest/JestClientCustomizationExample.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2012-2016 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.elasticsearch.jest;
+
+import io.searchbox.client.config.HttpClientConfig;
+
+import org.springframework.boot.autoconfigure.elasticsearch.jest.HttpClientConfigBuilderCustomizer;
+
+/**
+ * Example configuration for using a {@link HttpClientConfigBuilderCustomizer} to
+ * configure additional HTTP settings.
+ *
+ * @author Stephane Nicoll
+ */
+public class JestClientCustomizationExample {
+
+	/**
+	 * A {@link HttpClientConfigBuilderCustomizer} that applies additional HTTP settings
+	 * to the auto-configured jest client.
+	 */
+	// tag::customizer[]
+	static class HttpSettingsCustomizer implements HttpClientConfigBuilderCustomizer {
+
+		@Override
+		public void customize(HttpClientConfig.Builder builder) {
+			builder.maxTotalConnection(100)
+					.defaultMaxTotalConnectionPerRoute(5);
+		}
+	}
+	// end::customizer[]
+}