Skip to content

Commit fd045f0

Browse files
committed
Merge branch '1.5.x'
2 parents e52a328 + 7f8a8ba commit fd045f0

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
import org.springframework.boot.env.RandomValuePropertySource;
4646
import org.springframework.boot.logging.DeferredLog;
4747
import org.springframework.context.ApplicationEvent;
48-
import org.springframework.context.ApplicationListener;
4948
import org.springframework.context.ConfigurableApplicationContext;
5049
import org.springframework.context.annotation.ConfigurationClassPostProcessor;
50+
import org.springframework.context.event.SmartApplicationListener;
5151
import org.springframework.core.Ordered;
5252
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
5353
import org.springframework.core.env.ConfigurableEnvironment;
@@ -93,7 +93,7 @@
9393
* @author Madhura Bhave
9494
*/
9595
public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
96-
ApplicationListener<ApplicationEvent>, Ordered {
96+
SmartApplicationListener, Ordered {
9797

9898
private static final String DEFAULT_PROPERTIES = "defaultProperties";
9999

@@ -140,6 +140,17 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
140140

141141
private int order = DEFAULT_ORDER;
142142

143+
@Override
144+
public boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
145+
return ApplicationEnvironmentPreparedEvent.class.isAssignableFrom(eventType) ||
146+
ApplicationPreparedEvent.class.isAssignableFrom(eventType);
147+
}
148+
149+
@Override
150+
public boolean supportsSourceType(Class<?> aClass) {
151+
return true;
152+
}
153+
143154
@Override
144155
public void onApplicationEvent(ApplicationEvent event) {
145156
if (event instanceof ApplicationEnvironmentPreparedEvent) {

spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,8 @@ public boolean supports(Class<?> type) {
452452
if (AnnotatedElementUtils.hasAnnotation(type, Validated.class)) {
453453
return true;
454454
}
455-
if (type.getPackage().getName().startsWith("org.springframework.boot")) {
455+
if (type.getPackage() != null &&
456+
type.getPackage().getName().startsWith("org.springframework.boot")) {
456457
return false;
457458
}
458459
if (getConstraintsForClass(type).isBeanConstrained()) {

0 commit comments

Comments
 (0)