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

Avoid duplicate scope registration

Browse Source 
Closes gh-14990
This commit is contained in:
Andy Wilkinson
2018-11-23 16:55:43 +00:00
parent 85cb6bf096
commit 291522a261
2 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContext.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2016 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -51,6 +51,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;
/**
@@ -114,7 +115,7 @@ public class EmbeddedWebApplicationContext extends GenericWebApplicationContext
beanFactory.addBeanPostProcessor(
new WebApplicationContextServletContextAwareProcessor(this));
beanFactory.ignoreDependencyInterface(ServletContextAware.class);
registerWebApplicationScopes(null);
registerWebApplicationScopes();
}
@Override
@@ -218,7 +219,7 @@ public class EmbeddedWebApplicationContext extends GenericWebApplicationContext
private void selfInitialize(ServletContext servletContext) throws ServletException {
prepareEmbeddedWebApplicationContext(servletContext);
registerWebApplicationScopes(servletContext);
registerApplicationScope(servletContext);
WebApplicationContextUtils.registerEnvironmentBeans(getBeanFactory(),
servletContext);
for (ServletContextInitializer beans : getServletContextInitializerBeans()) {
@@ -226,11 +227,17 @@ public class EmbeddedWebApplicationContext extends GenericWebApplicationContext
}
}
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();
}

31
spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContextTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2016 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -51,6 +51,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.testutil.InternalOutputCapture;
import org.springframework.boot.web.servlet.DelegatingFilterProxyRegistrationBean;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.boot.web.servlet.ServletContextInitializer;
@@ -96,6 +97,9 @@ public class EmbeddedWebApplicationContextTests {
@Rule
public ExpectedException thrown = ExpectedException.none();
@Rule
public InternalOutputCapture output = new InternalOutputCapture();
private EmbeddedWebApplicationContext context;
@Captor
@@ -489,6 +493,7 @@ public class EmbeddedWebApplicationContextTests {
@Test
public void servletRequestCanBeInjectedEarly() throws Exception {
// gh-14990
int initialOutputLength = this.output.toString().length();
addEmbeddedServletContainerFactoryBean();
RootBeanDefinition beanDefinition = new RootBeanDefinition(
WithAutowiredServletRequest.class);
@@ -507,6 +512,16 @@ public class EmbeddedWebApplicationContextTests {
});
this.context.refresh();
String output = this.output.toString().substring(initialOutputLength);
assertThat(output).doesNotContain("Replacing scope");
}
@Test
public void webApplicationScopeIsRegistered() throws Exception {
addEmbeddedServletContainerFactoryBean();
this.context.refresh();
assertThat(this.context.getBeanFactory()
.getRegisteredScope(WebApplicationContext.SCOPE_APPLICATION)).isNotNull();
}
private void addEmbeddedServletContainerFactoryBean() {
@@ -575,4 +590,18 @@ public class EmbeddedWebApplicationContextTests {
}
protected static class WithAutowiredServletContext {
private final ServletContext context;
public WithAutowiredServletContext(ServletContext context) {
this.context = context;
}
public ServletContext getContext() {
return this.context;
}
}
}