Update to Spring Data Hopper

Fixes gh-470

samples/httpsession-gemfire-clientserver-xml/src/main/java/sample/Application.java

@@ -27,8 +27,8 @@ import org.springframework.context.annotation.ImportResource;
 public class Application {
 
 	public static void main(final String[] args) {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				Application.class);
+		AnnotationConfigApplicationContext context =
+			new AnnotationConfigApplicationContext(Application.class);
 		context.registerShutdownHook();
 	}
 }

samples/httpsession-gemfire-clientserver-xml/src/main/java/sample/GemFireCacheServerReadyBeanPostProcessor.java

@@ -51,35 +51,32 @@ public class GemFireCacheServerReadyBeanPostProcessor implements BeanPostProcess
 
 	// tag::class[]
 	static {
-		ClientMembership
-				.registerClientMembershipListener(new ClientMembershipListenerAdapter() {
-					public void memberJoined(final ClientMembershipEvent event) {
-						if (!event.isClient()) {
-							latch.countDown();
-						}
+		ClientMembership.registerClientMembershipListener(
+			new ClientMembershipListenerAdapter() {
+				public void memberJoined(final ClientMembershipEvent event) {
+					if (!event.isClient()) {
+						latch.countDown();
 					}
-				});
+				}
+			});
 	}
 
 	@SuppressWarnings("all")
 	@Resource(name = "applicationProperties")
 	private Properties applicationProperties;
 
-	public Object postProcessBeforeInitialization(Object bean, String beanName)
-			throws BeansException {
+	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 		if (bean instanceof PoolFactoryBean || bean instanceof Pool) {
 			String host = getServerHost(DEFAULT_SERVER_HOST);
 			Assert.isTrue(waitForCacheServerToStart(host, this.port),
-					String.format(
-							"GemFire Server failed to start [host: '%1$s', port: %2$d]%n",
-							host, this.port));
+				String.format("GemFire Server failed to start [host: '%1$s', port: %2$d]%n",
+					host, this.port));
 		}
 
 		return bean;
 	}
 
