Cleanup Java Generics compiler warnings on raw type usage.

This commit is contained in:
John Blum
2021-06-09 13:29:17 -07:00
parent 62b7409919
commit 4e096e6480
4 changed files with 14 additions and 18 deletions

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.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;

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.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;

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.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);
}
}

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.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);
}
}