Make SpringApplication list/initializers respect their Ordered

This commit is contained in:
Dave Syer 2014-01-28 05:21:59 +00:00
parent ef2eb8af6c
commit ea1a8d0dc0
1 changed files with 10 additions and 3 deletions

View File

@ -862,7 +862,11 @@ public class SpringApplication {
* @return the initializers * @return the initializers
*/ */
public Set<ApplicationContextInitializer<?>> getInitializers() { public Set<ApplicationContextInitializer<?>> getInitializers() {
return Collections.unmodifiableSet(this.initializers); ArrayList<ApplicationContextInitializer<?>> list = new ArrayList<ApplicationContextInitializer<?>>(
this.initializers);
AnnotationAwareOrderComparator.sort(list);
return Collections
.unmodifiableSet(new LinkedHashSet<ApplicationContextInitializer<?>>(list));
} }
/** /**
@ -905,8 +909,11 @@ public class SpringApplication {
* @return the listeners * @return the listeners
*/ */
public Set<ApplicationListener<?>> getListeners() { public Set<ApplicationListener<?>> getListeners() {
return Collections.unmodifiableSet(new LinkedHashSet<ApplicationListener<?>>( ArrayList<ApplicationListener<?>> list = new ArrayList<ApplicationListener<?>>(
this.listeners)); this.listeners);
AnnotationAwareOrderComparator.sort(list);
return Collections
.unmodifiableSet(new LinkedHashSet<ApplicationListener<?>>(list));
} }
/** /**