Spring/spring-session-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable GemFire Mock Object destruction on Spring ApplicationContext closed event.

Browse Source
This commit is contained in:
John Blum
2020-06-01 14:36:42 -07:00
parent 501cf93587
commit a4edf3cdbc
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/config/annotation/web/http/ConfigurerBasedGemFireHttpSessionConfigurationIntegrationTests.java
View File

@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.session.data.gemfire.config.annotation.web.http;
import static org.assertj.core.api.Assertions.assertThat;
@@ -34,6 +33,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.context.event.ContextClosedEvent;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.core.env.PropertySource;
import org.springframework.data.gemfire.config.annotation.ClientCacheApplication;
@@ -183,7 +183,7 @@ public class ConfigurerBasedGemFireHttpSessionConfigurationIntegrationTests exte
sessionExpirationPolicyBeanName = "TestSessionExpirationPolicy",
sessionSerializerBeanName = "TestSessionSerializer"
)
@EnableGemFireMockObjects
@EnableGemFireMockObjects(destroyOnEvent = ContextClosedEvent.class)
static class TestConfiguration {
@Bean("Car")

3
spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/config/annotation/web/http/ExposingSpringSessionGemFireConfigurationIntegrationTests.java
View File

@@ -32,6 +32,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.context.event.ContextClosedEvent;
import org.springframework.core.env.Environment;
import org.springframework.core.env.PropertySource;
import org.springframework.data.gemfire.config.annotation.ClientCacheApplication;
@@ -271,7 +272,7 @@ public class ExposingSpringSessionGemFireConfigurationIntegrationTests extends A
sessionExpirationPolicyBeanName = "AttributeSessionExpirationPolicy",
sessionSerializerBeanName = "AttributeSessionSerializer"
)
@EnableGemFireMockObjects
@EnableGemFireMockObjects(destroyOnEvent = ContextClosedEvent.class)
static class TestGemFireHttpSessionConfiguration {
@Bean("Car")

22
spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfigurationIntegrationTests.java
View File

@@ -36,6 +36,7 @@ import org.apache.geode.internal.InternalDataSerializer;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.event.ContextClosedEvent;
import org.springframework.data.gemfire.GemfireTemplate;
import org.springframework.data.gemfire.IndexType;
import org.springframework.data.gemfire.config.annotation.ClientCacheApplication;
@@ -53,8 +54,19 @@ import org.springframework.session.data.gemfire.serialization.pdx.support.PdxSer
* Integration Tests for {@link GemFireHttpSessionConfiguration}.
*
* @author John Blum
* @see java.io.DataInput
* @see java.io.DataOutput
* @see org.junit.Test
* @see org.mockito.Mockito
* @see org.apache.geode.cache.GemFireCache
* @see org.apache.geode.cache.Region
* @see org.apache.geode.cache.query.Index
* @see org.springframework.context.ConfigurableApplicationContext
* @see org.springframework.context.annotation.Bean
* @see org.springframework.data.gemfire.GemfireTemplate
* @see org.springframework.data.gemfire.config.annotation.ClientCacheApplication
* @see org.springframework.data.gemfire.tests.integration.SpringApplicationContextIntegrationTestsSupport
* @see org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects
* @see org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration
* @since 1.1.0
*/
@@ -216,12 +228,11 @@ public class GemFireHttpSessionConfigurationIntegrationTests extends SpringAppli
}
@ClientCacheApplication
@EnableGemFireMockObjects
@EnableGemFireHttpSession(clientRegionShortcut = ClientRegionShortcut.LOCAL, poolName = "DEFAULT")
@EnableGemFireMockObjects(destroyOnEvent = ContextClosedEvent.class)
static class BasicSpringSessionGemFireConfiguration { }
@ClientCacheApplication
@EnableGemFireMockObjects
@EnableGemFireHttpSession(
clientRegionShortcut = ClientRegionShortcut.LOCAL,
exposeConfigurationAsProperties = true,
@@ -233,6 +244,7 @@ public class GemFireHttpSessionConfigurationIntegrationTests extends SpringAppli
sessionExpirationPolicyBeanName = "MockSessionExpirationPolicy",
sessionSerializerBeanName = "MockSessionSerializer"
)
@EnableGemFireMockObjects(destroyOnEvent = ContextClosedEvent.class)
static class ExposingSpringSessionGemFireConfigurationAsPropertiesConfiguration {
@Bean("MockSessionExpirationPolicy")
@@ -303,16 +315,16 @@ public class GemFireHttpSessionConfigurationIntegrationTests extends SpringAppli
}
@ClientCacheApplication
@EnableGemFireMockObjects
@EnableGemFireHttpSession(
poolName = "DEFAULT",
sessionSerializerBeanName = GemFireHttpSessionConfiguration.SESSION_DATA_SERIALIZER_BEAN_NAME
)
@EnableGemFireMockObjects(destroyOnEvent = ContextClosedEvent.class)
static class DataSerializableSessionSerializerConfiguration { }
@ClientCacheApplication
@EnableGemFireMockObjects
@EnableGemFireHttpSession(poolName = "DEFAULT", sessionSerializerBeanName = "TestDataSerializer")
@EnableGemFireMockObjects(destroyOnEvent = ContextClosedEvent.class)
static class TestDataSerializerConfiguration {
@Bean("TestDataSerializer")
@@ -322,8 +334,8 @@ public class GemFireHttpSessionConfigurationIntegrationTests extends SpringAppli
}
@ClientCacheApplication
@EnableGemFireMockObjects
@EnableGemFireHttpSession(poolName = "DEFAULT", sessionSerializerBeanName = "TestSessionSerializer")
@EnableGemFireMockObjects(destroyOnEvent = ContextClosedEvent.class)
static class TestSessionSerializerConfiguration {
@Bean("TestSessionSerializer")