Workaround bizarre compiler problem

This commit is contained in:
Andy Wilkinson
2015-08-13 15:46:38 +01:00
parent 51dd806a98
commit c15a670c6d

View File

@@ -37,7 +37,6 @@ import org.junit.rules.ExpectedException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration.WebMvcAutoConfigurationAdapter;
import org.springframework.boot.autoconfigure.web.WebMvcAutoConfigurationTests.CustomConfigurableWebBindingInitializer.CustomWebBindingInitializer;
import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor;
import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
@@ -580,6 +579,21 @@ public class WebMvcAutoConfigurationTests {
}
@Configuration
static class CustomConfigurableWebBindingInitializer {
@Bean
public ConfigurableWebBindingInitializer customConfigurableWebBindingInitializer() {
return new CustomWebBindingInitializer();
}
}
private static class CustomWebBindingInitializer extends
ConfigurableWebBindingInitializer {
}
@Configuration
static class CustomHttpPutFormContentFilter {
@@ -590,19 +604,4 @@ public class WebMvcAutoConfigurationTests {
}
@Configuration
static class CustomConfigurableWebBindingInitializer {
@Bean
public ConfigurableWebBindingInitializer customConfigurableWebBindingInitializer() {
return new CustomWebBindingInitializer();
}
static class CustomWebBindingInitializer extends
ConfigurableWebBindingInitializer {
}
}
}