Polish

Author: philwebb

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Neo4jHealthIndicator.java

@@ -17,7 +17,6 @@
 package org.springframework.boot.actuate.health;
 
 import java.util.Collections;
-import java.util.Map;
 
 import org.neo4j.ogm.model.Result;
 import org.neo4j.ogm.session.Session;
@@ -51,11 +50,8 @@ public Neo4jHealthIndicator(SessionFactory sessionFactory) {
 	@Override
 	protected void doHealthCheck(Health.Builder builder) throws Exception {
 		Session session = this.sessionFactory.openSession();
-
-		Result result = session.query(CYPHER, Collections.EMPTY_MAP);
-		Iterable<Map<String, Object>> results = result.queryResults();
-		int nodes = (int) results.iterator().next().get("nodes");
-
+		Result result = session.query(CYPHER, Collections.emptyMap());
+		int nodes = (int) result.queryResults().iterator().next().get("nodes");
 		builder.up().withDetail("nodes", nodes);
 	}
 

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

@@ -79,9 +79,8 @@
  */
 public class HealthIndicatorAutoConfigurationTests {
 
-	public final ContextLoader contextLoader = ContextLoader.standard()
-			.autoConfig(HealthIndicatorAutoConfiguration.class,
-					ManagementServerProperties.class);
+	public final ContextLoader contextLoader = ContextLoader.standard().autoConfig(
+			HealthIndicatorAutoConfiguration.class, ManagementServerProperties.class);
 
 	@Test
 	public void defaultHealthIndicator() {

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/Neo4jHealthIndicatorTests.java

@@ -57,21 +57,18 @@ public void before() {
 	@Test
 	public void neo4jUp() {
 		Result result = mock(Result.class);
-		given(this.session.query(Neo4jHealthIndicator.CYPHER, Collections.EMPTY_MAP))
+		given(this.session.query(Neo4jHealthIndicator.CYPHER, Collections.emptyMap()))
 				.willReturn(result);
-
 		int nodeCount = 500;
 		Map<String, Object> expectedCypherDetails = new HashMap<>();
 		expectedCypherDetails.put("nodes", nodeCount);
 		List<Map<String, Object>> queryResults = new ArrayList<>();
 		queryResults.add(expectedCypherDetails);
 		given(result.queryResults()).willReturn(queryResults);
-
 		Health health = this.neo4jHealthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.UP);
 		Map<String, Object> details = health.getDetails();
 		int nodeCountFromDetails = (int) details.get("nodes");
-
 		Assert.assertEquals(nodeCount, nodeCountFromDetails);
 	}
 
@@ -80,9 +77,8 @@ public void neo4jDown() {
 		CypherException cypherException = new CypherException("Error executing Cypher",
 				"Neo.ClientError.Statement.SyntaxError",
 				"Unable to execute invalid Cypher");
-		given(this.session.query(Neo4jHealthIndicator.CYPHER, Collections.EMPTY_MAP))
+		given(this.session.query(Neo4jHealthIndicator.CYPHER, Collections.emptyMap()))
 				.willThrow(cypherException);
-
 		Health health = this.neo4jHealthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.DOWN);
 	}

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

@@ -71,16 +71,13 @@ public JedisConnectionFactory redisConnectionFactory() throws UnknownHostExcepti
 
 	private JedisConnectionFactory createJedisConnectionFactory() {
 		JedisClientConfiguration clientConfiguration = getJedisClientConfiguration();
-
 		if (getSentinelConfig() != null) {
 			return new JedisConnectionFactory(getSentinelConfig(), clientConfiguration);
 		}
-
 		if (getClusterConfiguration() != null) {
 			return new JedisConnectionFactory(getClusterConfiguration(),
 					clientConfiguration);
 		}
-
 		return new JedisConnectionFactory(getStandaloneConfig(), clientConfiguration);
 	}
 

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

@@ -145,16 +145,13 @@ private static GenericObjectPoolConfig lettucePoolConfig(RedisProperties.Pool pr
 
 	private LettuceConnectionFactory createLettuceConnectionFactory(
 			LettuceClientConfiguration clientConfiguration) {
-
 		if (getSentinelConfig() != null) {
 			return new LettuceConnectionFactory(getSentinelConfig(), clientConfiguration);
 		}
-
 		if (getClusterConfiguration() != null) {
 			return new LettuceConnectionFactory(getClusterConfiguration(),
 					clientConfiguration);
 		}
-
 		return new LettuceConnectionFactory(getStandaloneConfig(), clientConfiguration);
 	}
 

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

@@ -54,7 +54,6 @@ protected RedisConnectionConfiguration(RedisProperties properties,
 
 	protected final RedisStandaloneConfiguration getStandaloneConfig() {
 		RedisStandaloneConfiguration config = new RedisStandaloneConfiguration();
-
 		if (StringUtils.hasText(this.properties.getUrl())) {
 			ConnectionInfo connectionInfo = parseUrl(this.properties.getUrl());
 			config.setHostName(connectionInfo.getHostName());
@@ -149,7 +148,9 @@ protected ConnectionInfo parseUrl(String url) {
 	protected static class ConnectionInfo {
 
 		private final URI uri;
+
 		private final boolean useSsl;
+
 		private final String password;
 
 		public ConnectionInfo(URI uri, boolean useSsl, String password) {

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfiguration.java

@@ -32,26 +32,33 @@
 import org.springframework.util.MimeType;
 
 /**
- * {@link EnableAutoConfiguration Auto-configuration}
- * for {@link org.springframework.core.codec.Encoder}s and {@link org.springframework.core.codec.Decoder}s.
+ * {@link EnableAutoConfiguration Auto-configuration} for
+ * {@link org.springframework.core.codec.Encoder Encoders} and
+ * {@link org.springframework.core.codec.Decoder Decoders}.
+ *
  * @author Brian Clozel
+ * @since 2.0.0
  */
 @Configuration
 @ConditionalOnClass(CodecConfigurer.class)
 @AutoConfigureAfter(JacksonAutoConfiguration.class)
 public class CodecsAutoConfiguration {
 
+	private static final MimeType[] EMPTY_MIME_TYPES = {};
+
 	@Configuration
 	@ConditionalOnClass(ObjectMapper.class)
 	static class JacksonCodecConfiguration {
 
 		@Bean
 		@ConditionalOnBean(ObjectMapper.class)
 		public CodecCustomizer jacksonCodecCustomizer(ObjectMapper objectMapper) {
-			return configurer -> {
+			return (configurer) -> {
 				CodecConfigurer.DefaultCodecs defaults = configurer.defaultCodecs();
-				defaults.jackson2Decoder(new Jackson2JsonDecoder(objectMapper, new MimeType[0]));
-				defaults.jackson2Encoder(new Jackson2JsonEncoder(objectMapper, new MimeType[0]));
+				defaults.jackson2Decoder(
+						new Jackson2JsonDecoder(objectMapper, EMPTY_MIME_TYPES));
+				defaults.jackson2Encoder(
+						new Jackson2JsonEncoder(objectMapper, EMPTY_MIME_TYPES));
 			};
 		}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java

@@ -55,8 +55,7 @@ static class Hikari {
 
 		private final ObjectProvider<MBeanExporter> mBeanExporter;
 
-		Hikari(HikariDataSource dataSource,
-				ObjectProvider<MBeanExporter> mBeanExporter) {
+		Hikari(HikariDataSource dataSource, ObjectProvider<MBeanExporter> mBeanExporter) {
 			this.dataSource = dataSource;
 			this.mBeanExporter = mBeanExporter;
 		}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.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/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.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.