Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[bs-144] Make EmbedddedContainerConfiguration an import selector

Browse Source 
Previously EmbedddedContainerConfiguration cannot be imported directly.
This change ensures that the nested classes are not loaded automatically
so there can be no issues with the annotation parameters.

There might be a case for a change in Spring here since the framework
itself could just be more cautious when processing nested classes.

[Fixes #50880927]
This commit is contained in:
Dave Syer
2013-05-31 13:24:04 +01:00
parent 6c22e0ab6e
commit 990627b328
2 changed files with 106 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedContainerConfiguration.java
View File

@@ -28,7 +28,8 @@ import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServlet
import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.ImportSelector;
import org.springframework.core.type.AnnotationMetadata;
/**
* {@link EnableAutoConfiguration Auto-configuration} for an embedded servlet container.
@@ -37,13 +38,21 @@ import org.springframework.context.annotation.Import;
* @author Dave Syer
*
*/
@Import(ServerPropertiesConfiguration.class)
public class EmbeddedContainerConfiguration {
public class EmbeddedContainerConfiguration implements ImportSelector {
@Override
public String[] selectImports(AnnotationMetadata importingClassMetadata) {
// Don't import the classes directly because that might trigger loading them - use
// an import selector and the class name instead
return new String[] { ServerPropertiesConfiguration.class.getName(),
EmbeddedJettyAutoConfiguration.class.getName(),
EmbeddedTomcatAutoConfiguration.class.getName() };
}
@Configuration
@ConditionalOnClass({ Servlet.class, Server.class, Loader.class })
@ConditionalOnMissingBean(EmbeddedServletContainerFactory.class)
protected static class EmbeddedJettyAutoConfiguration {
public static class EmbeddedJettyAutoConfiguration {
@Bean
public JettyEmbeddedServletContainerFactory jettyEmbeddedServletContainerFactory() {
@@ -55,7 +64,7 @@ public class EmbeddedContainerConfiguration {
@Configuration
@ConditionalOnClass({ Servlet.class, Tomcat.class })
@ConditionalOnMissingBean(EmbeddedServletContainerFactory.class)
protected static class EmbeddedTomcatAutoConfiguration {
public static class EmbeddedTomcatAutoConfiguration {
@Bean
public TomcatEmbeddedServletContainerFactory tomcatEmbeddedServletContainerFactory() {