Add EnableEmbeddedRedis

Fixes gh-184

samples/httpsession/build.gradle

@@ -8,8 +8,8 @@ sonarRunner {
 
 dependencies {
 	compile project(':spring-session-data-redis'),
+			project(':samples:spring-embedded-redis'),
 			"org.springframework:spring-web:$springVersion",
-			"redis.embedded:embedded-redis:$embeddedRedisVersion",
 			jstlDependencies
 
 	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"

samples/httpsession/src/main/java/sample/Config.java

@@ -16,18 +16,19 @@
 package sample;
 
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
-import org.springframework.data.redis.connection.jedis.*;
-import org.springframework.session.data.redis.config.annotation.web.http.*;
+import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 
 // tag::class[]
-@Import(EmbeddedRedisConfiguration.class) // <1>
+@EnableEmbeddedRedis // <1>
 @EnableRedisHttpSession // <2>
 public class Config {
 
 	@Bean
-	public JedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory(); // <3>
+	public JedisConnectionFactory connectionFactory(@RedisServerPort int port) {
+		JedisConnectionFactory connection = new JedisConnectionFactory(); // <3>
+		connection.setPort(port);
+		return connection;
 	}
 }
 // end::class[]

samples/httpsession/src/main/java/sample/EmbeddedRedisConfiguration.java

@@ -1,70 +0,0 @@
-/*
- * 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 sample;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import redis.clients.jedis.Protocol;
-import redis.embedded.RedisServer;
-
-/**
- * Runs an embedded Redis instance. This is only necessary since we do not want
- * users to have to setup a Redis instance. In a production environment, this
- * would not be used since a Redis Server would be setup.
- *
- * @author Rob Winch
- */
-@Configuration
-public class EmbeddedRedisConfiguration {
-
-	@Bean
-	public static RedisServerBean redisServer() {
-		return new RedisServerBean();
-	}
-
-	/**
-	 * Implements BeanDefinitionRegistryPostProcessor to ensure this Bean
-	 * is initialized before any other Beans. Specifically, we want to ensure
-	 * that the Redis Server is started before RedisHttpSessionConfiguration
-	 * attempts to enable Keyspace notifications.
-	 */
-	static class RedisServerBean implements InitializingBean, DisposableBean, BeanDefinitionRegistryPostProcessor {
-		private RedisServer redisServer;
-
-
-		public void afterPropertiesSet() throws Exception {
-			redisServer = new RedisServer(Protocol.DEFAULT_PORT);
-			redisServer.start();
-		}
-
-		public void destroy() throws Exception {
-			if(redisServer != null) {
-				redisServer.stop();
-			}
-		}
-
-		public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {}
-
-		public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {}
-	}
-}