Polish

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisReactiveAutoConfiguration.java

@@ -51,16 +51,11 @@ public class RedisReactiveAutoConfiguration {
 	public ReactiveRedisTemplate<Object, Object> reactiveRedisTemplate(
 			ReactiveRedisConnectionFactory reactiveRedisConnectionFactory,
 			ResourceLoader resourceLoader) {
-
+		JdkSerializationRedisSerializer jdkSerializer = new JdkSerializationRedisSerializer(
-		JdkSerializationRedisSerializer jdkSerializer =
+				resourceLoader.getClassLoader());
-				new JdkSerializationRedisSerializer(resourceLoader.getClassLoader());
+		RedisSerializationContext<Object, Object> serializationContext = RedisSerializationContext
-
+				.newSerializationContext().key(jdkSerializer).value(jdkSerializer)
-		RedisSerializationContext<Object, Object> serializationContext =
+				.hashKey(jdkSerializer).hashValue(jdkSerializer).build();
-				RedisSerializationContext.newSerializationContext()
-						.key(jdkSerializer)
-						.value(jdkSerializer)
-						.hashKey(jdkSerializer)
-						.hashValue(jdkSerializer).build();
 		return new ReactiveRedisTemplate<>(reactiveRedisConnectionFactory,
 				serializationContext);
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java

@@ -107,8 +107,7 @@ public class FlywayAutoConfiguration {
 			this.dataSource = dataSource.getIfUnique();
 			this.flywayDataSource = flywayDataSource.getIfAvailable();
 			this.migrationStrategy = migrationStrategy.getIfAvailable();
-			this.flywayCallbacks = flywayCallbacks
+			this.flywayCallbacks = flywayCallbacks.getIfAvailable(Collections::emptyList);
-					.getIfAvailable(Collections::emptyList);
 		}
 
 		@PostConstruct

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastClientFactory.java

@@ -56,7 +56,6 @@ public class HazelcastClientFactory {
 		this.clientConfig = clientConfig;
 	}
 
-
 	private ClientConfig getClientConfig(Resource clientConfigLocation)
 			throws IOException {
 		URL configUrl = clientConfigLocation.getURL();
@@ -69,8 +68,8 @@ public class HazelcastClientFactory {
 	 */
 	public HazelcastInstance getHazelcastInstance() {
 		if (StringUtils.hasText(this.clientConfig.getInstanceName())) {
-			return HazelcastClient.getHazelcastClientByName(
+			return HazelcastClient
-					this.clientConfig.getInstanceName());
+					.getHazelcastClientByName(this.clientConfig.getInstanceName());
 		}
 		return HazelcastClient.newHazelcastClient(this.clientConfig);
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastConfigResourceCondition.java

@@ -48,8 +48,8 @@ public abstract class HazelcastConfigResourceCondition extends ResourceCondition
 	protected ConditionOutcome getResourceOutcome(ConditionContext context,
 			AnnotatedTypeMetadata metadata) {
 		if (System.getProperty(this.configSystemProperty) != null) {
-			return ConditionOutcome.match(startConditionMessage()
+			return ConditionOutcome.match(startConditionMessage().because(
-					.because("System property '" + this.configSystemProperty + "' is set."));
+					"System property '" + this.configSystemProperty + "' is set."));
 		}
 		return super.getResourceOutcome(context, metadata);
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java

@@ -137,8 +137,7 @@ public class ThymeleafAutoConfiguration {
 				Collection<ITemplateResolver> templateResolvers,
 				ObjectProvider<Collection<IDialect>> dialectsProvider) {
 			this.templateResolvers = templateResolvers;
-			this.dialects = dialectsProvider
+			this.dialects = dialectsProvider.getIfAvailable(Collections::emptyList);
-					.getIfAvailable(Collections::emptyList);
 		}
 
 		@Bean
@@ -221,8 +220,7 @@ public class ThymeleafAutoConfiguration {
 		ThymeleafReactiveConfiguration(Collection<ITemplateResolver> templateResolvers,
 				ObjectProvider<Collection<IDialect>> dialectsProvider) {
 			this.templateResolvers = templateResolvers;
-			this.dialects = dialectsProvider
+			this.dialects = dialectsProvider.getIfAvailable(Collections::emptyList);
-					.getIfAvailable(Collections::emptyList);
 		}
 
 		@Bean

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisReactiveAutoConfigurationTests.java

@@ -46,12 +46,10 @@ public class RedisReactiveAutoConfigurationTests {
 	@Test
 	public void testDefaultRedisConfiguration() {
 		load();
-		Map<String, ReactiveRedisTemplate> beans = this.context.getBeansOfType(
+		Map<String, ?> beans = this.context.getBeansOfType(ReactiveRedisTemplate.class);
-				ReactiveRedisTemplate.class);
 		assertThat(beans).containsOnlyKeys("reactiveRedisTemplate");
 	}
 
-
 	private void load(String... environment) {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		EnvironmentTestUtils.addEnvironment(ctx, environment);

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java

@@ -78,8 +78,8 @@ public class HazelcastAutoConfigurationClientTests {
 	@Test
 	public void systemProperty() throws IOException {
 		System.setProperty(HazelcastClientConfiguration.CONFIG_SYSTEM_PROPERTY,
-				"classpath:org/springframework/boot/autoconfigure/hazelcast/" +
+				"classpath:org/springframework/boot/autoconfigure/hazelcast/"
-						"hazelcast-client-specific.xml");
+						+ "hazelcast-client-specific.xml");
 		try {
 			load();
 			HazelcastInstance hazelcastInstance = this.context
@@ -120,7 +120,8 @@ public class HazelcastAutoConfigurationClientTests {
 
 	@Test
 	public void clientConfigTakesPrecedence() {
-		load(HazelcastServerAndClientConfig.class, "spring.hazelcast.config=this-is-ignored.xml");
+		load(HazelcastServerAndClientConfig.class,
+				"spring.hazelcast.config=this-is-ignored.xml");
 		HazelcastInstance hazelcastInstance = this.context
 				.getBean(HazelcastInstance.class);
 		assertThat(hazelcastInstance).isInstanceOf(HazelcastClientProxy.class);

spring-boot/src/main/java/org/springframework/boot/diagnostics/AbstractFailureAnalyzer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.

spring-boot/src/test/java/org/springframework/boot/system/EmbeddedServerPortFileWriterTests.java

@@ -19,6 +19,8 @@ package org.springframework.boot.system;
 import java.io.File;
 import java.io.FileReader;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.Set;
 import java.util.function.BiFunction;
 
@@ -59,28 +61,35 @@ public class EmbeddedServerPortFileWriterTests {
 
 	@Parameters(name = "{0}")
 	public static Object[] parameters() {
-		BiFunction<String, Integer, ? extends WebServerInitializedEvent> servletEvent = (
+		Map<String, BiFunction<String, Integer, WebServerInitializedEvent>> parameters = new LinkedHashMap<>();
-				String name, Integer port) -> {
+		parameters.put("Servlet",
-			ServletWebServerApplicationContext applicationContext = mock(
+				EmbeddedServerPortFileWriterTests::servletEventParameter);
-					ServletWebServerApplicationContext.class);
+		parameters.put("Reactive",
-			given(applicationContext.getNamespace()).willReturn(name);
+				EmbeddedServerPortFileWriterTests::reactiveEventParameter);
-			WebServer source = mock(WebServer.class);
+		return parameters.entrySet().stream()
-			given(source.getPort()).willReturn(port);
+				.map((e) -> new Object[] { e.getKey(), e.getValue() }).toArray();
-			ServletWebServerInitializedEvent event = new ServletWebServerInitializedEvent(
+	}
-					source, applicationContext);
+
-			return event;
+	private static WebServerInitializedEvent servletEventParameter(String name,
-		};
+			Integer port) {
-		BiFunction<String, Integer, ? extends WebServerInitializedEvent> reactiveEvent = (
+		ServletWebServerApplicationContext applicationContext = mock(
-				String name, Integer port) -> {
+				ServletWebServerApplicationContext.class);
-			ReactiveWebServerApplicationContext applicationContext = mock(
+		given(applicationContext.getNamespace()).willReturn(name);
-					ReactiveWebServerApplicationContext.class);
+		WebServer source = mock(WebServer.class);
-			given(applicationContext.getNamespace()).willReturn(name);
+		given(source.getPort()).willReturn(port);
-			WebServer source = mock(WebServer.class);
+		ServletWebServerInitializedEvent event = new ServletWebServerInitializedEvent(
-			given(source.getPort()).willReturn(port);
+				source, applicationContext);
-			return new ReactiveWebServerInitializedEvent(source, applicationContext);
+		return event;
-		};
+	}
-		return new Object[] { new Object[] { "Servlet", servletEvent },
+
-				new Object[] { "Reactive", reactiveEvent } };
+	private static WebServerInitializedEvent reactiveEventParameter(String name,
+			Integer port) {
+		ReactiveWebServerApplicationContext applicationContext = mock(
+				ReactiveWebServerApplicationContext.class);
+		given(applicationContext.getNamespace()).willReturn(name);
+		WebServer source = mock(WebServer.class);
+		given(source.getPort()).willReturn(port);
+		return new ReactiveWebServerInitializedEvent(source, applicationContext);
 	}
 
 	private final BiFunction<String, Integer, ? extends WebServerInitializedEvent> eventFactory;

spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java

@@ -261,11 +261,11 @@ public class UndertowServletWebServerFactoryTests
 	}
 
 	private ServletContainer getServletContainerFromNewFactory() {
-		UndertowServletWebServer container = (UndertowServletWebServer)
+		UndertowServletWebServer container = (UndertowServletWebServer) getFactory()
-				getFactory().getWebServer();
+				.getWebServer();
 		try {
-			return ((DeploymentManager) ReflectionTestUtils.getField(container, "manager"))
+			return ((DeploymentManager) ReflectionTestUtils.getField(container,
-					.getDeployment().getServletContainer();
+					"manager")).getDeployment().getServletContainer();
 		}
 		finally {
 			container.stop();