Fix rest sample tests

- move to itest folder
- dynamically allocate the port for Redis

Issues spring-projectsgh-183

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

@@ -14,6 +14,9 @@
  * 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;
@@ -22,8 +25,10 @@
 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.clients.jedis.Protocol;
 import redis.embedded.RedisServer;
 
 /**
@@ -34,11 +39,19 @@
  * @author Rob Winch
  */
 @Configuration
+//@org.springframework.context.annotation.PropertySource("classpath:application.properties")
 public class EmbeddedRedisConfiguration {
 
 	@Bean
-	public static RedisServerBean redisServer() {
-		return new RedisServerBean();
+	public static RedisServerBean redisServer(ConfigurableEnvironment env) {
+		RedisServerBean bean = new RedisServerBean();
+		env.getPropertySources().addLast(bean);
+		return bean;
+	}
+
+	@Bean
+	public static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() {
+		return new PropertySourcesPlaceholderConfigurer();
 	}
 
 	/**
@@ -47,11 +60,18 @@ public static RedisServerBean redisServer() {
 	 * that the Redis Server is started before RedisHttpSessionConfiguration
 	 * attempts to enable Keyspace notifications.
 	 */
-	static class RedisServerBean implements InitializingBean, DisposableBean, BeanDefinitionRegistryPostProcessor {
+	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(Protocol.DEFAULT_PORT);
+			redisServer = new RedisServer(port);
 			redisServer.start();
 		}
 
@@ -64,5 +84,27 @@ public void destroy() throws Exception {
 		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,6 +15,7 @@
  */
 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;
@@ -30,8 +31,10 @@
 public class HttpSessionConfig {
 
 	@Bean
-	public JedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory(); // <3>
+	public JedisConnectionFactory connectionFactory(@Value("${redis.server.port}") int port) {
+		JedisConnectionFactory factory = new JedisConnectionFactory();  // <3>
+		factory.setPort(port);
+		return factory;
 	}
 
 	@Bean

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

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