From 2c87c47c20948cc43c7de7cca61866bf772ee6e9 Mon Sep 17 00:00:00 2001 From: John Blum Date: Sat, 9 Jun 2018 19:47:23 -0700 Subject: [PATCH] DATAGEODE-109 - Remove all deprecated methods, properties, etc. --- .../data/gemfire/PeerRegionFactoryBean.java | 13 --- .../SubscriptionAttributesFactoryBean.java | 26 ++---- .../client/ClientRegionFactoryBean.java | 16 ---- .../data/gemfire/client/Interest.java | 27 ------- .../function/GemfireFunctionUtils.java | 18 ----- .../gemfire/mapping/MappingPdxSerializer.java | 26 ------ .../gemfire/wan/GatewaySenderFactoryBean.java | 31 ++------ .../gemfire/LocalRegionFactoryBeanTest.java | 45 ++++++++++- .../gemfire/PeerRegionFactoryBeanTest.java | 8 +- .../client/ClientRegionFactoryBeanTest.java | 28 ------- .../gemfire/client/InterestUnitTests.java | 16 ---- .../MappingPdxSerializerUnitTests.java | 20 ----- .../wan/GatewaySenderFactoryBeanTest.java | 79 ++++++++----------- 13 files changed, 94 insertions(+), 259 deletions(-) diff --git a/src/main/java/org/springframework/data/gemfire/PeerRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/PeerRegionFactoryBean.java index f4035174..42b60047 100644 --- a/src/main/java/org/springframework/data/gemfire/PeerRegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/PeerRegionFactoryBean.java @@ -752,19 +752,6 @@ public abstract class PeerRegionFactoryBean extends ConfigurableRegionFact this.dataPolicy = dataPolicy; } - /** - * Configures the {@link DataPolicy} for this {@link Region} as a {@link String}. - * - * @param dataPolicyName {@link String} containing the name of the {@link DataPolicy}, - * (e.g. {@literal PARTITION} or {@literal REPLICATE}, etc). - * @see #setDataPolicy(org.apache.geode.cache.DataPolicy) - * @deprecated as of 1.4.0; use setDataPolicy(:DataPolicy) instead. - */ - @Deprecated - public void setDataPolicy(String dataPolicyName) { - setDataPolicy(new DataPolicyConverter().convert(dataPolicyName)); - } - /** * Returns resolved {@link DataPolicy} as configured with the {@link RegionFactory} * when creating this {@link Region}. diff --git a/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java b/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java index 30c408df..0b4fa432 100644 --- a/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java @@ -45,7 +45,7 @@ public class SubscriptionAttributesFactoryBean implements FactoryBean getObjectType() { - return (subscriptionAttributes != null ? subscriptionAttributes.getClass() : SubscriptionAttributes.class); + + return this.subscriptionAttributes != null + ? this.subscriptionAttributes.getClass() + : SubscriptionAttributes.class; } /* @@ -83,7 +86,7 @@ public class SubscriptionAttributesFactoryBean implements FactoryBean extends ConfigurableRegionFactoryBean this.dataPolicy = dataPolicy; } - /** - * An alternate way to set the Data Policy, using the String name of the enumerated value. - * - * @param dataPolicyName the enumerated value String name of the Data Policy. - * @see org.apache.geode.cache.DataPolicy - * @see #setDataPolicy(org.apache.geode.cache.DataPolicy) - * @deprecated use setDataPolicy(:DataPolicy) instead. - */ - @Deprecated - public void setDataPolicyName(String dataPolicyName) { - DataPolicy resolvedDataPolicy = new DataPolicyConverter().convert(dataPolicyName); - Assert.notNull(resolvedDataPolicy, String.format("Data Policy [%1$s] is not valid", dataPolicyName)); - setDataPolicy(resolvedDataPolicy); - } - final boolean isDestroy() { return this.destroy; } diff --git a/src/main/java/org/springframework/data/gemfire/client/Interest.java b/src/main/java/org/springframework/data/gemfire/client/Interest.java index f8ee0f4a..1d873885 100644 --- a/src/main/java/org/springframework/data/gemfire/client/Interest.java +++ b/src/main/java/org/springframework/data/gemfire/client/Interest.java @@ -129,33 +129,6 @@ public class Interest implements InitializingBean { afterPropertiesSet(); } - /** - * @deprecated - * @see #Interest(Object, InterestResultPolicy) - */ - @Deprecated - public Interest(K key, String policy) { - this(key, policy, DEFAULT_DURABLE, DEFAULT_RECEIVE_VALUES); - } - - /** - * @deprecated - * @see #Interest(Object, InterestResultPolicy, boolean) - */ - @Deprecated - public Interest(K key, String policy, boolean durable) { - this(key, policy, durable, DEFAULT_RECEIVE_VALUES); - } - - /** - * @deprecated - * @see #Interest(Object, InterestResultPolicy, boolean, boolean) - */ - @Deprecated - public Interest(K key, String policy, boolean durable, boolean receiveValues) { - this(key, (InterestResultPolicy) constants.asObject(policy), durable, receiveValues); - } - /** * @inheritDoc */ diff --git a/src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java b/src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java index b5f77415..e9151e19 100644 --- a/src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java +++ b/src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java @@ -22,7 +22,6 @@ import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; -import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; @@ -195,23 +194,6 @@ public abstract class GemfireFunctionUtils { } - /** - * Wrap the {@link Object target object} and {@link Method method} in a GemFire/Geode {@link Function} - * and register the {@link Function} with the {@link FunctionService}. - * - * @param target {@link Object target object}. - * @param method {@link Method} bound to a {@link Function}. - * @param gemfireFunctionAttributes {@link GemfireFunction} annotation {@link Map attributes}. - * @param overwrite if {@literal true}, will replace any existing {@link Function} having the same ID. - * @deprecated use {@link #registerFunctionForPojoMethod(Object, Method, AnnotationAttributes, boolean)} instead. - */ - @Deprecated - public static void registerFunctionForPojoMethod(Object target, Method method, - Map gemfireFunctionAttributes, boolean overwrite) { - - registerFunctionForPojoMethod(target, method, AnnotationAttributes.fromMap(gemfireFunctionAttributes), overwrite); - } - /** * Wrap the {@link Object target object} and {@link Method method} in a GemFire/Geode {@link Function} * and register the {@link Function} with the {@link FunctionService}. diff --git a/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java b/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java index ef0ac9ba..bb6f34e9 100644 --- a/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java +++ b/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java @@ -294,14 +294,6 @@ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAw Optional.ofNullable(customPdxSerializers).ifPresent(this.customPdxSerializers::putAll); } - /** - * @deprecated please use ({@link #setCustomPdxSerializers(Map)} instead. - */ - @Deprecated - public void setCustomSerializers(Map, PdxSerializer> customSerializers) { - setCustomPdxSerializers(customSerializers); - } - /** * Returns a {@link Map mapping} of application {@link Class domain types} to custom * {@link PdxSerializer PDX serializers} used to customize the serialization @@ -317,15 +309,6 @@ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAw return Collections.unmodifiableMap(this.customPdxSerializers); } - /** - * @deprecated please use {@link #getCustomPdxSerializers()} instead. - */ - @Deprecated - @SuppressWarnings("unchecked") - protected Map, PdxSerializer> getCustomSerializers() { - return (Map, PdxSerializer>) getCustomPdxSerializers(); - } - /** * Returns a custom PDX serializer for the given {@link PersistentProperty entity persistent property}. * @@ -346,15 +329,6 @@ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAw .orElse(null); } - /** - * @deprecated please use {@link #getCustomPdxSerializer(PersistentProperty)} instead. - */ - @Nullable - @Deprecated - protected PdxSerializer getCustomSerializer(Class type) { - return getCustomPdxSerializers().get(type); - } - /** * Configures the {@link EntityInstantiator EntityInstantiators} used to create the instances * read by this {@link PdxSerializer}. diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java index d8d88373..ca1693d0 100644 --- a/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java @@ -86,8 +86,10 @@ public class GatewaySenderFactoryBean extends AbstractWANComponentFactoryBean getObjectType() { - return (gatewaySender != null ? gatewaySender.getClass() : GatewaySender.class); + return this.gatewaySender != null ? this.gatewaySender.getClass() : GatewaySender.class; } public void setAlertThreshold(Integer alertThreshold) { @@ -182,18 +184,6 @@ public class GatewaySenderFactoryBean extends AbstractWANComponentFactoryBean extends PeerRegionFactoryBean { - } + protected static class TestRegionFactoryBean extends PeerRegionFactoryBean { } + } diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java index 01eadddd..77861b24 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java @@ -471,34 +471,6 @@ public class ClientRegionFactoryBeanTest { verify(mockRegionAttributes, times(1)).getPoolName(); } - @Test - @SuppressWarnings("deprecation") - public void setDataPolicyName() throws Exception { - - factoryBean.setDataPolicyName("NORMAL"); - - assertEquals(DataPolicy.NORMAL, TestUtils.readField("dataPolicy", factoryBean)); - } - - @Test(expected = IllegalArgumentException.class) - @SuppressWarnings("deprecation") - public void setDataPolicyNameWithInvalidName() throws Exception { - - try { - factoryBean.setDataPolicyName("INVALID"); - } - catch (IllegalArgumentException expected) { - - assertThat(expected).hasMessage("Data Policy [INVALID] is not valid"); - assertThat(expected).hasNoCause(); - - throw expected; - } - finally { - assertNull(TestUtils.readField("dataPolicy", factoryBean)); - } - } - @Test public void isPersistentIsCorrect() { diff --git a/src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java b/src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java index e764c4fd..34f16996 100644 --- a/src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java @@ -129,22 +129,6 @@ public class InterestUnitTests { new Interest<>(null); } - @Test - @SuppressWarnings("deprecation") - public void constructInterestWithStringPolicy() { - Interest interest = new Interest<>("mockKey", "nOnE"); - - assertThat(interest.getKey()).isEqualTo("mockKey"); - assertThat(interest.getPolicy()).isEqualTo(InterestResultPolicy.NONE); - assertThat(interest.getType()).isEqualTo(KEY); - } - - @Test(expected = IllegalArgumentException.class) - @SuppressWarnings("deprecation") - public void constructInterestWithInvalidStringPolicy() { - new Interest<>("testKey", "INVALID"); - } - @Test public void isAlphanumericWhitespace() { Interest interest = newInterest("key"); diff --git a/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java b/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java index f86fd083..d892acbc 100644 --- a/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java @@ -321,26 +321,6 @@ public class MappingPdxSerializerUnitTests { assertThat(this.pdxSerializer.getCustomPdxSerializer(addressProperty)).isEqualTo(mockTypedSerializer); } - @Test - // TODO remove! - @SuppressWarnings("deprecation") - public void getCustomSerializerForMappedTypeReturnsPdxSerializer() { - - PdxSerializer mockPdxSerializer = mock(PdxSerializer.class); - - this.pdxSerializer.setCustomPdxSerializers(Collections.singletonMap(Person.class, mockPdxSerializer)); - - assertThat(this.pdxSerializer.getCustomSerializer(Person.class)).isEqualTo(mockPdxSerializer); - } - - @Test - // TODO remove! - @SuppressWarnings("deprecation") - public void getCustomSerializerForUnmappedTypeReturnsNull() { - assertThat(this.pdxSerializer.getCustomPdxSerializers()).isEmpty(); - assertThat(this.pdxSerializer.getCustomSerializer(Address.class)).isNull(); - } - @Test public void toFullyQualifiedPropertyName() { diff --git a/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java index 1d40fdcb..31e459b3 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java @@ -16,10 +16,8 @@ package org.springframework.data.gemfire.wan; -import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -47,13 +45,13 @@ import org.springframework.data.gemfire.TestUtils; */ public class GatewaySenderFactoryBeanTest { - protected Cache createMockCacheWithGatewayInfrastructure(final GatewaySenderFactory gatewaySenderFactory) { + private Cache mockCacheWithGatewayInfrastructure(final GatewaySenderFactory gatewaySenderFactory) { Cache mockCache = mock(Cache.class); when(mockCache.createGatewaySenderFactory()).thenReturn(gatewaySenderFactory); return mockCache; } - protected GatewaySenderFactory createMockGatewaySenderFactory(final String gatewaySenderName, + private GatewaySenderFactory mockGatewaySenderFactory(final String gatewaySenderName, final int remoteDistributedSystemId) { GatewaySenderFactory mockGatewaySenderFactory = mock(GatewaySenderFactory.class); GatewaySender mockGatewaySender = mock(GatewaySender.class); @@ -66,8 +64,9 @@ public class GatewaySenderFactoryBeanTest { return mockGatewaySenderFactory; } - protected void verifyExpectations(final GatewaySenderFactoryBean factoryBean, - final GatewaySenderFactory mockGatewaySenderFactory) throws Exception { + protected void verifyExpectations(GatewaySenderFactoryBean factoryBean, + GatewaySenderFactory mockGatewaySenderFactory) throws Exception { + Boolean parallel = TestUtils.readField("parallel", factoryBean); verify(mockGatewaySenderFactory).setParallel(eq(Boolean.TRUE.equals(parallel))); @@ -108,10 +107,12 @@ public class GatewaySenderFactoryBeanTest { @Test public void concurrentParallelGatewaySenderCreation() throws Exception { - GatewaySenderFactory mockGatewaySenderFactory = createMockGatewaySenderFactory("g0", 69); + + GatewaySenderFactory mockGatewaySenderFactory = + mockGatewaySenderFactory("g0", 69); GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean( - createMockCacheWithGatewayInfrastructure(mockGatewaySenderFactory)); + mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory)); factoryBean.setName("g0"); factoryBean.setRemoteDistributedSystemId(69); @@ -130,10 +131,12 @@ public class GatewaySenderFactoryBeanTest { @Test public void concurrentSerialGatewaySenderCreation() throws Exception { - GatewaySenderFactory mockGatewaySenderFactory = createMockGatewaySenderFactory("g4", 21); + + GatewaySenderFactory mockGatewaySenderFactory = + mockGatewaySenderFactory("g4", 21); GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean( - createMockCacheWithGatewayInfrastructure(mockGatewaySenderFactory)); + mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory)); factoryBean.setName("g4"); factoryBean.setRemoteDistributedSystemId(21); @@ -152,10 +155,12 @@ public class GatewaySenderFactoryBeanTest { @Test public void parallelGatewaySenderCreation() throws Exception { - GatewaySenderFactory mockGatewaySenderFactory = createMockGatewaySenderFactory("g1", 69); + + GatewaySenderFactory mockGatewaySenderFactory = + mockGatewaySenderFactory("g1", 69); GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean( - createMockCacheWithGatewayInfrastructure(mockGatewaySenderFactory)); + mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory)); factoryBean.setName("g1"); factoryBean.setRemoteDistributedSystemId(69); @@ -173,10 +178,12 @@ public class GatewaySenderFactoryBeanTest { @Test(expected = IllegalArgumentException.class) public void parallelGatewaySenderWithOrderPolicyCreation() { - GatewaySenderFactory mockGatewaySenderFactory = createMockGatewaySenderFactory("g2", 69); + + GatewaySenderFactory mockGatewaySenderFactory = + mockGatewaySenderFactory("g2", 69); GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean( - createMockCacheWithGatewayInfrastructure(mockGatewaySenderFactory)); + mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory)); factoryBean.setName("g2"); factoryBean.setRemoteDistributedSystemId(69); @@ -194,10 +201,12 @@ public class GatewaySenderFactoryBeanTest { @Test public void gatewaySenderCreationWithDiskSynchronousAndNoPersistence() throws Exception { - GatewaySenderFactory mockGatewaySenderFactory = createMockGatewaySenderFactory("g7", 51); + + GatewaySenderFactory mockGatewaySenderFactory = + mockGatewaySenderFactory("g7", 51); GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean( - createMockCacheWithGatewayInfrastructure(mockGatewaySenderFactory)); + mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory)); factoryBean.setName("g7"); factoryBean.setRemoteDistributedSystemId(51); @@ -215,10 +224,12 @@ public class GatewaySenderFactoryBeanTest { @Test public void gatewaySenderCreationWithOverflowDiskStoreAndNoPersistence() throws Exception { - GatewaySenderFactory mockGatewaySenderFactory = createMockGatewaySenderFactory("g6", 51); + + GatewaySenderFactory mockGatewaySenderFactory = + mockGatewaySenderFactory("g6", 51); GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean( - createMockCacheWithGatewayInfrastructure(mockGatewaySenderFactory)); + mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory)); factoryBean.setName("g6"); factoryBean.setRemoteDistributedSystemId(51); @@ -237,10 +248,12 @@ public class GatewaySenderFactoryBeanTest { @Test public void gatewaySenderCreationWithOrderPolicyAndDispatcherThreads() throws Exception { - GatewaySenderFactory mockGatewaySenderFactory = createMockGatewaySenderFactory("g5", 42); + + GatewaySenderFactory mockGatewaySenderFactory = + mockGatewaySenderFactory("g5", 42); GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean( - createMockCacheWithGatewayInfrastructure(mockGatewaySenderFactory)); + mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory)); factoryBean.setName("g5"); factoryBean.setRemoteDistributedSystemId(42); @@ -256,30 +269,4 @@ public class GatewaySenderFactoryBeanTest { assertEquals("g5", gatewaySender.getId()); assertEquals(42, gatewaySender.getRemoteDSId()); } - - @Test - @SuppressWarnings("deprecation") - public void setOrderPolicyAsValidString() throws Exception { - GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(mock(Cache.class, - "setOrderPolicyAsAValidString.MockCache")); - - factoryBean.setOrderPolicy(GatewaySender.OrderPolicy.THREAD.name().toLowerCase()); - - assertThat(TestUtils.readField("orderPolicy", factoryBean), - is(GatewaySender.OrderPolicy.THREAD)); - } - - @Test(expected = IllegalArgumentException.class) - @SuppressWarnings("deprecation") - public void setOrderPolicyAsInvalidString() { - try { - new GatewaySenderFactoryBean(mock(Cache.class, "setOrderPolicyAsInvalidString.MockCache")) - .setOrderPolicy("invalid"); - } - catch (IllegalArgumentException expected) { - assertEquals(String.format("[invalid] is not a valid %s", GatewaySender.OrderPolicy.class.getSimpleName()), - expected.getMessage()); - throw expected; - } - } }