Merge branch '1.5.x'

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;
+		}
+
+	}
+
 }