Merge branch '1.5.x'

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[]
+}