root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

ApplicationListenerMethodAdapter uses target method for order lookup 

Fixes #22307
This commit is contained in:
Juergen Hoeller 2019-01-25 15:44:43 +01:00
parent 85ec9b9df2
commit d0033f12d0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-context/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -94,11 +94,10 @@ public class ApplicationListenerMethodAdapter implements GenericApplicationListe
EventListener ann = AnnotatedElementUtils.findMergedAnnotation(this.targetMethod, EventListener.class); EventListener ann = AnnotatedElementUtils.findMergedAnnotation(this.targetMethod, EventListener.class);
this.declaredEventTypes = resolveDeclaredEventTypes(method, ann); this.declaredEventTypes = resolveDeclaredEventTypes(method, ann);
this.condition = (ann != null ? ann.condition() : null); this.condition = (ann != null ? ann.condition() : null);
this.order = resolveOrder(method); this.order = resolveOrder(this.targetMethod);
} }
private static List<ResolvableType> resolveDeclaredEventTypes(Method method, @Nullable EventListener ann) {
private List<ResolvableType> resolveDeclaredEventTypes(Method method, @Nullable EventListener ann) {
int count = method.getParameterCount(); int count = method.getParameterCount();
if (count > 1) { if (count > 1) {
throw new IllegalStateException( throw new IllegalStateException(
@ -123,11 +122,12 @@ public class ApplicationListenerMethodAdapter implements GenericApplicationListe
return Collections.singletonList(ResolvableType.forMethodParameter(method, 0)); return Collections.singletonList(ResolvableType.forMethodParameter(method, 0));
} }
private int resolveOrder(Method method) { private static int resolveOrder(Method method) {
Order ann = AnnotatedElementUtils.findMergedAnnotation(method, Order.class); Order ann = AnnotatedElementUtils.findMergedAnnotation(method, Order.class);
return (ann != null ? ann.value() : 0); return (ann != null ? ann.value() : 0);
} }
/** /**
* Initialize this instance. * Initialize this instance.
*/ */