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

SGF-567 - Rename all com.gemstone.gemfire package references to org.apache.geode.

Browse Source
This commit is contained in:
John Blum
2016-11-17 11:21:51 -08:00
parent 7c1574e600
commit b5e05a4b69
418 changed files with 3604 additions and 3907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java
View File

@@ -23,25 +23,24 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import com.gemstone.gemfire.GemFireCheckedException;
import com.gemstone.gemfire.GemFireException;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheClosedException;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.DynamicRegionFactory;
import com.gemstone.gemfire.cache.GemFireCache;
import com.gemstone.gemfire.cache.TransactionListener;
import com.gemstone.gemfire.cache.TransactionWriter;
import com.gemstone.gemfire.cache.util.GatewayConflictResolver;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.datasource.ConfigProperty;
import com.gemstone.gemfire.internal.jndi.JNDIInvoker;
import com.gemstone.gemfire.pdx.PdxSerializable;
import com.gemstone.gemfire.pdx.PdxSerializer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geode.GemFireCheckedException;
import org.apache.geode.GemFireException;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DynamicRegionFactory;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.TransactionListener;
import org.apache.geode.cache.TransactionWriter;
import org.apache.geode.cache.util.GatewayConflictResolver;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.datasource.ConfigProperty;
import org.apache.geode.internal.jndi.JNDIInvoker;
import org.apache.geode.pdx.PdxSerializable;
import org.apache.geode.pdx.PdxSerializer;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.BeanFactory;
@@ -79,11 +78,11 @@ import org.springframework.util.ObjectUtils;
* @see org.springframework.beans.factory.DisposableBean
* @see org.springframework.context.Phased
* @see org.springframework.dao.support.PersistenceExceptionTranslator
* @see com.gemstone.gemfire.cache.Cache
* @see com.gemstone.gemfire.cache.CacheFactory
* @see com.gemstone.gemfire.cache.GemFireCache
* @see com.gemstone.gemfire.distributed.DistributedMember
* @see com.gemstone.gemfire.distributed.DistributedSystem
* @see org.apache.geode.cache.Cache
* @see org.apache.geode.cache.CacheFactory
* @see org.apache.geode.cache.GemFireCache
* @see org.apache.geode.distributed.DistributedMember
* @see org.apache.geode.distributed.DistributedSystem
*/
@SuppressWarnings("unused")
public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware, BeanNameAware, FactoryBean<Cache>,
@@ -233,7 +232,7 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware,
* if an existing Cache could not be found, then this method proceeds in attempting to create a new Cache instance.
*
* @return the resolved GemFire Cache instance.
* @see com.gemstone.gemfire.cache.Cache
* @see org.apache.geode.cache.Cache
* @see #fetchCache()
* @see #createFactory(java.util.Properties)
* @see #prepareFactory(Object)
@@ -256,9 +255,9 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware,
*
* @param <T> parameterized Class type extension of GemFireCache.
* @return the existing GemFire Cache instance if available.
* @throws com.gemstone.gemfire.cache.CacheClosedException if an existing GemFire Cache instance does not exist.
* @see com.gemstone.gemfire.cache.GemFireCache
* @see com.gemstone.gemfire.cache.CacheFactory#getAnyInstance()
* @throws org.apache.geode.cache.CacheClosedException if an existing GemFire Cache instance does not exist.
* @see org.apache.geode.cache.GemFireCache
* @see org.apache.geode.cache.CacheFactory#getAnyInstance()
*/
@SuppressWarnings("unchecked")
protected <T extends GemFireCache> T fetchCache() {
@@ -282,7 +281,7 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware,
* @param gemfireProperties a Properties object containing GemFire System properties.
* @return an instance of a GemFire factory used to create a GemFire cache instance.
* @see java.util.Properties
* @see com.gemstone.gemfire.cache.CacheFactory
* @see org.apache.geode.cache.CacheFactory
*/
protected Object createFactory(Properties gemfireProperties) {
return new CacheFactory(gemfireProperties);
@@ -304,7 +303,7 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware,
* Initialize the PDX settings on the {@link CacheFactory}.
*
* @param cacheFactory the GemFire {@link CacheFactory} used to configure and create a GemFire {@link Cache}.
* @see com.gemstone.gemfire.cache.CacheFactory
* @see org.apache.geode.cache.CacheFactory
*/
CacheFactory initializePdx(CacheFactory cacheFactory) {
if (isPdxOptionsSpecified()) {
@@ -348,8 +347,8 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware,
* @param <T> parameterized Class type extension of GemFireCache.
* @param factory the appropriate GemFire factory used to create a cache instance.
* @return an instance of the GemFire cache.
* @see com.gemstone.gemfire.cache.GemFireCache
* @see com.gemstone.gemfire.cache.CacheFactory#create()
* @see org.apache.geode.cache.GemFireCache
* @see org.apache.geode.cache.CacheFactory#create()
*/
@SuppressWarnings("unchecked")
protected <T extends GemFireCache> T createCache(Object factory) {
@@ -364,11 +363,11 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware,
* @param cache the GemFire Cache instance to process.
* @return the GemFire Cache instance after processing.
* @throws IOException if the cache.xml Resource could not be loaded and applied to the Cache instance.
* @see com.gemstone.gemfire.cache.Cache#loadCacheXml(java.io.InputStream)
* @see org.apache.geode.cache.Cache#loadCacheXml(java.io.InputStream)
* @see #getCacheXml()
* @see #setHeapPercentages(com.gemstone.gemfire.cache.GemFireCache)
* @see #registerTransactionListeners(com.gemstone.gemfire.cache.GemFireCache)
* @see #registerTransactionWriter(com.gemstone.gemfire.cache.GemFireCache)
* @see #setHeapPercentages(org.apache.geode.cache.GemFireCache)
* @see #registerTransactionListeners(org.apache.geode.cache.GemFireCache)
* @see #registerTransactionWriter(org.apache.geode.cache.GemFireCache)
* @see #registerJndiDataSources()
*/
protected <T extends GemFireCache> T postProcess(T cache) throws IOException {
@@ -768,7 +767,7 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware,
* Requires GemFire 7.0 or higher
* @param gatewayConflictResolver defined as Object in the signature for backward
* compatibility with Gemfire 6 compatibility. This must be an instance of
* {@link com.gemstone.gemfire.cache.util.GatewayConflictResolver}
* {@link org.apache.geode.cache.util.GatewayConflictResolver}
*/
public void setGatewayConflictResolver(Object gatewayConflictResolver) {
this.gatewayConflictResolver = gatewayConflictResolver;
@@ -952,7 +951,7 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware,
* the transaction is processed (committed, rolled back).
*
* @param transactionListeners the list of GemFire TransactionListeners listening for transaction events.
* @see com.gemstone.gemfire.cache.TransactionListener
* @see org.apache.geode.cache.TransactionListener
*/
public void setTransactionListeners(List<TransactionListener> transactionListeners) {
this.transactionListeners = transactionListeners;
@@ -970,7 +969,7 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware,
* the transaction or update an external DB before the commit.
*
* @param transactionWriter the GemFire TransactionWriter callback receiving transaction events.
* @see com.gemstone.gemfire.cache.TransactionWriter
* @see org.apache.geode.cache.TransactionWriter
*/
public void setTransactionWriter(TransactionWriter transactionWriter) {
this.transactionWriter = transactionWriter;

5
src/main/java/org/springframework/data/gemfire/DataPolicyConverter.java
View File

@@ -16,17 +16,16 @@
package org.springframework.data.gemfire;
import org.apache.geode.cache.DataPolicy;
import org.springframework.core.convert.converter.Converter;
import com.gemstone.gemfire.cache.DataPolicy;
/**
* The DataPolicyConverter class converts String values into GemFire DataPolicy enumerated values.
*
* @author David Turanski
* @author John Blum
* @see org.springframework.core.convert.converter.Converter
* @see com.gemstone.gemfire.cache.DataPolicy
* @see org.apache.geode.cache.DataPolicy
*/
public class DataPolicyConverter implements Converter<String, DataPolicy> {

15
src/main/java/org/springframework/data/gemfire/DeclarableSupport.java
View File

@@ -18,26 +18,25 @@ package org.springframework.data.gemfire;
import java.util.Properties;
import org.apache.geode.cache.CacheCallback;
import org.apache.geode.cache.Declarable;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.access.BeanFactoryReference;
import com.gemstone.gemfire.cache.CacheCallback;
import com.gemstone.gemfire.cache.Declarable;
/**
* Convenience class for Spring-aware GemFire Declarable components. Provides a reference to the current
* Spring ApplicationContext, e.g. for Spring bean lookup or resource loading.
*
*
* Note that in most cases, one can just declare the same components as Spring beans, through {@link RegionFactoryBean}
* which gives access to the full Spring container capabilities and does not enforce the {@link Declarable} interface
* to be implemented.
*
*
* @author Costin Leau
* @author John Blum
* @see org.springframework.beans.factory.BeanFactory
* @see org.springframework.beans.factory.access.BeanFactoryReference
* @see com.gemstone.gemfire.cache.CacheCallback
* @see com.gemstone.gemfire.cache.Declarable
* @see org.apache.geode.cache.CacheCallback
* @see org.apache.geode.cache.Declarable
*/
@SuppressWarnings("unused")
public abstract class DeclarableSupport implements CacheCallback, Declarable {
@@ -89,7 +88,7 @@ public abstract class DeclarableSupport implements CacheCallback, Declarable {
* Initialize this Declarable object with the given Properties.
*
* @param props the Properties (parameters) used to initialize this Declarable.
* @see com.gemstone.gemfire.cache.Declarable#init(java.util.Properties)
* @see org.apache.geode.cache.Declarable#init(java.util.Properties)
* @see java.util.Properties
* @see #init(Properties)
*/

7
src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java
View File

@@ -19,6 +19,9 @@ package org.springframework.data.gemfire;
import java.io.File;
import java.util.List;
import org.apache.geode.cache.DiskStore;
import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.cache.GemFireCache;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
@@ -26,10 +29,6 @@ import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import com.gemstone.gemfire.cache.DiskStore;
import com.gemstone.gemfire.cache.DiskStoreFactory;
import com.gemstone.gemfire.cache.GemFireCache;
/**
* FactoryBean for creating a GemFire DiskStore.
*

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

@@ -15,12 +15,11 @@
*/
package org.springframework.data.gemfire;
import org.apache.geode.cache.FixedPartitionAttributes;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.Assert;
import com.gemstone.gemfire.cache.FixedPartitionAttributes;
/**
* @author David Turanski
*
@@ -54,7 +53,7 @@ public class FixedPartitionAttributesFactoryBean implements FactoryBean<FixedPar
this.numBuckets = numBuckets;
}
/* (non-Javadoc)
* @see org.springframework.beans.factory.FactoryBean#getObject()
*/
@@ -85,7 +84,7 @@ public class FixedPartitionAttributesFactoryBean implements FactoryBean<FixedPar
@Override
public void afterPropertiesSet() throws Exception {
Assert.hasText(partitionName,"partitionName cannot be empty or null");
fixedPartitionAttributes = null;
if (primary == null && numBuckets == null){
fixedPartitionAttributes = FixedPartitionAttributes.createFixedPartition(partitionName);
@@ -96,6 +95,6 @@ public class FixedPartitionAttributesFactoryBean implements FactoryBean<FixedPar
} else {
fixedPartitionAttributes = FixedPartitionAttributes.createFixedPartition(partitionName,primary,numBuckets);
}
}
}

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

@@ -16,12 +16,11 @@
package org.springframework.data.gemfire;
import com.gemstone.gemfire.GemFireCheckedException;
import com.gemstone.gemfire.GemFireException;
import com.gemstone.gemfire.cache.Region;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geode.GemFireCheckedException;
import org.apache.geode.GemFireException;
import org.apache.geode.cache.Region;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.dao.DataAccessException;
import org.springframework.util.Assert;
@@ -35,7 +34,7 @@ import org.springframework.util.Assert;
* @author Costin Leau
* @author John Blum
* @see org.springframework.beans.factory.InitializingBean
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.Region
*/
public class GemfireAccessor implements InitializingBean {
@@ -49,7 +48,7 @@ public class GemfireAccessor implements InitializingBean {
* @param <K> the Region key class type.
* @param <V> the Region value class type.
* @return the GemFire Cache Region.
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.Region
*/
@SuppressWarnings("unchecked")
public <K, V> Region<K, V> getRegion() {
@@ -60,7 +59,7 @@ public class GemfireAccessor implements InitializingBean {
* Sets the template GemFire Cache Region.
*
* @param region the GemFire Cache Region used by this template.
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.Region
*/
public void setRegion(Region<?, ?> region) {
this.region = region;

12
src/main/java/org/springframework/data/gemfire/GemfireBeanFactoryLocator.java
View File

@@ -36,16 +36,16 @@ import org.springframework.util.StringUtils;
/**
* {@link BeanFactoryLocator} used for storing Spring application context/bean factory for Gemfire
* user components (or {@link com.gemstone.gemfire.cache.Declarable}. As opposed to the "traditional"
* user components (or {@link org.apache.geode.cache.Declarable}. As opposed to the "traditional"
* {@link org.springframework.beans.factory.access.SingletonBeanFactoryLocator} this implementation does
* not require any configuration file; it rather assume declaration inside an application context
* (usually through {@link com.gemstone.gemfire.cache.CacheFactory} which it will store under the name
* and aliases of the bean (so the same "registry" can be used for storing multiple BeanFactories).
* (usually through {@link org.apache.geode.cache.CacheFactory} which it will store under the name
* and aliases of the bean (so the same "registry" can be used for storing multiple BeanFactories).
* If there is only one BeanFactory registered then a null value can be used with {@link #setBeanName(String)}.
*
*
* In most cases, one does not need to use this class directly as it is used internally
* by {@link com.gemstone.gemfire.cache.CacheFactory}.
*
* by {@link org.apache.geode.cache.CacheFactory}.
*
* @author Costin Leau
* @author John Blum
*/

115
src/main/java/org/springframework/data/gemfire/GemfireCacheUtils.java
View File

@@ -16,6 +16,54 @@
package org.springframework.data.gemfire;
import org.apache.geode.CancelException;
import org.apache.geode.CopyException;
import org.apache.geode.GemFireCacheException;
import org.apache.geode.GemFireCheckedException;
import org.apache.geode.GemFireConfigException;
import org.apache.geode.GemFireException;
import org.apache.geode.GemFireIOException;
import org.apache.geode.IncompatibleSystemException;
import org.apache.geode.InternalGemFireException;
import org.apache.geode.InvalidValueException;
import org.apache.geode.LicenseException;
import org.apache.geode.NoSystemException;
import org.apache.geode.SystemConnectException;
import org.apache.geode.SystemIsRunningException;
import org.apache.geode.UnmodifiableException;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.CacheExistsException;
import org.apache.geode.cache.CacheLoaderException;
import org.apache.geode.cache.CacheRuntimeException;
import org.apache.geode.cache.CacheWriterException;
import org.apache.geode.cache.CacheXmlException;
import org.apache.geode.cache.CommitConflictException;
import org.apache.geode.cache.CommitIncompleteException;
import org.apache.geode.cache.DiskAccessException;
import org.apache.geode.cache.EntryDestroyedException;
import org.apache.geode.cache.EntryExistsException;
import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.cache.FailedSynchronizationException;
import org.apache.geode.cache.OperationAbortedException;
import org.apache.geode.cache.PartitionedRegionDistributionException;
import org.apache.geode.cache.PartitionedRegionStorageException;
import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.cache.RegionExistsException;
import org.apache.geode.cache.ResourceException;
import org.apache.geode.cache.RoleException;
import org.apache.geode.cache.StatisticsDisabledException;
import org.apache.geode.cache.SynchronizationCommitConflictException;
import org.apache.geode.cache.VersionException;
import org.apache.geode.cache.client.ServerConnectivityException;
import org.apache.geode.cache.execute.FunctionException;
import org.apache.geode.cache.query.CqClosedException;
import org.apache.geode.cache.query.IndexInvalidException;
import org.apache.geode.cache.query.IndexMaintenanceException;
import org.apache.geode.cache.query.QueryException;
import org.apache.geode.cache.query.QueryExecutionTimeoutException;
import org.apache.geode.cache.query.QueryInvalidException;
import org.apache.geode.distributed.LeaseExpiredException;
import org.apache.geode.security.GemFireSecurityException;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.DataAccessResourceFailureException;
import org.springframework.dao.DataIntegrityViolationException;
@@ -28,58 +76,9 @@ import org.springframework.dao.PessimisticLockingFailureException;
import org.springframework.dao.TypeMismatchDataAccessException;
import org.springframework.util.ClassUtils;
import com.gemstone.gemfire.CancelException;
import com.gemstone.gemfire.CopyException;
import com.gemstone.gemfire.GemFireCacheException;
import com.gemstone.gemfire.GemFireCheckedException;
import com.gemstone.gemfire.GemFireConfigException;
import com.gemstone.gemfire.GemFireException;
import com.gemstone.gemfire.GemFireIOException;
import com.gemstone.gemfire.IncompatibleSystemException;
import com.gemstone.gemfire.InternalGemFireException;
import com.gemstone.gemfire.InvalidValueException;
import com.gemstone.gemfire.LicenseException;
import com.gemstone.gemfire.NoSystemException;
import com.gemstone.gemfire.SystemConnectException;
import com.gemstone.gemfire.SystemIsRunningException;
import com.gemstone.gemfire.UnmodifiableException;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.CacheExistsException;
import com.gemstone.gemfire.cache.CacheLoaderException;
import com.gemstone.gemfire.cache.CacheRuntimeException;
import com.gemstone.gemfire.cache.CacheWriterException;
import com.gemstone.gemfire.cache.CacheXmlException;
import com.gemstone.gemfire.cache.CommitConflictException;
import com.gemstone.gemfire.cache.CommitIncompleteException;
import com.gemstone.gemfire.cache.DiskAccessException;
import com.gemstone.gemfire.cache.EntryDestroyedException;
import com.gemstone.gemfire.cache.EntryExistsException;
import com.gemstone.gemfire.cache.EntryNotFoundException;
import com.gemstone.gemfire.cache.FailedSynchronizationException;
import com.gemstone.gemfire.cache.OperationAbortedException;
import com.gemstone.gemfire.cache.PartitionedRegionDistributionException;
import com.gemstone.gemfire.cache.PartitionedRegionStorageException;
import com.gemstone.gemfire.cache.RegionDestroyedException;
import com.gemstone.gemfire.cache.RegionExistsException;
import com.gemstone.gemfire.cache.ResourceException;
import com.gemstone.gemfire.cache.RoleException;
import com.gemstone.gemfire.cache.StatisticsDisabledException;
import com.gemstone.gemfire.cache.SynchronizationCommitConflictException;
import com.gemstone.gemfire.cache.VersionException;
import com.gemstone.gemfire.cache.client.ServerConnectivityException;
import com.gemstone.gemfire.cache.execute.FunctionException;
import com.gemstone.gemfire.cache.query.CqClosedException;
import com.gemstone.gemfire.cache.query.IndexInvalidException;
import com.gemstone.gemfire.cache.query.IndexMaintenanceException;
import com.gemstone.gemfire.cache.query.QueryException;
import com.gemstone.gemfire.cache.query.QueryExecutionTimeoutException;
import com.gemstone.gemfire.cache.query.QueryInvalidException;
import com.gemstone.gemfire.distributed.LeaseExpiredException;
import com.gemstone.gemfire.security.GemFireSecurityException;
/**
* Helper class featuring methods for GemFire Cache or Region handling.
*
*
* @author Costin Leau
*/
public abstract class GemfireCacheUtils {
@@ -90,7 +89,7 @@ public abstract class GemfireCacheUtils {
Class<?> type = null;
try {
type = ClassUtils.resolveClassName("com.gemstone.gemfire.cache.query.CqInvalidException",
type = ClassUtils.resolveClassName("org.apache.geode.cache.query.CqInvalidException",
GemfireCacheUtils.class.getClassLoader());
}
@@ -104,7 +103,7 @@ public abstract class GemfireCacheUtils {
/**
* Converts the given (unchecked) Gemfire exception to an appropriate one from the
* <code>org.springframework.dao</code> hierarchy.
*
*
* @param ex Gemfire unchecked exception
* @return new the corresponding DataAccessException instance
*/
@@ -154,7 +153,7 @@ public abstract class GemfireCacheUtils {
return new GemfireIndexException((IndexMaintenanceException) ex);
}
if (ex instanceof OperationAbortedException) {
// treat user exceptions first
// treat user exceptions first
if (ex instanceof CacheLoaderException) {
return new GemfireSystemException(ex);
}
@@ -176,7 +175,7 @@ public abstract class GemfireCacheUtils {
if (ex instanceof RegionDestroyedException) {
return new InvalidDataAccessResourceUsageException(ex.getMessage(), ex);
}
if (ex instanceof com.gemstone.gemfire.admin.RegionNotFoundException) {
if (ex instanceof org.apache.geode.admin.RegionNotFoundException) {
return new InvalidDataAccessResourceUsageException(ex.getMessage(), ex);
}
if (ex instanceof ResourceException) {
@@ -195,7 +194,7 @@ public abstract class GemfireCacheUtils {
if (ex instanceof CopyException) {
return new GemfireSystemException(ex);
}
if (ex instanceof com.gemstone.gemfire.cache.EntryNotFoundInRegion) {
if (ex instanceof org.apache.geode.cache.EntryNotFoundInRegion) {
return new DataRetrievalFailureException(ex.getMessage(), ex);
}
if (ex instanceof FunctionException) {
@@ -231,7 +230,7 @@ public abstract class GemfireCacheUtils {
if (ex instanceof NoSystemException) {
return new GemfireSystemException(ex);
}
if (ex instanceof com.gemstone.gemfire.admin.RuntimeAdminException) {
if (ex instanceof org.apache.geode.admin.RuntimeAdminException) {
return new GemfireSystemException(ex);
}
if (ex instanceof ServerConnectivityException) {
@@ -295,11 +294,11 @@ public abstract class GemfireCacheUtils {
return new DataAccessResourceFailureException(ex.getMessage(), ex);
}
// util.version exception (seems quite similar to the exception above)
if (ex instanceof com.gemstone.gemfire.cache.util.VersionException) {
if (ex instanceof org.apache.geode.cache.util.VersionException) {
return new DataAccessResourceFailureException(ex.getMessage(), ex);
}
// admin exception
if (ex instanceof com.gemstone.gemfire.admin.AdminException) {
if (ex instanceof org.apache.geode.admin.AdminException) {
return new GemfireSystemException(ex);
}
// fall back

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

@@ -16,18 +16,18 @@
package org.springframework.data.gemfire;
import com.gemstone.gemfire.GemFireCheckedException;
import com.gemstone.gemfire.GemFireException;
import com.gemstone.gemfire.cache.Region;
import org.apache.geode.GemFireCheckedException;
import org.apache.geode.GemFireException;
import org.apache.geode.cache.Region;
/**
* Callback interface for GemFire code. To be used with {@link GemfireTemplate}'s execution methods, often as anonymous
* classes within a method implementation. A typical implementation will call Region.get/put/query to perform some
* operations on stored objects.
*
* operations on stored objects.
*
* @author Costin Leau
* @author John Blum
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.Region
*/
public interface GemfireCallback<T> {
@@ -40,13 +40,13 @@ public interface GemfireCallback<T> {
*
* A thrown custom RuntimeException is treated as an application exception: it gets propagated to
* the caller of the template.
*
*
* @param region the GemFire Cache Region upon which the operation of this callback will be performed.
* @return a result object, or <tt>null</tt> if no result.
* @throws GemFireCheckedException for checked Exceptions occurring in GemFire.
* @throws GemFireException for runtime Exceptions occurring in GemFire.
* @see org.springframework.data.gemfire.GemfireTemplate
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.Region
*/
T doInGemfire(Region<?,?> region) throws GemFireCheckedException, GemFireException;

5
src/main/java/org/springframework/data/gemfire/GemfireCancellationException.java
View File

@@ -16,13 +16,12 @@
package org.springframework.data.gemfire;
import org.apache.geode.CancelException;
import org.springframework.dao.InvalidDataAccessResourceUsageException;
import com.gemstone.gemfire.CancelException;
/**
* GemFire-specific class for exceptions caused by system cancellations.
*
*
* @author Costin Leau
*/
@SuppressWarnings("serial")

23
src/main/java/org/springframework/data/gemfire/GemfireIndexException.java
View File

@@ -16,24 +16,23 @@
package org.springframework.data.gemfire;
import org.apache.geode.cache.query.IndexCreationException;
import org.apache.geode.cache.query.IndexExistsException;
import org.apache.geode.cache.query.IndexInvalidException;
import org.apache.geode.cache.query.IndexMaintenanceException;
import org.apache.geode.cache.query.IndexNameConflictException;
import org.springframework.dao.DataIntegrityViolationException;
import com.gemstone.gemfire.cache.query.IndexCreationException;
import com.gemstone.gemfire.cache.query.IndexExistsException;
import com.gemstone.gemfire.cache.query.IndexInvalidException;
import com.gemstone.gemfire.cache.query.IndexMaintenanceException;
import com.gemstone.gemfire.cache.query.IndexNameConflictException;
/**
* Gemfire-specific subclass thrown on Index management.
*
*
* @author Costin Leau
* @author John Blum
* @see com.gemstone.gemfire.cache.query.IndexCreationException
* @see com.gemstone.gemfire.cache.query.IndexExistsException
* @see com.gemstone.gemfire.cache.query.IndexInvalidException
* @see com.gemstone.gemfire.cache.query.IndexMaintenanceException
* @see com.gemstone.gemfire.cache.query.IndexNameConflictException
* @see org.apache.geode.cache.query.IndexCreationException
* @see org.apache.geode.cache.query.IndexExistsException
* @see org.apache.geode.cache.query.IndexInvalidException
* @see org.apache.geode.cache.query.IndexMaintenanceException
* @see org.apache.geode.cache.query.IndexNameConflictException
*/
@SuppressWarnings({ "serial", "unused" })
public class GemfireIndexException extends DataIntegrityViolationException {

15
src/main/java/org/springframework/data/gemfire/GemfireOperations.java
View File

@@ -1,11 +1,11 @@
/*
* Copyright 2002-2013 the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
@@ -15,14 +15,13 @@ package org.springframework.data.gemfire;
import java.util.Collection;
import java.util.Map;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.query.Query;
import com.gemstone.gemfire.cache.query.QueryService;
import com.gemstone.gemfire.cache.query.SelectResults;
/**
* @author David Turanski
* @author John Blum

11
src/main/java/org/springframework/data/gemfire/GemfireQueryException.java
View File

@@ -16,16 +16,15 @@
package org.springframework.data.gemfire;
import org.apache.geode.cache.query.QueryException;
import org.apache.geode.cache.query.QueryExecutionTimeoutException;
import org.apache.geode.cache.query.QueryInvalidException;
import org.springframework.dao.InvalidDataAccessResourceUsageException;
import com.gemstone.gemfire.cache.query.QueryException;
import com.gemstone.gemfire.cache.query.QueryExecutionTimeoutException;
import com.gemstone.gemfire.cache.query.QueryInvalidException;
/**
* GemFire-specific subclass of {@link InvalidDataAccessResourceUsageException} thrown on invalid
* OQL query syntax.
*
*
* @author Costin Leau
*/
@SuppressWarnings("serial")
@@ -62,4 +61,4 @@ public class GemfireQueryException extends InvalidDataAccessResourceUsageExcepti
public GemfireQueryException(RuntimeException ex) {
super(ex.getMessage(), ex);
}
}
}

7
src/main/java/org/springframework/data/gemfire/GemfireSystemException.java
View File

@@ -16,14 +16,13 @@
package org.springframework.data.gemfire;
import org.apache.geode.GemFireCheckedException;
import org.apache.geode.GemFireException;
import org.springframework.dao.UncategorizedDataAccessException;
import com.gemstone.gemfire.GemFireCheckedException;
import com.gemstone.gemfire.GemFireException;
/**
* GemFire-specific subclass of UncategorizedDataAccessException, for GemFire system errors that do not match any concrete <code>org.springframework.dao</code> exceptions.
*
*
* @author Costin Leau
*/
@SuppressWarnings("serial")

43
src/main/java/org/springframework/data/gemfire/GemfireTemplate.java
View File

@@ -24,18 +24,17 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import com.gemstone.gemfire.GemFireCheckedException;
import com.gemstone.gemfire.GemFireException;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.client.ClientCache;
import com.gemstone.gemfire.cache.query.IndexInvalidException;
import com.gemstone.gemfire.cache.query.Query;
import com.gemstone.gemfire.cache.query.QueryInvalidException;
import com.gemstone.gemfire.cache.query.QueryService;
import com.gemstone.gemfire.cache.query.SelectResults;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import org.apache.geode.GemFireCheckedException;
import org.apache.geode.GemFireException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.Scope;
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.query.IndexInvalidException;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryInvalidException;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.internal.cache.LocalRegion;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.util.Assert;
@@ -59,10 +58,10 @@ import org.springframework.util.StringUtils;
* @see java.util.Map
* @see org.springframework.data.gemfire.GemfireAccessor
* @see org.springframework.data.gemfire.GemfireOperations
* @see com.gemstone.gemfire.cache.Region
* @see com.gemstone.gemfire.cache.query.Query
* @see com.gemstone.gemfire.cache.query.QueryService
* @see com.gemstone.gemfire.cache.query.SelectResults
* @see org.apache.geode.cache.Region
* @see org.apache.geode.cache.query.Query
* @see org.apache.geode.cache.query.QueryService
* @see org.apache.geode.cache.query.SelectResults
*/
@SuppressWarnings("unused")
public class GemfireTemplate extends GemfireAccessor implements GemfireOperations {
@@ -389,10 +388,10 @@ public class GemfireTemplate extends GemfireAccessor implements GemfireOperation
*
* @param region {@link Region} used to acquire the {@link QueryService}.
* @return the {@link QueryService} that will perform the query.
* @see com.gemstone.gemfire.cache.Region
* @see com.gemstone.gemfire.cache.Region#getRegionService()
* @see com.gemstone.gemfire.cache.RegionService#getQueryService()
* @see com.gemstone.gemfire.cache.client.ClientCache#getLocalQueryService()
* @see org.apache.geode.cache.Region
* @see org.apache.geode.cache.Region#getRegionService()
* @see org.apache.geode.cache.RegionService#getQueryService()
* @see org.apache.geode.cache.client.ClientCache#getLocalQueryService()
*/
protected QueryService resolveQueryService(Region<?, ?> region) {
return (region.getRegionService() instanceof ClientCache ? resolveClientQueryService(region)
@@ -485,7 +484,7 @@ public class GemfireTemplate extends GemfireAccessor implements GemfireOperation
* @param <V> the Region value class type.
* @param region the GemFire Cache Region to create a proxy for.
* @return the Region proxy implementing all interfaces implemented by the passed-in Region object.
* @see com.gemstone.gemfire.cache.Region#close()
* @see org.apache.geode.cache.Region#close()
* @see #execute(GemfireCallback, boolean)
*/
@SuppressWarnings("unchecked")
@@ -500,7 +499,7 @@ public class GemfireTemplate extends GemfireAccessor implements GemfireOperation
/**
* InvocationHandler that suppresses close calls on GemFire Cache Regions.
*
* @see com.gemstone.gemfire.cache.Region#close()
* @see org.apache.geode.cache.Region#close()
* @see java.lang.reflect.InvocationHandler
*/
private static class RegionCloseSuppressingInvocationHandler implements InvocationHandler {

43
src/main/java/org/springframework/data/gemfire/GemfireTransactionManager.java
View File

@@ -16,6 +16,9 @@
package org.springframework.data.gemfire;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheTransactionManager;
import org.apache.geode.cache.Region;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.transaction.CannotCreateTransactionException;
import org.springframework.transaction.NoTransactionException;
@@ -28,38 +31,34 @@ import org.springframework.transaction.support.ResourceTransactionManager;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.util.Assert;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheTransactionManager;
import com.gemstone.gemfire.cache.Region;
/**
* Local transaction manager for GemFire Enterprise Fabric (GEF). Provides a
* {@link PlatformTransactionManager} implementation for a single GemFire
* {@link CacheTransactionManager}.
*
*
* Binds one or multiple GemFire regions for the specified {@link Cache} to the
* thread, potentially allowing for one region per cache model.
*
*
* <p>
* This local strategy is an alternative to executing cache operations within
* JTA transactions. Its advantage is that is able to work in any environment,
* for example a stand-alone application or a test suite. It is <i>not</i> able
* to provide XA transactions, for example to share transactions with data
* access.
*
*
* <p>
* To prevent dirty reads, by default, the cache is configured to return copies
* rather then direct references for <code>get</code> operations. As a
* workaround, one could use explicitly deep copy objects before making changes
* to them to avoid unnecessary copying on every fetch.
*
* @see com.gemstone.gemfire.cache.CacheTransactionManager
* @see com.gemstone.gemfire.cache.Cache#setCopyOnRead(boolean)
* @see com.gemstone.gemfire.cache.Region#get(Object)
* @see com.gemstone.gemfire.CopyHelper#copy(Object)
*
* @see org.apache.geode.cache.CacheTransactionManager
* @see org.apache.geode.cache.Cache#setCopyOnRead(boolean)
* @see org.apache.geode.cache.Region#get(Object)
* @see org.apache.geode.CopyHelper#copy(Object)
* @see #setCopyOnRead(boolean)
* @see org.springframework.transaction.support.AbstractPlatformTransactionManager
*
*
* @author Costin Leau
*/
// TODO add lenient behavior if a transaction is already started on the current
@@ -80,7 +79,7 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage
/**
* Creates a new GemfireTransactionManager instance.
*
*
* @param cache a reference to the GemFire Cache associated with Cache transactions.
*/
public GemfireTransactionManager(Cache cache) {
@@ -147,8 +146,8 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage
throw new NoTransactionException(
"No transaction associated with the current thread; are there multiple transaction managers ?", ex);
}
catch (com.gemstone.gemfire.cache.TransactionException ex) {
catch (org.apache.geode.cache.TransactionException ex) {
throw new GemfireTransactionCommitException("Unexpected failure on commit of Cache local transaction", ex);
}
}
@@ -189,7 +188,7 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage
/**
* Returns the Cache that this instance manages local transactions for.
*
*
* @return Gemfire cache
*/
public Cache getCache() {
@@ -198,7 +197,7 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage
/**
* Sets the Cache that this instance manages local transactions for.
*
*
* @param cache Gemfire cache
*/
public void setCache(Cache cache) {
@@ -229,11 +228,11 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage
* concurrent threads in the same VM, whether or not transactions are used.
*
* One could explicitly deep copy objects before making changes (for example
* by using {@link com.gemstone.gemfire.CopyHelper#copy(Object)} in which
* by using {@link org.apache.geode.CopyHelper#copy(Object)} in which
* case this setting can be set to <code>false</code>. However, unless there
* is a measurable performance penalty, the recommendation is to keep this
* setting to <code>true</code>
*
*
* @param copyOnRead whether copies (default) rather then direct references
* will be returned on fetch operations
*/
@@ -243,7 +242,7 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage
/**
* Indicates whether copy on read is set or not on the transaction manager.
*
*
* @see #setCopyOnRead(boolean)
* @return the copyOnRead
*/
@@ -253,7 +252,7 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage
/**
* GemfireTM local transaction object.
*
*
* @author Costin Leau
*/
private static class CacheTransactionObject {

17
src/main/java/org/springframework/data/gemfire/GemfireUtils.java
View File

@@ -18,20 +18,19 @@ package org.springframework.data.gemfire;
import java.util.concurrent.ConcurrentMap;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.springframework.data.gemfire.util.CacheUtils;
import org.springframework.util.ClassUtils;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.Region;
/**
* GemfireUtils is an abstract utility class encapsulating common functionality to access features and capabilities
* of GemFire based on version and other configuration meta-data.
*
* @author John Blum
* @see org.springframework.data.gemfire.util.DistributedSystemUtils
* @see com.gemstone.gemfire.cache.CacheFactory
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.CacheFactory
* @see org.apache.geode.cache.Region
* @since 1.3.3
*/
@SuppressWarnings("unused")
@@ -64,8 +63,8 @@ public abstract class GemfireUtils extends CacheUtils {
return isGemfireVersionGreaterThanEqualTo(7.0);
}
catch (NumberFormatException e) {
// NOTE the com.gemstone.gemfire.distributed.ServerLauncher class only exists in GemFire v 7.0.x or above...
return ClassUtils.isPresent("com.gemstone.gemfire.distributed.ServerLauncher",
// NOTE the org.apache.geode.distributed.ServerLauncher class only exists in GemFire v 7.0.x or above...
return ClassUtils.isPresent("org.apache.geode.distributed.ServerLauncher",
Thread.currentThread().getContextClassLoader());
}
}
@@ -76,9 +75,9 @@ public abstract class GemfireUtils extends CacheUtils {
return isGemfireVersionGreaterThanEqualTo(8.0);
}
catch (NumberFormatException e) {
// NOTE the com.gemstone.gemfire.management.internal.web.domain.LinkIndex class only exists
// NOTE the org.apache.geode.management.internal.web.domain.LinkIndex class only exists
// in GemFire v 8.0.0 or above...
return ClassUtils.isPresent("com.gemstone.gemfire.management.internal.web.domain.LinkIndex",
return ClassUtils.isPresent("org.apache.geode.management.internal.web.domain.LinkIndex",
Thread.currentThread().getContextClassLoader());
}
}

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

@@ -18,6 +18,15 @@ package org.springframework.data.gemfire;
import java.util.Collection;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionService;
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.query.Index;
import org.apache.geode.cache.query.IndexExistsException;
import org.apache.geode.cache.query.IndexInvalidException;
import org.apache.geode.cache.query.IndexNameConflictException;
import org.apache.geode.cache.query.IndexStatistics;
import org.apache.geode.cache.query.QueryService;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
@@ -31,16 +40,6 @@ import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionService;
import com.gemstone.gemfire.cache.client.ClientCache;
import com.gemstone.gemfire.cache.query.Index;
import com.gemstone.gemfire.cache.query.IndexExistsException;
import com.gemstone.gemfire.cache.query.IndexInvalidException;
import com.gemstone.gemfire.cache.query.IndexNameConflictException;
import com.gemstone.gemfire.cache.query.IndexStatistics;
import com.gemstone.gemfire.cache.query.QueryService;
/**
* Spring FactoryBean for easy declarative creation of GemFire Indexes.
*
@@ -52,9 +51,9 @@ import com.gemstone.gemfire.cache.query.QueryService;
* @see org.springframework.beans.factory.FactoryBean
* @see org.springframework.beans.factory.InitializingBean
* @see org.springframework.data.gemfire.IndexFactoryBean.IndexWrapper
* @see com.gemstone.gemfire.cache.RegionService
* @see com.gemstone.gemfire.cache.query.Index
* @see com.gemstone.gemfire.cache.query.QueryService
* @see org.apache.geode.cache.RegionService
* @see org.apache.geode.cache.query.Index
* @see org.apache.geode.cache.query.QueryService
* @since 1.0.0
*/
public class IndexFactoryBean implements InitializingBean, FactoryBean<Index>, BeanNameAware, BeanFactoryAware {
@@ -466,7 +465,7 @@ public class IndexFactoryBean implements InitializingBean, FactoryBean<Index>, B
@Override
@SuppressWarnings("deprecation")
public com.gemstone.gemfire.cache.query.IndexType getType() {
public org.apache.geode.cache.query.IndexType getType() {
return getIndex().getType();
}

14
src/main/java/org/springframework/data/gemfire/IndexMaintenancePolicyType.java
View File

@@ -16,16 +16,16 @@
package org.springframework.data.gemfire;
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.RegionFactory;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.RegionFactory;
/**
* The IndexMaintenanceType enum is a enumerated type of GemFire Index maintenance update options.
*
* @author John Blum
* @see com.gemstone.gemfire.cache.AttributesFactory#setIndexMaintenanceSynchronous(boolean)
* @see com.gemstone.gemfire.cache.RegionAttributes#getIndexMaintenanceSynchronous()
* @see com.gemstone.gemfire.cache.RegionFactory#setIndexMaintenanceSynchronous(boolean)
* @see org.apache.geode.cache.AttributesFactory#setIndexMaintenanceSynchronous(boolean)
* @see org.apache.geode.cache.RegionAttributes#getIndexMaintenanceSynchronous()
* @see org.apache.geode.cache.RegionFactory#setIndexMaintenanceSynchronous(boolean)
* @since 1.6.0
*/
@SuppressWarnings("unused")
@@ -61,7 +61,7 @@ public enum IndexMaintenancePolicyType {
*
* @param attributesFactory the AttributesFactory instance on which to set the indexMaintenanceProperty.
* @throws java.lang.NullPointerException if the AttributesFactory reference is null.
* @see #setIndexMaintenance(com.gemstone.gemfire.cache.RegionFactory)
* @see #setIndexMaintenance(org.apache.geode.cache.RegionFactory)
*/
@SuppressWarnings("deprecation")
public void setIndexMaintenance(final AttributesFactory attributesFactory) {
@@ -74,7 +74,7 @@ public enum IndexMaintenancePolicyType {
*
* @param regionFactory the RegionFactory instance on which to set the indexMaintenanceProperty.
* @throws java.lang.NullPointerException if the RegionFactory reference is null.
* @see #setIndexMaintenance(com.gemstone.gemfire.cache.AttributesFactory)
* @see #setIndexMaintenance(org.apache.geode.cache.AttributesFactory)
*/
public void setIndexMaintenance(final RegionFactory regionFactory) {
regionFactory.setIndexMaintenanceSynchronous(equals(SYNCHRONOUS));

24
src/main/java/org/springframework/data/gemfire/IndexType.java
View File

@@ -20,25 +20,25 @@ package org.springframework.data.gemfire;
* The IndexType class is an enumerated type of GemFire Index Types.
*
* @author John Blum
* @see com.gemstone.gemfire.cache.query.IndexType
* @see org.apache.geode.cache.query.IndexType
* @since 1.5.2
*/
@SuppressWarnings({ "deprecation", "unused" })
public enum IndexType {
FUNCTIONAL(com.gemstone.gemfire.cache.query.IndexType.FUNCTIONAL),
HASH(com.gemstone.gemfire.cache.query.IndexType.HASH),
PRIMARY_KEY(com.gemstone.gemfire.cache.query.IndexType.PRIMARY_KEY),
KEY(com.gemstone.gemfire.cache.query.IndexType.PRIMARY_KEY);
FUNCTIONAL(org.apache.geode.cache.query.IndexType.FUNCTIONAL),
HASH(org.apache.geode.cache.query.IndexType.HASH),
PRIMARY_KEY(org.apache.geode.cache.query.IndexType.PRIMARY_KEY),
KEY(org.apache.geode.cache.query.IndexType.PRIMARY_KEY);
private final com.gemstone.gemfire.cache.query.IndexType gemfireIndexType;
private final org.apache.geode.cache.query.IndexType gemfireIndexType;
/**
* Constructs an instance of the IndexType enum initialized with the given GemFire IndexType.
*
* @param gemfireIndexType the corresponding GemFire IndexType
* @see com.gemstone.gemfire.cache.query.IndexType
* @see org.apache.geode.cache.query.IndexType
*/
IndexType(final com.gemstone.gemfire.cache.query.IndexType gemfireIndexType) {
IndexType(final org.apache.geode.cache.query.IndexType gemfireIndexType) {
this.gemfireIndexType = gemfireIndexType;
}
@@ -82,9 +82,9 @@ public enum IndexType {
* @param gemfireIndexType the GemFire IndexType.
* @return a IndexType matching the GemFire IndexType or null if the GemFire IndexType does not match
* any IndexType in this enumeration.
* @see com.gemstone.gemfire.cache.query.IndexType
* @see org.apache.geode.cache.query.IndexType
*/
public static IndexType valueOf(final com.gemstone.gemfire.cache.query.IndexType gemfireIndexType) {
public static IndexType valueOf(final org.apache.geode.cache.query.IndexType gemfireIndexType) {
for (IndexType indexType : values()) {
if (indexType.getGemfireIndexType().equals(gemfireIndexType)) {
return indexType;
@@ -115,9 +115,9 @@ public enum IndexType {
* Gets the matching GemFire IndexType for this IndexType enumerated value.
*
* @return the matching GemFire IndexType.
* @see com.gemstone.gemfire.cache.query.IndexType
* @see org.apache.geode.cache.query.IndexType
*/
public com.gemstone.gemfire.cache.query.IndexType getGemfireIndexType() {
public org.apache.geode.cache.query.IndexType getGemfireIndexType() {
return gemfireIndexType;
}

5
src/main/java/org/springframework/data/gemfire/InterestPolicyConverter.java
View File

@@ -16,17 +16,16 @@
package org.springframework.data.gemfire;
import org.apache.geode.cache.InterestPolicy;
import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport;
import com.gemstone.gemfire.cache.InterestPolicy;
/**
* The InterestPolicyConverter class is a Spring Converter implementation and Java PropertyEditor handling
* the conversion between Strings and GemFire InterestPolicy values.
*
* @author John Blum
* @see org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport
* @see com.gemstone.gemfire.cache.InterestPolicy
* @see org.apache.geode.cache.InterestPolicy
* @since 1.6.0
*/
@SuppressWarnings("unused")

12
src/main/java/org/springframework/data/gemfire/InterestPolicyType.java
View File

@@ -15,14 +15,14 @@
*/
package org.springframework.data.gemfire;
import com.gemstone.gemfire.cache.InterestPolicy;
import org.apache.geode.cache.InterestPolicy;
/**
* The InterestPolicyType enum is an enumeration of all the GemFire Subscription, InterestPolicy values.
*
* @author Lyndon Adams
* @author John Blum
* @see com.gemstone.gemfire.cache.InterestPolicy
* @see org.apache.geode.cache.InterestPolicy
* @since 1.3.0
*/
@SuppressWarnings("unused")
@@ -38,7 +38,7 @@ public enum InterestPolicyType {
* Constructs an instance of the SubscriptionType enum initialized with the matching GemFire InterestPolicy.
*
* @param interestPolicy a GemFire InterestPolicy corresponding to this SubscriptionType.
* @see com.gemstone.gemfire.cache.InterestPolicy
* @see org.apache.geode.cache.InterestPolicy
*/
InterestPolicyType(final InterestPolicy interestPolicy) {
this.interestPolicy = interestPolicy;
@@ -50,7 +50,7 @@ public enum InterestPolicyType {
* @param interestPolicyType the InterestPolicyType enum from which to extract GemFire's InterestPolicy
* @return a GemFire InterestPolicy for the given InterestPolicyType enumerated value
* or null if InterestPolicyType is null.
* @see com.gemstone.gemfire.cache.InterestPolicy
* @see org.apache.geode.cache.InterestPolicy
*/
public static InterestPolicy getInterestPolicy(final InterestPolicyType interestPolicyType) {
return (interestPolicyType != null ? interestPolicyType.getInterestPolicy() : null);
@@ -62,7 +62,7 @@ public enum InterestPolicyType {
* @param interestPolicy the GemFire InterestPolicy used to lookup and match a SubscriptionType.
* @return a SubscriptionType enumerated value matching the given GemFire InterestPolicy
* or null if no matching value was found.
* @see com.gemstone.gemfire.cache.InterestPolicy
* @see org.apache.geode.cache.InterestPolicy
* @see #getInterestPolicy()
*/
public static InterestPolicyType valueOf(final InterestPolicy interestPolicy) {
@@ -98,7 +98,7 @@ public enum InterestPolicyType {
* Returns the GemFire InterestPolicy corresponding to this SubscriptionType enumerated value.
*
* @return the GemFire InterestPolicy corresponding to this SubscriptionType.
* @see com.gemstone.gemfire.cache.InterestPolicy
* @see org.apache.geode.cache.InterestPolicy
*/
public InterestPolicy getInterestPolicy() {
return interestPolicy;

5
src/main/java/org/springframework/data/gemfire/LazyWiringDeclarableSupport.java
View File

@@ -19,6 +19,7 @@ package org.springframework.data.gemfire;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.geode.cache.Declarable;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.access.BeanFactoryReference;
@@ -33,8 +34,6 @@ import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import com.gemstone.gemfire.cache.Declarable;
/**
* The LazyWiringDeclarableSupport class is an implementation of the GemFire Declarable interface that enables support
* for wiring GemFire components with Spring bean dependencies defined in the Spring context.
@@ -51,7 +50,7 @@ import com.gemstone.gemfire.cache.Declarable;
* @see org.springframework.data.gemfire.DeclarableSupport
* @see org.springframework.data.gemfire.WiringDeclarableSupport
* @see org.springframework.data.gemfire.support.SpringContextBootstrappingInitializer
* @see com.gemstone.gemfire.cache.Declarable
* @see org.apache.geode.cache.Declarable
* @since 1.3.4
*/
@SuppressWarnings("unused")

15
src/main/java/org/springframework/data/gemfire/LocalRegionFactoryBean.java
View File

@@ -15,10 +15,9 @@
*/
package org.springframework.data.gemfire;
import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.Scope;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.Scope;
import org.springframework.util.Assert;
/**
@@ -69,15 +68,15 @@ public class LocalRegionFactoryBean<K, V> extends RegionFactoryBean<K, V> {
/**
* Resolves the Data Policy used by this "local" GemFire Region (i.e. locally Scoped; Scope.LOCAL) based on the
* enumerated value from com.gemstone.gemfire.cache.RegionShortcuts (LOCAL, LOCAL_PERSISTENT, LOCAL_HEAP_LRU,
* enumerated value from org.apache.geode.cache.RegionShortcuts (LOCAL, LOCAL_PERSISTENT, LOCAL_HEAP_LRU,
* LOCAL_OVERFLOW, and LOCAL_PERSISTENT_OVERFLOW), but without consideration of the Eviction settings.
*
* @param regionFactory the GemFire RegionFactory used to created the Local Region.
* @param persistent a boolean value indicating whether the Local Region should persist it's data.
* @param dataPolicy requested Data Policy as set by the user in the Spring GemFire configuration meta-data.
* @see com.gemstone.gemfire.cache.DataPolicy
* @see com.gemstone.gemfire.cache.RegionFactory
* @see com.gemstone.gemfire.cache.RegionShortcut
* @see org.apache.geode.cache.DataPolicy
* @see org.apache.geode.cache.RegionFactory
* @see org.apache.geode.cache.RegionShortcut
*/
@Override
protected void resolveDataPolicy(RegionFactory<K, V> regionFactory, Boolean persistent, String dataPolicy) {

23
src/main/java/org/springframework/data/gemfire/LookupRegionFactoryBean.java
View File

@@ -16,27 +16,26 @@
package org.springframework.data.gemfire;
import org.apache.geode.cache.AttributesMutator;
import org.apache.geode.cache.CacheListener;
import org.apache.geode.cache.CacheLoader;
import org.apache.geode.cache.CacheWriter;
import org.apache.geode.cache.CustomExpiry;
import org.apache.geode.cache.EvictionAttributesMutator;
import org.apache.geode.cache.ExpirationAttributes;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
import org.apache.geode.cache.wan.GatewaySender;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import com.gemstone.gemfire.cache.AttributesMutator;
import com.gemstone.gemfire.cache.CacheListener;
import com.gemstone.gemfire.cache.CacheLoader;
import com.gemstone.gemfire.cache.CacheWriter;
import com.gemstone.gemfire.cache.CustomExpiry;
import com.gemstone.gemfire.cache.EvictionAttributesMutator;
import com.gemstone.gemfire.cache.ExpirationAttributes;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
import com.gemstone.gemfire.cache.wan.GatewaySender;
/**
* The LookupRegionFactoryBean class is a concrete implementation of RegionLookupFactoryBean for handling
* &gt;gfe:lookup-region/&lt; SDG XML namespace (XSD) elements.
*
* @author John Blum
* @see org.springframework.data.gemfire.RegionLookupFactoryBean
* @see com.gemstone.gemfire.cache.AttributesMutator
* @see org.apache.geode.cache.AttributesMutator
* @since 1.6.0
*/
@SuppressWarnings("unused")

15
src/main/java/org/springframework/data/gemfire/PartitionAttributesFactoryBean.java
View File

@@ -18,18 +18,17 @@ package org.springframework.data.gemfire;
import java.util.List;
import org.apache.geode.cache.FixedPartitionAttributes;
import org.apache.geode.cache.PartitionAttributes;
import org.apache.geode.cache.PartitionResolver;
import org.apache.geode.cache.partition.PartitionListener;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import com.gemstone.gemfire.cache.FixedPartitionAttributes;
import com.gemstone.gemfire.cache.PartitionAttributes;
import com.gemstone.gemfire.cache.PartitionResolver;
import com.gemstone.gemfire.cache.partition.PartitionListener;
/**
* Spring-friendly bean for creating {@link PartitionAttributes}. Eliminates the need of using
* a XML 'factory-method' tag and allows the attributes properties to be set directly.
*
*
* @author Costin Leau
* @author David Turanski
* @author John Blum
@@ -37,8 +36,8 @@ import com.gemstone.gemfire.cache.partition.PartitionListener;
@SuppressWarnings({ "rawtypes", "unchecked", "unused" })
public class PartitionAttributesFactoryBean implements FactoryBean<PartitionAttributes>, InitializingBean {
private final com.gemstone.gemfire.cache.PartitionAttributesFactory partitionAttributesFactory =
new com.gemstone.gemfire.cache.PartitionAttributesFactory();
private final org.apache.geode.cache.PartitionAttributesFactory partitionAttributesFactory =
new org.apache.geode.cache.PartitionAttributesFactory();
private List<PartitionListener> listeners;

7
src/main/java/org/springframework/data/gemfire/PartitionedRegionFactoryBean.java
View File

@@ -15,12 +15,11 @@
*/
package org.springframework.data.gemfire;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.RegionFactory;
import org.springframework.util.Assert;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.RegionFactory;
/**
* @author David Turanski
* @author John Blum

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

@@ -16,12 +16,11 @@
package org.springframework.data.gemfire;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.RegionAttributes;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.RegionAttributes;
/**
* Spring-friendly bean for creating {@link RegionAttributes}. Eliminates the need of using a XML 'factory-method' tag.
*
@@ -29,8 +28,8 @@ import com.gemstone.gemfire.cache.RegionAttributes;
* @author John Blum
* @see org.springframework.beans.factory.FactoryBean
* @see org.springframework.beans.factory.InitializingBean
* @see com.gemstone.gemfire.cache.AttributesFactory
* @see com.gemstone.gemfire.cache.RegionAttributes
* @see org.apache.geode.cache.AttributesFactory
* @see org.apache.geode.cache.RegionAttributes
*/
@SuppressWarnings({ "deprecation", "unused" })
public class RegionAttributesFactoryBean extends AttributesFactory implements FactoryBean<RegionAttributes>,

91
src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java
View File

@@ -18,27 +18,26 @@ package org.springframework.data.gemfire;
import java.lang.reflect.Field;
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheListener;
import com.gemstone.gemfire.cache.CacheLoader;
import com.gemstone.gemfire.cache.CacheWriter;
import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.EvictionAction;
import com.gemstone.gemfire.cache.GemFireCache;
import com.gemstone.gemfire.cache.PartitionAttributes;
import com.gemstone.gemfire.cache.PartitionAttributesFactory;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
import com.gemstone.gemfire.cache.wan.GatewaySender;
import com.gemstone.gemfire.internal.cache.UserSpecifiedRegionAttributes;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheListener;
import org.apache.geode.cache.CacheLoader;
import org.apache.geode.cache.CacheWriter;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.PartitionAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.Scope;
import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.internal.cache.UserSpecifiedRegionAttributes;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.context.SmartLifecycle;
import org.springframework.core.io.Resource;
@@ -200,10 +199,10 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
*
* @param cache the GemFire Cache instance.
* @return a RegionFactory used to configure and construct the Region created by this FactoryBean.
* @see com.gemstone.gemfire.cache.Cache#createRegionFactory()
* @see com.gemstone.gemfire.cache.Cache#createRegionFactory(com.gemstone.gemfire.cache.RegionAttributes)
* @see com.gemstone.gemfire.cache.Cache#createRegionFactory(com.gemstone.gemfire.cache.RegionShortcut)
* @see com.gemstone.gemfire.cache.RegionFactory
* @see org.apache.geode.cache.Cache#createRegionFactory()
* @see org.apache.geode.cache.Cache#createRegionFactory(org.apache.geode.cache.RegionAttributes)
* @see org.apache.geode.cache.Cache#createRegionFactory(org.apache.geode.cache.RegionShortcut)
* @see org.apache.geode.cache.RegionFactory
*/
protected RegionFactory<K, V> createRegionFactory(final Cache cache) {
if (shortcut != null) {
@@ -229,10 +228,10 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
* (RegionAttributesImpl) rather than the interface type (RegionAttributes)...
* so much for 'programming to interfaces' in GemFire!
*
* @see com.gemstone.gemfire.cache.RegionFactory#attrsFactory
* @see com.gemstone.gemfire.cache.AttributesFactory#regionAttributes
* @see com.gemstone.gemfire.cache.RegionAttributes#getDataPolicy
* @see com.gemstone.gemfire.cache.DataPolicy
* @see org.apache.geode.cache.RegionFactory#attrsFactory
* @see org.apache.geode.cache.AttributesFactory#regionAttributes
* @see org.apache.geode.cache.RegionAttributes#getDataPolicy
* @see org.apache.geode.cache.DataPolicy
*/
@SuppressWarnings({ "deprecation", "unchecked" })
DataPolicy getDataPolicy(final RegionFactory regionFactory) {
@@ -262,10 +261,10 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
* @param regionAttributes the RegionAttributes containing the Region configuration settings to merge to the
* RegionFactory.
* @return the RegionFactory with the configuration settings of the RegionAttributes merged.
* @see #isUserSpecifiedEvictionAttributes(com.gemstone.gemfire.cache.RegionAttributes)
* @see #validateRegionAttributes(com.gemstone.gemfire.cache.RegionAttributes)
* @see com.gemstone.gemfire.cache.RegionAttributes
* @see com.gemstone.gemfire.cache.RegionFactory
* @see #isUserSpecifiedEvictionAttributes(org.apache.geode.cache.RegionAttributes)
* @see #validateRegionAttributes(org.apache.geode.cache.RegionAttributes)
* @see org.apache.geode.cache.RegionAttributes
* @see org.apache.geode.cache.RegionFactory
*/
@SuppressWarnings("unchecked")
protected <K, V> RegionFactory<K, V> mergeRegionAttributes(final RegionFactory<K, V> regionFactory,
@@ -347,11 +346,11 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
* (non-Javadoc) - This method should not be considered part of the RegionFactoryBean API
* and is strictly for testing purposes!
*
* @see com.gemstone.gemfire.cache.AttributesFactory#validateAttributes(:RegionAttributes)
* @see org.apache.geode.cache.AttributesFactory#validateAttributes(:RegionAttributes)
*/
@SuppressWarnings("deprecation")
void validateRegionAttributes(final RegionAttributes regionAttributes) {
com.gemstone.gemfire.cache.AttributesFactory.validateAttributes(regionAttributes);
org.apache.geode.cache.AttributesFactory.validateAttributes(regionAttributes);
}
/*
@@ -359,7 +358,7 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
* and is strictly for testing purposes!
*
* NOTE unfortunately, must resort to using a GemFire internal class, ugh!
* @see com.gemstone.gemfire.internal.cache.UserSpecifiedRegionAttributes#hasEvictionAttributes
* @see org.apache.geode.internal.cache.UserSpecifiedRegionAttributes#hasEvictionAttributes
*/
boolean isUserSpecifiedEvictionAttributes(final RegionAttributes regionAttributes) {
return (regionAttributes instanceof UserSpecifiedRegionAttributes
@@ -424,7 +423,7 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
* meta-data.
* @see #isPersistent()
* @see #isNotPersistent()
* @see com.gemstone.gemfire.cache.DataPolicy
* @see org.apache.geode.cache.DataPolicy
*/
protected void assertDataPolicyAndPersistentAttributesAreCompatible(DataPolicy resolvedDataPolicy) {
if (resolvedDataPolicy.withPersistence()) {
@@ -444,7 +443,7 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
* is invoked.
*
* @param regionFactory the GemFire RegionFactory used to create the Region for post-processing.
* @see com.gemstone.gemfire.cache.RegionFactory
* @see org.apache.geode.cache.RegionFactory
*/
protected void postProcess(RegionFactory<K, V> regionFactory) {
}
@@ -454,7 +453,7 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
* already configured and initialized by the factory bean before this method is invoked.
*
* @param region the GemFire Region to post-process.
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.Region
*/
protected void postProcess(Region<K, V> region) {
}
@@ -467,9 +466,9 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
* @param persistent a boolean value indicating whether the Region should be persistent and persist it's
* data to disk.
* @param dataPolicy the configured Data Policy for the Region.
* @see #resolveDataPolicy(com.gemstone.gemfire.cache.RegionFactory, Boolean, String)
* @see com.gemstone.gemfire.cache.DataPolicy
* @see com.gemstone.gemfire.cache.RegionFactory
* @see #resolveDataPolicy(org.apache.geode.cache.RegionFactory, Boolean, String)
* @see org.apache.geode.cache.DataPolicy
* @see org.apache.geode.cache.RegionFactory
*/
protected void resolveDataPolicy(RegionFactory<K, V> regionFactory, Boolean persistent, DataPolicy dataPolicy) {
if (dataPolicy != null) {
@@ -489,8 +488,8 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
* @param regionFactory the GemFire RegionFactory used to create the desired Region.
* @param persistent a boolean value indicating whether the Region should persist it's data to disk.
* @param dataPolicy requested Data Policy as set by the user in the Spring GemFire configuration meta-data.
* @see com.gemstone.gemfire.cache.DataPolicy
* @see com.gemstone.gemfire.cache.RegionFactory
* @see org.apache.geode.cache.DataPolicy
* @see org.apache.geode.cache.RegionFactory
*/
protected void resolveDataPolicy(RegionFactory<K, V> regionFactory, Boolean persistent, String dataPolicy) {
if (dataPolicy != null) {
@@ -566,7 +565,7 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
* configuration meta-data, or as set with the setAttributes(:Attributes) method.
*
* @return the RegionAttributes used to configure the Region created by this factory.
* @see com.gemstone.gemfire.cache.RegionAttributes
* @see org.apache.geode.cache.RegionAttributes
*/
public RegionAttributes getAttributes() {
Region<K, V> region = getRegion();
@@ -640,7 +639,7 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
* Sets the DataPolicy of the Region as a String.
*
* @param dataPolicyName the name of the DataPolicy (e.g. REPLICATE, PARTITION)
* @see #setDataPolicy(com.gemstone.gemfire.cache.DataPolicy)
* @see #setDataPolicy(org.apache.geode.cache.DataPolicy)
* @deprecated as of 1.4.0, use setDataPolicy(:DataPolicy) instead.
*/
@Deprecated
@@ -653,7 +652,7 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
* of the Region to be created.
*
* @return the "resolved" Data Policy to be used to create the Region.
* @see com.gemstone.gemfire.cache.DataPolicy
* @see org.apache.geode.cache.DataPolicy
*/
public DataPolicy getDataPolicy() {
Assert.state(dataPolicy != null, "The Data Policy has not been properly resolved yet!");
@@ -706,7 +705,7 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
*
* @param shortcut the RegionShortcut used to configure pre-defined default for the Region created
* by this FactoryBean.
* @see com.gemstone.gemfire.cache.RegionShortcut
* @see org.apache.geode.cache.RegionShortcut
*/
public void setShortcut(RegionShortcut shortcut) {
this.shortcut = shortcut;

21
src/main/java/org/springframework/data/gemfire/RegionLookupFactoryBean.java
View File

@@ -18,6 +18,8 @@ package org.springframework.data.gemfire;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.Region;
import org.springframework.beans.factory.BeanInitializationException;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.FactoryBean;
@@ -25,9 +27,6 @@ import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import com.gemstone.gemfire.cache.GemFireCache;
import com.gemstone.gemfire.cache.Region;
/**
* Simple FactoryBean for retrieving generic GemFire {@link Region}s. If lookups are not enabled or the Region
* does not exist, an exception is thrown. For declaring and configuring new Regions, see {@link RegionFactoryBean}.
@@ -37,7 +36,7 @@ import com.gemstone.gemfire.cache.Region;
* @see org.springframework.beans.factory.BeanNameAware
* @see org.springframework.beans.factory.FactoryBean
* @see org.springframework.beans.factory.InitializingBean
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.Region
*/
@SuppressWarnings("unused")
public abstract class RegionLookupFactoryBean<K, V> implements FactoryBean<Region<K, V>>, InitializingBean, BeanNameAware {
@@ -85,7 +84,7 @@ public abstract class RegionLookupFactoryBean<K, V> implements FactoryBean<Regio
/**
* Fallback method in case the named Region does not exist. By default, this implementation throws an exception.
*
*
* @param cache a reference to the GemFire Cache.
* @param regionName the name of the GemFire Cache Region.
* @return the Region in the GemFire Cache with the given name.
@@ -125,7 +124,7 @@ public abstract class RegionLookupFactoryBean<K, V> implements FactoryBean<Regio
*
* @param cache a reference to the Cache.
* @see org.springframework.data.gemfire.CacheFactoryBean
* @see com.gemstone.gemfire.cache.GemFireCache
* @see org.apache.geode.cache.GemFireCache
*/
public void setCache(GemFireCache cache) {
this.cache = cache;
@@ -137,7 +136,7 @@ public abstract class RegionLookupFactoryBean<K, V> implements FactoryBean<Regio
*
* @param name the region name
* @see #setBeanName(String)
* @see com.gemstone.gemfire.cache.Region#getFullPath()
* @see org.apache.geode.cache.Region#getFullPath()
*/
public void setName(String name) {
this.name = name;
@@ -147,7 +146,7 @@ public abstract class RegionLookupFactoryBean<K, V> implements FactoryBean<Regio
* Sets a reference to the parent Region if this FactoryBean represents a GemFire Cache Sub-Region.
*
* @param parent a reference to the parent Region if this Region is a Sub-Region.
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.Region
*/
public void setParent(Region<?, ?> parent) {
this.parent = parent;
@@ -157,7 +156,7 @@ public abstract class RegionLookupFactoryBean<K, V> implements FactoryBean<Regio
* Gets a reference to the parent Region if this FactoryBean represents a GemFire Cache Sub-Region.
*
* @return a reference to the parent Region or null if this Region is not a Sub-Region.
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.Region
*/
protected Region<?, ?> getParent() {
return parent;
@@ -167,7 +166,7 @@ public abstract class RegionLookupFactoryBean<K, V> implements FactoryBean<Regio
* Gets the reference to the GemFire Region obtained by this Spring FactoryBean during the lookup operation.
*
* @return a reference to the GemFire Region found during lookup.
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.Region
*/
protected Region<K, V> getRegion() {
return region;
@@ -179,7 +178,7 @@ public abstract class RegionLookupFactoryBean<K, V> implements FactoryBean<Regio
*
* @param regionName a String indicating the name of the Region in GemFire.
* @see #setName(String)
* @see com.gemstone.gemfire.cache.Region#getName()
* @see org.apache.geode.cache.Region#getName()
*/
public void setRegionName(String regionName) {
this.regionName = regionName;

7
src/main/java/org/springframework/data/gemfire/RegionShortcutConverter.java
View File

@@ -16,17 +16,16 @@
package org.springframework.data.gemfire;
import org.apache.geode.cache.RegionShortcut;
import org.springframework.core.convert.converter.Converter;
import com.gemstone.gemfire.cache.RegionShortcut;
/**
* The RegionShortcutConverter class is a Spring Converter implementation converting String value Region Shortcut
* representations into actual GemFire RegionShortcut enumerated values.
*
* @author John Blum
* @see org.springframework.core.convert.converter.Converter
* @see com.gemstone.gemfire.cache.RegionShortcut
* @see org.apache.geode.cache.RegionShortcut
* @since 1.3.4
*/
@SuppressWarnings("unused")
@@ -52,7 +51,7 @@ public class RegionShortcutConverter implements Converter<String, RegionShortcut
* @param source the String representation of the Region Shortcut to convert.
* @return a RegionShortcut enumerated value for the String representation.
* @throws IllegalArgumentException if the String source is not a valid RegionShortcut enumerated value.
* @see com.gemstone.gemfire.cache.RegionShortcut#valueOf(String)
* @see org.apache.geode.cache.RegionShortcut#valueOf(String)
*/
@Override
public RegionShortcut convert(final String source) {

5
src/main/java/org/springframework/data/gemfire/RegionShortcutWrapper.java
View File

@@ -16,8 +16,7 @@
package org.springframework.data.gemfire;
import com.gemstone.gemfire.cache.RegionShortcut;
import org.apache.geode.cache.RegionShortcut;
import org.springframework.util.ObjectUtils;
/**
@@ -25,7 +24,7 @@ import org.springframework.util.ObjectUtils;
* with Spring Data GemFire RegionShortcutWrapper enumerated values.
*
* @author John Blum
* @see com.gemstone.gemfire.cache.RegionShortcut
* @see org.apache.geode.cache.RegionShortcut
* @since 1.4.0
*/
@SuppressWarnings("unused")

5
src/main/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBean.java
View File

@@ -15,11 +15,10 @@
*/
package org.springframework.data.gemfire;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.RegionFactory;
import org.springframework.util.Assert;
import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.RegionFactory;
/**
* @author David Turanski
* @author John Blum

7
src/main/java/org/springframework/data/gemfire/ScopeConverter.java
View File

@@ -16,17 +16,16 @@
package org.springframework.data.gemfire;
import org.apache.geode.cache.Scope;
import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport;
import com.gemstone.gemfire.cache.Scope;
/**
* The ScopeConverter class is a Spring Converter and JavaBeans PropertyEditor that converts Strings
* into GemFire Scope constant values.
*
* @author John Blum
* @see org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport
* @see com.gemstone.gemfire.cache.Scope
* @see org.apache.geode.cache.Scope
* @since 1.6.0
*/
@SuppressWarnings("unused")
@@ -40,7 +39,7 @@ public class ScopeConverter extends AbstractPropertyEditorConverterSupport<Scope
* @throws java.lang.IllegalArgumentException if the String is not a valid GemFire Scope.
* @see org.springframework.data.gemfire.ScopeType#getScope(ScopeType)
* @see org.springframework.data.gemfire.ScopeType#valueOfIgnoreCase(String)
* @see com.gemstone.gemfire.cache.Scope#fromString(String)
* @see org.apache.geode.cache.Scope#fromString(String)
* @see #assertConverted(String, Object, Class)
*/
@Override

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

@@ -16,15 +16,14 @@
package org.springframework.data.gemfire;
import org.apache.geode.cache.Scope;
import org.springframework.util.StringUtils;
import com.gemstone.gemfire.cache.Scope;
/**
* The ScopeType enum is an enumeration of GemFire Scopes.
*
* @author John Blum
* @see com.gemstone.gemfire.cache.Scope
* @see org.apache.geode.cache.Scope
* @since 1.6.0
*/
@SuppressWarnings("unused")
@@ -40,7 +39,7 @@ public enum ScopeType {
* Constructs an instance of the ScopeType initialized with a matching GemFire Scope.
*
* @param gemfireScope the GemFire Scope paired with this enumerated value.
* @see com.gemstone.gemfire.cache.Scope
* @see org.apache.geode.cache.Scope
*/
ScopeType(final Scope gemfireScope) {
this.gemfireScope = gemfireScope;
@@ -52,7 +51,7 @@ public enum ScopeType {
*
* @param scopeType the ScopeType enumerated value from which to extract the GemFire Scope.
* @return the paired GemFire Scope from the given ScopeType or null if scopeType is null.
* @see com.gemstone.gemfire.cache.Scope
* @see org.apache.geode.cache.Scope
* @see #getScope()
*/
public static Scope getScope(final ScopeType scopeType) {
@@ -64,7 +63,7 @@ public enum ScopeType {
*
* @param scope the GemFire Scope used to lookup and match the appropriate ScopeType.
* @return a ScopeType for the given GemFire Scope or null if no match was found.
* @see com.gemstone.gemfire.cache.Scope
* @see org.apache.geode.cache.Scope
* @see #getScope()
* @see #values()
*/
@@ -116,7 +115,7 @@ public enum ScopeType {
* Gets the matching GemFire Scope for this enumerated value.
*
* @return a GemFire Scope for this enumerated value.
* @see com.gemstone.gemfire.cache.Scope
* @see org.apache.geode.cache.Scope
*/
public Scope getScope() {
return gemfireScope;

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

@@ -15,23 +15,22 @@
*/
package org.springframework.data.gemfire;
import org.apache.geode.cache.InterestPolicy;
import org.apache.geode.cache.SubscriptionAttributes;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import com.gemstone.gemfire.cache.InterestPolicy;
import com.gemstone.gemfire.cache.SubscriptionAttributes;
/**
* The SubscriptionAttributesFactoryBean class is a Spring FactoryBean used for defining and constructing
* a GemFire SubscriptionAttributes object, which determines the Subscription policy used by Regions to
* declared their data interests.
*
*
* @author Lyndon Adams
* @author John Blum
* @see org.springframework.beans.factory.FactoryBean
* @see org.springframework.beans.factory.InitializingBean
* @see com.gemstone.gemfire.cache.InterestPolicy
* @see com.gemstone.gemfire.cache.SubscriptionAttributes
* @see org.apache.geode.cache.InterestPolicy
* @see org.apache.geode.cache.SubscriptionAttributes
* @since 1.3.0
*/
public class SubscriptionAttributesFactoryBean implements FactoryBean<SubscriptionAttributes>, InitializingBean {
@@ -48,7 +47,7 @@ public class SubscriptionAttributesFactoryBean implements FactoryBean<Subscripti
public void afterPropertiesSet() throws Exception {
subscriptionAttributes = new SubscriptionAttributes(getInterestPolicy());
}
/*
* (non-Javadoc)
* @see org.springframework.beans.factory.FactoryBean#getObject()
@@ -81,8 +80,8 @@ public class SubscriptionAttributesFactoryBean implements FactoryBean<Subscripti
* the data interests and distribution of changes.
*
* @param interestPolicy the GemFire InterestsPolicy to set for Subscription.
* @see com.gemstone.gemfire.cache.InterestPolicy
* @see com.gemstone.gemfire.cache.SubscriptionAttributes#SubscriptionAttributes(com.gemstone.gemfire.cache.InterestPolicy)
* @see org.apache.geode.cache.InterestPolicy
* @see org.apache.geode.cache.SubscriptionAttributes#SubscriptionAttributes(org.apache.geode.cache.InterestPolicy)
*/
public void setInterestPolicy(final InterestPolicy interestPolicy) {
this.interestPolicy = interestPolicy;
@@ -93,8 +92,8 @@ public class SubscriptionAttributesFactoryBean implements FactoryBean<Subscripti
* and distribution of changes.
*
* @return the GemFire InterestsPolicy set for Subscription.
* @see com.gemstone.gemfire.cache.InterestPolicy
* @see com.gemstone.gemfire.cache.SubscriptionAttributes#getInterestPolicy()
* @see org.apache.geode.cache.InterestPolicy
* @see org.apache.geode.cache.SubscriptionAttributes#getInterestPolicy()
*/
public InterestPolicy getInterestPolicy() {
return (interestPolicy != null ? interestPolicy : InterestPolicy.DEFAULT);

7
src/main/java/org/springframework/data/gemfire/WiringDeclarableSupport.java
View File

@@ -18,20 +18,19 @@ package org.springframework.data.gemfire;
import java.util.Properties;
import org.apache.geode.cache.Declarable;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.wiring.BeanConfigurerSupport;
import org.springframework.beans.factory.wiring.BeanWiringInfo;
import org.springframework.beans.factory.wiring.BeanWiringInfoResolver;
import org.springframework.util.StringUtils;
import com.gemstone.gemfire.cache.Declarable;
/**
* Dedicated {@link Declarable} support class for wiring the declaring instance through the Spring container.
*
* <p>This implementation first looks for a 'bean-name' property which will be used to locate a 'template'
* bean definition. Autowiring will be performed, based on the settings defined in the Spring container.
*
*
* @author Costin Leau
* @author John Blum
* @see org.springframework.beans.factory.BeanFactory
@@ -39,7 +38,7 @@ import com.gemstone.gemfire.cache.Declarable;
* @see org.springframework.beans.factory.wiring.BeanWiringInfo
* @see org.springframework.data.gemfire.DeclarableSupport
* @see org.springframework.data.gemfire.LazyWiringDeclarableSupport
* @see com.gemstone.gemfire.cache.Declarable
* @see org.apache.geode.cache.Declarable
* @deprecated please use LazyWiringDeclarableSupport instead.
*/
@Deprecated

25
src/main/java/org/springframework/data/gemfire/cache/GemfireCache.java vendored
View File

@@ -18,9 +18,8 @@ package org.springframework.data.gemfire.cache;
import java.util.concurrent.Callable;
import com.gemstone.gemfire.cache.GemFireCache;
import com.gemstone.gemfire.cache.Region;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.Region;
import org.springframework.cache.Cache;
import org.springframework.cache.support.SimpleValueWrapper;
import org.springframework.util.Assert;
@@ -32,7 +31,7 @@ import org.springframework.util.Assert;
* @author John Blum
* @author Oliver Gierke
* @see org.springframework.cache.Cache
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.Region
*/
public class GemfireCache implements Cache {
@@ -44,7 +43,7 @@ public class GemfireCache implements Cache {
*
* @param region GemFire {@link Region} to wrap.
* @return an instance of {@link GemfireCache} backed by the provided GemFire {@link Region}.
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.Region
* @see org.springframework.cache.Cache
* @see #GemfireCache(Region)
*/
@@ -69,7 +68,7 @@ public class GemfireCache implements Cache {
* Returns the GemFire {@link Region} used as the implementation for this Spring {@link Cache}.
*
* @return the GemFire {@link Region} used as the implementation for this Spring {@link Cache}.
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.Region
*/
public Region getNativeCache() {
return this.region;
@@ -79,7 +78,7 @@ public class GemfireCache implements Cache {
* Returns the name of this Spring {@link Cache}.
*
* @return the name of this Spring {@link Cache}.
* @see com.gemstone.gemfire.cache.Region#getName()
* @see org.apache.geode.cache.Region#getName()
*/
public String getName() {
return getNativeCache().getName();
@@ -88,7 +87,7 @@ public class GemfireCache implements Cache {
/**
* Clears the entire contents of this Spring {@link Cache}.
*
* @see com.gemstone.gemfire.cache.Region#clear()
* @see org.apache.geode.cache.Region#clear()
*/
public void clear() {
getNativeCache().clear();
@@ -98,7 +97,7 @@ public class GemfireCache implements Cache {
* Evicts (destroys) the entry (key/value) mapped to the given key from this Spring {@link Cache}.
*
* @param key key used to identify the cache entry to evict.
* @see com.gemstone.gemfire.cache.Region#destroy(Object)
* @see org.apache.geode.cache.Region#destroy(Object)
*/
public void evict(Object key) {
getNativeCache().remove(key);
@@ -111,7 +110,7 @@ public class GemfireCache implements Cache {
* @param key key identifying the the value to retrieve from the cache.
* @return the value cached with the given key.
* @see org.springframework.cache.Cache.ValueWrapper
* @see com.gemstone.gemfire.cache.Region#get(Object)
* @see org.apache.geode.cache.Region#get(Object)
*/
public ValueWrapper get(Object key) {
Object value = getNativeCache().get(key);
@@ -127,7 +126,7 @@ public class GemfireCache implements Cache {
* @param type desired {@link Class} type of the value.
* @return the cache value for the given key cast to the specified {@link Class} type.
* @throws IllegalStateException if the value is not null and not an instance of the desired type.
* @see com.gemstone.gemfire.cache.Region#get(Object)
* @see org.apache.geode.cache.Region#get(Object)
*/
@SuppressWarnings("unchecked")
public <T> T get(Object key, Class<T> type) {
@@ -186,7 +185,7 @@ public class GemfireCache implements Cache {
*
* @param key key used to reference the value in the cache.
* @param value value to store in the cache referenced by the key.
* @see com.gemstone.gemfire.cache.Region#put(Object, Object)
* @see org.apache.geode.cache.Region#put(Object, Object)
*/
@SuppressWarnings("unchecked")
public void put(Object key, Object value) {
@@ -202,7 +201,7 @@ public class GemfireCache implements Cache {
*
* @return the existing value if the given key is already mapped to a value.
* @see org.springframework.cache.Cache#putIfAbsent(java.lang.Object, java.lang.Object)
* @see com.gemstone.gemfire.cache.Region#putIfAbsent(Object, Object)
* @see org.apache.geode.cache.Region#putIfAbsent(Object, Object)
*/
@SuppressWarnings("unchecked")
public ValueWrapper putIfAbsent(Object key, Object value) {

25
src/main/java/org/springframework/data/gemfire/cache/GemfireCacheManager.java vendored
View File

@@ -21,9 +21,8 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import com.gemstone.gemfire.cache.GemFireCache;
import com.gemstone.gemfire.cache.Region;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.Region;
import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
import org.springframework.cache.support.AbstractCacheManager;
@@ -42,15 +41,15 @@ import org.springframework.util.Assert;
* @see org.springframework.cache.Cache
* @see org.springframework.cache.CacheManager
* @see org.springframework.cache.support.AbstractCacheManager
* @see com.gemstone.gemfire.cache.GemFireCache
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.GemFireCache
* @see org.apache.geode.cache.Region
*/
@SuppressWarnings("unused")
public class GemfireCacheManager extends AbstractCacheManager {
private final AtomicBoolean dynamic = new AtomicBoolean(true);
private com.gemstone.gemfire.cache.GemFireCache gemfireCache;
private org.apache.geode.cache.GemFireCache gemfireCache;
private Set<Region<?, ?>> regions;
@@ -142,7 +141,7 @@ public class GemfireCacheManager extends AbstractCacheManager {
* @param region GemFire {@link Region} to wrap (adapt).
* @return an instance of {@link GemfireCache} initialized with the given GemFire {@link Region}.
* @see GemfireCache
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.Region
*/
protected GemfireCache newGemfireCache(Region<?, ?> region) {
return GemfireCache.wrap(region);
@@ -193,9 +192,9 @@ public class GemfireCacheManager extends AbstractCacheManager {
*
* @param gemfireCache the GemFire cache instance used by this {@link CacheManager}
* to manage Spring {@link Cache Caches}.
* @see com.gemstone.gemfire.cache.GemFireCache
* @see org.apache.geode.cache.GemFireCache
*/
public void setCache(com.gemstone.gemfire.cache.GemFireCache gemfireCache) {
public void setCache(org.apache.geode.cache.GemFireCache gemfireCache) {
this.gemfireCache = gemfireCache;
}
@@ -203,9 +202,9 @@ public class GemfireCacheManager extends AbstractCacheManager {
* Returns the {@link GemFireCache} instance backing this {@link CacheManager}.
*
* @return the {@link GemFireCache} instance backing this {@link CacheManager}.
* @see com.gemstone.gemfire.cache.GemFireCache
* @see org.apache.geode.cache.GemFireCache
*/
protected com.gemstone.gemfire.cache.GemFireCache getCache() {
protected org.apache.geode.cache.GemFireCache getCache() {
return this.gemfireCache;
}
@@ -231,7 +230,7 @@ public class GemfireCacheManager extends AbstractCacheManager {
*
* @param regions {@link Set} of GemFire {@link Region Regions} used by this {@link CacheManager}
* as Spring {@link Cache Caches}.
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.Region
*/
public void setRegions(Set<Region<?, ?>> regions) {
this.regions = regions;
@@ -243,7 +242,7 @@ public class GemfireCacheManager extends AbstractCacheManager {
*
* @return the set of GemFire {@link Region Regions} functioning as Spring {@link Cache Caches}
* in Spring's caching infrastructure
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.Region
*/
protected Set<Region<?, ?>> getRegions() {
return this.regions;

59
src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java
View File

@@ -20,15 +20,14 @@ import java.net.InetSocketAddress;
import java.util.Map;
import java.util.Properties;
import com.gemstone.gemfire.cache.CacheClosedException;
import com.gemstone.gemfire.cache.GemFireCache;
import com.gemstone.gemfire.cache.client.ClientCache;
import com.gemstone.gemfire.cache.client.ClientCacheFactory;
import com.gemstone.gemfire.cache.client.Pool;
import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.pdx.PdxSerializer;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.pdx.PdxSerializer;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.ListableBeanFactory;
@@ -56,13 +55,13 @@ import org.springframework.util.ObjectUtils;
* @see org.springframework.data.gemfire.CacheFactoryBean
* @see org.springframework.data.gemfire.support.ConnectionEndpoint
* @see org.springframework.data.gemfire.support.ConnectionEndpointList
* @see com.gemstone.gemfire.cache.GemFireCache
* @see com.gemstone.gemfire.cache.client.ClientCache
* @see com.gemstone.gemfire.cache.client.ClientCacheFactory
* @see com.gemstone.gemfire.cache.client.Pool
* @see com.gemstone.gemfire.cache.client.PoolManager
* @see com.gemstone.gemfire.distributed.DistributedSystem
* @see com.gemstone.gemfire.pdx.PdxSerializer
* @see org.apache.geode.cache.GemFireCache
* @see org.apache.geode.cache.client.ClientCache
* @see org.apache.geode.cache.client.ClientCacheFactory
* @see org.apache.geode.cache.client.Pool
* @see org.apache.geode.cache.client.PoolManager
* @see org.apache.geode.distributed.DistributedSystem
* @see org.apache.geode.pdx.PdxSerializer
*/
@SuppressWarnings("unused")
public class ClientCacheFactoryBean extends CacheFactoryBean implements ApplicationListener<ContextRefreshedEvent> {
@@ -108,10 +107,10 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat
*
* @param <T> is Class type extension of GemFireCache.
* @return the existing GemFire ClientCache instance if available.
* @throws com.gemstone.gemfire.cache.CacheClosedException if an existing GemFire Cache instance does not exist.
* @throws org.apache.geode.cache.CacheClosedException if an existing GemFire Cache instance does not exist.
* @throws java.lang.IllegalStateException if the GemFire cache instance is not a ClientCache.
* @see com.gemstone.gemfire.cache.GemFireCache
* @see com.gemstone.gemfire.cache.client.ClientCacheFactory#getAnyInstance()
* @see org.apache.geode.cache.GemFireCache
* @see org.apache.geode.cache.client.ClientCacheFactory#getAnyInstance()
*/
@Override
@SuppressWarnings("unchecked")
@@ -155,7 +154,7 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat
* @param gemfireProperties a Properties object containing GemFire System properties.
* @return an instance of a GemFire factory used to create a GemFire cache instance.
* @see java.util.Properties
* @see com.gemstone.gemfire.cache.client.ClientCacheFactory
* @see org.apache.geode.cache.client.ClientCacheFactory
*/
@Override
protected Object createFactory(Properties gemfireProperties) {
@@ -180,7 +179,7 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat
*
* @param clientCacheFactory the GemFire {@link ClientCacheFactory} used to configure and create
* a GemFire {@link ClientCache}.
* @see com.gemstone.gemfire.cache.client.ClientCacheFactory
* @see org.apache.geode.cache.client.ClientCacheFactory
*/
ClientCacheFactory initializePdx(ClientCacheFactory clientCacheFactory) {
if (isPdxOptionsSpecified()) {
@@ -214,8 +213,8 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat
*
* @param clientCacheFactory the GemFire {@link ClientCacheFactory} used to configure and create
* a GemFire {@link ClientCache}.
* @see com.gemstone.gemfire.cache.client.ClientCacheFactory
* @see com.gemstone.gemfire.cache.client.Pool
* @see org.apache.geode.cache.client.ClientCacheFactory
* @see org.apache.geode.cache.client.Pool
*/
ClientCacheFactory initializePool(ClientCacheFactory clientCacheFactory) {
DefaultableDelegatingPoolAdapter pool = DefaultableDelegatingPoolAdapter.from(
@@ -270,8 +269,8 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat
* the GemFire {@link ClientCache}.
*
* @return the resolved GemFire {@link Pool}.
* @see com.gemstone.gemfire.cache.client.PoolManager#find(String)
* @see com.gemstone.gemfire.cache.client.Pool
* @see org.apache.geode.cache.client.PoolManager#find(String)
* @see org.apache.geode.cache.client.Pool
*/
Pool resolvePool() {
Pool localPool = getPool();
@@ -312,8 +311,8 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat
* @param name a String indicating the name of the GemFire {@link Pool} to find.
* @return a {@link Pool} instance with the given name registered in GemFire or <code>null</code> if no {@link Pool}
* with name exists.
* @see com.gemstone.gemfire.cache.client.PoolManager#find(String)
* @see com.gemstone.gemfire.cache.client.Pool
* @see org.apache.geode.cache.client.PoolManager#find(String)
* @see org.apache.geode.cache.client.Pool
*/
Pool findPool(String name) {
return PoolManager.find(name);
@@ -325,8 +324,8 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat
* @param <T> parameterized Class type extension of {@link GemFireCache}.
* @param factory the appropriate GemFire factory used to create a cache instance.
* @return an instance of the GemFire cache.
* @see com.gemstone.gemfire.cache.client.ClientCacheFactory#create()
* @see com.gemstone.gemfire.cache.GemFireCache
* @see org.apache.geode.cache.client.ClientCacheFactory#create()
* @see org.apache.geode.cache.GemFireCache
*/
@Override
@SuppressWarnings("unchecked")
@@ -338,7 +337,7 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat
* Inform the GemFire cluster that this client cache is ready to receive events iff the client is non-durable.
*
* @param event the ApplicationContextEvent fired when the ApplicationContext is refreshed.
* @see com.gemstone.gemfire.cache.client.ClientCache#readyForEvents()
* @see org.apache.geode.cache.client.ClientCache#readyForEvents()
* @see #getReadyForEvents()
* @see #getObject()
*/

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

@@ -16,20 +16,19 @@
package org.springframework.data.gemfire.client;
import com.gemstone.gemfire.cache.CacheListener;
import com.gemstone.gemfire.cache.CacheLoader;
import com.gemstone.gemfire.cache.CacheWriter;
import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.GemFireCache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.client.ClientCache;
import com.gemstone.gemfire.cache.client.ClientRegionFactory;
import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
import com.gemstone.gemfire.cache.client.Pool;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geode.cache.CacheListener;
import org.apache.geode.cache.CacheLoader;
import org.apache.geode.cache.CacheWriter;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.client.ClientRegionFactory;
import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.cache.client.Pool;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
@@ -53,16 +52,16 @@ import org.springframework.util.StringUtils;
* @see org.springframework.beans.factory.BeanFactoryAware
* @see org.springframework.beans.factory.DisposableBean
* @see org.springframework.data.gemfire.RegionLookupFactoryBean
* @see com.gemstone.gemfire.cache.CacheListener
* @see com.gemstone.gemfire.cache.CacheLoader
* @see com.gemstone.gemfire.cache.CacheWriter
* @see com.gemstone.gemfire.cache.DataPolicy
* @see com.gemstone.gemfire.cache.GemFireCache
* @see com.gemstone.gemfire.cache.Region
* @see com.gemstone.gemfire.cache.RegionAttributes
* @see com.gemstone.gemfire.cache.client.ClientCache
* @see com.gemstone.gemfire.cache.client.ClientRegionFactory
* @see com.gemstone.gemfire.cache.client.ClientRegionShortcut
* @see org.apache.geode.cache.CacheListener
* @see org.apache.geode.cache.CacheLoader
* @see org.apache.geode.cache.CacheWriter
* @see org.apache.geode.cache.DataPolicy
* @see org.apache.geode.cache.GemFireCache
* @see org.apache.geode.cache.Region
* @see org.apache.geode.cache.RegionAttributes
* @see org.apache.geode.cache.client.ClientCache
* @see org.apache.geode.cache.client.ClientRegionFactory
* @see org.apache.geode.cache.client.ClientRegionShortcut
*/
@SuppressWarnings("unused")
public class ClientRegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V>
@@ -183,7 +182,7 @@ public class ClientRegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V>
}
else {
// NOTE the Data Policy validation is based on the ClientRegionShortcut initialization logic
// in com.gemstone.gemfire.internal.cache.GemFireCacheImpl.initializeClientRegionShortcuts
// in org.apache.geode.internal.cache.GemFireCacheImpl.initializeClientRegionShortcuts
throw new IllegalArgumentException(String.format(
"Data Policy '%1$s' is invalid for Client Regions.", this.dataPolicy));
}
@@ -239,7 +238,7 @@ public class ClientRegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V>
* configuration meta-data.
* @see #isPersistent()
* @see #isNotPersistent()
* @see com.gemstone.gemfire.cache.client.ClientRegionShortcut
* @see org.apache.geode.cache.client.ClientRegionShortcut
*/
protected void assertClientRegionShortcutAndPersistentAttributeAreCompatible(final ClientRegionShortcut resolvedShortcut) {
final boolean persistentNotSpecified = (this.persistent == null);
@@ -263,7 +262,7 @@ public class ClientRegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V>
* meta-data.
* @see #isPersistent()
* @see #isNotPersistent()
* @see com.gemstone.gemfire.cache.DataPolicy
* @see org.apache.geode.cache.DataPolicy
*/
protected void assertDataPolicyAndPersistentAttributeAreCompatible(final DataPolicy resolvedDataPolicy) {
if (resolvedDataPolicy.withPersistence()) {
@@ -454,7 +453,7 @@ public class ClientRegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V>
* Sets the CacheLoader used to load data local to the client's Region on cache misses.
*
* @param cacheLoader a GemFire CacheLoader used to load data into the client Region.
* @see com.gemstone.gemfire.cache.CacheLoader
* @see org.apache.geode.cache.CacheLoader
*/
public void setCacheLoader(CacheLoader<K, V> cacheLoader) {
this.cacheLoader = cacheLoader;
@@ -464,7 +463,7 @@ public class ClientRegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V>
* Sets the CacheWriter used to perform a synchronous write-behind when data is put into the client's Region.
*
* @param cacheWriter the GemFire CacheWriter used to perform synchronous write-behinds on put ops.
* @see com.gemstone.gemfire.cache.CacheWriter
* @see org.apache.geode.cache.CacheWriter
*/
public void setCacheWriter(CacheWriter<K, V> cacheWriter) {
this.cacheWriter = cacheWriter;
@@ -474,7 +473,7 @@ public class ClientRegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V>
* Sets the Data Policy. Used only when a new Region is created.
*
* @param dataPolicy the client Region's Data Policy.
* @see com.gemstone.gemfire.cache.DataPolicy
* @see org.apache.geode.cache.DataPolicy
*/
public void setDataPolicy(DataPolicy dataPolicy) {
this.dataPolicy = dataPolicy;
@@ -484,8 +483,8 @@ public class ClientRegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V>
* 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 com.gemstone.gemfire.cache.DataPolicy
* @see #setDataPolicy(com.gemstone.gemfire.cache.DataPolicy)
* @see org.apache.geode.cache.DataPolicy
* @see #setDataPolicy(org.apache.geode.cache.DataPolicy)
* @deprecated use setDataPolicy(:DataPolicy) instead.
*/
@Deprecated

7
src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverter.java
View File

@@ -16,17 +16,16 @@
package org.springframework.data.gemfire.client;
import org.apache.geode.cache.client.ClientRegionShortcut;
import org.springframework.core.convert.converter.Converter;
import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
/**
* The ClientRegionShortcutConverter class is a Spring Converter implementation converting String value Client Region
* Shortcut representations into actual GemFire ClientRegionShortcut enumerated values.
*
* @author John Blum
* @see org.springframework.core.convert.converter.Converter
* @see com.gemstone.gemfire.cache.client.ClientRegionShortcut
* @see org.apache.geode.cache.client.ClientRegionShortcut
* @since 1.3.4
*/
@SuppressWarnings("unused")
@@ -53,7 +52,7 @@ public class ClientRegionShortcutConverter implements Converter<String, ClientRe
* @param source the String representation of the Client Region Shortcut to convert.
* @return a ClientRegionShortcut enumerated value for the String representation.
* @throws IllegalArgumentException if the String source is not a valid ClientRegionShortcut enumerated value.
* @see com.gemstone.gemfire.cache.client.ClientRegionShortcut#valueOf(String)
* @see org.apache.geode.cache.client.ClientRegionShortcut#valueOf(String)
*/
@Override
public ClientRegionShortcut convert(final String source) {

5
src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapper.java
View File

@@ -16,8 +16,7 @@
package org.springframework.data.gemfire.client;
import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
import org.apache.geode.cache.client.ClientRegionShortcut;
import org.springframework.util.ObjectUtils;
/**
@@ -25,7 +24,7 @@ import org.springframework.util.ObjectUtils;
* with Spring Data GemFire ClientRegionShortcutWrapper enumerated values.
*
* @author John Blum
* @see com.gemstone.gemfire.cache.client.ClientRegionShortcut
* @see org.apache.geode.cache.client.ClientRegionShortcut
* @since 1.4.0
*/
@SuppressWarnings("unused")

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

@@ -16,16 +16,15 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.client.ClientCache;
import com.gemstone.gemfire.cache.client.ClientRegionFactory;
import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
import com.gemstone.gemfire.cache.execute.Function;
import com.gemstone.gemfire.management.internal.cli.domain.RegionInformation;
import com.gemstone.gemfire.management.internal.cli.functions.GetRegionsFunction;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.client.ClientRegionFactory;
import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.management.internal.cli.domain.RegionInformation;
import org.apache.geode.management.internal.cli.functions.GetRegionsFunction;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -44,11 +43,11 @@ import org.springframework.util.ObjectUtils;
* @see org.springframework.beans.factory.config.ConfigurableListableBeanFactory
* @see org.springframework.data.gemfire.function.execution.GemfireOnServersFunctionTemplate
* @see org.springframework.data.gemfire.support.ListRegionsOnServerFunction
* @see com.gemstone.gemfire.cache.Region
* @see com.gemstone.gemfire.cache.client.ClientCache
* @see com.gemstone.gemfire.cache.client.ClientRegionFactory
* @see com.gemstone.gemfire.cache.execute.Function
* @see com.gemstone.gemfire.management.internal.cli.functions.GetRegionsFunction
* @see org.apache.geode.cache.Region
* @see org.apache.geode.cache.client.ClientCache
* @see org.apache.geode.cache.client.ClientRegionFactory
* @see org.apache.geode.cache.execute.Function
* @see org.apache.geode.management.internal.cli.functions.GetRegionsFunction
* @since 1.2.0
*/
public class GemfireDataSourcePostProcessor implements BeanFactoryPostProcessor {
@@ -63,7 +62,7 @@ public class GemfireDataSourcePostProcessor implements BeanFactoryPostProcessor
* configured in the GemFire cluster.
*
* @param clientCache the GemFire ClientCache instance.
* @see com.gemstone.gemfire.cache.client.ClientCache
* @see org.apache.geode.cache.client.ClientCache
*/
public GemfireDataSourcePostProcessor(final ClientCache clientCache) {
this.clientCache = clientCache;

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

@@ -16,8 +16,7 @@
package org.springframework.data.gemfire.client;
import com.gemstone.gemfire.cache.InterestResultPolicy;
import org.apache.geode.cache.InterestResultPolicy;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.Constants;
import org.springframework.util.Assert;
@@ -28,7 +27,7 @@ import org.springframework.util.Assert;
* @author Costin Leau
* @author John Blum
* @see org.springframework.beans.factory.InitializingBean
* @see com.gemstone.gemfire.cache.InterestResultPolicy
* @see org.apache.geode.cache.InterestResultPolicy
* @since 1.0.0
*/
@SuppressWarnings("unused")

7
src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyConverter.java
View File

@@ -16,8 +16,7 @@
package org.springframework.data.gemfire.client;
import com.gemstone.gemfire.cache.InterestResultPolicy;
import org.apache.geode.cache.InterestResultPolicy;
import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport;
/**
@@ -26,7 +25,7 @@ import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterS
*
* @author John Blum
* @see org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport
* @see com.gemstone.gemfire.cache.InterestResultPolicy
* @see org.apache.geode.cache.InterestResultPolicy
* @since 1.6.0
*/
public class InterestResultPolicyConverter extends AbstractPropertyEditorConverterSupport<InterestResultPolicy> {
@@ -40,7 +39,7 @@ public class InterestResultPolicyConverter extends AbstractPropertyEditorConvert
* @see org.springframework.data.gemfire.client.InterestResultPolicyType#getInterestResultPolicy(InterestResultPolicyType)
* @see org.springframework.data.gemfire.client.InterestResultPolicyType#valueOfIgnoreCase(String)
* @see #assertConverted(String, Object, Class)
* @see com.gemstone.gemfire.cache.InterestResultPolicy
* @see org.apache.geode.cache.InterestResultPolicy
*/
@Override
public InterestResultPolicy convert(final String source) {

4
src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyType.java
View File

@@ -16,13 +16,13 @@
package org.springframework.data.gemfire.client;
import com.gemstone.gemfire.cache.InterestResultPolicy;
import org.apache.geode.cache.InterestResultPolicy;
/**
* The InterestResultPolicyType enum is an enumeration of all client Register Interests (result) policy values.
*
* @author John Blum
* @see com.gemstone.gemfire.cache.InterestResultPolicy
* @see org.apache.geode.cache.InterestResultPolicy
* @since 1.6.0
*/
@SuppressWarnings("unused")

6
src/main/java/org/springframework/data/gemfire/client/PoolAdapter.java
View File

@@ -20,8 +20,8 @@ package org.springframework.data.gemfire.client;
import java.net.InetSocketAddress;
import java.util.List;
import com.gemstone.gemfire.cache.client.Pool;
import com.gemstone.gemfire.cache.query.QueryService;
import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.query.QueryService;
/**
* The PoolAdapter class is an abstract, default no-op implementation of the GemFire {@link Pool} interface
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.cache.query.QueryService;
*
* @author John Blum
* @see org.springframework.data.gemfire.client.PoolFactoryBean
* @see com.gemstone.gemfire.cache.client.Pool
* @see org.apache.geode.cache.client.Pool
* @since 1.8.0
*/
@SuppressWarnings("unused")

35
src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java
View File

@@ -19,15 +19,14 @@ package org.springframework.data.gemfire.client;
import java.net.InetSocketAddress;
import java.util.List;
import com.gemstone.gemfire.cache.client.ClientCache;
import com.gemstone.gemfire.cache.client.Pool;
import com.gemstone.gemfire.cache.client.PoolFactory;
import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.cache.query.QueryService;
import com.gemstone.gemfire.distributed.DistributedSystem;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.client.PoolFactory;
import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.distributed.DistributedSystem;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
@@ -58,9 +57,9 @@ import org.springframework.util.StringUtils;
* @see org.springframework.beans.factory.InitializingBean
* @see org.springframework.data.gemfire.support.ConnectionEndpoint
* @see org.springframework.data.gemfire.support.ConnectionEndpointList
* @see com.gemstone.gemfire.cache.client.Pool
* @see com.gemstone.gemfire.cache.client.PoolFactory
* @see com.gemstone.gemfire.cache.client.PoolManager
* @see org.apache.geode.cache.client.Pool
* @see org.apache.geode.cache.client.PoolFactory
* @see org.apache.geode.cache.client.PoolManager
*/
@SuppressWarnings("unused")
public class PoolFactoryBean implements FactoryBean<Pool>, InitializingBean, DisposableBean,
@@ -112,9 +111,9 @@ public class PoolFactoryBean implements FactoryBean<Pool>, InitializingBean, Dis
* Constructs and initializes a GemFire {@link Pool}.
*
* @throws Exception if the {@link Pool} creation and initialization fails.
* @see com.gemstone.gemfire.cache.client.Pool
* @see com.gemstone.gemfire.cache.client.PoolFactory
* @see com.gemstone.gemfire.cache.client.PoolManager
* @see org.apache.geode.cache.client.Pool
* @see org.apache.geode.cache.client.PoolFactory
* @see org.apache.geode.cache.client.PoolManager
* @see #createPoolFactory()
*/
@Override
@@ -207,11 +206,11 @@ public class PoolFactoryBean implements FactoryBean<Pool>, InitializingBean, Dis
/**
* Attempts to eagerly initialize the GemFire {@link ClientCache} if not already present so that the single
* {@link com.gemstone.gemfire.distributed.DistributedSystem} will exists, which is required to create
* {@link org.apache.geode.distributed.DistributedSystem} will exists, which is required to create
* a {@link Pool} instance.
*
* @see org.springframework.beans.factory.BeanFactory#getBean(Class)
* @see com.gemstone.gemfire.cache.client.ClientCache
* @see org.apache.geode.cache.client.ClientCache
*/
void eagerlyInitializeClientCacheIfNotPresent() {
if (!isDistributedSystemPresent()) {
@@ -225,7 +224,7 @@ public class PoolFactoryBean implements FactoryBean<Pool>, InitializingBean, Dis
* @return a boolean value indicating whether the single, GemFire DistributedSystem has been created already.
* @see org.springframework.data.gemfire.GemfireUtils#getDistributedSystem()
* @see org.springframework.data.gemfire.GemfireUtils#isConnected(DistributedSystem)
* @see com.gemstone.gemfire.distributed.DistributedSystem
* @see org.apache.geode.distributed.DistributedSystem
*/
boolean isDistributedSystemPresent() {
return GemfireUtils.isConnected(GemfireUtils.getDistributedSystem());
@@ -236,8 +235,8 @@ public class PoolFactoryBean implements FactoryBean<Pool>, InitializingBean, Dis
* a GemFire {@link Pool}.
*
* @return a {@link PoolFactory} implementation to create a {@link Pool}.
* @see com.gemstone.gemfire.cache.client.PoolManager#createFactory()
* @see com.gemstone.gemfire.cache.client.PoolFactory
* @see org.apache.geode.cache.client.PoolManager#createFactory()
* @see org.apache.geode.cache.client.PoolFactory
*/
protected PoolFactory createPoolFactory() {
return PoolManager.createFactory();

7
src/main/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapter.java
View File

@@ -21,9 +21,8 @@ import java.net.InetSocketAddress;
import java.util.Collection;
import java.util.List;
import com.gemstone.gemfire.cache.client.Pool;
import com.gemstone.gemfire.cache.query.QueryService;
import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.query.QueryService;
import org.springframework.data.gemfire.util.SpringUtils;
import org.springframework.util.Assert;
@@ -32,7 +31,7 @@ import org.springframework.util.Assert;
* values to be providing in the case that the Pool's setting were null.
*
* @author John Blum
* @see com.gemstone.gemfire.cache.client.Pool
* @see org.apache.geode.cache.client.Pool
* @since 1.8.0
*/
@SuppressWarnings("unused")

6
src/main/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapter.java
View File

@@ -20,8 +20,8 @@ package org.springframework.data.gemfire.client.support;
import java.net.InetSocketAddress;
import java.util.List;
import com.gemstone.gemfire.cache.client.Pool;
import com.gemstone.gemfire.cache.query.QueryService;
import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.query.QueryService;
/**
* DelegatingPoolAdapter is an abstract implementation of GemFire's {@link Pool} interface and extension of
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.cache.query.QueryService;
*
* @author John Blum
* @see FactoryDefaultsPoolAdapter
* @see com.gemstone.gemfire.cache.client.Pool
* @see org.apache.geode.cache.client.Pool
* @since 1.8.0
*/
@SuppressWarnings("unused")

11
src/main/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapter.java
View File

@@ -21,21 +21,20 @@ import java.net.InetSocketAddress;
import java.util.Collections;
import java.util.List;
import com.gemstone.gemfire.cache.client.PoolFactory;
import com.gemstone.gemfire.cache.query.QueryService;
import org.apache.geode.cache.client.PoolFactory;
import org.apache.geode.cache.query.QueryService;
import org.springframework.data.gemfire.GemfireUtils;
import org.springframework.data.gemfire.client.PoolAdapter;
/**
* FactoryDefaultsPoolAdapter is an abstract implementation of GemFire's {@link com.gemstone.gemfire.cache.client.Pool}
* FactoryDefaultsPoolAdapter is an abstract implementation of GemFire's {@link org.apache.geode.cache.client.Pool}
* interface and extension of {@link PoolAdapter} providing default factory values for all configuration properties
* (e.g. freeConnectionTimeout, idleTimeout, etc).
*
* @author John Blum
* @see org.springframework.data.gemfire.client.PoolAdapter
* @see com.gemstone.gemfire.cache.client.PoolFactory
* @see com.gemstone.gemfire.cache.client.Pool
* @see org.apache.geode.cache.client.PoolFactory
* @see org.apache.geode.cache.client.Pool
* @since 1.8.0
*/
@SuppressWarnings("unused")

29
src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java
View File

@@ -28,11 +28,10 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
import com.gemstone.gemfire.cache.TransactionListener;
import com.gemstone.gemfire.cache.TransactionWriter;
import com.gemstone.gemfire.cache.util.GatewayConflictResolver;
import com.gemstone.gemfire.pdx.PdxSerializer;
import org.apache.geode.cache.TransactionListener;
import org.apache.geode.cache.TransactionWriter;
import org.apache.geode.cache.util.GatewayConflictResolver;
import org.apache.geode.pdx.PdxSerializer;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.BeanFactory;
@@ -67,8 +66,8 @@ import org.springframework.util.StringUtils;
* {@link org.springframework.context.annotation.Configuration} support.
*
* This class encapsulates configuration settings common to both GemFire peer
* {@link com.gemstone.gemfire.cache.Cache caches} and
* {@link com.gemstone.gemfire.cache.client.ClientCache client caches}.
* {@link org.apache.geode.cache.Cache caches} and
* {@link org.apache.geode.cache.client.ClientCache client caches}.
*
* @author John Blum
* @see org.springframework.beans.factory.BeanClassLoaderAware
@@ -182,7 +181,7 @@ public abstract class AbstractCacheConfiguration implements BeanClassLoaderAware
* depending on the type of configuration meta-data applied.
*
* Both 'mcast-port' and 'locators' are to set 0 and empty String respectively, which is necessary
* for {@link com.gemstone.gemfire.cache.client.ClientCache cache client}-based applications. These values
* for {@link org.apache.geode.cache.client.ClientCache cache client}-based applications. These values
* can be changed for peer cache and cache server applications.
*
* Finally, GemFire's {@literal log-level} System property defaults to {@literal config}.
@@ -451,7 +450,7 @@ public abstract class AbstractCacheConfiguration implements BeanClassLoaderAware
}
/**
* Determines whether this is a GemFire {@link com.gemstone.gemfire.cache.server.CacheServer} application,
* Determines whether this is a GemFire {@link org.apache.geode.cache.server.CacheServer} application,
* which is indicated by the presence of the {@link CacheServerApplication} annotation on a Spring application
* {@link org.springframework.context.annotation.Configuration @Configuration} class.
*
@@ -466,7 +465,7 @@ public abstract class AbstractCacheConfiguration implements BeanClassLoaderAware
}
/**
* Determines whether this is a GemFire {@link com.gemstone.gemfire.cache.client.ClientCache} application,
* Determines whether this is a GemFire {@link org.apache.geode.cache.client.ClientCache} application,
* which is indicated by the presence of the {@link ClientCacheApplication} annotation on a Spring application
* {@link org.springframework.context.annotation.Configuration @Configuration} class.
*
@@ -481,7 +480,7 @@ public abstract class AbstractCacheConfiguration implements BeanClassLoaderAware
}
/**
* Determines whether this is a GemFire peer {@link com.gemstone.gemfire.cache.Cache} application,
* Determines whether this is a GemFire peer {@link org.apache.geode.cache.Cache} application,
* which is indicated by the presence of the {@link PeerCacheApplication} annotation on a Spring application
* {@link org.springframework.context.annotation.Configuration @Configuration} class.
*
@@ -515,8 +514,8 @@ public abstract class AbstractCacheConfiguration implements BeanClassLoaderAware
}
/**
* Determines whether this is a GemFire {@link com.gemstone.gemfire.cache.server.CacheServer} or
* {@link com.gemstone.gemfire.cache.Cache peer cache} application, which is indicated by the presence
* Determines whether this is a GemFire {@link org.apache.geode.cache.server.CacheServer} or
* {@link org.apache.geode.cache.Cache peer cache} application, which is indicated by the presence
* of either the {@link CacheServerApplication} annotation or the {@link PeerCacheApplication} annotation
* on a Spring application {@link org.springframework.context.annotation.Configuration @Configuration} class.
*
@@ -534,8 +533,8 @@ public abstract class AbstractCacheConfiguration implements BeanClassLoaderAware
}
/**
* Determine whether this Spring application is a {@link com.gemstone.gemfire.cache.server.CacheServer},
* {@link com.gemstone.gemfire.cache.client.ClientCache} or a {@link com.gemstone.gemfire.cache.Cache} application.
* Determine whether this Spring application is a {@link org.apache.geode.cache.server.CacheServer},
* {@link org.apache.geode.cache.client.ClientCache} or a {@link org.apache.geode.cache.Cache} application.
*
* @param importMetadata {@link AnnotationMetadata} containing application configuration meta-data
* from the class type-level annotations used to configure the Spring application.

2
src/main/java/org/springframework/data/gemfire/config/annotation/AddCacheServerConfiguration.java
View File

@@ -29,7 +29,7 @@ import org.springframework.data.gemfire.server.CacheServerFactoryBean;
/**
* The {@link AddCacheServerConfiguration} class is a Spring {@link ImportBeanDefinitionRegistrar} that registers
* a {@link CacheServerFactoryBean} definition for the {@link com.gemstone.gemfire.cache.server.CacheServer}
* a {@link CacheServerFactoryBean} definition for the {@link org.apache.geode.cache.server.CacheServer}
* configuration meta-data defined in {@link EnableCacheServer}.
*
* @author John Blum

6
src/main/java/org/springframework/data/gemfire/config/annotation/AddPoolConfiguration.java
View File

@@ -33,7 +33,7 @@ import org.springframework.util.StringUtils;
/**
* The {@link AddCacheServerConfiguration} class is a Spring {@link ImportBeanDefinitionRegistrar} that registers
* a {@link PoolFactoryBean} definition for the {@link com.gemstone.gemfire.cache.client.Pool}
* a {@link PoolFactoryBean} definition for the {@link org.apache.geode.cache.client.Pool}
* configuration meta-data defined in {@link EnablePool}.
*
* @author John Blum
@@ -106,11 +106,11 @@ public class AddPoolConfiguration implements ImportBeanDefinitionRegistrar {
/**
* Uses the list of GemFire Locator and Server connection endpoint definitions and meta-data to configure
* the GemFire client {@link com.gemstone.gemfire.cache.client.Pool} used to communicate with the servers
* the GemFire client {@link org.apache.geode.cache.client.Pool} used to communicate with the servers
* in the GemFire cluster.
*
* @param enablePoolAttributes {@link EnablePool} annotation containing
* {@link com.gemstone.gemfire.cache.client.Pool} Locator/Server connection endpoint meta-data.
* {@link org.apache.geode.cache.client.Pool} Locator/Server connection endpoint meta-data.
* @see org.springframework.data.gemfire.config.annotation.ClientCacheApplication
* @see java.util.Map
*/

43
src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerApplication.java
View File

@@ -24,10 +24,9 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import com.gemstone.gemfire.cache.control.ResourceManager;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig;
import org.apache.geode.cache.control.ResourceManager;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.cache.server.ClientSubscriptionConfig;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.access.BeanFactoryLocator;
import org.springframework.context.annotation.Configuration;
@@ -36,18 +35,18 @@ import org.springframework.data.gemfire.server.SubscriptionEvictionPolicy;
/**
* The CacheServerApplication annotation enables an embedded GemFire
* {@link com.gemstone.gemfire.cache.server.CacheServer} instance in a Spring Data GemFire based application.
* {@link org.apache.geode.cache.server.CacheServer} instance in a Spring Data GemFire based application.
*
* In addition, this also implies an embedded GemFire peer {@link com.gemstone.gemfire.cache.Cache} must exist
* In addition, this also implies an embedded GemFire peer {@link org.apache.geode.cache.Cache} must exist
* and therefore will be configured, constructed and initialized as a Spring bean in the application context.
*
* @author John Blum
* @see org.springframework.context.annotation.Configuration
* @see org.springframework.context.annotation.Import
* @see org.springframework.data.gemfire.config.annotation.CacheServerConfiguration
* @see com.gemstone.gemfire.cache.control.ResourceManager
* @see com.gemstone.gemfire.cache.server.CacheServer
* @see com.gemstone.gemfire.cache.server.ClientSubscriptionConfig
* @see org.apache.geode.cache.control.ResourceManager
* @see org.apache.geode.cache.server.CacheServer
* @see org.apache.geode.cache.server.ClientSubscriptionConfig
* @since 1.9.0
*/
@Target(ElementType.TYPE)
@@ -69,7 +68,7 @@ public @interface CacheServerApplication {
/**
* Configures the ip address or host name that this cache server will listen on.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_BIND_ADDRESS
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_BIND_ADDRESS
*/
String bindAddress() default CacheServer.DEFAULT_BIND_ADDRESS;
@@ -83,7 +82,7 @@ public @interface CacheServerApplication {
/**
* Configures the percentage of heap at or above which the cache is considered in danger of becoming inoperable.
*
* @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_CRITICAL_HEAP_PERCENTAGE
* @see org.apache.geode.cache.control.ResourceManager#DEFAULT_CRITICAL_HEAP_PERCENTAGE
*/
float criticalHeapPercentage() default ResourceManager.DEFAULT_CRITICAL_HEAP_PERCENTAGE;
@@ -100,7 +99,7 @@ public @interface CacheServerApplication {
* Configures the percentage of heap at or above which the eviction should begin on Regions configured
* for HeapLRU eviction.
*
* @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_EVICTION_HEAP_PERCENTAGE
* @see org.apache.geode.cache.control.ResourceManager#DEFAULT_EVICTION_HEAP_PERCENTAGE
*/
float evictionHeapPercentage() default ResourceManager.DEFAULT_EVICTION_HEAP_PERCENTAGE;
@@ -108,14 +107,14 @@ public @interface CacheServerApplication {
* Configures the ip address or host name that server locators will tell clients that this cache server
* is listening on.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_HOSTNAME_FOR_CLIENTS
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_HOSTNAME_FOR_CLIENTS
*/
String hostnameForClients() default CacheServer.DEFAULT_HOSTNAME_FOR_CLIENTS;
/**
* Configures the frequency in milliseconds to poll the load probe on this cache server.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_LOAD_POLL_INTERVAL
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_LOAD_POLL_INTERVAL
*/
long loadPollInterval() default CacheServer.DEFAULT_LOAD_POLL_INTERVAL;
@@ -149,28 +148,28 @@ public @interface CacheServerApplication {
/**
* Configures the maximum allowed client connections.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MAX_CONNECTIONS
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_MAX_CONNECTIONS
*/
int maxConnections() default CacheServer.DEFAULT_MAX_CONNECTIONS;
/**
* Configures he maximum number of messages that can be enqueued in a client-queue.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MAXIMUM_MESSAGE_COUNT
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_MAXIMUM_MESSAGE_COUNT
*/
int maxMessageCount() default CacheServer.DEFAULT_MAXIMUM_MESSAGE_COUNT;
/**
* Configures the maximum number of threads allowed in this cache server to service client requests.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MAX_THREADS
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_MAX_THREADS
*/
int maxThreads() default CacheServer.DEFAULT_MAX_THREADS;
/**
* Configures the maximum amount of time between client pings.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS
*/
int maxTimeBetweenPings() default CacheServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS;
@@ -185,7 +184,7 @@ public @interface CacheServerApplication {
/**
* Configures the time (in seconds ) after which a message in the client queue will expire.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MESSAGE_TIME_TO_LIVE
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_MESSAGE_TIME_TO_LIVE
*/
int messageTimeToLive() default CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE;
@@ -199,7 +198,7 @@ public @interface CacheServerApplication {
/**
* Configures the port on which this cache server listens for clients.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_PORT
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_PORT
*/
int port() default CacheServer.DEFAULT_PORT;
@@ -213,14 +212,14 @@ public @interface CacheServerApplication {
/**
* Configures the configured buffer size of the socket connection for this CacheServer.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_SOCKET_BUFFER_SIZE
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_SOCKET_BUFFER_SIZE
*/
int socketBufferSize() default CacheServer.DEFAULT_SOCKET_BUFFER_SIZE;
/**
* Configures the capacity of the client queue.
*
* @see com.gemstone.gemfire.cache.server.ClientSubscriptionConfig#DEFAULT_CAPACITY
* @see org.apache.geode.cache.server.ClientSubscriptionConfig#DEFAULT_CAPACITY
*/
int subscriptionCapacity() default ClientSubscriptionConfig.DEFAULT_CAPACITY;

15
src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfiguration.java
View File

@@ -20,12 +20,11 @@ package org.springframework.data.gemfire.config.annotation;
import java.util.Map;
import java.util.Set;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.InterestRegistrationListener;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig;
import com.gemstone.gemfire.cache.server.ServerLoadProbe;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.InterestRegistrationListener;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.cache.server.ClientSubscriptionConfig;
import org.apache.geode.cache.server.ServerLoadProbe;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.type.AnnotationMetadata;
@@ -42,8 +41,8 @@ import org.springframework.data.gemfire.util.SpringUtils;
* @see org.springframework.context.annotation.Bean
* @see org.springframework.context.annotation.Configuration
* @see org.springframework.data.gemfire.config.annotation.PeerCacheConfiguration
* @see com.gemstone.gemfire.cache.Cache
* @see com.gemstone.gemfire.cache.server.CacheServer
* @see org.apache.geode.cache.Cache
* @see org.apache.geode.cache.server.CacheServer
* @since 1.9.0
*/
@Configuration

57
src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplication.java
View File

@@ -24,9 +24,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import com.gemstone.gemfire.cache.client.PoolFactory;
import com.gemstone.gemfire.cache.control.ResourceManager;
import org.apache.geode.cache.client.PoolFactory;
import org.apache.geode.cache.control.ResourceManager;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.access.BeanFactoryLocator;
import org.springframework.context.annotation.Configuration;
@@ -35,14 +34,14 @@ import org.springframework.data.gemfire.GemfireUtils;
/**
* The {@link ClientCacheApplication} annotation enables a Spring Data GemFire based application to become
* a GemFire cache client (i.e. {@link com.gemstone.gemfire.cache.client.ClientCache}).
* a GemFire cache client (i.e. {@link org.apache.geode.cache.client.ClientCache}).
*
* @author John Blum
* @see org.springframework.context.annotation.Configuration
* @see org.springframework.context.annotation.Import
* @see org.springframework.data.gemfire.config.annotation.ClientCacheConfiguration
* @see com.gemstone.gemfire.cache.client.PoolFactory
* @see com.gemstone.gemfire.cache.control.ResourceManager
* @see org.apache.geode.cache.client.PoolFactory
* @see org.apache.geode.cache.control.ResourceManager
* @since 1.9.0
*/
@Target(ElementType.TYPE)
@@ -64,7 +63,7 @@ public @interface ClientCacheApplication {
/**
* Configures the percentage of heap at or above which the cache is considered in danger of becoming inoperable.
*
* @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_CRITICAL_HEAP_PERCENTAGE
* @see org.apache.geode.cache.control.ResourceManager#DEFAULT_CRITICAL_HEAP_PERCENTAGE
*/
float criticalHeapPercentage() default ResourceManager.DEFAULT_CRITICAL_HEAP_PERCENTAGE;
@@ -85,21 +84,21 @@ public @interface ClientCacheApplication {
* Configures the percentage of heap at or above which the eviction should begin on Regions configured
* for HeapLRU eviction.
*
* @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_EVICTION_HEAP_PERCENTAGE
* @see org.apache.geode.cache.control.ResourceManager#DEFAULT_EVICTION_HEAP_PERCENTAGE
*/
float evictionHeapPercentage() default ResourceManager.DEFAULT_EVICTION_HEAP_PERCENTAGE;
/**
* Configures the free connection timeout for this pool.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_FREE_CONNECTION_TIMEOUT
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_FREE_CONNECTION_TIMEOUT
*/
int freeConnectionTimeout() default PoolFactory.DEFAULT_FREE_CONNECTION_TIMEOUT;
/**
* Configures the amount of time a connection can be idle before expiring the connection.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_IDLE_TIMEOUT
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_IDLE_TIMEOUT
*/
long idleTimeout() default PoolFactory.DEFAULT_IDLE_TIMEOUT;
@@ -113,12 +112,12 @@ public @interface ClientCacheApplication {
/**
* Configures the load conditioning interval for this pool.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_LOAD_CONDITIONING_INTERVAL
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_LOAD_CONDITIONING_INTERVAL
*/
int loadConditioningInterval() default PoolFactory.DEFAULT_LOAD_CONDITIONING_INTERVAL;
/**
* Configures the GemFire {@link com.gemstone.gemfire.distributed.Locator}s to which
* Configures the GemFire {@link org.apache.geode.distributed.Locator}s to which
* this cache client will connect.
*/
Locator[] locators() default {};
@@ -133,21 +132,21 @@ public @interface ClientCacheApplication {
/**
* Configures the max number of client to server connections that the pool will create.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_MAX_CONNECTIONS
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_MAX_CONNECTIONS
*/
int maxConnections() default PoolFactory.DEFAULT_MAX_CONNECTIONS;
/**
* Configures the minimum number of connections to keep available at all times.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_MIN_CONNECTIONS
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_MIN_CONNECTIONS
*/
int minConnections() default PoolFactory.DEFAULT_MIN_CONNECTIONS;
/**
* If set to true then the created pool can be used by multiple users.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_MULTIUSER_AUTHENTICATION
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_MULTIUSER_AUTHENTICATION
*/
boolean multiUserAuthentication() default PoolFactory.DEFAULT_MULTIUSER_AUTHENTICATION;
@@ -161,15 +160,15 @@ public @interface ClientCacheApplication {
/**
* Configures how often to ping servers to verify that they are still alive.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_PING_INTERVAL
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_PING_INTERVAL
*/
long pingInterval() default PoolFactory.DEFAULT_PING_INTERVAL;
/**
* By default {@code prSingleHopEnabled} is {@literal true} in which case the client is aware of the location
* of partitions on servers hosting Regions with {@link com.gemstone.gemfire.cache.DataPolicy#PARTITION}.
* of partitions on servers hosting Regions with {@link org.apache.geode.cache.DataPolicy#PARTITION}.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_PR_SINGLE_HOP_ENABLED
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_PR_SINGLE_HOP_ENABLED
*/
boolean prSingleHopEnabled() default PoolFactory.DEFAULT_PR_SINGLE_HOP_ENABLED;
@@ -177,7 +176,7 @@ public @interface ClientCacheApplication {
* Configures the number of milliseconds to wait for a response from a server before timing out the operation
* and trying another server (if any are available).
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_READ_TIMEOUT
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_READ_TIMEOUT
*/
int readTimeout() default PoolFactory.DEFAULT_READ_TIMEOUT;
@@ -191,19 +190,19 @@ public @interface ClientCacheApplication {
/**
* Configures the number of times to retry a request after timeout/exception.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_RETRY_ATTEMPTS
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_RETRY_ATTEMPTS
*/
int retryAttempts() default PoolFactory.DEFAULT_RETRY_ATTEMPTS;
/**
* Configures the group that all servers this pool connects to must belong to.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SERVER_GROUP
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SERVER_GROUP
*/
String serverGroup() default PoolFactory.DEFAULT_SERVER_GROUP;
/**
* Configures the GemFire {@link com.gemstone.gemfire.cache.server.CacheServer}s to which
* Configures the GemFire {@link org.apache.geode.cache.server.CacheServer}s to which
* this cache client will connect.
*/
Server[] servers() default {};
@@ -211,14 +210,14 @@ public @interface ClientCacheApplication {
/**
* Configures the socket buffer size for each connection made in this pool.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SOCKET_BUFFER_SIZE
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SOCKET_BUFFER_SIZE
*/
int socketBufferSize() default PoolFactory.DEFAULT_SOCKET_BUFFER_SIZE;
/**
* Configures how often to send client statistics to the server.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_STATISTIC_INTERVAL
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_STATISTIC_INTERVAL
*/
int statisticInterval() default PoolFactory.DEFAULT_STATISTIC_INTERVAL;
@@ -226,14 +225,14 @@ public @interface ClientCacheApplication {
* Configures the interval in milliseconds to wait before sending acknowledgements to the cache server
* for events received from the server subscriptions.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_ACK_INTERVAL
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_ACK_INTERVAL
*/
int subscriptionAckInterval() default PoolFactory.DEFAULT_SUBSCRIPTION_ACK_INTERVAL;
/**
* If set to true then the created pool will have server-to-client subscriptions enabled.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_ENABLED
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_ENABLED
*/
boolean subscriptionEnabled() default PoolFactory.DEFAULT_SUBSCRIPTION_ENABLED;
@@ -241,21 +240,21 @@ public @interface ClientCacheApplication {
* Configures the messageTrackingTimeout attribute which is the time-to-live period, in milliseconds,
* for subscription events the client has received from the server.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_MESSAGE_TRACKING_TIMEOUT
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_MESSAGE_TRACKING_TIMEOUT
*/
int subscriptionMessageTrackingTimeout() default PoolFactory.DEFAULT_SUBSCRIPTION_MESSAGE_TRACKING_TIMEOUT;
/**
* Configures the redundancy level for this pools server-to-client subscriptions.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_REDUNDANCY
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_REDUNDANCY
*/
int subscriptionRedundancy() default PoolFactory.DEFAULT_SUBSCRIPTION_REDUNDANCY;
/**
* Configures the thread local connections policy for this pool.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_THREAD_LOCAL_CONNECTIONS
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_THREAD_LOCAL_CONNECTIONS
*/
boolean threadLocalConnections() default PoolFactory.DEFAULT_THREAD_LOCAL_CONNECTIONS;

12
src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfiguration.java
View File

@@ -34,13 +34,13 @@ import org.springframework.data.gemfire.support.ConnectionEndpointList;
/**
* Spring {@link Configuration} class used to configure, construct and initialize
* a GemFire {@link com.gemstone.gemfire.cache.client.ClientCache} instance in a Spring application context.
* a GemFire {@link org.apache.geode.cache.client.ClientCache} instance in a Spring application context.
*
* @author John Blum
* @see org.springframework.context.annotation.Bean
* @see org.springframework.context.annotation.Configuration
* @see org.springframework.data.gemfire.config.annotation.AbstractCacheConfiguration
* @see com.gemstone.gemfire.cache.client.ClientCache
* @see org.apache.geode.cache.client.ClientCache
* @since 1.0.0
*/
@Configuration
@@ -143,10 +143,10 @@ public class ClientCacheConfiguration extends AbstractCacheConfiguration {
}
/**
* Configures GemFire {@link com.gemstone.gemfire.cache.client.ClientCache} specific settings.
* Configures GemFire {@link org.apache.geode.cache.client.ClientCache} specific settings.
*
* @param importMetadata {@link AnnotationMetadata} containing client cache meta-data used to configure
* the GemFire {@link com.gemstone.gemfire.cache.client.ClientCache}.
* the GemFire {@link org.apache.geode.cache.client.ClientCache}.
* @see org.springframework.core.type.AnnotationMetadata
*/
@Override
@@ -186,11 +186,11 @@ public class ClientCacheConfiguration extends AbstractCacheConfiguration {
/**
* Uses the list of GemFire Locator and Server connection endpoint definitions and meta-data to configure
* the GemFire client {@link com.gemstone.gemfire.cache.client.Pool} used to communicate with the servers
* the GemFire client {@link org.apache.geode.cache.client.Pool} used to communicate with the servers
* in the GemFire cluster.
*
* @param clientCacheApplicationAttributes {@link ClientCacheApplication} annotation containing
* {@link com.gemstone.gemfire.cache.client.Pool} Locator/Server connection endpoint meta-data.
* {@link org.apache.geode.cache.client.Pool} Locator/Server connection endpoint meta-data.
* @see org.springframework.data.gemfire.config.annotation.ClientCacheApplication
* @see java.util.Map
*/

13
src/main/java/org/springframework/data/gemfire/config/annotation/EnableAuth.java
View File

@@ -24,10 +24,9 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import com.gemstone.gemfire.security.AccessControl;
import com.gemstone.gemfire.security.AuthInitialize;
import com.gemstone.gemfire.security.Authenticator;
import org.apache.geode.security.AccessControl;
import org.apache.geode.security.AuthInitialize;
import org.apache.geode.security.Authenticator;
import org.springframework.context.annotation.Import;
/**
@@ -36,9 +35,9 @@ import org.springframework.context.annotation.Import;
*
* @author John Blum
* @see org.springframework.data.gemfire.config.annotation.AuthConfiguration
* @see com.gemstone.gemfire.security.AccessControl
* @see com.gemstone.gemfire.security.AuthInitialize
* @see com.gemstone.gemfire.security.Authenticator
* @see org.apache.geode.security.AccessControl
* @see org.apache.geode.security.AuthInitialize
* @see org.apache.geode.security.Authenticator
* @see <a href="http://gemfire.docs.pivotal.io/docs-gemfire/latest/managing/security/authentication_overview.html">Authentication</a>
* @see <a href="http://gemfire.docs.pivotal.io/docs-gemfire/latest/managing/security/authorization_overview.html">Authorization</a>
* @since 1.9.0

8
src/main/java/org/springframework/data/gemfire/config/annotation/EnableAutoRegionLookup.java
View File

@@ -28,11 +28,11 @@ import org.springframework.context.annotation.Import;
/**
* The {@link EnableAutoRegionLookup} annotation configures a Spring {@link org.springframework.context.annotation.Configuration}
* annotated class with the ability to automatically look up and register GemFire {@link com.gemstone.gemfire.cache.Region Regions}
* annotated class with the ability to automatically look up and register GemFire {@link org.apache.geode.cache.Region Regions}
* which may have be defined in {@literal cache.xml} or by using GemFire's Cluster Configuration Service.
*
* This annotation defines the {@code enabled} attribute to allow users to dynamically change the behavior
* of auto {@link com.gemstone.gemfire.cache.Region} lookup at application configuration time using either a SpEL
* of auto {@link org.apache.geode.cache.Region} lookup at application configuration time using either a SpEL
* expression or a Spring property placeholder.
*
* @author John Blum
@@ -48,11 +48,11 @@ import org.springframework.context.annotation.Import;
public @interface EnableAutoRegionLookup {
/**
* Attribute to indicate whether auto {@link com.gemstone.gemfire.cache.Region} lookup should be enabled;
* Attribute to indicate whether auto {@link org.apache.geode.cache.Region} lookup should be enabled;
* Defaults to {@literal true}.
*
* This attribute accepts either a SpEL or Spring property placeholder expression so that
* auto {@link com.gemstone.gemfire.cache.Region} lookup behavior can be determined
* auto {@link org.apache.geode.cache.Region} lookup behavior can be determined
* at application configuration time.
*/
String enabled() default "true";

29
src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServer.java
View File

@@ -24,9 +24,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.cache.server.ClientSubscriptionConfig;
import org.springframework.context.annotation.Import;
import org.springframework.data.gemfire.server.SubscriptionEvictionPolicy;
@@ -43,7 +42,7 @@ import org.springframework.data.gemfire.server.SubscriptionEvictionPolicy;
* @author John Blum
* @see org.springframework.data.gemfire.config.annotation.AddCacheServerConfiguration
* @see com.gemstone.gemfire.cache.server.CacheServer
* @see org.apache.geode.cache.server.CacheServer
* @since 1.9.0
*/
@Target(ElementType.TYPE)
@@ -64,7 +63,7 @@ public @interface EnableCacheServer {
/**
* Configures the ip address or host name that this cache server will listen on.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_BIND_ADDRESS
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_BIND_ADDRESS
*/
String bindAddress() default CacheServer.DEFAULT_BIND_ADDRESS;
@@ -72,70 +71,70 @@ public @interface EnableCacheServer {
* Configures the ip address or host name that server locators will tell clients that this cache server
* is listening on.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_HOSTNAME_FOR_CLIENTS
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_HOSTNAME_FOR_CLIENTS
*/
String hostnameForClients() default CacheServer.DEFAULT_HOSTNAME_FOR_CLIENTS;
/**
* Configures the frequency in milliseconds to poll the load probe on this cache server.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_LOAD_POLL_INTERVAL
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_LOAD_POLL_INTERVAL
*/
long loadPollInterval() default CacheServer.DEFAULT_LOAD_POLL_INTERVAL;
/**
* Configures the maximum allowed client connections.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MAX_CONNECTIONS
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_MAX_CONNECTIONS
*/
int maxConnections() default CacheServer.DEFAULT_MAX_CONNECTIONS;
/**
* Configures he maximum number of messages that can be enqueued in a client-queue.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MAXIMUM_MESSAGE_COUNT
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_MAXIMUM_MESSAGE_COUNT
*/
int maxMessageCount() default CacheServer.DEFAULT_MAXIMUM_MESSAGE_COUNT;
/**
* Configures the maximum number of threads allowed in this cache server to service client requests.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MAX_THREADS
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_MAX_THREADS
*/
int maxThreads() default CacheServer.DEFAULT_MAX_THREADS;
/**
* Configures the maximum amount of time between client pings.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS
*/
int maxTimeBetweenPings() default CacheServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS;
/**
* Configures the time (in seconds ) after which a message in the client queue will expire.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MESSAGE_TIME_TO_LIVE
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_MESSAGE_TIME_TO_LIVE
*/
int messageTimeToLive() default CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE;
/**
* Configures the port on which this cache server listens for clients.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_PORT
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_PORT
*/
int port() default CacheServer.DEFAULT_PORT;
/**
* Configures the configured buffer size of the socket connection for this CacheServer.
*
* @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_SOCKET_BUFFER_SIZE
* @see org.apache.geode.cache.server.CacheServer#DEFAULT_SOCKET_BUFFER_SIZE
*/
int socketBufferSize() default CacheServer.DEFAULT_SOCKET_BUFFER_SIZE;
/**
* Configures the capacity of the client queue.
*
* @see com.gemstone.gemfire.cache.server.ClientSubscriptionConfig#DEFAULT_CAPACITY
* @see org.apache.geode.cache.server.ClientSubscriptionConfig#DEFAULT_CAPACITY
*/
int subscriptionCapacity() default ClientSubscriptionConfig.DEFAULT_CAPACITY;

4
src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServers.java
View File

@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
import org.springframework.context.annotation.Import;
/**
* The {@link EnableCacheServers} annotation enables 1 or more GemFire {@link com.gemstone.gemfire.cache.server.CacheServer CacheServers}
* The {@link EnableCacheServers} annotation enables 1 or more GemFire {@link org.apache.geode.cache.server.CacheServer CacheServers}
* to be defined and used in a GemFire peer cache application configured with Spring (Data GemFire).
*
* @author John Blum
@@ -44,7 +44,7 @@ import org.springframework.context.annotation.Import;
public @interface EnableCacheServers {
/**
* Enables the definition of multiple GemFire {@link com.gemstone.gemfire.cache.server.CacheServer CacheServers}.
* Enables the definition of multiple GemFire {@link org.apache.geode.cache.server.CacheServer CacheServers}.
*/
EnableCacheServer[] servers() default {};

2
src/main/java/org/springframework/data/gemfire/config/annotation/EnablePdx.java
View File

@@ -59,7 +59,7 @@ public @interface EnablePdx {
boolean persistent() default false;
/**
* Configures the object preference to {@link com.gemstone.gemfire.pdx.PdxInstance} type or {@link Object}.
* Configures the object preference to {@link org.apache.geode.pdx.PdxInstance} type or {@link Object}.
*
* Default is {@literal false}.
*/

51
src/main/java/org/springframework/data/gemfire/config/annotation/EnablePool.java
View File

@@ -24,9 +24,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import com.gemstone.gemfire.cache.client.Pool;
import com.gemstone.gemfire.cache.client.PoolFactory;
import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.client.PoolFactory;
import org.springframework.context.annotation.Import;
import org.springframework.data.gemfire.GemfireUtils;
@@ -42,8 +41,8 @@ import org.springframework.data.gemfire.GemfireUtils;
*
* @author John Blum
* @see org.springframework.data.gemfire.config.annotation.AddPoolConfiguration
* @see com.gemstone.gemfire.cache.client.Pool
* @see com.gemstone.gemfire.cache.client.PoolFactory
* @see org.apache.geode.cache.client.Pool
* @see org.apache.geode.cache.client.PoolFactory
* @since 1.9.0
*/
@Target(ElementType.TYPE)
@@ -57,26 +56,26 @@ public @interface EnablePool {
/**
* Configures the free connection timeout for this pool.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_FREE_CONNECTION_TIMEOUT
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_FREE_CONNECTION_TIMEOUT
*/
int freeConnectionTimeout() default PoolFactory.DEFAULT_FREE_CONNECTION_TIMEOUT;
/**
* Configures the amount of time a connection can be idle before expiring the connection.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_IDLE_TIMEOUT
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_IDLE_TIMEOUT
*/
long idleTimeout() default PoolFactory.DEFAULT_IDLE_TIMEOUT;
/**
* Configures the load conditioning interval for this pool.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_LOAD_CONDITIONING_INTERVAL
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_LOAD_CONDITIONING_INTERVAL
*/
int loadConditioningInterval() default PoolFactory.DEFAULT_LOAD_CONDITIONING_INTERVAL;
/**
* Configures the GemFire {@link com.gemstone.gemfire.distributed.Locator Locators} to which
* Configures the GemFire {@link org.apache.geode.distributed.Locator Locators} to which
* this cache client will connect.
*/
Locator[] locators() default {};
@@ -92,21 +91,21 @@ public @interface EnablePool {
/**
* Configures the max number of client to server connections that the pool will create.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_MAX_CONNECTIONS
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_MAX_CONNECTIONS
*/
int maxConnections() default PoolFactory.DEFAULT_MAX_CONNECTIONS;
/**
* Configures the minimum number of connections to keep available at all times.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_MIN_CONNECTIONS
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_MIN_CONNECTIONS
*/
int minConnections() default PoolFactory.DEFAULT_MIN_CONNECTIONS;
/**
* If set to true then the created pool can be used by multiple users.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_MULTIUSER_AUTHENTICATION
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_MULTIUSER_AUTHENTICATION
*/
boolean multiUserAuthentication() default PoolFactory.DEFAULT_MULTIUSER_AUTHENTICATION;
@@ -118,15 +117,15 @@ public @interface EnablePool {
/**
* Configures how often to ping servers to verify that they are still alive.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_PING_INTERVAL
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_PING_INTERVAL
*/
long pingInterval() default PoolFactory.DEFAULT_PING_INTERVAL;
/**
* By default {@code prSingleHopEnabled} is {@literal true} in which case the client is aware of the location
* of partitions on servers hosting Regions with {@link com.gemstone.gemfire.cache.DataPolicy#PARTITION}.
* of partitions on servers hosting Regions with {@link org.apache.geode.cache.DataPolicy#PARTITION}.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_PR_SINGLE_HOP_ENABLED
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_PR_SINGLE_HOP_ENABLED
*/
boolean prSingleHopEnabled() default PoolFactory.DEFAULT_PR_SINGLE_HOP_ENABLED;
@@ -134,26 +133,26 @@ public @interface EnablePool {
* Configures the number of milliseconds to wait for a response from a server before timing out the operation
* and trying another server (if any are available).
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_READ_TIMEOUT
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_READ_TIMEOUT
*/
int readTimeout() default PoolFactory.DEFAULT_READ_TIMEOUT;
/**
* Configures the number of times to retry a request after timeout/exception.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_RETRY_ATTEMPTS
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_RETRY_ATTEMPTS
*/
int retryAttempts() default PoolFactory.DEFAULT_RETRY_ATTEMPTS;
/**
* Configures the group that all servers this pool connects to must belong to.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SERVER_GROUP
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SERVER_GROUP
*/
String serverGroup() default PoolFactory.DEFAULT_SERVER_GROUP;
/**
* Configures the GemFire {@link com.gemstone.gemfire.cache.server.CacheServer CacheServers} to which
* Configures the GemFire {@link org.apache.geode.cache.server.CacheServer CacheServers} to which
* this cache client will connect.
*/
Server[] servers() default {};
@@ -169,14 +168,14 @@ public @interface EnablePool {
/**
* Configures the socket buffer size for each connection made in this pool.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SOCKET_BUFFER_SIZE
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SOCKET_BUFFER_SIZE
*/
int socketBufferSize() default PoolFactory.DEFAULT_SOCKET_BUFFER_SIZE;
/**
* Configures how often to send client statistics to the server.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_STATISTIC_INTERVAL
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_STATISTIC_INTERVAL
*/
int statisticInterval() default PoolFactory.DEFAULT_STATISTIC_INTERVAL;
@@ -184,14 +183,14 @@ public @interface EnablePool {
* Configures the interval in milliseconds to wait before sending acknowledgements to the cache server
* for events received from the server subscriptions.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_ACK_INTERVAL
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_ACK_INTERVAL
*/
int subscriptionAckInterval() default PoolFactory.DEFAULT_SUBSCRIPTION_ACK_INTERVAL;
/**
* If set to true then the created pool will have server-to-client subscriptions enabled.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_ENABLED
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_ENABLED
*/
boolean subscriptionEnabled() default PoolFactory.DEFAULT_SUBSCRIPTION_ENABLED;
@@ -199,21 +198,21 @@ public @interface EnablePool {
* Configures the messageTrackingTimeout attribute which is the time-to-live period, in milliseconds,
* for subscription events the client has received from the server.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_MESSAGE_TRACKING_TIMEOUT
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_MESSAGE_TRACKING_TIMEOUT
*/
int subscriptionMessageTrackingTimeout() default PoolFactory.DEFAULT_SUBSCRIPTION_MESSAGE_TRACKING_TIMEOUT;
/**
* Configures the redundancy level for this pools server-to-client subscriptions.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_REDUNDANCY
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_REDUNDANCY
*/
int subscriptionRedundancy() default PoolFactory.DEFAULT_SUBSCRIPTION_REDUNDANCY;
/**
* Configures the thread local connections policy for this pool.
*
* @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_THREAD_LOCAL_CONNECTIONS
* @see org.apache.geode.cache.client.PoolFactory#DEFAULT_THREAD_LOCAL_CONNECTIONS
*/
boolean threadLocalConnections() default PoolFactory.DEFAULT_THREAD_LOCAL_CONNECTIONS;

4
src/main/java/org/springframework/data/gemfire/config/annotation/EnablePools.java
View File

@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
import org.springframework.context.annotation.Import;
/**
* The {@link EnablePools} annotation enables 1 or more GemFire {@link com.gemstone.gemfire.cache.client.Pool Pools}
* The {@link EnablePools} annotation enables 1 or more GemFire {@link org.apache.geode.cache.client.Pool Pools}
* to be defined and used in a GemFire client cache application configured with Spring (Data GemFire).
*
* @author John Blum
@@ -44,7 +44,7 @@ import org.springframework.context.annotation.Import;
public @interface EnablePools {
/**
* Enables the definition of multiple GemFire {@link com.gemstone.gemfire.cache.client.Pool Pools}.
* Enables the definition of multiple GemFire {@link org.apache.geode.cache.client.Pool Pools}.
*/
EnablePool[] pools() default {};

11
src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplication.java
View File

@@ -24,22 +24,21 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import com.gemstone.gemfire.cache.control.ResourceManager;
import org.apache.geode.cache.control.ResourceManager;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.access.BeanFactoryLocator;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
/**
* The {@link PeerCacheApplication} annotation enables an embedded GemFire peer {@link com.gemstone.gemfire.cache.Cache}
* The {@link PeerCacheApplication} annotation enables an embedded GemFire peer {@link org.apache.geode.cache.Cache}
* instance in a Spring Data GemFire based application.
*
* @author John Blum
* @see org.springframework.context.annotation.Configuration
* @see org.springframework.context.annotation.Import
* @see org.springframework.data.gemfire.config.annotation.PeerCacheConfiguration
* @see com.gemstone.gemfire.cache.control.ResourceManager
* @see org.apache.geode.cache.control.ResourceManager
* @since 1.9.0
*/
@Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE})
@@ -61,7 +60,7 @@ public @interface PeerCacheApplication {
/**
* Configures the percentage of heap at or above which the cache is considered in danger of becoming inoperable.
*
* @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_CRITICAL_HEAP_PERCENTAGE
* @see org.apache.geode.cache.control.ResourceManager#DEFAULT_CRITICAL_HEAP_PERCENTAGE
*/
float criticalHeapPercentage() default ResourceManager.DEFAULT_CRITICAL_HEAP_PERCENTAGE;
@@ -78,7 +77,7 @@ public @interface PeerCacheApplication {
* Configures the percentage of heap at or above which the eviction should begin on Regions configured
* for HeapLRU eviction.
*
* @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_EVICTION_HEAP_PERCENTAGE
* @see org.apache.geode.cache.control.ResourceManager#DEFAULT_EVICTION_HEAP_PERCENTAGE
*/
float evictionHeapPercentage() default ResourceManager.DEFAULT_EVICTION_HEAP_PERCENTAGE;

8
src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfiguration.java
View File

@@ -26,13 +26,13 @@ import org.springframework.data.gemfire.CacheFactoryBean;
/**
* Spring {@link Configuration} class used to configure, construct and initialize
* a GemFire peer {@link com.gemstone.gemfire.cache.Cache} instance in a Spring application context.
* a GemFire peer {@link org.apache.geode.cache.Cache} instance in a Spring application context.
*
* @author John Blum
* @see org.springframework.context.annotation.Bean
* @see org.springframework.context.annotation.Configuration
* @see org.springframework.data.gemfire.config.annotation.AbstractCacheConfiguration
* @see com.gemstone.gemfire.cache.Cache
* @see org.apache.geode.cache.Cache
* @since 1.9.0
*/
@Configuration
@@ -77,10 +77,10 @@ public class PeerCacheConfiguration extends AbstractCacheConfiguration {
}
/**
* Configures GemFire peer {@link com.gemstone.gemfire.cache.Cache} specific settings.
* Configures GemFire peer {@link org.apache.geode.cache.Cache} specific settings.
*
* @param importMetadata {@link AnnotationMetadata} containing peer cache meta-data used to configure
* the GemFire peer {@link com.gemstone.gemfire.cache.Cache}.
* the GemFire peer {@link org.apache.geode.cache.Cache}.
* @see org.springframework.core.type.AnnotationMetadata
* @see #isCacheServerOrPeerCacheApplication(AnnotationMetadata)
*/

9
src/main/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessor.java
View File

@@ -19,9 +19,8 @@ package org.springframework.data.gemfire.config.support;
import java.util.Collections;
import java.util.Set;
import com.gemstone.gemfire.cache.GemFireCache;
import com.gemstone.gemfire.cache.Region;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.Region;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
@@ -41,8 +40,8 @@ import org.springframework.util.ObjectUtils;
* @see org.springframework.beans.factory.BeanFactory
* @see org.springframework.beans.factory.BeanFactoryAware
* @see org.springframework.beans.factory.config.BeanPostProcessor
* @see com.gemstone.gemfire.cache.GemFireCache
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.GemFireCache
* @see org.apache.geode.cache.Region
* @since 1.5.0
*/
public class AutoRegionLookupBeanPostProcessor implements BeanPostProcessor, BeanFactoryAware {

6
src/main/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessor.java
View File

@@ -31,9 +31,9 @@ import org.springframework.data.gemfire.util.SpringUtils;
/**
* {@link ClientRegionPoolBeanFactoryPostProcessor} is a Spring {@link BeanFactoryPostProcessor} implementation
* ensuring a proper dependency is declared between a GemFire client {@link com.gemstone.gemfire.cache.Region}
* and the GemFire client {@link com.gemstone.gemfire.cache.client.Pool} it references and uses, providing
* the GemFire client {@link com.gemstone.gemfire.cache.client.Pool} has been defined and configured with
* ensuring a proper dependency is declared between a GemFire client {@link org.apache.geode.cache.Region}
* and the GemFire client {@link org.apache.geode.cache.client.Pool} it references and uses, providing
* the GemFire client {@link org.apache.geode.cache.client.Pool} has been defined and configured with
* Spring (Data GemFire) configuration meta-data (e.g. XML).
*
* @author John Blum

21
src/main/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessor.java
View File

@@ -18,21 +18,16 @@ package org.springframework.data.gemfire.config.support;
import java.beans.PropertyEditorSupport;
import com.gemstone.gemfire.cache.EvictionAction;
import com.gemstone.gemfire.cache.ExpirationAction;
import com.gemstone.gemfire.cache.InterestPolicy;
import com.gemstone.gemfire.cache.InterestResultPolicy;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.util.Gateway;
import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.ExpirationAction;
import org.apache.geode.cache.InterestPolicy;
import org.apache.geode.cache.InterestResultPolicy;
import org.apache.geode.cache.Scope;
import org.apache.geode.cache.util.Gateway;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.core.convert.converter.Converter;
import org.springframework.data.gemfire.eviction.EvictionActionConverter;
import org.springframework.data.gemfire.eviction.EvictionPolicyConverter;
import org.springframework.data.gemfire.eviction.EvictionPolicyType;
import org.springframework.data.gemfire.expiration.ExpirationActionConverter;
import org.springframework.data.gemfire.IndexMaintenancePolicyConverter;
import org.springframework.data.gemfire.IndexMaintenancePolicyType;
import org.springframework.data.gemfire.IndexType;
@@ -40,6 +35,10 @@ import org.springframework.data.gemfire.IndexTypeConverter;
import org.springframework.data.gemfire.InterestPolicyConverter;
import org.springframework.data.gemfire.ScopeConverter;
import org.springframework.data.gemfire.client.InterestResultPolicyConverter;
import org.springframework.data.gemfire.eviction.EvictionActionConverter;
import org.springframework.data.gemfire.eviction.EvictionPolicyConverter;
import org.springframework.data.gemfire.eviction.EvictionPolicyType;
import org.springframework.data.gemfire.expiration.ExpirationActionConverter;
import org.springframework.data.gemfire.server.SubscriptionEvictionPolicy;
import org.springframework.data.gemfire.server.SubscriptionEvictionPolicyConverter;
import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport;

13
src/main/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListener.java
View File

@@ -16,11 +16,10 @@
package org.springframework.data.gemfire.config.support;
import com.gemstone.gemfire.cache.query.MultiIndexCreationException;
import com.gemstone.gemfire.cache.query.QueryService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geode.cache.query.MultiIndexCreationException;
import org.apache.geode.cache.query.QueryService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
@@ -28,14 +27,14 @@ import org.springframework.data.gemfire.config.xml.GemfireConstants;
/**
* {@link DefinedIndexesApplicationListener} is a Spring {@link ApplicationListener} used to create all
* "defined" GemFire {@link com.gemstone.gemfire.cache.query.Index Indexes} by using the {@link QueryService},
* "defined" GemFire {@link org.apache.geode.cache.query.Index Indexes} by using the {@link QueryService},
* {@literal defineXxxIndex(..)} methods.
*
* @author John Blum
* @see org.springframework.context.ApplicationContext
* @see org.springframework.context.ApplicationListener
* @see org.springframework.context.event.ContextRefreshedEvent
* @see com.gemstone.gemfire.cache.query.QueryService
* @see org.apache.geode.cache.query.QueryService
* @since 1.7.0
*/
public class DefinedIndexesApplicationListener implements ApplicationListener<ContextRefreshedEvent> {
@@ -43,13 +42,13 @@ public class DefinedIndexesApplicationListener implements ApplicationListener<Co
protected final Log logger = initLogger();
/**
* Attempts to create all defined {@link com.gemstone.gemfire.cache.query.Index Indexes} using
* Attempts to create all defined {@link org.apache.geode.cache.query.Index Indexes} using
* the {@link QueryService}, {@literal defineXxxIndex(..)} API once the Spring {@link ApplicationContext}
* has been refreshed.
*
* @param event {@link ContextRefreshedEvent} fired when the Spring {@link ApplicationContext} gets refreshed.
* @see org.springframework.context.event.ContextRefreshedEvent
* @see com.gemstone.gemfire.cache.query.QueryService#createDefinedIndexes()
* @see org.apache.geode.cache.query.QueryService#createDefinedIndexes()
* @see #getQueryService(ContextRefreshedEvent)
*/
@Override

6
src/main/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessor.java
View File

@@ -28,13 +28,13 @@ import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
/**
* The {@link DiskStoreDirectoryBeanPostProcessor} processes any GemFire {@link com.gemstone.gemfire.cache.DiskStore},
* The {@link DiskStoreDirectoryBeanPostProcessor} processes any GemFire {@link org.apache.geode.cache.DiskStore},
* {@link DiskDir} Spring beans defined in the application context to ensure that the directory actually exists
* before creating the {@link com.gemstone.gemfire.cache.DiskStore}.
* before creating the {@link org.apache.geode.cache.DiskStore}.
*
* @author John Blum
* @see org.springframework.beans.factory.config.BeanPostProcessor
* @see com.gemstone.gemfire.cache.DiskStore
* @see org.apache.geode.cache.DiskStore
* @since 1.5.0
*/
@SuppressWarnings("unused")

13
src/main/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessor.java
View File

@@ -16,10 +16,9 @@
package org.springframework.data.gemfire.config.support;
import com.gemstone.gemfire.cache.DiskStore;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
import org.apache.geode.cache.DiskStore;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
@@ -39,9 +38,9 @@ import org.springframework.util.Assert;
* @author John Blum
* @see org.springframework.beans.factory.config.BeanFactoryPostProcessor
* @see org.springframework.beans.factory.config.ConfigurableListableBeanFactory
* @see com.gemstone.gemfire.cache.DiskStore
* @see com.gemstone.gemfire.cache.Region
* @see com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue
* @see org.apache.geode.cache.DiskStore
* @see org.apache.geode.cache.Region
* @see org.apache.geode.cache.asyncqueue.AsyncEventQueue
* @since 1.3.3
*/
public class PdxDiskStoreAwareBeanFactoryPostProcessor implements BeanFactoryPostProcessor {

5
src/main/java/org/springframework/data/gemfire/config/xml/AbstractRegionParser.java
View File

@@ -20,11 +20,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
import com.gemstone.gemfire.cache.wan.GatewaySender;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
import org.apache.geode.cache.wan.GatewaySender;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;

3
src/main/java/org/springframework/data/gemfire/config/xml/CacheParser.java
View File

@@ -18,8 +18,7 @@ package org.springframework.data.gemfire.config.xml;
import java.util.List;
import com.gemstone.gemfire.internal.datasource.ConfigProperty;
import org.apache.geode.internal.datasource.ConfigProperty;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;

5
src/main/java/org/springframework/data/gemfire/config/xml/LookupRegionParser.java
View File

@@ -16,9 +16,8 @@
package org.springframework.data.gemfire.config.xml;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
import com.gemstone.gemfire.cache.wan.GatewaySender;
import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
import org.apache.geode.cache.wan.GatewaySender;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.data.gemfire.LookupRegionFactoryBean;

7
src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java
View File

@@ -18,12 +18,11 @@ package org.springframework.data.gemfire.config.xml;
import java.util.List;
import com.gemstone.gemfire.cache.LossAction;
import com.gemstone.gemfire.cache.MembershipAttributes;
import com.gemstone.gemfire.cache.ResumptionAction;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geode.cache.LossAction;
import org.apache.geode.cache.MembershipAttributes;
import org.apache.geode.cache.ResumptionAction;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;

7
src/main/java/org/springframework/data/gemfire/eviction/EvictionActionConverter.java
View File

@@ -16,8 +16,7 @@
package org.springframework.data.gemfire.eviction;
import com.gemstone.gemfire.cache.EvictionAction;
import org.apache.geode.cache.EvictionAction;
import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport;
/**
@@ -27,7 +26,7 @@ import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterS
* @author John Blum
* @see EvictionActionType
* @see org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport
* @see com.gemstone.gemfire.cache.EvictionAction
* @see org.apache.geode.cache.EvictionAction
* @since 1.6.0
*/
@SuppressWarnings("unused")
@@ -40,7 +39,7 @@ public class EvictionActionConverter extends AbstractPropertyEditorConverterSupp
* @return the GemFire EvictionAction value matching the given String.
* @throws java.lang.IllegalArgumentException if the String could not be converted into
* an instance of GemFire EvictionAction.
* @see com.gemstone.gemfire.cache.EvictionAction
* @see org.apache.geode.cache.EvictionAction
*/
@Override
public EvictionAction convert(final String source) {

10
src/main/java/org/springframework/data/gemfire/eviction/EvictionActionType.java
View File

@@ -16,13 +16,13 @@
package org.springframework.data.gemfire.eviction;
import com.gemstone.gemfire.cache.EvictionAction;
import org.apache.geode.cache.EvictionAction;
/**
* The EvictionActionType enum is an enumeration of all the GemFire EvictionAction values.
*
* @author John Blum
* @see com.gemstone.gemfire.cache.EvictionAction
* @see org.apache.geode.cache.EvictionAction
* @since 1.6.0
*/
@SuppressWarnings("unused")
@@ -39,7 +39,7 @@ public enum EvictionActionType {
* Constructs an instance of the EvictionActionType enum initialized with the matching GemFire EvictionAction.
*
* @param evictionAction the matching GemFire EvictionAction value for this enumerated value.
* @see com.gemstone.gemfire.cache.EvictionAction
* @see org.apache.geode.cache.EvictionAction
*/
EvictionActionType(final EvictionAction evictionAction) {
this.evictionAction = evictionAction;
@@ -63,7 +63,7 @@ public enum EvictionActionType {
* @param evictionAction the GemFire EvictionAction used to lookup and match the appropriate EvictionActionType.
* @return an EvictionActionType enumerated value matching the given GemFire EvictionAction
* or null if no match was found.
* @see com.gemstone.gemfire.cache.EvictionAction
* @see org.apache.geode.cache.EvictionAction
* @see #getEvictionAction()
*/
public static EvictionActionType valueOf(final EvictionAction evictionAction) {
@@ -99,7 +99,7 @@ public enum EvictionActionType {
* Gets the matching GemFire EvictionAction represented by this enumerated value.
*
* @return the GemFire EvictionAction represented by this enum.
* @see com.gemstone.gemfire.cache.EvictionAction
* @see org.apache.geode.cache.EvictionAction
*/
public EvictionAction getEvictionAction() {
return evictionAction;

23
src/main/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBean.java
View File

@@ -16,12 +16,11 @@
package org.springframework.data.gemfire.eviction;
import com.gemstone.gemfire.cache.EvictionAction;
import com.gemstone.gemfire.cache.EvictionAttributes;
import com.gemstone.gemfire.cache.util.ObjectSizer;
import com.gemstone.gemfire.internal.cache.lru.LRUCapacityController;
import com.gemstone.gemfire.internal.cache.lru.MemLRUCapacityController;
import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.util.ObjectSizer;
import org.apache.geode.internal.cache.lru.LRUCapacityController;
import org.apache.geode.internal.cache.lru.MemLRUCapacityController;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
@@ -32,8 +31,8 @@ import org.springframework.beans.factory.InitializingBean;
* @author John Blum
* @see org.springframework.beans.factory.FactoryBean
* @see org.springframework.beans.factory.InitializingBean
* @see com.gemstone.gemfire.cache.EvictionAttributes
* @see com.gemstone.gemfire.cache.util.ObjectSizer
* @see org.apache.geode.cache.EvictionAttributes
* @see org.apache.geode.cache.util.ObjectSizer
*/
@SuppressWarnings("unused")
public class EvictionAttributesFactoryBean implements FactoryBean<EvictionAttributes>, InitializingBean {
@@ -94,7 +93,7 @@ public class EvictionAttributesFactoryBean implements FactoryBean<EvictionAttrib
* Sets the action to perform on the Region when Eviction occurs.
*
* @param action the specified EvictionAction taken on the Region.
* @see com.gemstone.gemfire.cache.EvictionAction
* @see org.apache.geode.cache.EvictionAction
*/
public void setAction(final EvictionAction action) {
this.action = action;
@@ -104,7 +103,7 @@ public class EvictionAttributesFactoryBean implements FactoryBean<EvictionAttrib
* Gets the action performed on the Region when Eviction occurs.
*
* @return the EvictionAction taken on the Region.
* @see com.gemstone.gemfire.cache.EvictionAction
* @see org.apache.geode.cache.EvictionAction
*/
public EvictionAction getAction() {
return (action != null ? action : EvictionAction.DEFAULT_EVICTION_ACTION);
@@ -114,7 +113,7 @@ public class EvictionAttributesFactoryBean implements FactoryBean<EvictionAttrib
* Sets the GemFire ObjectSizer used in determining object sizes of data stored in the Cache.
*
* @param objectSizer the ObjectSizer used in sizing object data stored in the Cache.
* @see com.gemstone.gemfire.cache.util.ObjectSizer
* @see org.apache.geode.cache.util.ObjectSizer
*/
public void setObjectSizer(final ObjectSizer objectSizer) {
this.objectSizer = objectSizer;
@@ -124,7 +123,7 @@ public class EvictionAttributesFactoryBean implements FactoryBean<EvictionAttrib
* Gets the GemFire ObjectSizer used in determining object sizes of data stored in the Cache.
*
* @return the ObjectSizer used in sizing object data stored in the Cache.
* @see com.gemstone.gemfire.cache.util.ObjectSizer
* @see org.apache.geode.cache.util.ObjectSizer
*/
public ObjectSizer getObjectSizer() {
return objectSizer;

12
src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyType.java
View File

@@ -16,7 +16,7 @@
package org.springframework.data.gemfire.eviction;
import com.gemstone.gemfire.cache.EvictionAlgorithm;
import org.apache.geode.cache.EvictionAlgorithm;
/**
* The EvictionPolicyType enum is an enumeration of all GemFire Eviction policies, where the Eviction 'policy'
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.EvictionAlgorithm;
*
* @author Costin Leau
* @author John Blum
* @see com.gemstone.gemfire.cache.EvictionAlgorithm
* @see org.apache.geode.cache.EvictionAlgorithm
* @since 1.0.0
*/
@SuppressWarnings("unused")
@@ -40,7 +40,7 @@ public enum EvictionPolicyType {
* Constructs an instance of the EvictionPolicyType enum initialized with the matching GemFire EvictionAlgorithm.
*
* @param evictionAlgorithm the GemFire EvictionAlgorithm represented by this EvictionPolicyType enumerated value.
* @see com.gemstone.gemfire.cache.EvictionAlgorithm
* @see org.apache.geode.cache.EvictionAlgorithm
*/
EvictionPolicyType(final EvictionAlgorithm evictionAlgorithm) {
this.evictionAlgorithm = evictionAlgorithm;
@@ -51,7 +51,7 @@ public enum EvictionPolicyType {
*
* @param evictionPolicyType the EvictionPolicyType from which to extract the GemFire EvictionAlgorithm.
* @return the GemFire EvictionAlgorithm for the corresponding EvictionPolicyType or null if evictionType is null.
* @see com.gemstone.gemfire.cache.EvictionAlgorithm
* @see org.apache.geode.cache.EvictionAlgorithm
* @see #getEvictionAlgorithm()
*/
public static EvictionAlgorithm getEvictionAlgorithm(final EvictionPolicyType evictionPolicyType) {
@@ -63,7 +63,7 @@ public enum EvictionPolicyType {
*
* @param evictionAlgorithm the GemFire EvictionAlgorithm used to lookup and match the EvictionPolicyType.
* @return an EvictionPolicyType matching the specified GemFire EvictionAlgorithm or null if no match was found.
* @see com.gemstone.gemfire.cache.EvictionAlgorithm
* @see org.apache.geode.cache.EvictionAlgorithm
* @see #getEvictionAlgorithm()
*/
public static EvictionPolicyType valueOf(final EvictionAlgorithm evictionAlgorithm) {
@@ -98,7 +98,7 @@ public enum EvictionPolicyType {
* Gets the GemFire EvictionAlgorithm represented by this enumerated value.
*
* @return the GemFire EvictionAlgorithm represented by this enum.
* @see com.gemstone.gemfire.cache.EvictionAlgorithm
* @see org.apache.geode.cache.EvictionAlgorithm
*/
public EvictionAlgorithm getEvictionAlgorithm() {
return evictionAlgorithm;

35
src/main/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpiration.java
View File

@@ -19,11 +19,10 @@ package org.springframework.data.gemfire.expiration;
import java.lang.annotation.Annotation;
import java.util.concurrent.atomic.AtomicReference;
import com.gemstone.gemfire.cache.CustomExpiry;
import com.gemstone.gemfire.cache.ExpirationAction;
import com.gemstone.gemfire.cache.ExpirationAttributes;
import com.gemstone.gemfire.cache.Region;
import org.apache.geode.cache.CustomExpiry;
import org.apache.geode.cache.ExpirationAction;
import org.apache.geode.cache.ExpirationAttributes;
import org.apache.geode.cache.Region;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
@@ -59,10 +58,10 @@ import org.springframework.util.ObjectUtils;
* @see Expiration
* @see IdleTimeoutExpiration
* @see TimeToLiveExpiration
* @see com.gemstone.gemfire.cache.CustomExpiry
* @see com.gemstone.gemfire.cache.ExpirationAction
* @see com.gemstone.gemfire.cache.ExpirationAttributes
* @see com.gemstone.gemfire.cache.Region
* @see org.apache.geode.cache.CustomExpiry
* @see org.apache.geode.cache.ExpirationAction
* @see org.apache.geode.cache.ExpirationAttributes
* @see org.apache.geode.cache.Region
* @since 1.7.0
*/
@SuppressWarnings("unused")
@@ -88,7 +87,7 @@ public class AnnotationBasedExpiration<K, V> implements BeanFactoryAware, Custom
* expiration policy.
*
* @param defaultExpirationAttributes expiration settings used as the default expiration policy.
* @see com.gemstone.gemfire.cache.ExpirationAttributes
* @see org.apache.geode.cache.ExpirationAttributes
*/
public AnnotationBasedExpiration(ExpirationAttributes defaultExpirationAttributes) {
this.defaultExpirationAttributes = defaultExpirationAttributes;
@@ -103,7 +102,7 @@ public class AnnotationBasedExpiration<K, V> implements BeanFactoryAware, Custom
* @return an AnnotationBasedExpiration instance to process Idle Timeout Expiration annotated Region Entries.
* @see AnnotationBasedExpiration
* @see IdleTimeoutExpiration
* @see #forIdleTimeout(com.gemstone.gemfire.cache.ExpirationAttributes)
* @see #forIdleTimeout(org.apache.geode.cache.ExpirationAttributes)
*/
public static <K, V> AnnotationBasedExpiration<K, V> forIdleTimeout() {
return forIdleTimeout(null);
@@ -139,7 +138,7 @@ public class AnnotationBasedExpiration<K, V> implements BeanFactoryAware, Custom
* @return an AnnotationBasedExpiration instance to process Time-To-Live Expiration annotated Region Entries.
* @see AnnotationBasedExpiration
* @see TimeToLiveExpiration
* @see #forTimeToLive(com.gemstone.gemfire.cache.ExpirationAttributes)
* @see #forTimeToLive(org.apache.geode.cache.ExpirationAttributes)
*/
public static <K, V> AnnotationBasedExpiration<K, V> forTimeToLive() {
return forTimeToLive(null);
@@ -228,7 +227,7 @@ public class AnnotationBasedExpiration<K, V> implements BeanFactoryAware, Custom
*
* @param defaultExpirationAttributes expiration settings used as the default expiration policy.
* @see #getDefaultExpirationAttributes()
* @see com.gemstone.gemfire.cache.ExpirationAttributes
* @see org.apache.geode.cache.ExpirationAttributes
*/
public void setDefaultExpirationAttributes(ExpirationAttributes defaultExpirationAttributes) {
this.defaultExpirationAttributes = defaultExpirationAttributes;
@@ -239,8 +238,8 @@ public class AnnotationBasedExpiration<K, V> implements BeanFactoryAware, Custom
* has been specified.
*
* @return an instance of ExpirationAttributes with expiration settings defining the default expiration policy.
* @see #setDefaultExpirationAttributes(com.gemstone.gemfire.cache.ExpirationAttributes)
* @see com.gemstone.gemfire.cache.ExpirationAttributes
* @see #setDefaultExpirationAttributes(org.apache.geode.cache.ExpirationAttributes)
* @see org.apache.geode.cache.ExpirationAttributes
*/
protected ExpirationAttributes getDefaultExpirationAttributes() {
//return (defaultExpirationAttributes != null ? defaultExpirationAttributes : ExpirationAttributes.DEFAULT);
@@ -253,7 +252,7 @@ public class AnnotationBasedExpiration<K, V> implements BeanFactoryAware, Custom
*
* @param entry the entry to calculate the expiration for.
* @return the expiration to be used, null if the Region's defaults should be used.
* @see com.gemstone.gemfire.cache.ExpirationAttributes
* @see org.apache.geode.cache.ExpirationAttributes
*/
@Override
public ExpirationAttributes getExpiry(Region.Entry<K, V> entry) {
@@ -283,7 +282,7 @@ public class AnnotationBasedExpiration<K, V> implements BeanFactoryAware, Custom
* or the default expiration settings if the application domain object has not been annotated with custom
* expiration meta-data.
* @see AnnotationBasedExpiration.ExpirationMetaData
* @see com.gemstone.gemfire.cache.ExpirationAttributes
* @see org.apache.geode.cache.ExpirationAttributes
* @see #getDefaultExpirationAttributes()
*/
protected ExpirationAttributes newExpirationAttributes(ExpirationMetaData expirationMetaData) {
@@ -388,7 +387,7 @@ public class AnnotationBasedExpiration<K, V> implements BeanFactoryAware, Custom
* The ExpirationMetaData class encapsulates the settings constituting the expiration policy including
* the expiration timeout and the action performed when expiration occurs.
*
* @see com.gemstone.gemfire.cache.ExpirationAttributes
* @see org.apache.geode.cache.ExpirationAttributes
*/
protected static class ExpirationMetaData {

5
src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionConverter.java
View File

@@ -16,8 +16,7 @@
package org.springframework.data.gemfire.expiration;
import com.gemstone.gemfire.cache.ExpirationAction;
import org.apache.geode.cache.ExpirationAction;
import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport;
/**
@@ -39,7 +38,7 @@ public class ExpirationActionConverter extends AbstractPropertyEditorConverterSu
* @return an GemFire ExpirationAction value for the given String.
* @throws java.lang.IllegalArgumentException if the String is not a valid GemFire ExpirationAction.
* @see ExpirationActionType#valueOfIgnoreCase(String)
* @see com.gemstone.gemfire.cache.ExpirationAction
* @see org.apache.geode.cache.ExpirationAction
*/
@Override
public ExpirationAction convert(final String source) {

12
src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionType.java
View File

@@ -16,13 +16,13 @@
package org.springframework.data.gemfire.expiration;
import com.gemstone.gemfire.cache.ExpirationAction;
import org.apache.geode.cache.ExpirationAction;
/**
* The ExpirationActionType enum is a enumeration of GemFire ExpirationActions on expired Cache Region entries.
*
* @author John Blum
* @see com.gemstone.gemfire.cache.ExpirationAction
* @see org.apache.geode.cache.ExpirationAction
* @since 1.6.0
*/
@SuppressWarnings("unused")
@@ -40,7 +40,7 @@ public enum ExpirationActionType {
* Constructs an instance of the ExpirationActionType enum initialized with the matching GemFire ExpirationAction.
*
* @param expirationAction the matching GemFire ExpirationAction for this enumerated value.
* @see com.gemstone.gemfire.cache.ExpirationAction
* @see org.apache.geode.cache.ExpirationAction
*/
ExpirationActionType(final ExpirationAction expirationAction) {
this.expirationAction = expirationAction;
@@ -52,7 +52,7 @@ public enum ExpirationActionType {
* @param expirationActionType the ExpirationActionType enumerated value from which to extract
* the corresponding GemFire ExpirationAction.
* @return a GemFire ExpirationAction given the ExpirationActionType enumerated value.
* @see com.gemstone.gemfire.cache.ExpirationAction
* @see org.apache.geode.cache.ExpirationAction
*/
public static ExpirationAction getExpirationAction(final ExpirationActionType expirationActionType) {
return (expirationActionType != null ? expirationActionType.getExpirationAction() : null);
@@ -64,7 +64,7 @@ public enum ExpirationActionType {
* @param expirationAction the GemFire ExpirationAction used to match the ExpirationActionType.
* @return a matching ExpirationActionType enumerated value given a GemFire ExpirationAction
* or null if no match was found.
* @see com.gemstone.gemfire.cache.ExpirationAction
* @see org.apache.geode.cache.ExpirationAction
* @see #getExpirationAction()
*/
public static ExpirationActionType valueOf(final ExpirationAction expirationAction) {
@@ -100,7 +100,7 @@ public enum ExpirationActionType {
* Gets the matching GemFire ExpirationAction for this enumerated value.
*
* @return the GemFire ExpirationAction instance corresponding to this enumerated value.
* @see com.gemstone.gemfire.cache.ExpirationAction
* @see org.apache.geode.cache.ExpirationAction
*/
public ExpirationAction getExpirationAction() {
return expirationAction;

15
src/main/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBean.java
View File

@@ -16,9 +16,8 @@
package org.springframework.data.gemfire.expiration;
import com.gemstone.gemfire.cache.ExpirationAction;
import com.gemstone.gemfire.cache.ExpirationAttributes;
import org.apache.geode.cache.ExpirationAction;
import org.apache.geode.cache.ExpirationAttributes;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
@@ -30,7 +29,7 @@ import org.springframework.beans.factory.InitializingBean;
* @author John Blum
* @see org.springframework.beans.factory.FactoryBean
* @see org.springframework.beans.factory.InitializingBean
* @see com.gemstone.gemfire.cache.ExpirationAttributes
* @see org.apache.geode.cache.ExpirationAttributes
* @since 1.6.0
*/
@SuppressWarnings("unused")
@@ -69,7 +68,7 @@ public class ExpirationAttributesFactoryBean implements FactoryBean<ExpirationAt
* Sets the action to perform when a Region or an Entry expire.
*
* @param action the type of action to perform on expiration
* @see com.gemstone.gemfire.cache.ExpirationAction
* @see org.apache.geode.cache.ExpirationAction
*/
public void setAction(final ExpirationAction action) {
this.action = action;
@@ -80,7 +79,7 @@ public class ExpirationAttributesFactoryBean implements FactoryBean<ExpirationAt
*
* @return the type of action to perform on expiration.
* @see ExpirationActionType
* @see com.gemstone.gemfire.cache.ExpirationAttributes#getAction()
* @see org.apache.geode.cache.ExpirationAttributes#getAction()
*/
public ExpirationAction getAction() {
return (action != null ? action : DEFAULT_EXPIRATION_ACTION);
@@ -99,7 +98,7 @@ public class ExpirationAttributesFactoryBean implements FactoryBean<ExpirationAt
* Gets the number of seconds before a Region or an Entry expires.
*
* @return the number of seconds before a Region or an Entry expires.
* @see com.gemstone.gemfire.cache.ExpirationAttributes#getTimeout()
* @see org.apache.geode.cache.ExpirationAttributes#getTimeout()
*/
public int getTimeout() {
return (timeout != null ? timeout : DEFAULT_TIMEOUT);
@@ -112,7 +111,7 @@ public class ExpirationAttributesFactoryBean implements FactoryBean<ExpirationAt
* @see #getAction()
* @see #getTimeout()
* @see ExpirationActionType#getExpirationAction()
* @see com.gemstone.gemfire.cache.ExpirationAttributes
* @see org.apache.geode.cache.ExpirationAttributes
*/
@Override
public void afterPropertiesSet() throws Exception {

65
src/main/java/org/springframework/data/gemfire/function/BatchingResultSender.java
View File

@@ -1,11 +1,11 @@
/*
* Copyright 2002-2013 the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
@@ -18,42 +18,41 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import org.apache.geode.cache.execute.ResultSender;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import com.gemstone.gemfire.cache.execute.ResultSender;
/**
* Sends collection results using a {@link ResultSender} in chunks determined by batchSize
*
*
* @author David Turanski
* @since 1.3.0
*/
class BatchingResultSender {
private final int batchSize;
private ResultSender<Object> resultSender;
public BatchingResultSender(int batchSize, ResultSender<Object> resultSender) {
Assert.notNull(resultSender, "resultSender cannot be null");
Assert.isTrue(batchSize >= 0, "batchSize must be >= 0");
this.batchSize = batchSize;
this.resultSender = resultSender;
}
public void sendResults(Iterable<?> result) {
if (batchSize == 0) {
resultSender.lastResult(result);
return;
}
}
List<Object> chunk = new ArrayList<Object>(batchSize);
for (Iterator<?> it = result.iterator(); it.hasNext();) {
if (chunk.size() < batchSize) {
chunk.add(it.next());
}
}
if (chunk.size() == batchSize || !it.hasNext()) {
if (it.hasNext()) {
resultSender.sendResult(chunk);
@@ -65,19 +64,19 @@ class BatchingResultSender {
}
}
public void sendArrayResults(Object result) {
if (batchSize == 0) {
resultSender.lastResult(result);
return;
}
Assert.isTrue(ObjectUtils.isArray(result));
Assert.isTrue(ObjectUtils.isArray(result));
int length = Array.getLength(result);
for (int from =0; from < length; from += batchSize) {
for (int from =0; from < length; from += batchSize) {
int to = Math.min(length,from + batchSize);
Object chunk = copyOfRange(result,from, to);
@@ -85,7 +84,7 @@ class BatchingResultSender {
resultSender.lastResult(chunk);
} else {
resultSender.sendResult(chunk);
}
}
}
}
@@ -97,10 +96,10 @@ class BatchingResultSender {
* @return
*/
private Object copyOfRange(Object result, int from, int to) {
Class<?> arrayClass = result.getClass();
int size = to - from;
if (int[].class.isAssignableFrom(arrayClass)) {
int[] array = new int[size];
for(int i = 0; i < size ; ++i){
@@ -108,7 +107,7 @@ class BatchingResultSender {
}
return array;
}
if (float[].class.isAssignableFrom(arrayClass)) {
float[] array = new float[size];
for(int i = 0; i < size ; ++i){
@@ -116,7 +115,7 @@ class BatchingResultSender {
}
return array;
}
if (double[].class.isAssignableFrom(arrayClass)) {
double[] array = new double[size];
for(int i = 0; i < size ; ++i){
@@ -124,7 +123,7 @@ class BatchingResultSender {
}
return array;
}
if (boolean[].class.isAssignableFrom(arrayClass)) {
boolean[] array = new boolean[size];
for(int i = 0; i < size ; ++i){
@@ -132,7 +131,7 @@ class BatchingResultSender {
}
return array;
}
if (byte[].class.isAssignableFrom(arrayClass)) {
byte[] array = new byte[size];
for(int i = 0; i < size ; ++i){
@@ -140,7 +139,7 @@ class BatchingResultSender {
}
return array;
}
if (short[].class.isAssignableFrom(arrayClass)) {
short[] array = new short[size];
for(int i = 0; i < size ; ++i){
@@ -148,7 +147,7 @@ class BatchingResultSender {
}
return array;
}
if (long[].class.isAssignableFrom(arrayClass)) {
long[] array = new long[size];
for(int i = 0; i < size ; ++i){
@@ -156,7 +155,7 @@ class BatchingResultSender {
}
return array;
}
if (char[].class.isAssignableFrom(arrayClass)) {
char[] array = new char[size];
for(int i = 0; i < size ; ++i){
@@ -164,8 +163,8 @@ class BatchingResultSender {
}
return array;
}
return Arrays.copyOfRange((Object[])result, from, to);
}
}

10
src/main/java/org/springframework/data/gemfire/function/DefaultFunctionArgumentResolver.java
View File

@@ -1,11 +1,11 @@
/*
* Copyright 2002-2013 the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
@@ -14,7 +14,7 @@ package org.springframework.data.gemfire.function;
import java.lang.reflect.Method;
import com.gemstone.gemfire.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.FunctionContext;
/**
* @author David Turanski
@@ -38,7 +38,7 @@ class DefaultFunctionArgumentResolver implements FunctionArgumentResolver {
/*
* (non-Javadoc)
*
* @see org.springframework.data.gemfire.function.FunctionArgumentResolver#resolveFunctionArguments(com.gemstone.gemfire.cache.execute.FunctionContext)
* @see org.springframework.data.gemfire.function.FunctionArgumentResolver#resolveFunctionArguments(org.apache.geode.cache.execute.FunctionContext)
*/
@Override
public Object[] resolveFunctionArguments(final FunctionContext functionContext) {

10
src/main/java/org/springframework/data/gemfire/function/FunctionArgumentResolver.java
View File

@@ -1,11 +1,11 @@
/*
* Copyright 2002-2013 the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
@@ -14,7 +14,7 @@ package org.springframework.data.gemfire.function;
import java.lang.reflect.Method;
import com.gemstone.gemfire.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.FunctionContext;
/**
* The FunctionArgumentResolver interface is a Strategy Interface for resolving Function invocation arguments,
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.execute.FunctionContext;
*
* @author David Turanski
* @author John Blum
* @see com.gemstone.gemfire.cache.execute.FunctionContext
* @see org.apache.geode.cache.execute.FunctionContext
* @since 1.3.0
*/
interface FunctionArgumentResolver {

19
src/main/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolver.java
View File

@@ -1,11 +1,11 @@
/*
* Copyright 2002-2013 the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
@@ -18,17 +18,16 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.RegionFunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.cache.partition.PartitionRegionHelper;
import org.springframework.data.gemfire.function.annotation.Filter;
import org.springframework.data.gemfire.function.annotation.RegionData;
import org.springframework.data.gemfire.util.ArrayUtils;
import org.springframework.util.Assert;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.execute.FunctionContext;
import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
import com.gemstone.gemfire.cache.execute.ResultSender;
import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
/**
* @author David Turanski
* @since 1.3.0
@@ -113,7 +112,7 @@ class FunctionContextInjectingArgumentResolver extends PdxFunctionArgumentResolv
/*
* (non-Javadoc)
* @see com.gemstone.gemfire.cache.execute.RegionFunctionContext
* @see org.apache.geode.cache.execute.RegionFunctionContext
*/
private static Region<?, ?> getRegionForContext(RegionFunctionContext regionFunctionContext) {
Region<?, ?> region = regionFunctionContext.getDataSet();

9
src/main/java/org/springframework/data/gemfire/function/FunctionServiceFactoryBean.java
View File

@@ -17,11 +17,10 @@ package org.springframework.data.gemfire.function;
import java.util.List;
import com.gemstone.gemfire.cache.execute.Function;
import com.gemstone.gemfire.cache.execute.FunctionService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionService;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.CollectionUtils;
@@ -33,8 +32,8 @@ import org.springframework.util.CollectionUtils;
* @author John Blum
* @see org.springframework.beans.factory.FactoryBean
* @see org.springframework.beans.factory.InitializingBean
* @see com.gemstone.gemfire.cache.execute.Function
* @see com.gemstone.gemfire.cache.execute.FunctionService
* @see org.apache.geode.cache.execute.Function
* @see org.apache.geode.cache.execute.FunctionService
*/
public class FunctionServiceFactoryBean implements FactoryBean<FunctionService>, InitializingBean {

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

@@ -1,11 +1,11 @@
/*
* Copyright 2002-2013 the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
@@ -21,11 +21,10 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geode.cache.execute.FunctionService;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import com.gemstone.gemfire.cache.execute.FunctionService;
/**
* @author David Turanski
*/

17
src/main/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolver.java
View File

@@ -18,13 +18,12 @@ package org.springframework.data.gemfire.function;
import java.lang.reflect.Method;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.pdx.PdxInstance;
import org.springframework.util.ClassUtils;
import com.gemstone.gemfire.cache.CacheClosedException;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.execute.FunctionContext;
import com.gemstone.gemfire.pdx.PdxInstance;
/**
* The PdxFunctionArgumentResolver class is a Spring Data GemFire FunctionArgumentResolver that automatically resolves
* PDX types when GemFire is configured with read-serialized set to true, but the application domain classes
@@ -32,7 +31,7 @@ import com.gemstone.gemfire.pdx.PdxInstance;
*
* @author John Blum
* @see org.springframework.data.gemfire.function.DefaultFunctionArgumentResolver
* @see com.gemstone.gemfire.pdx.PdxInstance
* @see org.apache.geode.pdx.PdxInstance
* @since 1.5.2
*/
@SuppressWarnings("unused")
@@ -41,7 +40,7 @@ class PdxFunctionArgumentResolver extends DefaultFunctionArgumentResolver {
/*
* (non-Javadoc)
*
* @see com.gemstone.gemfire.cache.execute.FunctionContext
* @see org.apache.geode.cache.execute.FunctionContext
*/
@Override
public Object[] resolveFunctionArguments(final FunctionContext functionContext) {
@@ -79,8 +78,8 @@ class PdxFunctionArgumentResolver extends DefaultFunctionArgumentResolver {
/*
* (non-Javadoc)
*
* @see com.gemstone.gemfire.cache.Cache#getPdxSerializer()
* @see com.gemstone.gemfire.cache.CacheFactory#getAnyInstance()
* @see org.apache.geode.cache.Cache#getPdxSerializer()
* @see org.apache.geode.cache.CacheFactory#getAnyInstance()
*/
boolean isPdxSerializerConfigured() {
try {

21
src/main/java/org/springframework/data/gemfire/function/PojoFunctionWrapper.java
View File

@@ -1,11 +1,11 @@
/*
* Copyright 2002-2013 the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
@@ -16,20 +16,19 @@ import java.lang.reflect.Method;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.springframework.util.ObjectUtils;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
import com.gemstone.gemfire.cache.execute.Function;
import com.gemstone.gemfire.cache.execute.FunctionContext;
import com.gemstone.gemfire.cache.execute.ResultSender;
/**
* Invokes a POJO's given method as a Gemfire remote function.
* If the POJO has a constructor that takes a Map, and the function context is Region, the
* Invokes a POJO's given method as a Gemfire remote function.
* If the POJO has a constructor that takes a Map, and the function context is Region, the
* region will be injected. The delegate class name, the method name, and the method arguments
* are part of a remote function invocation, therefore all arguments must be serializable
* or an alternate serialization method must be used.
* are part of a remote function invocation, therefore all arguments must be serializable
* or an alternate serialization method must be used.
* The delegate class must be the class path of the remote cache(s)
* @author David Turanski
*

19
src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecution.java
View File

@@ -1,11 +1,11 @@
/*
* Copyright 2002-2013 the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
@@ -19,15 +19,14 @@ import java.util.concurrent.TimeUnit;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionException;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.execute.ResultCollector;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import com.gemstone.gemfire.cache.execute.Execution;
import com.gemstone.gemfire.cache.execute.Function;
import com.gemstone.gemfire.cache.execute.FunctionException;
import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.cache.execute.ResultCollector;
/**
* Base class for * Creating a GemFire {@link Execution} using {@link FunctionService}. Protected setters support
* method chaining.
@@ -86,7 +85,7 @@ abstract class AbstractFunctionExecution {
long getTimeout() {
return timeout;
}
<T> Iterable<T> execute() {
return execute(true);
}

17
src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplate.java
View File

@@ -1,11 +1,11 @@
/*
* Copyright 2002-2013 the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
@@ -14,17 +14,16 @@ package org.springframework.data.gemfire.function.execution;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import com.gemstone.gemfire.cache.execute.Function;
import com.gemstone.gemfire.cache.execute.ResultCollector;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.ResultCollector;
/**
* The base class for GemFire FunctionTemplates used to invoke GemFire Functions.
*
* @author David Turanski
* @author John Blum
* @see com.gemstone.gemfire.cache.execute.Function
* @see com.gemstone.gemfire.cache.execute.ResultCollector
* @see org.apache.geode.cache.execute.Function
* @see org.apache.geode.cache.execute.ResultCollector
*/
abstract class AbstractFunctionTemplate implements GemfireFunctionOperations {
@@ -67,7 +66,7 @@ abstract class AbstractFunctionTemplate implements GemfireFunctionOperations {
protected <T> Iterable<T> execute(AbstractFunctionExecution execution) {
return execution.setTimeout(timeout).setResultCollector(resultCollector).execute();
}
protected <T> Iterable<T> execute(AbstractFunctionExecution execution, boolean returnResult) {
return execution.setTimeout(timeout).setResultCollector(resultCollector).execute(returnResult);
}

12
src/main/java/org/springframework/data/gemfire/function/execution/AllMembersFunctionExecution.java
View File

@@ -1,19 +1,19 @@
/*
* Copyright 2002-2013 the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.springframework.data.gemfire.function.execution;
import com.gemstone.gemfire.cache.execute.Execution;
import com.gemstone.gemfire.cache.execute.FunctionService;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionService;
/**
* A FunctionExecution wrapper for onMembers execution
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.execute.FunctionService;
* @since 1.3.0
*/
class AllMembersFunctionExecution extends AbstractFunctionExecution {
@Override
protected Execution getExecution() {
return FunctionService.onMembers();

12
src/main/java/org/springframework/data/gemfire/function/execution/DefaultMemberFunctionExecution.java
View File

@@ -1,26 +1,26 @@
/*
* Copyright 2002-2013 the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.springframework.data.gemfire.function.execution;
import com.gemstone.gemfire.cache.execute.Execution;
import com.gemstone.gemfire.cache.execute.FunctionService;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionService;
/**
* @author David Turanski
*
*/
class DefaultMemberFunctionExecution extends AbstractFunctionExecution {
@Override
protected Execution getExecution() {
return FunctionService.onMember();

21
src/main/java/org/springframework/data/gemfire/function/execution/DistributedMemberFunctionExecution.java
View File

@@ -1,42 +1,41 @@
/*
* Copyright 2002-2013 the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.springframework.data.gemfire.function.execution;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.distributed.DistributedMember;
import org.springframework.util.Assert;
import com.gemstone.gemfire.cache.execute.Execution;
import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.distributed.DistributedMember;
/**
* @author David Turanski
*
*/
class DistributedMemberFunctionExecution extends AbstractFunctionExecution {
private final DistributedMember distributedMember;
/**
*
*
* @param distributedMember
*/
public DistributedMemberFunctionExecution(DistributedMember distributedMember) {
super();
Assert.notNull(distributedMember);
this.distributedMember = distributedMember;
this.distributedMember = distributedMember;
}
@Override
protected Execution getExecution() {
return FunctionService.onMember(this.distributedMember);

20
src/main/java/org/springframework/data/gemfire/function/execution/DistributedMembersFunctionExecution.java
View File

@@ -1,11 +1,11 @@
/*
* Copyright 2002-2013 the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
@@ -14,26 +14,26 @@ package org.springframework.data.gemfire.function.execution;
import java.util.Set;
import com.gemstone.gemfire.cache.execute.Execution;
import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.distributed.DistributedMember;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.distributed.DistributedMember;
/**
* @author David Turanski
*
*/
class DistributedMembersFunctionExecution extends AbstractFunctionExecution {
private final Set<DistributedMember> distributedMembers;
/**
*
*
* @param distributedMembers
*/
public DistributedMembersFunctionExecution(Set<DistributedMember> distributedMembers ) {
super( );
this.distributedMembers = distributedMembers;
this.distributedMembers = distributedMembers;
}
@Override
protected Execution getExecution() {
return FunctionService.onMembers(this.distributedMembers);

Some files were not shown because too many files have changed in this diff Show More