diff --git a/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/client/Application.java b/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/client/Application.java index de9ce5b..d4cb24e 100644 --- a/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/client/Application.java +++ b/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/client/Application.java @@ -73,11 +73,12 @@ public class Application { SpringApplication.run(Application.class, args); } - @ClientCacheApplication(name = "SpringSessionDataGeodeClientWithScopedProxiesBootSample", + @ClientCacheApplication(name = "SpringSessionDataGeodeClientWithScopedProxiesBootSample", logLevel = "error", pingInterval = 5000L, readTimeout = 15000, retryAttempts = 1, subscriptionEnabled = true) // <3> @EnableGemFireHttpSession(poolName = "DEFAULT") // <4> static class ClientCacheConfiguration { + // Required to resolve property placeholders in Spring @Value annotations. @Bean static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() { return new PropertySourcesPlaceholderConfigurer(); diff --git a/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/server/GemFireServer.java b/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/server/GemFireServer.java index eb74ab5..dc6c97f 100644 --- a/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/server/GemFireServer.java +++ b/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/server/GemFireServer.java @@ -41,7 +41,7 @@ import org.springframework.session.data.gemfire.config.annotation.web.http.Enabl @SuppressWarnings("unused") // tag::class[] @SpringBootApplication // <1> -@CacheServerApplication(name = "SpringSessionDataGeodeServerWithScopedProxiesBootSample") // <2> +@CacheServerApplication(name = "SpringSessionDataGeodeServerWithScopedProxiesBootSample", logLevel = "error") // <2> @EnableGemFireHttpSession(maxInactiveIntervalInSeconds = 10) // <3> @EnableManager(start = true) // <4> public class GemFireServer { @@ -54,6 +54,7 @@ public class GemFireServer { .run(args); } + // Required to resolve property placeholders in Spring @Value annotations. @Bean static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() { return new PropertySourcesPlaceholderConfigurer(); 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 53d46f5..20a154d 100644 --- a/samples/boot/gemfire/src/main/java/sample/client/Application.java +++ b/samples/boot/gemfire/src/main/java/sample/client/Application.java @@ -75,7 +75,7 @@ public class Application { SpringApplication.run(Application.class, args); } - @ClientCacheApplication(name = "SpringSessionDataGeodeClientBootSample", logLevel = "warning", + @ClientCacheApplication(name = "SpringSessionDataGeodeClientBootSample", logLevel = "error", pingInterval = 5000L, readTimeout = 15000, retryAttempts = 1, subscriptionEnabled = true) // <3> @EnableGemFireHttpSession(poolName = "DEFAULT") // <4> static class ClientCacheConfiguration extends IntegrationTestConfiguration { 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 a2ef65b..3cf2762 100644 --- a/samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java +++ b/samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java @@ -21,7 +21,6 @@ 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.support.PropertySourcesPlaceholderConfigurer; import org.springframework.data.gemfire.config.annotation.CacheServerApplication; import org.springframework.data.gemfire.config.annotation.CacheServerConfigurer; import org.springframework.data.gemfire.config.annotation.EnableManager; @@ -41,7 +40,7 @@ import org.springframework.session.data.gemfire.config.annotation.web.http.Enabl @SuppressWarnings("unused") // tag::class[] @SpringBootApplication // <1> -@CacheServerApplication(name = "SpringSessionDataGeodeServerBootSample", logLevel = "warning") // <2> +@CacheServerApplication(name = "SpringSessionDataGeodeServerBootSample", logLevel = "error") // <2> @EnableGemFireHttpSession(maxInactiveIntervalInSeconds = 20) // <3> @EnableManager(start = true) // <4> public class GemFireServer { @@ -52,12 +51,6 @@ public class GemFireServer { springApplication.run(args); } - // Required to resolve property placeholders in Spring @Value annotations. - @Bean - static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() { - return new PropertySourcesPlaceholderConfigurer(); - } - @Bean CacheServerConfigurer cacheServerPortConfigurer( @Value("${spring.session.data.geode.cache.server.port:40404}") int port) { // <5> diff --git a/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ClientConfig.java b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ClientConfig.java index 2c0668a..7709680 100644 --- a/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ClientConfig.java +++ b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ClientConfig.java @@ -26,7 +26,7 @@ import org.springframework.data.gemfire.config.annotation.ClientCacheConfigurer; import org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession; // tag::class[] -@ClientCacheApplication(name = "SpringSessionDataGeodeClientJavaConfigSample", logLevel = "warning", +@ClientCacheApplication(name = "SpringSessionDataGeodeClientJavaConfigSample", logLevel = "error", pingInterval = 5000L, readTimeout = 15000, retryAttempts = 1, subscriptionEnabled = true) // <1> @EnableGemFireHttpSession(maxInactiveIntervalInSeconds = 30, poolName = "DEFAULT") // <2> public class ClientConfig extends IntegrationTestConfig { diff --git a/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ServerConfig.java b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ServerConfig.java index 69f04ab..37d241c 100644 --- a/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ServerConfig.java +++ b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ServerConfig.java @@ -27,7 +27,7 @@ import org.springframework.data.gemfire.config.annotation.CacheServerConfigurer; import org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession; // tag::class[] -@CacheServerApplication(name = "SpringSessionSampleJavaConfigGemFireClientServer", logLevel = "warning") // <1> +@CacheServerApplication(name = "SpringSessionSampleJavaConfigGemFireClientServer", logLevel = "error") // <1> @EnableGemFireHttpSession(maxInactiveIntervalInSeconds = 30) // <2> public class ServerConfig { diff --git a/samples/javaconfig/gemfire-p2p/src/main/java/sample/Config.java b/samples/javaconfig/gemfire-p2p/src/main/java/sample/Config.java index ae83e7a..4ddb7e1 100644 --- a/samples/javaconfig/gemfire-p2p/src/main/java/sample/Config.java +++ b/samples/javaconfig/gemfire-p2p/src/main/java/sample/Config.java @@ -21,7 +21,7 @@ import org.springframework.data.gemfire.config.annotation.PeerCacheApplication; import org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession; // tag::class[] -@PeerCacheApplication(name = "SpringSessionSampleJavaConfigGemFireP2p", logLevel = "warning") // <1> +@PeerCacheApplication(name = "SpringSessionSampleJavaConfigGemFireP2p", logLevel = "error") // <1> @EnableGemFireHttpSession // <2> @EnableManager(start = true) // <3> public class Config { diff --git a/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml b/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml index 43d959b..c4bdc91 100644 --- a/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml +++ b/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml @@ -20,7 +20,7 @@ SpringSessionSampleXmlGemFireClientServer - ${spring.session.data.gemfire.log-level:warning} + ${spring.session.data.gemfire.log-level:error} - ${spring.session.data.geode.log-level:warning} + ${spring.session.data.geode.log-level:error} diff --git a/samples/xml/gemfire-p2p/src/main/webapp/WEB-INF/spring/session.xml b/samples/xml/gemfire-p2p/src/main/webapp/WEB-INF/spring/session.xml index be4be0b..0719844 100644 --- a/samples/xml/gemfire-p2p/src/main/webapp/WEB-INF/spring/session.xml +++ b/samples/xml/gemfire-p2p/src/main/webapp/WEB-INF/spring/session.xml @@ -19,7 +19,7 @@ SpringSessionSampleXmlGemFireP2p - ${spring.session.data.geode.log-level:warning} + ${spring.session.data.geode.log-level:error} true true diff --git a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/MultiPoolClientServerGemFireOperationsSessionRepositoryIntegrationTests.java b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/MultiPoolClientServerGemFireOperationsSessionRepositoryIntegrationTests.java index 7cd2c9e..bcd1fbb 100644 --- a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/MultiPoolClientServerGemFireOperationsSessionRepositoryIntegrationTests.java +++ b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/MultiPoolClientServerGemFireOperationsSessionRepositoryIntegrationTests.java @@ -302,7 +302,7 @@ public class MultiPoolClientServerGemFireOperationsSessionRepositoryIntegrationT static final String SERVER_HOSTNAME = "localhost"; @Bean - PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { + static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { return new PropertySourcesPlaceholderConfigurer(); } diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/serialization/SerializationException.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/serialization/SerializationException.java index 5b2458f..c3d9961 100644 --- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/serialization/SerializationException.java +++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/serialization/SerializationException.java @@ -31,17 +31,16 @@ public class SerializationException extends RuntimeException { * Constructs a default instance of {@link SerializationException} with no {@link String message} * or {@link Throwable cause}. * - * @see RuntimeException + * @see java.lang.RuntimeException#RuntimeException() */ - public SerializationException() { - } + public SerializationException() { } /** * Constructs a new instance of {@link SerializationException} initialized with the given {@link String message} * describing the serialization error. * * @param message {@link String} describing the serialization error. - * @see RuntimeException(String) + * @see java.lang.RuntimeException#RuntimeException(String) * @see java.lang.String */ public SerializationException(String message) { @@ -53,7 +52,7 @@ public class SerializationException extends RuntimeException { * of the serialization error. * * @param cause {@link Throwable underlying cause} of the serialization error. - * @see RuntimeException(Throwable) + * @see java.lang.RuntimeException#RuntimeException(Throwable) * @see java.lang.Throwable */ public SerializationException(Throwable cause) { @@ -66,7 +65,7 @@ public class SerializationException extends RuntimeException { * * @param message {@link String} describing the serialization error. * @param cause {@link Throwable underlying cause} of the serialization error. - * @see RuntimeException(String, Throwable) + * @see java.lang.RuntimeException#RuntimeException(String, Throwable) * @see java.lang.Throwable * @see java.lang.String */