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

Merge branch '1.5.x' into 2.0.x

This commit is contained in:
Andy Wilkinson 2018-11-23 16:59:18 +00:00
parent a54de61e61 291522a261
commit 3331fa2d02
2 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java
View File

@ -55,6 +55,7 @@ import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.GenericWebApplicationContext;
import org.springframework.web.context.support.ServletContextAwareProcessor;
import org.springframework.web.context.support.ServletContextResource;
import org.springframework.web.context.support.ServletContextScope;
import org.springframework.web.context.support.WebApplicationContextUtils;
/**
@ -132,7 +133,7 @@ public class ServletWebServerApplicationContext extends GenericWebApplicationCon
beanFactory.addBeanPostProcessor(
new WebApplicationContextServletContextAwareProcessor(this));
beanFactory.ignoreDependencyInterface(ServletContextAware.class);
registerWebApplicationScopes(null);
registerWebApplicationScopes();
}
@Override
@ -227,7 +228,7 @@ public class ServletWebServerApplicationContext extends GenericWebApplicationCon
private void selfInitialize(ServletContext servletContext) throws ServletException {
prepareWebApplicationContext(servletContext);
registerWebApplicationScopes(servletContext);
registerApplicationScope(servletContext);
WebApplicationContextUtils.registerEnvironmentBeans(getBeanFactory(),
servletContext);
for (ServletContextInitializer beans : getServletContextInitializerBeans()) {
@ -235,11 +236,17 @@ public class ServletWebServerApplicationContext extends GenericWebApplicationCon
}
}
private void registerWebApplicationScopes(ServletContext servletContext) {
private void registerApplicationScope(ServletContext servletContext) {
ServletContextScope appScope = new ServletContextScope(servletContext);
getBeanFactory().registerScope(WebApplicationContext.SCOPE_APPLICATION, appScope);
// Register as ServletContext attribute, for ContextCleanupListener to detect it.
servletContext.setAttribute(ServletContextScope.class.getName(), appScope);
}
private void registerWebApplicationScopes() {
ExistingWebApplicationScopes existingScopes = new ExistingWebApplicationScopes(
getBeanFactory());
WebApplicationContextUtils.registerWebApplicationScopes(getBeanFactory(),
servletContext);
WebApplicationContextUtils.registerWebApplicationScopes(getBeanFactory());
existingScopes.restore();
}

29
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContextTests.java
View File

@ -49,6 +49,7 @@ import org.springframework.beans.factory.config.ConstructorArgumentValues;
import org.springframework.beans.factory.config.Scope;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.boot.testsupport.rule.OutputCapture;
import org.springframework.boot.web.context.ServerPortInfoApplicationContextInitializer;
import org.springframework.boot.web.servlet.DelegatingFilterProxyRegistrationBean;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
@ -94,6 +95,9 @@ public class ServletWebServerApplicationContextTests {
private ServletWebServerApplicationContext context;
@Rule
public OutputCapture output = new OutputCapture();
@Captor
private ArgumentCaptor<Filter> filterCaptor;
@ -469,6 +473,7 @@ public class ServletWebServerApplicationContextTests {
@Test
public void servletRequestCanBeInjectedEarly() throws Exception {
// gh-14990
int initialOutputLength = this.output.toString().length();
addWebServerFactoryBean();
RootBeanDefinition beanDefinition = new RootBeanDefinition(
WithAutowiredServletRequest.class);
@ -487,6 +492,16 @@ public class ServletWebServerApplicationContextTests {
});
this.context.refresh();
String output = this.output.toString().substring(initialOutputLength);
assertThat(output).doesNotContain("Replacing scope");
}
@Test
public void webApplicationScopeIsRegistered() throws Exception {
addWebServerFactoryBean();
this.context.refresh();
assertThat(this.context.getBeanFactory()
.getRegisteredScope(WebApplicationContext.SCOPE_APPLICATION)).isNotNull();
}
private void addWebServerFactoryBean() {
@ -555,4 +570,18 @@ public class ServletWebServerApplicationContextTests {
}
protected static class WithAutowiredServletContext {
private final ServletContext context;
public WithAutowiredServletContext(ServletContext context) {
this.context = context;
}
public ServletContext getContext() {
return this.context;
}
}
}