Polish

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

@@ -53,6 +53,8 @@ import static org.springframework.util.StringUtils.trimAllWhitespace;
 @ConfigurationProperties(prefix = "spring.messages")
 public class MessageSourceAutoConfiguration {
 
+	private static final Resource[] NO_RESOURCES = {};
+
 	private String basename = "messages";
 
 	private String encoding = "utf-8";
@@ -103,27 +105,27 @@ public class MessageSourceAutoConfiguration {
 			String basename = context.getEnvironment().getProperty(
 					"spring.messages.basename", "messages");
 			for (String name : commaDelimitedListToStringArray(trimAllWhitespace(basename))) {
-				Resource[] resources;
-				try {
-					resources = new PathMatchingResourcePatternResolver(
-							context.getClassLoader()).getResources("classpath*:" + name
-							+ "*.properties");
-				}
-				catch (IOException e) {
-					continue;
-				}
-				for (Resource resource : resources) {
-
+				for (Resource resource : getResources(context.getClassLoader(), name)) {
 					if (resource.exists()) {
-						return ConditionOutcome
-								.match("Bundle found for spring.messages.basename: "
-										+ name);
+						return ConditionOutcome.match("Bundle found for "
+								+ "spring.messages.basename: " + name);
 					}
 				}
 			}
-			return ConditionOutcome
-					.noMatch("No bundle found for spring.messages.basename: " + basename);
+			return ConditionOutcome.noMatch("No bundle found for "
+					+ "spring.messages.basename: " + basename);
 		}
+
+		private Resource[] getResources(ClassLoader classLoader, String name) {
+			try {
+				return new PathMatchingResourcePatternResolver(classLoader)
+						.getResources("classpath*:" + name + "*.properties");
+			}
+			catch (IOException ex) {
+				return NO_RESOURCES;
+			}
+		}
+
 	}
 
 }

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java

@@ -107,7 +107,8 @@ public class RabbitProperties {
 			}
 			result.add(address);
 		}
-		return result.isEmpty() ? null : StringUtils.collectionToCommaDelimitedString(result);
+		return (result.isEmpty() ? null : StringUtils
+				.collectionToCommaDelimitedString(result));
 	}
 
 	public void setPort(int port) {

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConverters.java

@@ -93,10 +93,8 @@ public class HttpMessageConverters implements Iterable<HttpMessageConverter<?>>
 
 	private List<HttpMessageConverter<?>> getDefaultConverters() {
 		List<HttpMessageConverter<?>> converters = new ArrayList<HttpMessageConverter<?>>();
-		if (ClassUtils
-				.isPresent(
-						"org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport",
-						null)) {
+		if (ClassUtils.isPresent("org.springframework.web.servlet.config.annotation."
+				+ "WebMvcConfigurationSupport", null)) {
 			converters.addAll(new WebMvcConfigurationSupport() {
 				public List<HttpMessageConverter<?>> defaultMessageConverters() {
 					return super.getMessageConverters();

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfiguration.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.autoconfigure.web;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -53,9 +52,7 @@ public class HttpMessageConvertersAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	public HttpMessageConverters messageConverters() {
-		List<HttpMessageConverter<?>> converters = new ArrayList<HttpMessageConverter<?>>(
-				this.converters);
-		return new HttpMessageConverters(converters);
+		return new HttpMessageConverters(this.converters);
 	}
 
 	@Configuration