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

DATAGEODE-109 - Remove all deprecated methods, properties, etc.

Browse Source
This commit is contained in:
John Blum
2018-06-09 19:47:23 -07:00
parent f8df9a056d
commit 2c87c47c20
13 changed files with 94 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/springframework/data/gemfire/PeerRegionFactoryBean.java
View File

@@ -752,19 +752,6 @@ public abstract class PeerRegionFactoryBean<K, V> 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}.

26
src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java
View File

@@ -45,7 +45,7 @@ public class SubscriptionAttributesFactoryBean implements FactoryBean<Subscripti
*/
@Override
public void afterPropertiesSet() throws Exception {
subscriptionAttributes = new SubscriptionAttributes(getInterestPolicy());
this.subscriptionAttributes = new SubscriptionAttributes(getInterestPolicy());
}
/*
@@ -54,7 +54,7 @@ public class SubscriptionAttributesFactoryBean implements FactoryBean<Subscripti
*/
@Override
public SubscriptionAttributes getObject() throws Exception {
return subscriptionAttributes;
return this.subscriptionAttributes;
}
/*
@@ -63,7 +63,10 @@ public class SubscriptionAttributesFactoryBean implements FactoryBean<Subscripti
*/
@Override
public Class<?> 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<Subscripti
* @see org.apache.geode.cache.InterestPolicy
* @see org.apache.geode.cache.SubscriptionAttributes#SubscriptionAttributes(org.apache.geode.cache.InterestPolicy)
*/
public void setInterestPolicy(final InterestPolicy interestPolicy) {
public void setInterestPolicy(InterestPolicy interestPolicy) {
this.interestPolicy = interestPolicy;
}
@@ -96,19 +99,6 @@ public class SubscriptionAttributesFactoryBean implements FactoryBean<Subscripti
* @see org.apache.geode.cache.SubscriptionAttributes#getInterestPolicy()
*/
public InterestPolicy getInterestPolicy() {
return (interestPolicy != null ? interestPolicy : InterestPolicy.DEFAULT);
return this.interestPolicy != null ? this.interestPolicy : InterestPolicy.DEFAULT;
}
/* non-Javadoc */
@Deprecated
public void setPolicy(InterestPolicy policy) {
setInterestPolicy(policy);
}
/* non-Javadoc */
@Deprecated
public InterestPolicy getPolicy() {
return getInterestPolicy();
}
}

16
src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java
View File

@@ -45,7 +45,6 @@ import org.apache.geode.compression.Compressor;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.data.gemfire.ConfigurableRegionFactoryBean;
import org.springframework.data.gemfire.DataPolicyConverter;
import org.springframework.data.gemfire.GemfireUtils;
import org.springframework.data.gemfire.config.annotation.RegionConfigurer;
import org.springframework.data.gemfire.config.xml.GemfireConstants;
@@ -572,21 +571,6 @@ public class ClientRegionFactoryBean<K, V> 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;
}

27
src/main/java/org/springframework/data/gemfire/client/Interest.java
View File

@@ -129,33 +129,6 @@ public class Interest<K> 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
*/

18
src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java
View File

@@ -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<String, Object> 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}.

26
src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java
View File

@@ -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<Class<?>, 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<Class<?>, PdxSerializer> getCustomSerializers() {
return (Map<Class<?>, 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}.

31
src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java
View File

@@ -86,8 +86,10 @@ public class GatewaySenderFactoryBean extends AbstractWANComponentFactoryBean<Ga
*/
@Override
protected void doInit() {
GatewaySenderFactory gatewaySenderFactory = (this.factory != null ? (GatewaySenderFactory) factory
: cache.createGatewaySenderFactory());
GatewaySenderFactory gatewaySenderFactory = this.factory != null
? (GatewaySenderFactory) factory
: cache.createGatewaySenderFactory();
if (alertThreshold != null) {
gatewaySenderFactory.setAlertThreshold(alertThreshold);
@@ -163,7 +165,7 @@ public class GatewaySenderFactoryBean extends AbstractWANComponentFactoryBean<Ga
*/
@Override
public GatewaySender getObject() throws Exception {
return gatewaySender;
return this.gatewaySender;
}
/**
@@ -171,7 +173,7 @@ public class GatewaySenderFactoryBean extends AbstractWANComponentFactoryBean<Ga
*/
@Override
public Class<?> 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<Ga
this.batchConflationEnabled = batchConflationEnabled;
}
/**
* Boolean value that determines whether GemFire should conflate messages.
*
* @param enableBatchConflation a boolean value indicating whether GemFire should conflate messages in the Queue.
* @see #setBatchConflationEnabled(Boolean)
* @deprecated use setBatchConflationEnabled(Boolean)
*/
@Deprecated
public void setEnableBatchConflation(Boolean enableBatchConflation) {
this.batchConflationEnabled = enableBatchConflation;
}
public void setBatchSize(Integer batchSize) {
this.batchSize = batchSize;
}
@@ -230,15 +220,6 @@ public class GatewaySenderFactoryBean extends AbstractWANComponentFactoryBean<Ga
this.maximumQueueMemory = maximumQueueMemory;
}
/**
* @see #setOrderPolicy(org.apache.geode.cache.wan.GatewaySender.OrderPolicy)
* @deprecated please use setOrderPolicy(:GatewaySender.OrderPolicy) instead.
*/
@Deprecated
public void setOrderPolicy(String orderPolicy) {
setOrderPolicy(new OrderPolicyConverter().convert(orderPolicy));
}
public void setOrderPolicy(GatewaySender.OrderPolicy orderPolicy) {
this.orderPolicy = orderPolicy;
}

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

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

@@ -115,10 +115,12 @@ public class PeerRegionFactoryBeanTest extends AbstractRegionFactoryBeanTests {
@SuppressWarnings({ "deprecation", "rawtypes" })
private RegionFactoryBeanConfig invalidPersistentConfig() {
return new RegionFactoryBeanConfig(new TestRegionFactoryBean(), "invalid-persistence") {
@Override
public void configureRegionFactoryBean() {
regionFactoryBean.setDataPolicy("persistent_replicate");
regionFactoryBean.setDataPolicy(DataPolicy.PERSISTENT_REPLICATE);
regionFactoryBean.setPersistent(false);
}
@@ -1087,6 +1089,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

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

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

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

@@ -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.<GatewaySender.OrderPolicy>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;
}
}
}