Polish

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java

@@ -192,8 +192,11 @@ public class HealthIndicatorAutoConfiguration {
 			this.metadataProviders = metadataProvidersProvider.getIfAvailable();
 		}
 
-		private static Map<String, DataSource> filterDataSources(
+		private Map<String, DataSource> filterDataSources(
 				Map<String, DataSource> candidates) {
+			if (candidates == null) {
+				return null;
+			}
 			Map<String, DataSource> dataSources = new LinkedHashMap<String, DataSource>();
 			for (Map.Entry<String, DataSource> entry : candidates.entrySet()) {
 				if (!(entry.getValue() instanceof AbstractRoutingDataSource)) {

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java

@@ -24,7 +24,6 @@ import io.searchbox.client.JestClient;
 import org.junit.After;
 import org.junit.Test;
 
-import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.boot.actuate.health.ApplicationHealthIndicator;
 import org.springframework.boot.actuate.health.CassandraHealthIndicator;
 import org.springframework.boot.actuate.health.CompositeHealthIndicator;
@@ -242,9 +241,8 @@ public class HealthIndicatorAutoConfigurationTests {
 		assertThat(beans).hasSize(1);
 		HealthIndicator bean = beans.values().iterator().next();
 		assertThat(bean).isExactlyInstanceOf(CompositeHealthIndicator.class);
-		Map<String, HealthIndicator> indicators = (Map<String, HealthIndicator>)
+		assertThat(bean.health().getDetails()).containsOnlyKeys("dataSource",
-				new DirectFieldAccessor(bean).getPropertyValue("indicators");
+				"testDataSource");
-		assertThat(indicators).hasSize(2);
 	}
 
 	@Test
@@ -258,8 +256,8 @@ public class HealthIndicatorAutoConfigurationTests {
 		Map<String, HealthIndicator> beans = this.context
 				.getBeansOfType(HealthIndicator.class);
 		assertThat(beans).hasSize(1);
-		assertThat(beans.values().iterator().next().getClass())
+		assertThat(beans.values().iterator().next())
-				.isEqualTo(DataSourceHealthIndicator.class);
+				.isExactlyInstanceOf(DataSourceHealthIndicator.class);
 	}
 
 	@Test

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

@@ -20,7 +20,8 @@ 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
+ * {@link io.searchbox.client.config.HttpClientConfig} via
+ * {@link io.searchbox.client.config.HttpClientConfig.Builder} retaining its default
  * auto-configuration.
  *
  * @author Stephane Nicoll
@@ -29,7 +30,7 @@ import io.searchbox.client.config.HttpClientConfig;
 public interface HttpClientConfigBuilderCustomizer {
 
 	/**
-	 * Customize the {@link HttpClientConfig.Builder}.
+	 * Customize the {@link io.searchbox.client.config.HttpClientConfig.Builder}.
 	 * @param builder the builder to customize
 	 */
 	void customize(HttpClientConfig.Builder builder);

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

@@ -88,10 +88,11 @@ public class JestAutoConfigurationTests {
 
 	@Test
 	public void customizerOverridesAutoConfig() {
-		load(BuilderCustomizer.class, "spring.elasticsearch.jest.uris=http://localhost:9200");
+		load(BuilderCustomizer.class,
+				"spring.elasticsearch.jest.uris=http://localhost:9200");
 		JestHttpClient client = (JestHttpClient) this.context.getBean(JestClient.class);
-		assertThat(client.getGson()).isSameAs(
+		assertThat(client.getGson())
-				this.context.getBean(BuilderCustomizer.class).getGson());
+				.isSameAs(this.context.getBean(BuilderCustomizer.class).getGson());
 	}
 
 	@Test
@@ -166,10 +167,12 @@ public class JestAutoConfigurationTests {
 		@Bean
 		public HttpClientConfigBuilderCustomizer customizer() {
 			return new HttpClientConfigBuilderCustomizer() {
+
 				@Override
 				public void customize(HttpClientConfig.Builder builder) {
 					builder.gson(BuilderCustomizer.this.gson);
 				}
+
 			};
 		}
 

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

@@ -37,9 +37,9 @@ public class JestClientCustomizationExample {
 
 		@Override
 		public void customize(HttpClientConfig.Builder builder) {
-			builder.maxTotalConnection(100)
+			builder.maxTotalConnection(100).defaultMaxTotalConnectionPerRoute(5);
-					.defaultMaxTotalConnectionPerRoute(5);
 		}
+
 	}
 	// end::customizer[]
 }

spring-boot-test/src/test/java/org/springframework/boot/test/context/PortTest.java

@@ -0,0 +1,87 @@
+/*
+ * 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.test.context;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.PortTest.RandomPortInitailizer;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.support.TestPropertySourceUtils;
+import org.springframework.util.SocketUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@ContextConfiguration(initializers = RandomPortInitailizer.class)
+public class PortTest {
+
+	@Autowired
+	private SomeService service;
+
+	@Test
+	public void testName() throws Exception {
+		System.out.println(this.service);
+		assertThat(this.service.toString()).containsOnlyDigits();
+	}
+
+	@Configuration
+	static class MyConfig {
+
+		@Bean
+		public SomeService someService(@Value("${my.random.port}") int port) {
+			return new SomeService(port);
+		}
+
+	}
+
+	static class SomeService {
+
+		private final int port;
+
+		public SomeService(int port) {
+			this.port = port;
+		}
+
+		@Override
+		public String toString() {
+			return String.valueOf(this.port);
+		}
+
+	}
+
+	public static class RandomPortInitailizer
+			implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+
+		@Override
+		public void initialize(ConfigurableApplicationContext applicationContext) {
+			int randomPort = SocketUtils.findAvailableTcpPort();
+			TestPropertySourceUtils.addInlinedPropertiesToEnvironment(applicationContext,
+					"my.random.port=" + randomPort);
+		}
+
+	}
+
+}