From e766ad774d3ea1497dbabdbc008f4083213f5983 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Thu, 3 Dec 2015 16:08:43 -0600 Subject: [PATCH] Make ServletContext Optional Fixes gh-318 --- .../http/SpringHttpSessionConfiguration.java | 8 +++- ...onClassPathXmlApplicationContextTests.java | 47 +++++++++++++++++++ ...PathXmlApplicationContextTests-context.xml | 14 ++++++ 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 spring-session/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationClassPathXmlApplicationContextTests.java create mode 100644 spring-session/src/test/resources/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationClassPathXmlApplicationContextTests-context.xml diff --git a/spring-session/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java b/spring-session/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java index bade59a..9a42bc7 100644 --- a/spring-session/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java +++ b/spring-session/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java @@ -91,6 +91,7 @@ public class SpringHttpSessionConfiguration { private List httpSessionListeners = new ArrayList(); + private ServletContext servletContext; @Bean public SessionEventHttpSessionListenerAdapter sessionEventHttpSessionListenerAdapter() { @@ -98,7 +99,7 @@ public class SpringHttpSessionConfiguration { } @Bean - public SessionRepositoryFilter springSessionRepositoryFilter(SessionRepository sessionRepository, ServletContext servletContext) { + public SessionRepositoryFilter springSessionRepositoryFilter(SessionRepository sessionRepository) { SessionRepositoryFilter sessionRepositoryFilter = new SessionRepositoryFilter(sessionRepository); sessionRepositoryFilter.setServletContext(servletContext); if(httpSessionStrategy instanceof MultiHttpSessionStrategy) { @@ -109,6 +110,11 @@ public class SpringHttpSessionConfiguration { return sessionRepositoryFilter; } + @Autowired(required=false) + public void setServletContext(ServletContext servletContext) { + this.servletContext = servletContext; + } + @Autowired(required = false) public void setCookieSerializer(CookieSerializer cookieSerializer) { this.defaultHttpSessionStrategy.setCookieSerializer(cookieSerializer); diff --git a/spring-session/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationClassPathXmlApplicationContextTests.java b/spring-session/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationClassPathXmlApplicationContextTests.java new file mode 100644 index 0000000..8143abd --- /dev/null +++ b/spring-session/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationClassPathXmlApplicationContextTests.java @@ -0,0 +1,47 @@ +/* + * Copyright 2002-2015 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.session.data.redis.config.annotation.web.http; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.data.redis.connection.RedisConnection; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +/** + * @author Rob Winch + * + */ +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration +public class RedisHttpSessionConfigurationClassPathXmlApplicationContextTests { + + // gh-318 + @Test + public void contextLoads() {} + + static RedisConnectionFactory connectionFactory() { + RedisConnectionFactory factory = mock(RedisConnectionFactory.class); + RedisConnection connection = mock(RedisConnection.class); + when(factory.getConnection()).thenReturn(connection); + + return factory; + } +} \ No newline at end of file diff --git a/spring-session/src/test/resources/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationClassPathXmlApplicationContextTests-context.xml b/spring-session/src/test/resources/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationClassPathXmlApplicationContextTests-context.xml new file mode 100644 index 0000000..b5339a8 --- /dev/null +++ b/spring-session/src/test/resources/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationClassPathXmlApplicationContextTests-context.xml @@ -0,0 +1,14 @@ + + + + + + + + + \ No newline at end of file