From ea1a8d0dc0ccd1dcc75eb4aeef384bce1f01348a Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 28 Jan 2014 05:21:59 +0000 Subject: [PATCH] Make SpringApplication list/initializers respect their Ordered --- .../org/springframework/boot/SpringApplication.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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 cbf80a2ad73..6433b546f6d 100644 --- a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java +++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java @@ -862,7 +862,11 @@ public class SpringApplication { * @return the initializers */ public Set> getInitializers() { - return Collections.unmodifiableSet(this.initializers); + ArrayList> list = new ArrayList>( + this.initializers); + AnnotationAwareOrderComparator.sort(list); + return Collections + .unmodifiableSet(new LinkedHashSet>(list)); } /** @@ -905,8 +909,11 @@ public class SpringApplication { * @return the listeners */ public Set> getListeners() { - return Collections.unmodifiableSet(new LinkedHashSet>( - this.listeners)); + ArrayList> list = new ArrayList>( + this.listeners); + AnnotationAwareOrderComparator.sort(list); + return Collections + .unmodifiableSet(new LinkedHashSet>(list)); } /**