Fix bug in Spring Session (core) infrastructure component initialization.

Resolves gh-51.

spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java

@@ -904,7 +904,7 @@ public class GemFireHttpSessionConfiguration extends AbstractGemFireHttpSessionC
 	}
 
 	@PostConstruct
-	public void init() {
+	public void initGemFire() {
 		getBeanFactory().registerAlias(getSessionSerializerBeanName(), SESSION_SERIALIZER_BEAN_ALIAS);
 	}
 

spring-session-data-geode/src/test/java/org/springframework/session/data/gemfire/config/CustomCookieSerializerConfigurationUnitTests.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.session.data.gemfire.config;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.session.data.gemfire.AbstractGemFireUnitTests;
+import org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession;
+import org.springframework.session.web.http.CookieHttpSessionIdResolver;
+import org.springframework.session.web.http.CookieSerializer;
+import org.springframework.session.web.http.HttpSessionIdResolver;
+import org.springframework.session.web.http.SessionRepositoryFilter;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * Unit Tests testing the configuration of a custom {@link CookieSerializer} in the context of SSDG.
+ *
+ * @author John Blum
+ * @see org.junit.Test
+ * @see org.mockito.Mockito
+ * @see org.springframework.context.annotation.Bean
+ * @see org.springframework.context.annotation.Configuration
+ * @see org.springframework.session.data.gemfire.AbstractGemFireUnitTests
+ * @see org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession
+ * @see org.springframework.session.web.http.CookieHttpSessionIdResolver
+ * @see org.springframework.session.web.http.CookieSerializer
+ * @see org.springframework.session.web.http.HttpSessionIdResolver
+ * @see org.springframework.session.web.http.SessionRepositoryFilter
+ * @see org.springframework.test.context.ContextConfiguration
+ * @see org.springframework.test.context.junit4.SpringRunner
+ * @since 1.0.0
+ */
+@RunWith(SpringRunner.class)
+@ContextConfiguration
+public class CustomCookieSerializerConfigurationUnitTests extends AbstractGemFireUnitTests {
+
+	@Autowired
+	private CookieSerializer cookieSerializer;
+
+	@Autowired
+	private SessionRepositoryFilter<?> filter;
+
+	@Test
+	public void customCookieSerializerConfigured() {
+
+		assertThat(this.filter).isNotNull();
+		assertThat(this.cookieSerializer).isInstanceOf(TestCookieSerializer.class);
+
+		HttpSessionIdResolver configuredHttpSessionIdResolver =
+			getValue(this.filter, "httpSessionIdResolver");
+
+		assertThat(configuredHttpSessionIdResolver).isInstanceOf(CookieHttpSessionIdResolver.class);
+
+		CookieSerializer configuredCookieSerializer =
+			getValue(configuredHttpSessionIdResolver, "cookieSerializer");
+
+		assertThat(configuredCookieSerializer).isSameAs(this.cookieSerializer);
+	}
+
+	@Configuration
+	@EnableGemFireHttpSession
+	static class TestConfiguration extends BaseTestConfiguration {
+
+		@Bean
+		CookieSerializer mockCookieSerializer() {
+			return mock(TestCookieSerializer.class);
+		}
+	}
+
+	interface TestCookieSerializer extends CookieSerializer { }
+
+}

spring-session-data-geode/src/test/java/org/springframework/session/data/gemfire/config/CustomHttpSessionIdResolverConfigurationUnitTests.java

@@ -0,0 +1,115 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.session.data.gemfire.config;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.session.data.gemfire.AbstractGemFireUnitTests;
+import org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession;
+import org.springframework.session.data.gemfire.web.http.AbstractHttpSessionIdResolver;
+import org.springframework.session.web.http.CookieSerializer;
+import org.springframework.session.web.http.HttpSessionIdResolver;
+import org.springframework.session.web.http.SessionRepositoryFilter;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * Unit Tests testing the configuration of a custom {@link HttpSessionIdResolver} in the context of SSDG.
+ *
+ * @author John Blum
+ * @see org.junit.Test
+ * @see org.mockito.Mockito
+ * @see org.springframework.context.annotation.Bean
+ * @see org.springframework.context.annotation.Configuration
+ * @see org.springframework.session.data.gemfire.AbstractGemFireUnitTests
+ * @see org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession
+ * @see org.springframework.session.web.http.CookieSerializer
+ * @see org.springframework.session.web.http.HttpSessionIdResolver
+ * @see org.springframework.test.context.ContextConfiguration
+ * @see org.springframework.test.context.junit4.SpringRunner
+ * @since 1.0.0
+ */
+@RunWith(SpringRunner.class)
+@ContextConfiguration
+public class CustomHttpSessionIdResolverConfigurationUnitTests extends AbstractGemFireUnitTests {
+
+	@Autowired
+	private CookieSerializer cookieSerializer;
+
+	@Autowired
+	private HttpSessionIdResolver httpSessionIdResolver;
+
+	@Autowired
+	private SessionRepositoryFilter<?> filter;
+
+	@Test
+	public void customHttpSessionIdResolverConfigured() {
+
+		assertThat(this.filter).isNotNull();
+		assertThat(this.cookieSerializer).isInstanceOf(TestCookieSerializer.class);
+		assertThat(this.httpSessionIdResolver).isInstanceOf(TestHttpSessionIdResolver.class);
+
+		HttpSessionIdResolver configuredHttpSessionIdResolver =
+			getValue(this.filter, "httpSessionIdResolver");
+
+		assertThat(configuredHttpSessionIdResolver).isSameAs(this.httpSessionIdResolver);
+
+		CookieSerializer configuredCookieSerializer =
+			getValue(configuredHttpSessionIdResolver, "cookieSerializer");
+
+		assertThat(configuredCookieSerializer).isSameAs(this.cookieSerializer);
+	}
+
+	@Configuration
+	@EnableGemFireHttpSession
+	static class TestConfiguration extends BaseTestConfiguration {
+
+		@Bean
+		CookieSerializer mockCookieSerializer() {
+			return mock(TestCookieSerializer.class);
+		}
+
+		@Bean
+		HttpSessionIdResolver mockHttpSessionIdResolver(CookieSerializer cookieSerializer) {
+			//return new TestHttpSessionIdResolver();
+			return new TestHttpSessionIdResolver(cookieSerializer);
+		}
+	}
+
+	interface TestCookieSerializer extends CookieSerializer { }
+
+	@Getter
+	@Setter
+	@AllArgsConstructor
+	@NoArgsConstructor
+	static class TestHttpSessionIdResolver extends AbstractHttpSessionIdResolver {
+
+		private CookieSerializer cookieSerializer;
+
+	}
+}

spring-session-data-geode/src/test/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfigurationUnitTests.java

@@ -688,6 +688,7 @@ public class GemFireHttpSessionConfigurationUnitTests {
 
 		this.gemfireConfiguration.setApplicationContext(mockApplicationContext);
 		this.gemfireConfiguration.setSessionSerializerBeanName("testSessionSerializer");
+		this.gemfireConfiguration.initGemFire();
 		this.gemfireConfiguration.init();
 
 		assertThat(this.gemfireConfiguration.getApplicationContext()).isSameAs(mockApplicationContext);