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

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

23
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,16 +99,6 @@ public class SubscriptionAttributesFactoryBean implements FactoryBean<Subscripti
* @see org.apache.geode.cache.SubscriptionAttributes#getInterestPolicy()
*/
public InterestPolicy getInterestPolicy() {
return (interestPolicy != null ? interestPolicy : InterestPolicy.DEFAULT);
}
@Deprecated
public void setPolicy(InterestPolicy policy) {
setInterestPolicy(policy);
}
@Deprecated
public InterestPolicy getPolicy() {
return getInterestPolicy();
return this.interestPolicy != null ? this.interestPolicy : InterestPolicy.DEFAULT;
}
}

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 Pivotal GemFire/Apache 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 Pivotal GemFire/Apache 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}.

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

@@ -88,8 +88,9 @@ public class GatewaySenderFactoryBean extends AbstractWANComponentFactoryBean<Ga
@Override
protected void doInit() {
GatewaySenderFactory gatewaySenderFactory =
this.factory != null ? (GatewaySenderFactory) this.factory : this.cache.createGatewaySenderFactory();
GatewaySenderFactory gatewaySenderFactory = this.factory != null
? (GatewaySenderFactory) this.factory
: this.cache.createGatewaySenderFactory();
if (alertThreshold != null) {
gatewaySenderFactory.setAlertThreshold(alertThreshold);
@@ -228,10 +229,6 @@ public class GatewaySenderFactoryBean extends AbstractWANComponentFactoryBean<Ga
this.maximumQueueMemory = maximumQueueMemory;
}
public void setOrderPolicy(String orderPolicy) {
setOrderPolicy(GatewaySender.OrderPolicy.valueOf(String.valueOf(orderPolicy).toUpperCase()));
}
public void setOrderPolicy(GatewaySender.OrderPolicy orderPolicy) {
this.orderPolicy = orderPolicy;
}