SchedulingConfigurer and JmsListenerConfigurer respect @order

Issue: SPR-16090
spring-projects · Oct 20, 2017 · d1fac36 · d1fac36
1 parent a4537b1
commit d1fac36
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 20 deletions.
diff --git a/...context/src/main/java/org/springframework/context/event/EventListenerMethodProcessor.java b/...context/src/main/java/org/springframework/context/event/EventListenerMethodProcessor.java
@@ -129,9 +129,9 @@ public void afterSingletonsInstantiated() {
 	 */
 	protected List<EventListenerFactory> getEventListenerFactories() {
 		Map<String, EventListenerFactory> beans = getApplicationContext().getBeansOfType(EventListenerFactory.class);
-		List<EventListenerFactory> allFactories = new ArrayList<>(beans.values());
-		AnnotationAwareOrderComparator.sort(allFactories);
-		return allFactories;
+		List<EventListenerFactory> factories = new ArrayList<>(beans.values());
+		AnnotationAwareOrderComparator.sort(factories);
+		return factories;
 	}
 
 	protected void processBean(
@@ -141,9 +141,8 @@ protected void processBean(
 			Map<Method, EventListener> annotatedMethods = null;
 			try {
 				annotatedMethods = MethodIntrospector.selectMethods(targetType,
-						(MethodIntrospector.MetadataLookup<EventListener>) method -> {
-							return AnnotatedElementUtils.findMergedAnnotation(method, EventListener.class);
-						});
+						(MethodIntrospector.MetadataLookup<EventListener>) method ->
+								AnnotatedElementUtils.findMergedAnnotation(method, EventListener.class));
 			}
 			catch (Throwable ex) {
 				// An unresolvable type in a method signature, probably from a lazy bean - let's ignore it.

diff --git a/.../java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java b/.../java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
@@ -17,10 +17,12 @@
 package org.springframework.scheduling.annotation;
 
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.IdentityHashMap;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
@@ -53,6 +55,7 @@
 import org.springframework.core.MethodIntrospector;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.lang.Nullable;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.Trigger;
@@ -211,9 +214,11 @@ private void finishRegistration() {
 		}
 
 		if (this.beanFactory instanceof ListableBeanFactory) {
-			Map<String, SchedulingConfigurer> configurers =
+			Map<String, SchedulingConfigurer> beans =
 					((ListableBeanFactory) this.beanFactory).getBeansOfType(SchedulingConfigurer.class);
-			for (SchedulingConfigurer configurer : configurers.values()) {
+			List<SchedulingConfigurer> configurers = new ArrayList<>(beans.values());
+			AnnotationAwareOrderComparator.sort(configurers);
+			for (SchedulingConfigurer configurer : configurers) {
 				configurer.configureTasks(this.registrar);
 			}
 		}

diff --git a/.../main/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessor.java b/.../main/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessor.java
@@ -17,7 +17,9 @@
 package org.springframework.jms.annotation;
 
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -41,6 +43,7 @@
 import org.springframework.core.MethodIntrospector;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.jms.config.JmsListenerConfigUtils;
 import org.springframework.jms.config.JmsListenerContainerFactory;
 import org.springframework.jms.config.JmsListenerEndpointRegistrar;
@@ -170,9 +173,11 @@ public void afterSingletonsInstantiated() {
 
 		if (this.beanFactory instanceof ListableBeanFactory) {
 			// Apply JmsListenerConfigurer beans from the BeanFactory, if any
-			Map<String, JmsListenerConfigurer> instances =
+			Map<String, JmsListenerConfigurer> beans =
 					((ListableBeanFactory) this.beanFactory).getBeansOfType(JmsListenerConfigurer.class);
-			for (JmsListenerConfigurer configurer : instances.values()) {
+			List<JmsListenerConfigurer> configurers = new ArrayList<>(beans.values());
+			AnnotationAwareOrderComparator.sort(configurers);
+			for (JmsListenerConfigurer configurer : configurers) {
 				configurer.configureJmsListeners(this.registrar);
 			}
 		}

diff --git a/...-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceUrlProvider.java b/...-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceUrlProvider.java
@@ -18,7 +18,6 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -106,8 +105,8 @@ public void onApplicationEvent(ContextRefreshedEvent event) {
 	private void detectResourceHandlers(ApplicationContext context) {
 		logger.debug("Looking for resource handler mappings");
 
-		Map<String, SimpleUrlHandlerMapping> map = context.getBeansOfType(SimpleUrlHandlerMapping.class);
-		List<SimpleUrlHandlerMapping> mappings = new ArrayList<>(map.values());
+		Map<String, SimpleUrlHandlerMapping> beans = context.getBeansOfType(SimpleUrlHandlerMapping.class);
+		List<SimpleUrlHandlerMapping> mappings = new ArrayList<>(beans.values());
 		AnnotationAwareOrderComparator.sort(mappings);
 
 		mappings.forEach(mapping -> {

diff --git a/...ng-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java b/...ng-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
@@ -22,7 +22,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
@@ -142,13 +141,13 @@ public void onApplicationEvent(ContextRefreshedEvent event) {
 	protected void detectResourceHandlers(ApplicationContext appContext) {
 		logger.debug("Looking for resource handler mappings");
 
-		Map<String, SimpleUrlHandlerMapping> map = appContext.getBeansOfType(SimpleUrlHandlerMapping.class);
-		List<SimpleUrlHandlerMapping> handlerMappings = new ArrayList<>(map.values());
-		AnnotationAwareOrderComparator.sort(handlerMappings);
+		Map<String, SimpleUrlHandlerMapping> beans = appContext.getBeansOfType(SimpleUrlHandlerMapping.class);
+		List<SimpleUrlHandlerMapping> mappings = new ArrayList<>(beans.values());
+		AnnotationAwareOrderComparator.sort(mappings);
 
-		for (SimpleUrlHandlerMapping hm : handlerMappings) {
-			for (String pattern : hm.getHandlerMap().keySet()) {
-				Object handler = hm.getHandlerMap().get(pattern);
+		for (SimpleUrlHandlerMapping mapping : mappings) {
+			for (String pattern : mapping.getHandlerMap().keySet()) {
+				Object handler = mapping.getHandlerMap().get(pattern);
 				if (handler instanceof ResourceHttpRequestHandler) {
 					ResourceHttpRequestHandler resourceHandler = (ResourceHttpRequestHandler) handler;
 					if (logger.isDebugEnabled()) {