Make SpringApplication list/initializers respect their Ordered
This commit is contained in:
parent
ef2eb8af6c
commit
ea1a8d0dc0
|
|
@ -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));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue