|
|
@ -62,7 +62,6 @@ import org.springframework.core.io.DefaultResourceLoader;
|
|
|
|
import org.springframework.core.io.Resource;
|
|
|
|
import org.springframework.core.io.Resource;
|
|
|
|
import org.springframework.core.io.ResourceLoader;
|
|
|
|
import org.springframework.core.io.ResourceLoader;
|
|
|
|
import org.springframework.core.io.support.SpringFactoriesLoader;
|
|
|
|
import org.springframework.core.io.support.SpringFactoriesLoader;
|
|
|
|
import org.springframework.lang.Nullable;
|
|
|
|
|
|
|
|
import org.springframework.util.Assert;
|
|
|
|
import org.springframework.util.Assert;
|
|
|
|
import org.springframework.util.ResourceUtils;
|
|
|
|
import org.springframework.util.ResourceUtils;
|
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
import org.springframework.util.StringUtils;
|
|
|
@ -152,6 +151,17 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
|
|
|
|
|
|
|
|
|
|
|
|
private final ConversionService conversionService = new DefaultConversionService();
|
|
|
|
private final ConversionService conversionService = new DefaultConversionService();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
|
|
|
|
|
|
|
|
return ApplicationEnvironmentPreparedEvent.class.isAssignableFrom(eventType) ||
|
|
|
|
|
|
|
|
ApplicationPreparedEvent.class.isAssignableFrom(eventType);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public boolean supportsSourceType(Class<?> aClass) {
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void onApplicationEvent(ApplicationEvent event) {
|
|
|
|
public void onApplicationEvent(ApplicationEvent event) {
|
|
|
|
if (event instanceof ApplicationEnvironmentPreparedEvent) {
|
|
|
|
if (event instanceof ApplicationEnvironmentPreparedEvent) {
|
|
|
@ -277,17 +287,6 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
|
|
|
|
this.names = names;
|
|
|
|
this.names = names;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
|
|
|
|
|
|
|
|
return ApplicationEnvironmentPreparedEvent.class.isAssignableFrom(eventType) ||
|
|
|
|
|
|
|
|
ApplicationPreparedEvent.class.isAssignableFrom(eventType);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public boolean supportsSourceType(@Nullable Class<?> aClass) {
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* {@link BeanFactoryPostProcessor} to re-order our property sources below any
|
|
|
|
* {@link BeanFactoryPostProcessor} to re-order our property sources below any
|
|
|
|
* {@code @PropertySource} items added by the {@link ConfigurationClassPostProcessor}.
|
|
|
|
* {@code @PropertySource} items added by the {@link ConfigurationClassPostProcessor}.
|
|
|
|