From 4e096e6480a98dc2c4173fb88fc94962d525500a Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 9 Jun 2021 13:29:17 -0700 Subject: [PATCH] Cleanup Java Generics compiler warnings on raw type usage. --- ...aSerializationConfigurationIntegrationTests.java | 5 ++--- ...xSerializationConfigurationIntegrationTests.java | 5 ++--- ...rConfiguredAsDataSerializerIntegrationTests.java | 13 ++++++------- ...erConfiguredAsPdxSerializerIntegrationTests.java | 9 ++++----- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/DataSerializationConfigurationIntegrationTests.java b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/DataSerializationConfigurationIntegrationTests.java index 832db35..8b3ae01 100644 --- a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/DataSerializationConfigurationIntegrationTests.java +++ b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/DataSerializationConfigurationIntegrationTests.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.session.data.gemfire.serialization; import static org.assertj.core.api.Assertions.assertThat; @@ -55,11 +54,11 @@ public class DataSerializationConfigurationIntegrationTests extends AbstractGemF @Autowired @Qualifier(GemFireHttpSessionConfiguration.SESSION_SERIALIZER_BEAN_ALIAS) - private SessionSerializer configuredSessionSerializer; + private SessionSerializer configuredSessionSerializer; @Autowired @Qualifier(GemFireHttpSessionConfiguration.SESSION_DATA_SERIALIZER_BEAN_NAME) - private SessionSerializer dataSerializableSessionSerialzer; + private SessionSerializer dataSerializableSessionSerialzer; @Autowired private GemFireCache gemfireCache; diff --git a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/PdxSerializationConfigurationIntegrationTests.java b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/PdxSerializationConfigurationIntegrationTests.java index 1b3440d..cf2ecd0 100644 --- a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/PdxSerializationConfigurationIntegrationTests.java +++ b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/PdxSerializationConfigurationIntegrationTests.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.session.data.gemfire.serialization; import static org.assertj.core.api.Assertions.assertThat; @@ -55,11 +54,11 @@ public class PdxSerializationConfigurationIntegrationTests extends AbstractGemFi @Autowired @Qualifier(GemFireHttpSessionConfiguration.SESSION_SERIALIZER_BEAN_ALIAS) - private SessionSerializer configuredSessionSerializer; + private SessionSerializer configuredSessionSerializer; @Autowired @Qualifier(GemFireHttpSessionConfiguration.SESSION_PDX_SERIALIZER_BEAN_NAME) - private SessionSerializer pdxSerializableSessionSerialzer; + private SessionSerializer pdxSerializableSessionSerialzer; @Autowired private GemFireCache gemfireCache; diff --git a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/SessionSerializerConfiguredAsDataSerializerIntegrationTests.java b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/SessionSerializerConfiguredAsDataSerializerIntegrationTests.java index 1d73287..759eeab 100644 --- a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/SessionSerializerConfiguredAsDataSerializerIntegrationTests.java +++ b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/SessionSerializerConfiguredAsDataSerializerIntegrationTests.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.session.data.gemfire.serialization; import static org.assertj.core.api.Assertions.assertThat; @@ -64,15 +63,15 @@ public class SessionSerializerConfiguredAsDataSerializerIntegrationTests extends @Autowired @Qualifier(GemFireHttpSessionConfiguration.SESSION_SERIALIZER_BEAN_ALIAS) - private SessionSerializer configuredSessionSerializer; + private SessionSerializer configuredSessionSerializer; @Autowired @Qualifier("customSessionSerializer") - private SessionSerializer customSessionSerializer; + private SessionSerializer customSessionSerializer; @Autowired(required = false) @Qualifier("dataSerializerSessionSerializer") - private SessionSerializer dataSerializerSessionSerializer; + private SessionSerializer dataSerializerSessionSerializer; @Test public void gemfireCachePdxSerializerIsNull() { @@ -101,12 +100,12 @@ public class SessionSerializerConfiguredAsDataSerializerIntegrationTests extends static class TestConfiguration { @Bean - DataSerializerSessionSerializerAdapter dataSerializerSessionSerializer() { - return new DataSerializerSessionSerializerAdapter(); + DataSerializerSessionSerializerAdapter dataSerializerSessionSerializer() { + return new DataSerializerSessionSerializerAdapter<>(); } @Bean - SessionSerializer customSessionSerializer() { + SessionSerializer customSessionSerializer() { return mock(SessionSerializer.class); } } diff --git a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/SessionSerializerConfiguredAsPdxSerializerIntegrationTests.java b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/SessionSerializerConfiguredAsPdxSerializerIntegrationTests.java index 2aa5c87..9461ef1 100644 --- a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/SessionSerializerConfiguredAsPdxSerializerIntegrationTests.java +++ b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/SessionSerializerConfiguredAsPdxSerializerIntegrationTests.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.session.data.gemfire.serialization; import static org.assertj.core.api.Assertions.assertThat; @@ -64,18 +63,18 @@ public class SessionSerializerConfiguredAsPdxSerializerIntegrationTests extends @Autowired @Qualifier(GemFireHttpSessionConfiguration.SESSION_SERIALIZER_BEAN_ALIAS) - private SessionSerializer configuredSessionSerializer; + private SessionSerializer configuredSessionSerializer; @Autowired @Qualifier("customSessionSerializer") - private SessionSerializer customSessionSerializer; + private SessionSerializer customSessionSerializer; @Test public void gemfireCachePdxSerializerIsPdxSerializerSessionSerializerAdapter() { assertThat(this.gemfireCache.getPdxSerializer()).isInstanceOf(PdxSerializerSessionSerializerAdapter.class); - assertThat(((PdxSerializerSessionSerializerAdapter) this.gemfireCache.getPdxSerializer()).getSessionSerializer()) + assertThat(((PdxSerializerSessionSerializerAdapter) this.gemfireCache.getPdxSerializer()).getSessionSerializer()) .isSameAs(this.customSessionSerializer); } @@ -96,7 +95,7 @@ public class SessionSerializerConfiguredAsPdxSerializerIntegrationTests extends static class TestConfiguration { @Bean - SessionSerializer customSessionSerializer() { + SessionSerializer customSessionSerializer() { return mock(SessionSerializer.class); } }