From 69b6e3a2f13889bcd088d100379f9fe51abf1889 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 7 Jun 2017 21:33:17 -0700 Subject: [PATCH] Apply final polish and fixups to :spring-session-sample-boot-gemfire example and integration tests. --- .../spring-session-sample-boot-gemfire.gradle | 4 ++-- .../src/main/java/sample/client/Application.java | 14 ++++++++------ .../src/main/java/sample/server/GemFireServer.java | 12 ++++++++---- .../src/main/resources/application.properties | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle b/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle index 29b5282..abc7185 100644 --- a/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle +++ b/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle @@ -54,8 +54,8 @@ task runGemFireServer() { String[] commandLine = [ 'java', '-server', '-ea', '-classpath', classpath, - "-Dgemfire.log-file=gemfire-server.log", - "-Dgemfire.log-level=config", + //"-Dgemfire.log-file=gemfire-server.log", + //"-Dgemfire.log-level=config", "-Dspring-session-data-gemfire.cache.server.port=$port", "-Dspring-session-data-gemfire.log.level=" + System.getProperty('spring-session-data-gemfire.log.level', 'warning'), diff --git a/samples/boot/gemfire/src/main/java/sample/client/Application.java b/samples/boot/gemfire/src/main/java/sample/client/Application.java index 3b3b53f..6f2c9ad 100644 --- a/samples/boot/gemfire/src/main/java/sample/client/Application.java +++ b/samples/boot/gemfire/src/main/java/sample/client/Application.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; import javax.servlet.http.HttpSession; import org.apache.geode.cache.Region; @@ -46,12 +45,14 @@ import org.apache.geode.management.membership.ClientMembershipEvent; import org.apache.geode.management.membership.ClientMembershipListenerAdapter; import org.springframework.beans.BeansException; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.data.gemfire.client.ClientCacheFactoryBean; import org.springframework.data.gemfire.client.ClientRegionFactoryBean; @@ -93,7 +94,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @SuppressWarnings("unused") public class Application { - static final long DEFAULT_TIMEOUT = TimeUnit.SECONDS.toMillis(60); + static final long DEFAULT_TIMEOUT = TimeUnit.SECONDS.toMillis(30); static final CountDownLatch LATCH = new CountDownLatch(1); @@ -178,6 +179,7 @@ public class Application { } @Bean(name = "Example") + @Profile("debug") ClientRegionFactoryBean exampleRegion(ClientCache gemfireCache) { ClientRegionFactoryBean exampleRegionFactory = new ClientRegionFactoryBean<>(); @@ -192,7 +194,7 @@ public class Application { @Bean BeanPostProcessor gemfireClientServerReadyBeanPostProcessor( @Value("${spring-session-data-gemfire.cache.server.host:localhost}") final String host, - @Value("${spring-session-data-gemfire.cache.server.port:12480}") final int port) { // <5> + @Value("${spring-session-data-gemfire.cache.server.port:40404}") final int port) { // <5> return new BeanPostProcessor() { @@ -308,8 +310,8 @@ public class Application { } } - @Resource(name = "Example") - private Region example; + @Autowired(required = false) + private ClientCache gemfireCache; @ExceptionHandler @ResponseBody @@ -328,7 +330,7 @@ public class Application { @RequestMapping(method = RequestMethod.GET, path = "/time") @ResponseBody public String time() { - return String.valueOf(this.example.get("time")); + return String.valueOf(this.gemfireCache.getRegion("/Example").get("time")); } /* diff --git a/samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java b/samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java index 9a7e97e..f32e56e 100644 --- a/samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java +++ b/samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java @@ -21,8 +21,6 @@ import java.time.format.DateTimeFormatter; import java.util.Properties; import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; - import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; @@ -33,6 +31,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Profile; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.data.gemfire.CacheFactoryBean; import org.springframework.data.gemfire.ReplicatedRegionFactoryBean; @@ -120,6 +119,7 @@ public class GemFireServer { } @Bean(name = "Example") + @Profile("debug") ReplicatedRegionFactoryBean exampleRegion(Cache gemfireCache) { ReplicatedRegionFactoryBean exampleRegionFactory = new ReplicatedRegionFactoryBean<>(); @@ -130,12 +130,16 @@ public class GemFireServer { return exampleRegionFactory; } - @Resource(name = "Example") - private Region example; + @Autowired + private Cache gemfireCache; @Bean + @Profile("debug") CommandLineRunner exampleInitializer() { + return args -> { + + Region example = this.gemfireCache.getRegion("/Example"); String key = "time"; example.put(key, LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd hh:ss a"))); diff --git a/samples/boot/gemfire/src/main/resources/application.properties b/samples/boot/gemfire/src/main/resources/application.properties index 261ef19..31c8979 100644 --- a/samples/boot/gemfire/src/main/resources/application.properties +++ b/samples/boot/gemfire/src/main/resources/application.properties @@ -1,2 +1,2 @@ #server.error.whitelabel.enabled=false -spring.thymeleaf.prefix=classpath*:/templates/ +#spring.thymeleaf.prefix=classpath*:/templates/