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

SGF-749 - Remove all deprecated methods, properties, etc.

Browse Source
This commit is contained in:
John Blum
2018-06-09 19:47:23 -07:00
parent 7adece32ec
commit 7ca0bc3a17
13 changed files with 134 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/test/java/org/springframework/data/gemfire/LocalRegionFactoryBeanTest.java
View File

@@ -48,15 +48,17 @@ public class LocalRegionFactoryBeanTest extends AbstractRegionFactoryBeanTests {
@SuppressWarnings("rawtypes")
private RegionFactoryBeanConfig defaultConfig() {
return new RegionFactoryBeanConfig(new LocalRegionFactoryBean(), "default") {
@Override
public void configureRegionFactoryBean() {
}
public void configureRegionFactoryBean() { }
@Override
public void verify() {
Region region = regionFactoryBean.getRegion();
assertNotNull(region);
assertEquals(DataPolicy.DEFAULT, region.getAttributes().getDataPolicy());
}
@@ -65,11 +67,12 @@ public class LocalRegionFactoryBeanTest extends AbstractRegionFactoryBeanTests {
@SuppressWarnings({ "deprecation", "rawtypes" })
private RegionFactoryBeanConfig invalidConfig() {
return new RegionFactoryBeanConfig(new LocalRegionFactoryBean(), "local-replicate") {
@Override
public void configureRegionFactoryBean() {
regionFactoryBean.setDataPolicy("replicate");
regionFactoryBean.setDataPolicy(DataPolicy.REPLICATE);
}
@Override
@@ -91,29 +94,39 @@ public class LocalRegionFactoryBeanTest extends AbstractRegionFactoryBeanTests {
@Test
public void testResolveDataPolicyWhenPersistentUnspecifiedAndDataPolicyUnspecified() {
RegionFactory mockRegionFactory = createMockRegionFactory();
factoryBean.resolveDataPolicy(mockRegionFactory, null, (String) null);
verify(mockRegionFactory).setDataPolicy(eq(DataPolicy.NORMAL));
}
@Test
public void testResolveDataPolicyWhenNotPersistentAndDataPolicyUnspecified() {
RegionFactory mockRegionFactory = createMockRegionFactory();
factoryBean.setPersistent(false);
factoryBean.resolveDataPolicy(mockRegionFactory, false, (String) null);
verify(mockRegionFactory).setDataPolicy(eq(DataPolicy.NORMAL));
}
@Test
public void testResolveDataPolicyWhenPersistentAndDataPolicyUnspecified() {
RegionFactory mockRegionFactory = createMockRegionFactory();
factoryBean.setPersistent(true);
factoryBean.resolveDataPolicy(mockRegionFactory, true, (String) null);
verify(mockRegionFactory).setDataPolicy(eq(DataPolicy.PERSISTENT_REPLICATE));
}
@Test(expected = IllegalArgumentException.class)
public void testResolveDataPolicyWithBlankDataPolicy() {
RegionFactory mockRegionFactory = createMockRegionFactory();
try {
@@ -133,6 +146,7 @@ public class LocalRegionFactoryBeanTest extends AbstractRegionFactoryBeanTests {
@Test(expected = IllegalArgumentException.class)
public void testResolveDataPolicyWithEmptyDataPolicy() {
RegionFactory mockRegionFactory = createMockRegionFactory();
try {
@@ -152,6 +166,7 @@ public class LocalRegionFactoryBeanTest extends AbstractRegionFactoryBeanTests {
@Test(expected = IllegalArgumentException.class)
public void testResolveDataPolicyWithInvalidDataPolicyName() {
RegionFactory mockRegionFactory = createMockRegionFactory();
try {
@@ -171,6 +186,7 @@ public class LocalRegionFactoryBeanTest extends AbstractRegionFactoryBeanTests {
@Test(expected = IllegalArgumentException.class)
public void testResolveDataPolicyWithInvalidDataPolicyType() {
RegionFactory mockRegionFactory = createMockRegionFactory();
try {
@@ -190,52 +206,71 @@ public class LocalRegionFactoryBeanTest extends AbstractRegionFactoryBeanTests {
@Test
public void testResolveDataPolicyWhenPersistentUnspecifiedAndNormalDataPolicy() {
RegionFactory mockRegionFactory = createMockRegionFactory();
factoryBean.resolveDataPolicy(mockRegionFactory, null, "Normal");
verify(mockRegionFactory).setDataPolicy(eq(DataPolicy.NORMAL));
}
@Test
public void testResolveDataPolicyWhenNotPersistentAndNormalDataPolicy() {
RegionFactory mockRegionFactory = createMockRegionFactory();
factoryBean.setPersistent(false);
factoryBean.resolveDataPolicy(mockRegionFactory, false, "NORMAL");
verify(mockRegionFactory).setDataPolicy(eq(DataPolicy.NORMAL));
}
@Test
public void testResolveDataPolicyWhenPersistentAndNormalDataPolicy() {
RegionFactory mockRegionFactory = createMockRegionFactory();
factoryBean.setPersistent(true);
factoryBean.resolveDataPolicy(mockRegionFactory, true, "NORMAL");
verify(mockRegionFactory).setDataPolicy(eq(DataPolicy.PERSISTENT_REPLICATE));
}
@Test
public void testResolveDataPolicyWhenPersistentUnspecifiedAndPreloadedDataPolicy() {
RegionFactory mockRegionFactory = createMockRegionFactory();
factoryBean.resolveDataPolicy(mockRegionFactory, null, "preloaded");
verify(mockRegionFactory).setDataPolicy(eq(DataPolicy.PRELOADED));
}
@Test
public void testResolveDataPolicyWhenNotPersistentAndPreloadedDataPolicy() {
RegionFactory mockRegionFactory = createMockRegionFactory();
factoryBean.setPersistent(false);
factoryBean.resolveDataPolicy(mockRegionFactory, false, "PreLoaded");
verify(mockRegionFactory).setDataPolicy(eq(DataPolicy.PRELOADED));
}
@Test
public void testResolveDataPolicyWhenPersistentAndPreloadedDataPolicy() {
RegionFactory mockRegionFactory = createMockRegionFactory();
factoryBean.setPersistent(true);
factoryBean.resolveDataPolicy(mockRegionFactory, true, "PRELOADED");
verify(mockRegionFactory).setDataPolicy(eq(DataPolicy.PERSISTENT_REPLICATE));
}
@Test(expected = IllegalArgumentException.class)
public void testResolveDataPolicyWhenShortcutIsNullAndPersistentReplicateDataPolicy() {
RegionFactory mockRegionFactory = createMockRegionFactory();
try {
@@ -257,6 +292,7 @@ public class LocalRegionFactoryBeanTest extends AbstractRegionFactoryBeanTests {
@Test(expected = IllegalArgumentException.class)
public void testResolveDataPolicyWhenShortcutNotPersistentAndPersistentReplicateDataPolicy() {
RegionFactory mockRegionFactory = createMockRegionFactory();
try {
@@ -278,9 +314,12 @@ public class LocalRegionFactoryBeanTest extends AbstractRegionFactoryBeanTests {
@Test
public void testResolveDataPolicyWhenPersistentPersistentReplicateDataPolicy() {
RegionFactory mockRegionFactory = createMockRegionFactory();
factoryBean.setShortcut(RegionShortcut.LOCAL_PERSISTENT_OVERFLOW);
factoryBean.resolveDataPolicy(mockRegionFactory, false, DataPolicy.PERSISTENT_REPLICATE);
verify(mockRegionFactory).setDataPolicy(DataPolicy.PERSISTENT_REPLICATE);
}
}

6
src/test/java/org/springframework/data/gemfire/PeerRegionFactoryBeanTest.java
View File

@@ -124,7 +124,7 @@ public class PeerRegionFactoryBeanTest extends AbstractRegionFactoryBeanTests {
@Override
public void configureRegionFactoryBean() {
regionFactoryBean.setDataPolicy("persistent_replicate");
regionFactoryBean.setDataPolicy(DataPolicy.PERSISTENT_REPLICATE);
regionFactoryBean.setPersistent(false);
}
@@ -1114,6 +1114,6 @@ public class PeerRegionFactoryBeanTest extends AbstractRegionFactoryBeanTests {
}
}
protected static class TestRegionFactoryBean<K, V> extends PeerRegionFactoryBean<K, V> {
}
protected static class TestRegionFactoryBean<K, V> extends PeerRegionFactoryBean<K, V> { }
}

28
src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java
View File

@@ -465,34 +465,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() {

16
src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java
View File

@@ -129,22 +129,6 @@ public class InterestUnitTests {
new Interest<>(null);
}
@Test
@SuppressWarnings("deprecation")
public void constructInterestWithStringPolicy() {
Interest<String> 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");

20
src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java
View File

@@ -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() {

144
src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java
View File

@@ -46,13 +46,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);
@@ -107,11 +107,13 @@ public class GatewaySenderFactoryBeanTest {
}
@Test
public void testConcurrentParallelGatewaySender() throws Exception {
GatewaySenderFactory mockGatewaySenderFactory = createMockGatewaySenderFactory("g0", 69);
public void concurrentParallelGatewaySenderCreation() throws Exception {
GatewaySenderFactory mockGatewaySenderFactory =
mockGatewaySenderFactory("g0", 69);
GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(
createMockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
factoryBean.setName("g0");
factoryBean.setRemoteDistributedSystemId(69);
@@ -129,53 +131,13 @@ public class GatewaySenderFactoryBeanTest {
}
@Test
public void testParallelGatewaySender() throws Exception {
GatewaySenderFactory mockGatewaySenderFactory = createMockGatewaySenderFactory("g1", 69);
public void concurrentSerialGatewaySenderCreation() throws Exception {
GatewaySenderFactory mockGatewaySenderFactory =
mockGatewaySenderFactory("g4", 21);
GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(
createMockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
factoryBean.setName("g1");
factoryBean.setRemoteDistributedSystemId(69);
factoryBean.setParallel(true);
factoryBean.doInit();
verifyExpectations(factoryBean, mockGatewaySenderFactory);
GatewaySender gatewaySender = factoryBean.getObject();
assertNotNull(gatewaySender);
assertEquals("g1", gatewaySender.getId());
assertEquals(69, gatewaySender.getRemoteDSId());
}
@Test(expected = IllegalArgumentException.class)
public void testParallelGatewaySenderWithOrderPolicy() {
GatewaySenderFactory mockGatewaySenderFactory = createMockGatewaySenderFactory("g2", 69);
GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(
createMockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
factoryBean.setName("g2");
factoryBean.setRemoteDistributedSystemId(69);
factoryBean.setParallel(true);
factoryBean.setOrderPolicy("KEY");
try {
factoryBean.doInit();
}
catch (IllegalArgumentException expected) {
assertEquals("OrderPolicy cannot be used with a Parallel GatewaySender", expected.getMessage());
throw expected;
}
}
@Test
public void testConcurrentSerialGatewaySender() throws Exception {
GatewaySenderFactory mockGatewaySenderFactory = createMockGatewaySenderFactory("g4", 21);
GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(
createMockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
factoryBean.setName("g4");
factoryBean.setRemoteDistributedSystemId(21);
@@ -193,17 +155,63 @@ public class GatewaySenderFactoryBeanTest {
}
@Test
public void testGatewaySenderWithOrderPolicyAndDispatcherThreads() throws Exception {
public void parallelGatewaySenderCreation() throws Exception {
GatewaySenderFactory mockGatewaySenderFactory =
createMockGatewaySenderFactory("g5", 42);
mockGatewaySenderFactory("g1", 69);
GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(
createMockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
factoryBean.setName("g5");
factoryBean.setRemoteDistributedSystemId(42);
factoryBean.setOrderPolicy("THREAD");
factoryBean.setName("g1");
factoryBean.setRemoteDistributedSystemId(69);
factoryBean.setParallel(true);
factoryBean.doInit();
verifyExpectations(factoryBean, mockGatewaySenderFactory);
GatewaySender gatewaySender = factoryBean.getObject();
assertNotNull(gatewaySender);
assertEquals("g1", gatewaySender.getId());
assertEquals(69, gatewaySender.getRemoteDSId());
}
@Test(expected = IllegalArgumentException.class)
public void parallelGatewaySenderWithOrderPolicyCreation() {
GatewaySenderFactory mockGatewaySenderFactory =
mockGatewaySenderFactory("g2", 69);
GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(
mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
factoryBean.setName("g2");
factoryBean.setRemoteDistributedSystemId(69);
factoryBean.setParallel(true);
factoryBean.setOrderPolicy(GatewaySender.OrderPolicy.KEY);
try {
factoryBean.doInit();
}
catch (IllegalArgumentException expected) {
assertEquals("OrderPolicy cannot be used with a Parallel GatewaySender", expected.getMessage());
throw expected;
}
}
@Test
public void gatewaySenderCreationWithDiskSynchronousAndNoPersistence() throws Exception {
GatewaySenderFactory mockGatewaySenderFactory =
mockGatewaySenderFactory("g7", 51);
GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(
mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
factoryBean.setName("g4");
factoryBean.setRemoteDistributedSystemId(21);
factoryBean.setParallel(false);
factoryBean.setDispatcherThreads(1);
factoryBean.doInit();
@@ -212,16 +220,18 @@ public class GatewaySenderFactoryBeanTest {
GatewaySender gatewaySender = factoryBean.getObject();
assertNotNull(gatewaySender);
assertEquals("g5", gatewaySender.getId());
assertEquals(42, gatewaySender.getRemoteDSId());
assertEquals("g4", gatewaySender.getId());
assertEquals(21, gatewaySender.getRemoteDSId());
}
@Test
public void testGatewaySenderWithOverflowDiskStoreNoPersistence() throws Exception {
GatewaySenderFactory mockGatewaySenderFactory = createMockGatewaySenderFactory("g6", 51);
public void gatewaySenderCreationWithOverflowDiskStoreAndNoPersistence() throws Exception {
GatewaySenderFactory mockGatewaySenderFactory =
mockGatewaySenderFactory("g6", 51);
GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(
createMockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
factoryBean.setName("g6");
factoryBean.setRemoteDistributedSystemId(51);
@@ -239,11 +249,13 @@ public class GatewaySenderFactoryBeanTest {
}
@Test
public void testGatewaySenderWithDiskSynchronousSetPersistenceUnset() throws Exception {
GatewaySenderFactory mockGatewaySenderFactory = createMockGatewaySenderFactory("g7", 51);
public void gatewaySenderCreationWithOrderPolicyAndDispatcherThreads() throws Exception {
GatewaySenderFactory mockGatewaySenderFactory =
mockGatewaySenderFactory("g5", 42);
GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(
createMockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
factoryBean.setName("g7");
factoryBean.setRemoteDistributedSystemId(51);
@@ -255,7 +267,7 @@ public class GatewaySenderFactoryBeanTest {
GatewaySender gatewaySender = factoryBean.getObject();
assertNotNull(gatewaySender);
assertEquals("g7", gatewaySender.getId());
assertEquals(51, gatewaySender.getRemoteDSId());
assertEquals("g5", gatewaySender.getId());
assertEquals(42, gatewaySender.getRemoteDSId());
}
}