-	public Object postProcessAfterInitialization(Object bean, String beanName)
-			throws BeansException {
+	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 		if (bean instanceof PoolFactoryBean || bean instanceof Pool) {
 			try {
 				latch.await(DEFAULT_WAIT_DURATION, TimeUnit.MILLISECONDS);
@@ -157,4 +154,5 @@ public class GemFireCacheServerReadyBeanPostProcessor implements BeanPostProcess
 
 		return condition.evaluate();
 	}
+
 }

samples/httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/spring/session-client.xml

@@ -35,6 +35,8 @@
 		<prop key="log-level">${sample.httpsession.gemfire.log-level:warning}</prop>
 	</util:properties>
 
+	<gfe:client-cache properties-ref="gemfireProperties"/>
+
 	<!--7-->
 	<gfe:pool free-connection-timeout="5000"
               keep-alive="false"
@@ -47,9 +49,6 @@
 		<gfe:server host="${application.gemfire.client-server.host}"
                     port="${spring.session.data.gemfire.port:${application.gemfire.client-server.port}}"/>
 	</gfe:pool>
-
-	<gfe:client-cache properties-ref="gemfireProperties"
-                      use-bean-factory-locator="false"/>
 	<!-- end::beans[] -->
 
 </beans>

samples/httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/web.xml

@@ -9,9 +9,7 @@
 	<!-- tag::context-param[] -->
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			/WEB-INF/spring/session-client.xml
-		</param-value>
+		<param-value>/WEB-INF/spring/session-client.xml</param-value>
 	</context-param>
 	<!-- end::context-param[] -->
 
@@ -23,9 +21,9 @@
 	<filter-mapping>
 		<filter-name>springSessionRepositoryFilter</filter-name>
 		<url-pattern>/*</url-pattern>
-                <dispatcher>REQUEST</dispatcher>
-                <dispatcher>ERROR</dispatcher>
-                <dispatcher>ASYNC</dispatcher>
+		<dispatcher>REQUEST</dispatcher>
+		<dispatcher>ERROR</dispatcher>
+		<dispatcher>ASYNC</dispatcher>
 	</filter-mapping>
 	<!-- end::springSessionRepositoryFilter[] -->
 
@@ -36,9 +34,7 @@
 	-->
 	<!-- tag::listeners[] -->
 	<listener>
-		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
-		</listener-class>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
 	<!-- end::listeners[] -->
 

samples/httpsession-gemfire-clientserver/src/main/java/sample/ClientConfig.java

@@ -36,7 +36,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.data.gemfire.client.ClientCacheFactoryBean;
 import org.springframework.data.gemfire.client.PoolFactoryBean;
-import org.springframework.data.gemfire.config.GemfireConstants;
 import org.springframework.data.gemfire.support.ConnectionEndpoint;
 import org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession;
 import org.springframework.session.data.gemfire.support.GemFireUtils;
@@ -52,17 +51,20 @@ public class ClientConfig {
 	static final CountDownLatch latch = new CountDownLatch(1);
 
 	static {
-		System.setProperty("gemfire.log-level",
-				System.getProperty("sample.httpsession.gemfire.log-level", "warning"));
+		System.setProperty("gemfire.log-level", logLevel());
 
-		ClientMembership
-				.registerClientMembershipListener(new ClientMembershipListenerAdapter() {
-					public void memberJoined(ClientMembershipEvent event) {
-						if (!event.isClient()) {
-							latch.countDown();
-						}
+		ClientMembership.registerClientMembershipListener(
+			new ClientMembershipListenerAdapter() {
+				public void memberJoined(ClientMembershipEvent event) {
+					if (!event.isClient()) {
+						latch.countDown();
 					}
-				});
+				}
+			});
+	}
+
+	private static String logLevel() {
+		return System.getProperty("sample.httpsession.gemfire.log-level", "warning");
 	}
 
 	@Bean
@@ -75,14 +77,22 @@ public class ClientConfig {
 		return new Properties();
 	}
 
-	@Bean(name = GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME)
+	@Bean
+	ClientCacheFactoryBean gemfireCache() { // <4>
+		ClientCacheFactoryBean clientCacheFactory = new ClientCacheFactoryBean();
+
+		clientCacheFactory.setClose(true);
+		clientCacheFactory.setProperties(gemfireProperties());
+
+		return clientCacheFactory;
+	}
+
+	@Bean
 	PoolFactoryBean gemfirePool(// <3>
-			@Value("${spring.session.data.gemfire.port:" + ServerConfig.SERVER_PORT
-					+ "}") int port) {
+			@Value("${spring.session.data.gemfire.port:" + ServerConfig.SERVER_PORT + "}") int port) {
 
 		PoolFactoryBean poolFactory = new PoolFactoryBean();
 
-		poolFactory.setName(GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME);
 		poolFactory.setFreeConnectionTimeout(5000); // 5 seconds
 		poolFactory.setKeepAlive(false);
 		poolFactory.setMaxConnections(ServerConfig.MAX_CONNECTIONS);
@@ -92,46 +102,29 @@ public class ClientConfig {
 		poolFactory.setSubscriptionEnabled(true);
 		poolFactory.setThreadLocalConnections(false);
 
-		poolFactory.setServerEndpoints(Collections.singletonList(
-				new ConnectionEndpoint(ServerConfig.SERVER_HOSTNAME, port)));
+		poolFactory.setServers(Collections.singletonList(
+			new ConnectionEndpoint(ServerConfig.SERVER_HOSTNAME, port)));
 
 		return poolFactory;
 	}
 
-	@Bean
-	ClientCacheFactoryBean gemfireCache(Pool gemfirePool) { // <4>
-		ClientCacheFactoryBean clientCacheFactory = new ClientCacheFactoryBean();
-
-		clientCacheFactory.setClose(true);
-		clientCacheFactory.setProperties(gemfireProperties());
-		clientCacheFactory.setPool(gemfirePool);
-		clientCacheFactory.setUseBeanFactoryLocator(false);
-
-		return clientCacheFactory;
-	}
-
 	@Bean
 	BeanPostProcessor gemfireCacheServerReadyBeanPostProcessor(// <5>
-			@Value("${spring.session.data.gemfire.port:" + ServerConfig.SERVER_PORT
-					+ "}") final int port) {
+			@Value("${spring.session.data.gemfire.port:" + ServerConfig.SERVER_PORT + "}") final int port) {
 
 		return new BeanPostProcessor() {
 
-			public Object postProcessBeforeInitialization(Object bean, String beanName)
-					throws BeansException {
+			public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 				if (bean instanceof PoolFactoryBean || bean instanceof Pool) {
-					Assert.isTrue(
-							waitForCacheServerToStart(ServerConfig.SERVER_HOSTNAME, port),
-							String.format(
-									"GemFire Server failed to start [hostname: %1$s, port: %2$d]",
-									ServerConfig.SERVER_HOSTNAME, port));
+					Assert.isTrue(waitForCacheServerToStart(ServerConfig.SERVER_HOSTNAME, port),
+						String.format("GemFire Server failed to start [hostname: %1$s, port: %2$d]",
+							ServerConfig.SERVER_HOSTNAME, port));
 				}
 
 				return bean;
 			}
 
-			public Object postProcessAfterInitialization(Object bean, String beanName)
-					throws BeansException {
+			public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 				if (bean instanceof PoolFactoryBean || bean instanceof Pool) {
 					try {
 						latch.await(DEFAULT_WAIT_DURATION, TimeUnit.MILLISECONDS);
@@ -206,4 +199,5 @@ public class ClientConfig {
 
 		return condition.evaluate();
 	}
+
 }

samples/httpsession-gemfire-clientserver/src/main/java/sample/ServerConfig.java

@@ -49,20 +49,23 @@ public class ServerConfig {
 
 		gemfireProperties.setProperty("name", "GemFireClientServerHttpSessionSample");
 		gemfireProperties.setProperty("mcast-port", "0");
-		gemfireProperties.setProperty("log-level",
-				System.getProperty("sample.httpsession.gemfire.log-level", "warning"));
+		gemfireProperties.setProperty("log-level", logLevel());
 		gemfireProperties.setProperty("jmx-manager", "true");
 		gemfireProperties.setProperty("jmx-manager-start", "true");
 
 		return gemfireProperties;
 	}
 
+	private String logLevel() {
+		return System.getProperty("sample.httpsession.gemfire.log-level", "warning");
+	}
+
 	@Bean
 	CacheFactoryBean gemfireCache() { // <3>
 		CacheFactoryBean gemfireCache = new CacheFactoryBean();
 
+		gemfireCache.setClose(true);
 		gemfireCache.setProperties(gemfireProperties());
-		gemfireCache.setUseBeanFactoryLocator(false);
 
 		return gemfireCache;
 	}
@@ -76,6 +79,7 @@ public class ServerConfig {
 		cacheServerFactory.setAutoStartup(true);
 		cacheServerFactory.setBindAddress(SERVER_HOSTNAME);
 		cacheServerFactory.setCache(gemfireCache);
+		cacheServerFactory.setHostNameForClients(SERVER_HOSTNAME);
 		cacheServerFactory.setMaxConnections(MAX_CONNECTIONS);
 		cacheServerFactory.setPort(port);
 
@@ -86,5 +90,6 @@ public class ServerConfig {
 	public static void main(final String[] args) throws IOException { // <5>
 		new AnnotationConfigApplicationContext(ServerConfig.class).registerShutdownHook();
 	}
+
 }
 // end::class[]

samples/httpsession-gemfire-p2p/src/main/java/sample/Config.java

@@ -44,8 +44,8 @@ public class Config {
 	CacheFactoryBean gemfireCache() { // <3>
 		CacheFactoryBean gemfireCache = new CacheFactoryBean();
 
+		gemfireCache.setClose(true);
 		gemfireCache.setProperties(gemfireProperties());
-		gemfireCache.setUseBeanFactoryLocator(false);
 
 		return gemfireCache;
 	}