From f96dea701120bcffce4dc303f152691c68f9c620 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 17 Dec 2015 13:52:45 +0000 Subject: [PATCH] Polish --- .../java/org/springframework/boot/Banner.java | 1 + .../boot/BeanDefinitionLoader.java | 5 ----- .../boot/SpringApplication.java | 18 ++++++++++-------- .../SpringApplicationAdminMXBeanRegistrar.java | 1 + .../boot/bind/RelaxedConversionService.java | 2 ++ .../boot/bind/RelaxedDataBinder.java | 2 ++ .../bind/YamlJavaBeanPropertyConstructor.java | 1 - 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/Banner.java b/spring-boot/src/main/java/org/springframework/boot/Banner.java index e8f9c857155..079a2cf940a 100644 --- a/spring-boot/src/main/java/org/springframework/boot/Banner.java +++ b/spring-boot/src/main/java/org/springframework/boot/Banner.java @@ -57,6 +57,7 @@ public interface Banner { * Print the banner to the log file. */ LOG + } } diff --git a/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java b/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java index 54d80dfe3ff..7b242ebb787 100644 --- a/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java +++ b/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java @@ -183,10 +183,8 @@ class BeanDefinitionLoader { } private int load(CharSequence source) { - String resolvedSource = this.xmlReader.getEnvironment() .resolvePlaceholders(source.toString()); - // Attempt as a Class try { return load(ClassUtils.forName(resolvedSource, null)); @@ -197,7 +195,6 @@ class BeanDefinitionLoader { catch (ClassNotFoundException ex) { // swallow exception and continue } - // Attempt as resources Resource[] resources = findResources(resolvedSource); int loadCount = 0; @@ -211,13 +208,11 @@ class BeanDefinitionLoader { if (atLeastOneResourceExists) { return loadCount; } - // Attempt as package Package packageResource = findPackage(resolvedSource); if (packageResource != null) { return load(packageResource); } - throw new IllegalArgumentException("Invalid source '" + resolvedSource + "'"); } diff --git a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java index 2e92f6541ab..246cd029a9d 100644 --- a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java +++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java @@ -383,17 +383,23 @@ public class SpringApplication { return getSpringFactoriesInstances(type, new Class[] {}); } - @SuppressWarnings("unchecked") private Collection getSpringFactoriesInstances(Class type, Class[] parameterTypes, Object... args) { ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - // Use names and ensure unique to protect against duplicates Set names = new LinkedHashSet( SpringFactoriesLoader.loadFactoryNames(type, classLoader)); - List instances = new ArrayList(names.size()); + List instances = createSpringFactoriesInstances(type, parameterTypes, + classLoader, args, names); + AnnotationAwareOrderComparator.sort(instances); + return instances; + } - // Create instances from the names + @SuppressWarnings("unchecked") + private List createSpringFactoriesInstances(Class type, + Class[] parameterTypes, ClassLoader classLoader, Object[] args, + Set names) { + List instances = new ArrayList(names.size()); for (String name : names) { try { Class instanceClass = ClassUtils.forName(name, classLoader); @@ -407,8 +413,6 @@ public class SpringApplication { "Cannot instantiate " + type + " : " + name, ex); } } - - AnnotationAwareOrderComparator.sort(instances); return instances; } @@ -420,7 +424,6 @@ public class SpringApplication { return new StandardServletEnvironment(); } return new StandardEnvironment(); - } /** @@ -608,7 +611,6 @@ public class SpringApplication { } } } - if (this.resourceLoader != null) { if (context instanceof GenericApplicationContext) { ((GenericApplicationContext) context) diff --git a/spring-boot/src/main/java/org/springframework/boot/admin/SpringApplicationAdminMXBeanRegistrar.java b/spring-boot/src/main/java/org/springframework/boot/admin/SpringApplicationAdminMXBeanRegistrar.java index 56e85f12837..81dbf54f983 100644 --- a/spring-boot/src/main/java/org/springframework/boot/admin/SpringApplicationAdminMXBeanRegistrar.java +++ b/spring-boot/src/main/java/org/springframework/boot/admin/SpringApplicationAdminMXBeanRegistrar.java @@ -122,6 +122,7 @@ public class SpringApplicationAdminMXBeanRegistrar logger.info("Application shutdown requested."); SpringApplicationAdminMXBeanRegistrar.this.applicationContext.close(); } + } } diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedConversionService.java b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedConversionService.java index 2ba672915f3..affdec0d1e0 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedConversionService.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedConversionService.java @@ -140,7 +140,9 @@ class RelaxedConversionService implements ConversionService { throw new IllegalArgumentException("No enum constant " + this.enumType.getCanonicalName() + "." + source); } + } } + } diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java index 02407f2ac93..cc3553a4b32 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java @@ -629,6 +629,7 @@ public class RelaxedDataBinder extends DataBinder { public String toString() { return "[" + this.name + "]"; } + } private static class PropertyNode extends PathNode { @@ -645,6 +646,7 @@ public class RelaxedDataBinder extends DataBinder { public String toString() { return "." + this.name; } + } } diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java b/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java index 653cf46d468..f72c17803b5 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java @@ -65,7 +65,6 @@ public class YamlJavaBeanPropertyConstructor extends Constructor { */ protected final void addPropertyAlias(String alias, Class type, String name) { Map typeMap = this.properties.get(type); - if (typeMap == null) { typeMap = new HashMap(); this.properties.put(type, typeMap);