Polish

Author: Phillip Webb

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

@@ -81,14 +81,12 @@
  * into a Spring Boot enabled application. By default a SSH daemon is started on port
  * 2000. If the CRaSH Telnet plugin is available on the classpath, Telnet daemon will be
  * launched on port 5000.
- *
  * <p>
  * The default shell authentication method uses a username and password combination. If no
  * configuration is provided the default username is 'user' and the password will be
  * printed to console during application startup. Those default values can be overridden
  * by using <code>shell.auth.simple.username</code> and
  * <code>shell.auth.simple.password</code>.
- *
  * <p>
  * If a Spring Security {@link AuthenticationManager} is detected, this configuration will
  * create a {@link CRaSHPlugin} to forward shell authentication requests to Spring
@@ -98,21 +96,19 @@
  * restricted to users having roles that match those configured in
  * {@link ManagementServerProperties}. Required roles can be overridden by
  * <code>shell.auth.spring.roles</code>.
- *
  * <p>
  * To add customizations to the shell simply define beans of type {@link CRaSHPlugin} in
  * the application context. Those beans will get auto detected during startup and
  * registered with the underlying shell infrastructure. To configure plugins and the CRaSH
  * infrastructure add beans of type {@link CrshShellProperties} to the application
  * context.
- *
  * <p>
  * Additional shell commands can be implemented using the guide and documentation at <a
  * href="http://www.crashub.org">crashub.org</a>. By default Boot will search for commands
  * using the following classpath scanning pattern <code>classpath*:/commands/**</code>. To
  * add different locations or override the default use
  * <code>shell.command_path_patterns</code> in your application configuration.
- *
+ * 
  * @author Christian Dupuis
  * @see ShellProperties
  */

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

@@ -58,7 +58,7 @@
 
 /**
  * Tests for {@link CrshAutoConfiguration}.
- *
+ * 
  * @author Christian Dupuis
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java

@@ -48,7 +48,7 @@ public abstract class AutoConfigurationPackages {
 
 	/**
 	 * Determine if the auto-configuration base packages for the given bean factory are
-	 * available
+	 * available.
 	 * @param beanFactory the source bean factory
 	 * @return true if there are auto-config packages available
 	 */

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java

@@ -1,5 +1,5 @@
 /*
-On * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2014 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/elasticsearch/ElasticsearchAutoConfiguration.java

@@ -32,7 +32,7 @@
 /**
  * {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration
  * Auto-configuration} for Elasticsearch.
- *
+ * 
  * @author Artur Konczak
  * @author Mohsin Husen
  * @author Andy Wilkinson
@@ -54,17 +54,19 @@ public class ElasticsearchAutoConfiguration implements DisposableBean {
 	@Bean
 	public Client elasticsearchClient() {
 		try {
-			if (StringUtils.hasLength(this.properties.getClusterNodes())) {
-				this.client = createTransportClient();
-			}
-			else {
-				this.client = createNodeClient();
-			}
+			this.client = createClient();
+			return this.client;
 		}
 		catch (Exception ex) {
 			throw new IllegalStateException(ex);
 		}
-		return this.client;
+	}
+
+	private Client createClient() throws Exception {
+		if (StringUtils.hasLength(this.properties.getClusterNodes())) {
+			return createTransportClient();
+		}
+		return createNodeClient();
 	}
 
 	private Client createNodeClient() throws Exception {

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

@@ -20,7 +20,7 @@
 
 /**
  * Configuration properties for Elasticsearch.
- *
+ * 
  * @author Artur Konczak
  * @author Mohsin Husen
  * @since 1.1.0

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2012-2014 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.
@@ -32,7 +32,7 @@
  * 
  * @author Artem Bilan
  * @author Dave Syer
- * @since 1.1
+ * @since 1.1.0
  */
 @Configuration
 @ConditionalOnClass(EnableIntegration.class)

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java

@@ -49,7 +49,7 @@
  * <li>auto-registration for all {@link Module} beans with all {@link ObjectMapper} beans
  * (including the defaulted ones).</li>
  * </ul>
- *
+ * 
  * @author Oliver Gierke
  * @since 1.1.0
  */
@@ -65,31 +65,27 @@ public class JacksonAutoConfiguration {
 	private ListableBeanFactory beanFactory;
 
 	@Bean
-	@ConditionalOnMissingBean
 	@Primary
+	@ConditionalOnMissingBean
 	public ObjectMapper jacksonObjectMapper() {
-
 		ObjectMapper objectMapper = new ObjectMapper();
-
 		if (this.properties.isJsonSortKeys()) {
 			objectMapper.configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true);
 		}
-
 		return objectMapper;
 	}
 
 	@PostConstruct
-	public void init() {
+	private void registerModulesWithObjectMappers() {
+		Collection<Module> modules = getBeans(Module.class);
+		for (ObjectMapper objectMapper : getBeans(ObjectMapper.class)) {
+			objectMapper.registerModules(modules);
+		}
+	}
 
-		Collection<ObjectMapper> mappers = BeanFactoryUtils
-				.beansOfTypeIncludingAncestors(this.beanFactory, ObjectMapper.class)
+	private <T> Collection<T> getBeans(Class<T> type) {
+		return BeanFactoryUtils.beansOfTypeIncludingAncestors(this.beanFactory, type)
 				.values();
-		Collection<Module> modules = BeanFactoryUtils.beansOfTypeIncludingAncestors(
-				this.beanFactory, Module.class).values();
-
-		for (ObjectMapper mapper : mappers) {
-			mapper.registerModules(modules);
-		}
 	}
 
 	@Configuration
@@ -101,6 +97,7 @@ static class JodaModuleAutoConfiguration {
 		JodaModule jacksonJodaModule() {
 			return new JodaModule();
 		}
+
 	}
 
 	@Configuration
@@ -113,5 +110,6 @@ static class Jsr310ModuleAutoConfiguration {
 		JSR310Module jacksonJsr310Module() {
 			return new JSR310Module();
 		}
+
 	}
 }

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQAutoConfiguration.java

@@ -53,9 +53,9 @@
 
 /**
  * {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration
- * Auto-configuration} to integrate with an HornetQ broker. If the necessary
- * classes are present, embed the broker in the application by default. Otherwise,
- * connect to a broker available on the local machine with the default settings.
+ * Auto-configuration} to integrate with an HornetQ broker. If the necessary classes are
+ * present, embed the broker in the application by default. Otherwise, connect to a broker
+ * available on the local machine with the default settings.
  * 
  * @author Stephane Nicoll
  * @since 1.1.0

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java

@@ -58,6 +58,8 @@
 @Import(DataSourceInitializedPublisher.Registrar.class)
 public abstract class JpaBaseConfiguration implements BeanFactoryAware {
 
+	private static final String[] NO_PACKAGES = new String[0];
+
 	private ConfigurableListableBeanFactory beanFactory;
 
 	@Autowired
@@ -118,7 +120,7 @@ protected String[] getPackagesToScan() {
 			List<String> basePackages = AutoConfigurationPackages.get(this.beanFactory);
 			return basePackages.toArray(new String[basePackages.size()]);
 		}
-		return new String[0];
+		return NO_PACKAGES;
 	}
 
 	protected void configure(