Add EnableEmbeddedRedis

Fixes gh-184

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

@@ -1,110 +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 java.io.IOException;
-import java.net.ServerSocket;
-
-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 org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.PropertySource;
-
-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
-//@org.springframework.context.annotation.PropertySource("classpath:application.properties")
-public class EmbeddedRedisConfiguration {
-
-	@Bean
-	public static RedisServerBean redisServer(ConfigurableEnvironment env) {
-		RedisServerBean bean = new RedisServerBean();
-		env.getPropertySources().addLast(bean);
-		return bean;
-	}
-
-	@Bean
-	public static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() {
-		return new PropertySourcesPlaceholderConfigurer();
-	}
-
-	/**
-	 * 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 extends PropertySource<RedisServerBean> implements InitializingBean, DisposableBean, BeanDefinitionRegistryPostProcessor {
-		public static final String SERVER_PORT_PROP_NAME = "redis.server.port";
-		private final int port = getAvailablePort();
-
-		private RedisServer redisServer;
-
-		public RedisServerBean() {
-			super("redisServerPortPropertySource");
-		}
-
-		public void afterPropertiesSet() throws Exception {
-			redisServer = new RedisServer(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 {}
-
-		@Override
-		public Object getProperty(String name) {
-			if(SERVER_PORT_PROP_NAME.equals(name)) {
-				return port;
-			}
-			return null;
-		}
-
-		private static int getAvailablePort() {
-			ServerSocket socket = null;
-			try {
-				socket = new ServerSocket(0);
-				return socket.getLocalPort();
-			} catch(IOException e) {
-				throw new RuntimeException(e);
-			} finally {
-				try {
-					socket.close();
-				}catch(IOException e) {}
-			}
-		}
-	}
-}

samples/rest/src/main/java/sample/HttpSessionConfig.java

@@ -15,10 +15,8 @@
  */
 package sample;
 
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.session.web.http.HeaderHttpSessionStrategy;
@@ -26,12 +24,12 @@ import org.springframework.session.web.http.HttpSessionStrategy;
 
 // tag::class[]
 @Configuration
-@Import(EmbeddedRedisConfiguration.class) // <1>
+@EnableEmbeddedRedis // <1>
 @EnableRedisHttpSession // <2>
 public class HttpSessionConfig {
 
 	@Bean
-	public JedisConnectionFactory connectionFactory(@Value("${redis.server.port}") int port) {
+	public JedisConnectionFactory connectionFactory(@RedisServerPort int port) {
 		JedisConnectionFactory factory = new JedisConnectionFactory();  // <3>
 		factory.setPort(port);
 		return factory;

samples/rest/src/test/resources/application.properties

@@ -1 +0,0 @@
-redis.server.port=12345