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

EventListenerMethodProcessor accepts internal configuration classes 

Issue: SPR-17160
This commit is contained in:
Juergen Hoeller 2018-08-18 12:05:39 +02:00
parent a6a6cf7d97
commit 1d59e52f11
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-context/src/main/java/org/springframework/context/event/EventListenerMethodProcessor.java
View File

@ -45,6 +45,7 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.CollectionUtils;
/**
@ -196,7 +197,7 @@ public class EventListenerMethodProcessor
*/
private static boolean isSpringContainerClass(Class<?> clazz) {
return (clazz.getName().startsWith("org.springframework.") &&
!AnnotatedElementUtils.isAnnotated(clazz, Component.class));
!AnnotatedElementUtils.isAnnotated(ClassUtils.getUserClass(clazz), Component.class));
}
}

4
spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -951,7 +951,7 @@ public class AnnotationDrivenEventListenerTests {
}
@Component
@Configuration
static class OrderedTestListener extends TestEventListener {
public final List<String> order = new ArrayList<>();