diff --git a/src/main/asciidoc/reference/data.adoc b/src/main/asciidoc/reference/data.adoc index 8ea08eca..d912cc43 100644 --- a/src/main/asciidoc/reference/data.adoc +++ b/src/main/asciidoc/reference/data.adoc @@ -61,7 +61,7 @@ Since 1.1, Spring Data GemFire provides an implementation of the Spring 3.1 http - + ---- diff --git a/src/main/asciidoc/reference/region.adoc b/src/main/asciidoc/reference/region.adoc index e312a523..27fbd758 100644 --- a/src/main/asciidoc/reference/region.adoc +++ b/src/main/asciidoc/reference/region.adoc @@ -703,7 +703,7 @@ class, like so... + [source,xml] ---- - @@ -733,7 +733,7 @@ Expiration attributes on the `AnnotationBasedExpiration` bean by doing the follo - @@ -786,7 +786,7 @@ can be strongly typed. For example (building on the example above)... ---- 600 - #{T(org.springframework.data.gemfire.ExpirationActionType).DESTROY} + #{T(org.springframework.data.gemfire.expiration.ExpirationActionType).DESTROY} #{T(com.gemstone.gemfire.cache.ExpirationAction).INVALIDATE} ... diff --git a/src/main/java/org/springframework/data/gemfire/LocalRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/LocalRegionFactoryBean.java index 1bd9373a..0c1446a1 100644 --- a/src/main/java/org/springframework/data/gemfire/LocalRegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/LocalRegionFactoryBean.java @@ -15,13 +15,12 @@ */ package org.springframework.data.gemfire; -import org.springframework.data.gemfire.support.RegionShortcutWrapper; -import org.springframework.util.Assert; - import com.gemstone.gemfire.cache.DataPolicy; import com.gemstone.gemfire.cache.RegionFactory; import com.gemstone.gemfire.cache.Scope; +import org.springframework.util.Assert; + /** * @author David Turanski * @author John Blum diff --git a/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java index a0a80607..a7f63f01 100644 --- a/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java @@ -18,17 +18,6 @@ package org.springframework.data.gemfire; import java.lang.reflect.Field; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.context.SmartLifecycle; -import org.springframework.core.io.Resource; -import org.springframework.data.gemfire.client.ClientRegionFactoryBean; -import org.springframework.data.gemfire.support.RegionShortcutWrapper; -import org.springframework.util.Assert; -import org.springframework.util.ObjectUtils; -import org.springframework.util.ReflectionUtils; - import com.gemstone.gemfire.cache.AttributesFactory; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheListener; @@ -48,6 +37,16 @@ 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.springframework.beans.factory.DisposableBean; +import org.springframework.context.SmartLifecycle; +import org.springframework.core.io.Resource; +import org.springframework.data.gemfire.client.ClientRegionFactoryBean; +import org.springframework.util.Assert; +import org.springframework.util.ObjectUtils; +import org.springframework.util.ReflectionUtils; + /** * Base class for FactoryBeans used to create GemFire {@link Region}s. Will try * to first locate the region (by name) and, in case none if found, proceed to diff --git a/src/main/java/org/springframework/data/gemfire/support/RegionShortcutWrapper.java b/src/main/java/org/springframework/data/gemfire/RegionShortcutWrapper.java similarity index 98% rename from src/main/java/org/springframework/data/gemfire/support/RegionShortcutWrapper.java rename to src/main/java/org/springframework/data/gemfire/RegionShortcutWrapper.java index 66a99294..8458acf8 100644 --- a/src/main/java/org/springframework/data/gemfire/support/RegionShortcutWrapper.java +++ b/src/main/java/org/springframework/data/gemfire/RegionShortcutWrapper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.data.gemfire.support; - -import org.springframework.util.ObjectUtils; +package org.springframework.data.gemfire; import com.gemstone.gemfire.cache.RegionShortcut; +import org.springframework.util.ObjectUtils; + /** * The RegionShortcutWrapper enum is a Java enumerated type that wraps GemFire's RegionShortcuts * with Spring Data GemFire RegionShortcutWrapper enumerated values. diff --git a/src/main/java/org/springframework/data/gemfire/SubRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/SubRegionFactoryBean.java deleted file mode 100644 index 7d6fac0e..00000000 --- a/src/main/java/org/springframework/data/gemfire/SubRegionFactoryBean.java +++ /dev/null @@ -1,176 +0,0 @@ -/* - * Copyright 2010-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; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.BeanInitializationException; -import org.springframework.beans.factory.FactoryBean; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.util.Assert; -import org.springframework.util.ObjectUtils; - -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.wan.GatewaySender; - -/** - * FactoryBean for creating a Gemfire sub-Regions. - * - * @author David Turanski - * @author John Blum - * @param Region Key Type - * @param Region Value Type - * @deprecated as Spring Data GemFire 1.4.0. Use Region type specific FactoryBeans - * (e.g. ReplicatedRegionFactoryBean) instead. - */ -@Deprecated -@SuppressWarnings({"deprecation", "unused"}) -public class SubRegionFactoryBean extends com.gemstone.gemfire.cache.AttributesFactory - implements FactoryBean>, InitializingBean { - - protected final Log log = LogFactory.getLog(getClass()); - - private boolean lookupOnly; - - private CacheListener[] cacheListeners; - - private Object[] asyncEventQueues; - private Object[] gatewaySenders; - - private Region parentRegion; - private Region subRegion; - - private String name; - private String regionName; - - @Override - public Region getObject() throws Exception { - return this.subRegion; - } - - @Override - public Class getObjectType() { - // TODO perhaps this should be 'return (subRegion != null ? subRegion.getClass() : Region.class);' for consistency. - return Region.class; - } - - @Override - public boolean isSingleton() { - return true; - } - - @Override - public void afterPropertiesSet() throws Exception { - Assert.notNull(parentRegion, "The parent Region cannot be null."); - - this.subRegion = parentRegion.getSubregion(regionName); - - if (this.subRegion == null) { - if (lookupOnly) { - throw new BeanInitializationException(String.format("Cannot find Region [%1$s] in Cache %2$s", - regionName, parentRegion.getRegionService())); - } - else { - log.debug(String.format("Creating sub-Region of [%1$s] with name [%2$s]...", - (parentRegion.getFullPath() != null ? parentRegion.getFullPath() : parentRegion.getName()), - regionName)); - - if (!ObjectUtils.isEmpty(asyncEventQueues)) { - for (Object asyncEventQueue : asyncEventQueues) { - addAsyncEventQueueId(((AsyncEventQueue) asyncEventQueue).getId()); - } - } - - if (!ObjectUtils.isEmpty(cacheListeners)) { - for (CacheListener listener : cacheListeners) { - addCacheListener(listener); - } - } - - if (!ObjectUtils.isEmpty(gatewaySenders)) { - for (Object gatewaySender : gatewaySenders) { - addGatewaySenderId(((GatewaySender) gatewaySender).getId()); - } - } - - this.subRegion = this.parentRegion.createSubregion(regionName, create()); - } - } - } - - /** - * - * @param asyncEventQueues defined as Object for backward compatibility with Gemfire 6. - */ - public void setAsyncEventQueues(Object[] asyncEventQueues) { - this.asyncEventQueues = asyncEventQueues; - } - - /** - * Sets the cache listeners used for the region used by this factory. Used - * only when a new region is created. Overrides the settings specified - * through setAttributes(com.gemstone.gemfire.cache.RegionAttributes). - * - * @param cacheListeners the cacheListeners to set on a newly created region - */ - public void setCacheListeners(CacheListener[] cacheListeners) { - this.cacheListeners = cacheListeners; - } - - public void setGatewaySenders(Object[] gatewaySenders) { - this.gatewaySenders = gatewaySenders; - } - - /** - * Set to true if the subregion should already exist, e.g., specified by - * <lookup-region> - * - * @param lookupOnly a boolean value indicating whether this Subregion should be looked up instead of created. - */ - public void setLookupOnly(boolean lookupOnly) { - this.lookupOnly = lookupOnly; - } - - /** - * Set the bean name - the same as the Subregion full path. - * - * @param name the name of this Subregion bean in the Spring context. - */ - public void setName(String name) { - this.name = name; - } - - /** - * Set the simple name of this Subregion. - * - * @param regionName the simple name of this Subregion. - */ - public void setRegionName(String regionName) { - this.regionName = regionName; - } - - /** - * Set the parent Region. - * - * @param parent a reference to the parent Region. - */ - public void setParent(Region parent) { - this.parentRegion = parent; - } - -} diff --git a/src/main/java/org/springframework/data/gemfire/support/GemfireCache.java b/src/main/java/org/springframework/data/gemfire/cache/GemfireCache.java similarity index 99% rename from src/main/java/org/springframework/data/gemfire/support/GemfireCache.java rename to src/main/java/org/springframework/data/gemfire/cache/GemfireCache.java index c4a3a29a..2e10c1c4 100644 --- a/src/main/java/org/springframework/data/gemfire/support/GemfireCache.java +++ b/src/main/java/org/springframework/data/gemfire/cache/GemfireCache.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire.support; +package org.springframework.data.gemfire.cache; import java.util.concurrent.Callable; diff --git a/src/main/java/org/springframework/data/gemfire/support/GemfireCacheManager.java b/src/main/java/org/springframework/data/gemfire/cache/GemfireCacheManager.java similarity index 98% rename from src/main/java/org/springframework/data/gemfire/support/GemfireCacheManager.java rename to src/main/java/org/springframework/data/gemfire/cache/GemfireCacheManager.java index 42b8e3af..14b1469a 100644 --- a/src/main/java/org/springframework/data/gemfire/support/GemfireCacheManager.java +++ b/src/main/java/org/springframework/data/gemfire/cache/GemfireCacheManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire.support; +package org.springframework.data.gemfire.cache; import java.util.Collection; import java.util.HashSet; @@ -141,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 org.springframework.data.gemfire.support.GemfireCache + * @see GemfireCache * @see com.gemstone.gemfire.cache.Region */ protected GemfireCache newGemfireCache(Region region) { diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java index edc3f8bf..3f6ff807 100644 --- a/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java @@ -16,6 +16,18 @@ 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.springframework.beans.BeansException; @@ -31,18 +43,6 @@ import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; -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; - /** * Client extension for GemFire Regions. * diff --git a/src/main/java/org/springframework/data/gemfire/ClientRegionShortcutConverter.java b/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverter.java similarity index 98% rename from src/main/java/org/springframework/data/gemfire/ClientRegionShortcutConverter.java rename to src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverter.java index c120a988..0ee674a2 100644 --- a/src/main/java/org/springframework/data/gemfire/ClientRegionShortcutConverter.java +++ b/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.client; import org.springframework.core.convert.converter.Converter; diff --git a/src/main/java/org/springframework/data/gemfire/support/ClientRegionShortcutWrapper.java b/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapper.java similarity index 98% rename from src/main/java/org/springframework/data/gemfire/support/ClientRegionShortcutWrapper.java rename to src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapper.java index 5e58d266..292115f5 100644 --- a/src/main/java/org/springframework/data/gemfire/support/ClientRegionShortcutWrapper.java +++ b/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.data.gemfire.support; - -import org.springframework.util.ObjectUtils; +package org.springframework.data.gemfire.client; import com.gemstone.gemfire.cache.client.ClientRegionShortcut; +import org.springframework.util.ObjectUtils; + /** * The ClientRegionShortcutWrapper enum is a Java enumerated type that wraps GemFire's ClientRegionShortcuts * with Spring Data GemFire ClientRegionShortcutWrapper enumerated values. diff --git a/src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java b/src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java index 4bb4638d..429ec29f 100644 --- a/src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java +++ b/src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java @@ -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,6 +16,14 @@ 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.springframework.beans.BeansException; @@ -26,14 +34,6 @@ import org.springframework.data.gemfire.support.ListRegionsOnServerFunction; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; -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; - /** * A Spring {@link BeanFactoryPostProcessor} used to register a Client Region Proxy bean for each Region * accessible to a GemFire DataSource. If the Region is already defined, the bean definition will not be overridden. diff --git a/src/main/java/org/springframework/data/gemfire/client/Interest.java b/src/main/java/org/springframework/data/gemfire/client/Interest.java index 120c1c92..f14ffeeb 100644 --- a/src/main/java/org/springframework/data/gemfire/client/Interest.java +++ b/src/main/java/org/springframework/data/gemfire/client/Interest.java @@ -16,15 +16,15 @@ package org.springframework.data.gemfire.client; +import com.gemstone.gemfire.cache.InterestResultPolicy; + import org.springframework.beans.factory.InitializingBean; import org.springframework.core.Constants; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.InterestResultPolicy; - /** * The Interest class holds details for registering a client interest. - * + * * @author Costin Leau * @author John Blum * @see org.springframework.beans.factory.InitializingBean @@ -85,7 +85,7 @@ public class Interest implements InitializingBean { /** * Returns the key of interest. - * + * * @return the key */ public K getKey() { @@ -94,7 +94,7 @@ public class Interest implements InitializingBean { /** * Sets the key of interest. - * + * * @param key the key to set */ public void setKey(K key) { @@ -103,7 +103,7 @@ public class Interest implements InitializingBean { /** * Returns the interest policy. - * + * * @return the policy */ public InterestResultPolicy getPolicy() { @@ -114,7 +114,7 @@ public class Interest implements InitializingBean { * Sets the interest policy. The argument is set as an Object * to be able to accept both InterestResultType instances but also * Strings (for XML configurations). - * + * * @param policy the policy to set */ public void setPolicy(Object policy) { @@ -132,7 +132,7 @@ public class Interest implements InitializingBean { /** * Returns the interest durability. - * + * * @return the durable */ public boolean isDurable() { @@ -141,7 +141,7 @@ public class Interest implements InitializingBean { /** * Sets the interest durability. - * + * * @param durable the durable to set */ public void setDurable(boolean durable) { @@ -150,7 +150,7 @@ public class Interest implements InitializingBean { /** * Returns the type of values received by the listener. - * + * * @return the receiveValues */ public boolean isReceiveValues() { @@ -159,7 +159,7 @@ public class Interest implements InitializingBean { /** * Switches between the different entities received by the listener. - * + * * @param receiveValues the receiveValues to set */ public void setReceiveValues(boolean receiveValues) { diff --git a/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyConverter.java b/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyConverter.java index 7aead724..06c05980 100644 --- a/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyConverter.java +++ b/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyConverter.java @@ -16,10 +16,10 @@ package org.springframework.data.gemfire.client; -import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; - import com.gemstone.gemfire.cache.InterestResultPolicy; +import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; + /** * The InterestResultPolicyConverter class is a Spring Converter and JavaBeans PropertyEditor capable of converting * a String into a GemFire InterestResultPolicyConverter. diff --git a/src/main/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapter.java b/src/main/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapter.java index a189e516..d421757a 100644 --- a/src/main/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapter.java +++ b/src/main/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapter.java @@ -21,12 +21,12 @@ import java.net.InetSocketAddress; import java.util.Collection; import java.util.List; -import org.springframework.data.gemfire.util.SpringUtils; -import org.springframework.util.Assert; - import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.query.QueryService; +import org.springframework.data.gemfire.util.SpringUtils; +import org.springframework.util.Assert; + /** * The DefaultableDelegatingPoolAdapter class is a wrapper class around Pool allowing default configuration property * values to be providing in the case that the Pool's setting were null. diff --git a/src/main/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapter.java b/src/main/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapter.java index b5abd8a0..428b7953 100644 --- a/src/main/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapter.java +++ b/src/main/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapter.java @@ -21,12 +21,12 @@ import java.net.InetSocketAddress; import java.util.Collections; import java.util.List; -import org.springframework.data.gemfire.GemfireUtils; -import org.springframework.data.gemfire.client.PoolAdapter; - import com.gemstone.gemfire.cache.client.PoolFactory; import com.gemstone.gemfire.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} * interface and extension of {@link PoolAdapter} providing default factory values for all configuration properties diff --git a/src/main/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessor.java b/src/main/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessor.java index 1c638377..78ad3b19 100644 --- a/src/main/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessor.java +++ b/src/main/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessor.java @@ -29,10 +29,10 @@ 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.EvictionActionConverter; -import org.springframework.data.gemfire.EvictionPolicyConverter; -import org.springframework.data.gemfire.EvictionPolicyType; -import org.springframework.data.gemfire.ExpirationActionConverter; +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; diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/FunctionServiceParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/FunctionServiceParser.java index eba319b0..43a30115 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/FunctionServiceParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/FunctionServiceParser.java @@ -21,7 +21,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.data.gemfire.FunctionServiceFactoryBean; +import org.springframework.data.gemfire.function.FunctionServiceFactoryBean; import org.springframework.data.gemfire.util.SpringUtils; import org.springframework.util.xml.DomUtils; import org.w3c.dom.Element; @@ -32,7 +32,7 @@ import org.w3c.dom.Element; * @author David Turanski * @author John Blum * @see org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser - * @see org.springframework.data.gemfire.FunctionServiceFactoryBean + * @see FunctionServiceFactoryBean */ class FunctionServiceParser extends AbstractSimpleBeanDefinitionParser { diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/LookupRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/LookupRegionParser.java index 1bff88a5..68b1d54b 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/LookupRegionParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/LookupRegionParser.java @@ -16,15 +16,15 @@ package org.springframework.data.gemfire.config.xml; +import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; +import com.gemstone.gemfire.cache.wan.GatewaySender; + import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.LookupRegionFactoryBean; import org.springframework.util.xml.DomUtils; import org.w3c.dom.Element; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.wan.GatewaySender; - /** * Bean definition parser for the <gfe:lookup-region> SDG XML namespace (XSD) element. * diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java b/src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java index 8edbd517..255cd75d 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java @@ -31,10 +31,10 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.ManagedList; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.core.Conventions; -import org.springframework.data.gemfire.EvictionAttributesFactoryBean; -import org.springframework.data.gemfire.ExpirationAttributesFactoryBean; import org.springframework.data.gemfire.GemfireUtils; import org.springframework.data.gemfire.SubscriptionAttributesFactoryBean; +import org.springframework.data.gemfire.eviction.EvictionAttributesFactoryBean; +import org.springframework.data.gemfire.expiration.ExpirationAttributesFactoryBean; import org.springframework.data.gemfire.util.SpringUtils; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; diff --git a/src/main/java/org/springframework/data/gemfire/EvictionActionConverter.java b/src/main/java/org/springframework/data/gemfire/eviction/EvictionActionConverter.java similarity index 94% rename from src/main/java/org/springframework/data/gemfire/EvictionActionConverter.java rename to src/main/java/org/springframework/data/gemfire/eviction/EvictionActionConverter.java index 8fadd2fd..0d7c4d02 100644 --- a/src/main/java/org/springframework/data/gemfire/EvictionActionConverter.java +++ b/src/main/java/org/springframework/data/gemfire/eviction/EvictionActionConverter.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.data.gemfire; - -import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; +package org.springframework.data.gemfire.eviction; import com.gemstone.gemfire.cache.EvictionAction; +import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; + /** * The EvictionActionConverter class is a Spring Converter and JavaBeans PropertyEditor that converts * an Object value into an instance of GemFire EvictionAction. * * @author John Blum - * @see org.springframework.data.gemfire.EvictionActionType + * @see EvictionActionType * @see org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport * @see com.gemstone.gemfire.cache.EvictionAction * @since 1.6.0 diff --git a/src/main/java/org/springframework/data/gemfire/EvictionActionType.java b/src/main/java/org/springframework/data/gemfire/eviction/EvictionActionType.java similarity index 98% rename from src/main/java/org/springframework/data/gemfire/EvictionActionType.java rename to src/main/java/org/springframework/data/gemfire/eviction/EvictionActionType.java index eddd6dff..0857a285 100644 --- a/src/main/java/org/springframework/data/gemfire/EvictionActionType.java +++ b/src/main/java/org/springframework/data/gemfire/eviction/EvictionActionType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.eviction; import com.gemstone.gemfire.cache.EvictionAction; diff --git a/src/main/java/org/springframework/data/gemfire/EvictionAttributesFactoryBean.java b/src/main/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBean.java similarity index 99% rename from src/main/java/org/springframework/data/gemfire/EvictionAttributesFactoryBean.java rename to src/main/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBean.java index 84cee6a7..8b099bf0 100644 --- a/src/main/java/org/springframework/data/gemfire/EvictionAttributesFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBean.java @@ -14,10 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire; - -import org.springframework.beans.factory.FactoryBean; -import org.springframework.beans.factory.InitializingBean; +package org.springframework.data.gemfire.eviction; import com.gemstone.gemfire.cache.EvictionAction; import com.gemstone.gemfire.cache.EvictionAttributes; @@ -25,6 +22,9 @@ 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.springframework.beans.factory.FactoryBean; +import org.springframework.beans.factory.InitializingBean; + /** * Simple utility class used for defining nested factory-method like definitions w/o polluting the container with useless beans. * diff --git a/src/main/java/org/springframework/data/gemfire/EvictionPolicyConverter.java b/src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyConverter.java similarity index 97% rename from src/main/java/org/springframework/data/gemfire/EvictionPolicyConverter.java rename to src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyConverter.java index 4a2c5073..9489d1f4 100644 --- a/src/main/java/org/springframework/data/gemfire/EvictionPolicyConverter.java +++ b/src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.eviction; import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; diff --git a/src/main/java/org/springframework/data/gemfire/EvictionPolicyType.java b/src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyType.java similarity index 98% rename from src/main/java/org/springframework/data/gemfire/EvictionPolicyType.java rename to src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyType.java index dbf3c8b6..92a198a1 100644 --- a/src/main/java/org/springframework/data/gemfire/EvictionPolicyType.java +++ b/src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyType.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.eviction; import com.gemstone.gemfire.cache.EvictionAlgorithm; /** * The EvictionPolicyType enum is an enumeration of all GemFire Eviction policies, where the Eviction 'policy' * is a combination of the Eviction algorithm mixed with the monitored resource (e.g. such as JVM HEAP memory). - * + * * @author Costin Leau * @author John Blum * @see com.gemstone.gemfire.cache.EvictionAlgorithm diff --git a/src/main/java/org/springframework/data/gemfire/support/AnnotationBasedExpiration.java b/src/main/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpiration.java similarity index 92% rename from src/main/java/org/springframework/data/gemfire/support/AnnotationBasedExpiration.java rename to src/main/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpiration.java index c2a47927..f9a33e9c 100644 --- a/src/main/java/org/springframework/data/gemfire/support/AnnotationBasedExpiration.java +++ b/src/main/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpiration.java @@ -14,11 +14,16 @@ * limitations under the License. */ -package org.springframework.data.gemfire.support; +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.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -29,8 +34,6 @@ import org.springframework.context.expression.EnvironmentAccessor; import org.springframework.context.expression.MapAccessor; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.convert.ConversionService; -import org.springframework.data.gemfire.ExpirationActionConverter; -import org.springframework.data.gemfire.ExpirationActionType; import org.springframework.expression.EvaluationContext; import org.springframework.expression.EvaluationException; import org.springframework.expression.Expression; @@ -42,11 +45,6 @@ import org.springframework.expression.spel.support.StandardTypeLocator; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; -import com.gemstone.gemfire.cache.CustomExpiry; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.Region; - /** * The AnnotationBasedExpiration class is an implementation of GemFire's CustomExpiry interface that determines * the Time-To-Live (TTL) or Idle-Timeout (TTI) expiration policy of a Region entry by introspecting the Region @@ -57,10 +55,10 @@ import com.gemstone.gemfire.cache.Region; * @see java.lang.annotation.Annotation * @see org.springframework.beans.factory.BeanFactory * @see org.springframework.beans.factory.BeanFactoryAware - * @see org.springframework.data.gemfire.ExpirationActionType - * @see org.springframework.data.gemfire.support.Expiration - * @see org.springframework.data.gemfire.support.IdleTimeoutExpiration - * @see org.springframework.data.gemfire.support.TimeToLiveExpiration + * @see ExpirationActionType + * @see Expiration + * @see IdleTimeoutExpiration + * @see TimeToLiveExpiration * @see com.gemstone.gemfire.cache.CustomExpiry * @see com.gemstone.gemfire.cache.ExpirationAction * @see com.gemstone.gemfire.cache.ExpirationAttributes @@ -103,8 +101,8 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * @param the class type of the Region Entry Key. * @param the class type of the Region Entry Value. * @return an AnnotationBasedExpiration instance to process Idle Timeout Expiration annotated Region Entries. - * @see org.springframework.data.gemfire.support.AnnotationBasedExpiration - * @see org.springframework.data.gemfire.support.IdleTimeoutExpiration + * @see AnnotationBasedExpiration + * @see IdleTimeoutExpiration * @see #forIdleTimeout(com.gemstone.gemfire.cache.ExpirationAttributes) */ public static AnnotationBasedExpiration forIdleTimeout() { @@ -120,8 +118,8 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * @param defaultExpirationAttributes ExpirationAttributes used by default if no Expiration policy was specified * on the Region Entry. * @return an AnnotationBasedExpiration instance to process Idle Timeout Expiration annotated Region Entries. - * @see org.springframework.data.gemfire.support.AnnotationBasedExpiration - * @see org.springframework.data.gemfire.support.IdleTimeoutExpiration + * @see AnnotationBasedExpiration + * @see IdleTimeoutExpiration */ public static AnnotationBasedExpiration forIdleTimeout(ExpirationAttributes defaultExpirationAttributes) { return new AnnotationBasedExpiration(defaultExpirationAttributes) { @@ -139,8 +137,8 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * @param the class type of the Region Entry Key. * @param the class type of the Region Entry Value. * @return an AnnotationBasedExpiration instance to process Time-To-Live Expiration annotated Region Entries. - * @see org.springframework.data.gemfire.support.AnnotationBasedExpiration - * @see org.springframework.data.gemfire.support.TimeToLiveExpiration + * @see AnnotationBasedExpiration + * @see TimeToLiveExpiration * @see #forTimeToLive(com.gemstone.gemfire.cache.ExpirationAttributes) */ public static AnnotationBasedExpiration forTimeToLive() { @@ -156,8 +154,8 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * @param defaultExpirationAttributes ExpirationAttributes used by default if no Expiration policy was specified * on the Region Entry. * @return an AnnotationBasedExpiration instance to process Time-To-Live Expiration annotated Region Entries. - * @see org.springframework.data.gemfire.support.AnnotationBasedExpiration - * @see org.springframework.data.gemfire.support.TimeToLiveExpiration + * @see AnnotationBasedExpiration + * @see TimeToLiveExpiration */ public static AnnotationBasedExpiration forTimeToLive(ExpirationAttributes defaultExpirationAttributes) { return new AnnotationBasedExpiration(defaultExpirationAttributes) { @@ -268,7 +266,7 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * @param entry the Region entry used as the source of the expiration meta-data. * @return ExpirationMetaData extracted from the Region entry. * @throws NullPointerException if the Region.Entry, Region or the Region's attributes are null. - * @see org.springframework.data.gemfire.support.AnnotationBasedExpiration.ExpirationMetaData + * @see AnnotationBasedExpiration.ExpirationMetaData */ protected ExpirationMetaData getExpirationMetaData(Region.Entry entry) { return (isExpirationConfigured(entry) ? ExpirationMetaData.from(getExpiration(entry)) : null); @@ -284,7 +282,7 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * @return a custom ExpirationAttributes configured with the application domain object specific expiration policy * or the default expiration settings if the application domain object has not been annotated with custom * expiration meta-data. - * @see org.springframework.data.gemfire.support.AnnotationBasedExpiration.ExpirationMetaData + * @see AnnotationBasedExpiration.ExpirationMetaData * @see com.gemstone.gemfire.cache.ExpirationAttributes * @see #getDefaultExpirationAttributes() */ @@ -298,7 +296,7 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * * @param entry the Region.Entry to evaluate for the presence of the Expiration Annotation. * @return a boolean value indicating whether the Region Entry has been annotated with @Expiration. - * @see org.springframework.data.gemfire.support.Expiration + * @see Expiration * @see #isAnnotationPresent(Object, Class) */ protected boolean isExpirationConfigured(Region.Entry entry) { @@ -311,7 +309,7 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * @param entry the Region.Entry from which to extract the Expiration Annotation meta-data. * @return the Expiration Annotation meta-data for the given Region Entry or {@code null} * if the Region Entry has not been annotated with @Expiration. - * @see org.springframework.data.gemfire.support.Expiration + * @see Expiration * @see #getAnnotation(Object, Class) */ protected Expiration getExpiration(Region.Entry entry) { @@ -323,7 +321,7 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * * @param entry the Region.Entry to evaluate for the presence of the IdleTimeoutExpiration Annotation. * @return a boolean value indicating whether the Region Entry has been annotated with @IdleTimeoutExpiration. - * @see org.springframework.data.gemfire.support.IdleTimeoutExpiration + * @see IdleTimeoutExpiration * @see #isAnnotationPresent(Object, Class) */ protected boolean isIdleTimeoutConfigured(Region.Entry entry) { @@ -336,7 +334,7 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * @param entry the Region.Entry from which to extract the IdleTimeoutExpiration Annotation meta-data. * @return the IdleTimeoutExpiration Annotation meta-data for the given Region Entry or {@code null} * if the Region Entry has not been annotated with @IdleTimeoutExpiration. - * @see org.springframework.data.gemfire.support.IdleTimeoutExpiration + * @see IdleTimeoutExpiration * @see #getAnnotation(Object, Class) */ protected IdleTimeoutExpiration getIdleTimeout(Region.Entry entry) { @@ -348,7 +346,7 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * * @param entry the Region.Entry to evaluate for the presence of the TimeToLiveExpiration Annotation. * @return a boolean value indicating whether the Region Entry has been annotated with @TimeToLiveExpiration. - * @see org.springframework.data.gemfire.support.TimeToLiveExpiration + * @see TimeToLiveExpiration * @see #isAnnotationPresent(Object, Class) */ protected boolean isTimeToLiveConfigured(Region.Entry entry) { @@ -361,7 +359,7 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * @param entry the Region.Entry from which to extract the TimeToLiveExpiration Annotation meta-data. * @return the TimeToLiveExpiration Annotation meta-data for the given Region Entry or {@code null} * if the Region Entry has not been annotated with @TimeToLiveExpiration. - * @see org.springframework.data.gemfire.support.TimeToLiveExpiration + * @see TimeToLiveExpiration * @see #getAnnotation(Object, Class) */ protected TimeToLiveExpiration getTimeToLive(Region.Entry entry) { diff --git a/src/main/java/org/springframework/data/gemfire/support/Expiration.java b/src/main/java/org/springframework/data/gemfire/expiration/Expiration.java similarity index 92% rename from src/main/java/org/springframework/data/gemfire/support/Expiration.java rename to src/main/java/org/springframework/data/gemfire/expiration/Expiration.java index 4b31ad6e..36790e64 100644 --- a/src/main/java/org/springframework/data/gemfire/support/Expiration.java +++ b/src/main/java/org/springframework/data/gemfire/expiration/Expiration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire.support; +package org.springframework.data.gemfire.expiration; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -28,7 +28,7 @@ import java.lang.annotation.Target; * to express their general expiration policy. * * @author John Blum - * @see org.springframework.data.gemfire.ExpirationActionType + * @see ExpirationActionType * @since 1.7.0 */ @Documented diff --git a/src/main/java/org/springframework/data/gemfire/ExpirationActionConverter.java b/src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionConverter.java similarity index 90% rename from src/main/java/org/springframework/data/gemfire/ExpirationActionConverter.java rename to src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionConverter.java index 615e6beb..ec240354 100644 --- a/src/main/java/org/springframework/data/gemfire/ExpirationActionConverter.java +++ b/src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionConverter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.data.gemfire; - -import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; +package org.springframework.data.gemfire.expiration; import com.gemstone.gemfire.cache.ExpirationAction; +import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; + /** * The ExpirationActionTypeConverter class is a Spring Converter used to convert a String value into * a corresponding ExpirationActionType enumerated value. @@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache.ExpirationAction; * @author John Blum * @see java.beans.PropertyEditorSupport * @see org.springframework.core.convert.converter.Converter - * @see org.springframework.data.gemfire.ExpirationActionType + * @see ExpirationActionType * @since 1.6.0 */ public class ExpirationActionConverter extends AbstractPropertyEditorConverterSupport { @@ -38,7 +38,7 @@ public class ExpirationActionConverter extends AbstractPropertyEditorConverterSu * @param source the String to convert into an GemFire ExpirationAction. * @return an GemFire ExpirationAction value for the given String. * @throws java.lang.IllegalArgumentException if the String is not a valid GemFire ExpirationAction. - * @see org.springframework.data.gemfire.ExpirationActionType#valueOfIgnoreCase(String) + * @see ExpirationActionType#valueOfIgnoreCase(String) * @see com.gemstone.gemfire.cache.ExpirationAction */ @Override diff --git a/src/main/java/org/springframework/data/gemfire/ExpirationActionType.java b/src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionType.java similarity index 98% rename from src/main/java/org/springframework/data/gemfire/ExpirationActionType.java rename to src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionType.java index ae73ec6a..32bf3cd6 100644 --- a/src/main/java/org/springframework/data/gemfire/ExpirationActionType.java +++ b/src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.expiration; import com.gemstone.gemfire.cache.ExpirationAction; diff --git a/src/main/java/org/springframework/data/gemfire/ExpirationAttributesFactoryBean.java b/src/main/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBean.java similarity index 95% rename from src/main/java/org/springframework/data/gemfire/ExpirationAttributesFactoryBean.java rename to src/main/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBean.java index d1068c83..f413dab2 100644 --- a/src/main/java/org/springframework/data/gemfire/ExpirationAttributesFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBean.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.data.gemfire; - -import org.springframework.beans.factory.FactoryBean; -import org.springframework.beans.factory.InitializingBean; +package org.springframework.data.gemfire.expiration; import com.gemstone.gemfire.cache.ExpirationAction; import com.gemstone.gemfire.cache.ExpirationAttributes; +import org.springframework.beans.factory.FactoryBean; +import org.springframework.beans.factory.InitializingBean; + /** * The ExpirationAttributesFactoryBean class is a Spring FactoryBean used to create GemFire ExpirationAttributes * to specify Expiration policies for Region Time-to-Live (TTL) and Idle-Timeouts (TTI) as well as @@ -79,7 +79,7 @@ public class ExpirationAttributesFactoryBean implements FactoryBean T[] asArray(T... elements) { return elements; } @@ -45,7 +46,7 @@ public abstract class ArrayUtils { * @return the first element in the array or {@literal null} if the array is null or empty. * @see #getFirst(Object[], Object) */ - public static T getFirst(T... array) { + public static T getFirst(T[] array) { return getFirst(array, null); } diff --git a/src/test/java/org/springframework/data/gemfire/support/RegionShortcutWrapperTest.java b/src/test/java/org/springframework/data/gemfire/RegionShortcutWrapperTest.java similarity index 99% rename from src/test/java/org/springframework/data/gemfire/support/RegionShortcutWrapperTest.java rename to src/test/java/org/springframework/data/gemfire/RegionShortcutWrapperTest.java index 425112ae..a64bbe0d 100644 --- a/src/test/java/org/springframework/data/gemfire/support/RegionShortcutWrapperTest.java +++ b/src/test/java/org/springframework/data/gemfire/RegionShortcutWrapperTest.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package org.springframework.data.gemfire.support; +package org.springframework.data.gemfire; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import org.junit.Test; - import com.gemstone.gemfire.cache.RegionShortcut; +import org.junit.Test; + /** * The RegionShortcutWrapperTest class is a test suite of test cases testing the contract and functionality of the * RegionShortcutWrapper enum class type. * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.support.RegionShortcutWrapper + * @see RegionShortcutWrapper * @see com.gemstone.gemfire.cache.RegionShortcut * @since 1.4.0 */ @@ -299,5 +299,4 @@ public class RegionShortcutWrapperTest { assertTrue(RegionShortcutWrapper.REPLICATE_PROXY.isReplicate()); assertFalse(RegionShortcutWrapper.UNSPECIFIED.isReplicate()); } - } diff --git a/src/test/java/org/springframework/data/gemfire/SubRegionTest.java b/src/test/java/org/springframework/data/gemfire/SubRegionTest.java deleted file mode 100644 index 8e224610..00000000 --- a/src/test/java/org/springframework/data/gemfire/SubRegionTest.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright 2010-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; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; - -import org.junit.Test; - -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.Region; - -/** - * - * @author David Turanski - * @author John Blum - */ -public class SubRegionTest extends RecreatingContextTest { - @Override - protected String location() { - return "org/springframework/data/gemfire/basic-subregion.xml"; - } - - @Test - public void testAll() throws Exception { - testBasic(); - testContext(); - testChildOnly(); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - private void testBasic() throws Exception { - CacheFactoryBean cacheFactoryBean = new CacheFactoryBean(); - - cacheFactoryBean.setBeanName("gemfireCache"); - cacheFactoryBean.setUseBeanFactoryLocator(false); - cacheFactoryBean.afterPropertiesSet(); - - GemFireCache cache = cacheFactoryBean.getObject(); - - assertNotNull(cache); - - RegionFactoryBean regionFactory = new ReplicatedRegionFactoryBean(); - - regionFactory.setCache(cache); - regionFactory.setName("Outer"); - regionFactory.afterPropertiesSet(); - - Region outer = regionFactory.getObject(); - - assertNotNull(outer); - assertEquals("Outer", outer.getName()); - assertEquals("/Outer", outer.getFullPath()); - assertSame(outer, cache.getRegion("/Outer")); - - RegionFactoryBean subRegionFactory = new RegionFactoryBean() { }; - - subRegionFactory.setCache(cache); - subRegionFactory.setParent(outer); - subRegionFactory.setName("/Outer/Inner"); - subRegionFactory.setRegionName("Inner"); - subRegionFactory.afterPropertiesSet(); - - Region inner = subRegionFactory.getObject(); - - assertNotNull(inner); - assertSame(inner, outer.getSubregion("Inner")); - assertSame(inner, cache.getRegion("/Outer/Inner")); - } - - @SuppressWarnings("rawtypes") - private void testContext() throws Exception { - Region parent = ctx.getBean("parent", Region.class); - Region child = ctx.getBean("/parent/child", Region.class); - assertNotNull(parent.getSubregion("child")); - assertSame(child, parent.getSubregion("child")); - assertEquals("/parent/child", child.getFullPath()); - } - - @SuppressWarnings("rawtypes") - public void testChildOnly() throws Exception { - Region child = ctx.getBean("/parent/child", Region.class); - assertEquals("/parent/child", child.getFullPath()); - } -} diff --git a/src/test/java/org/springframework/data/gemfire/support/CachingWithGemFireIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java similarity index 99% rename from src/test/java/org/springframework/data/gemfire/support/CachingWithGemFireIntegrationTest.java rename to src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java index ae563fbd..b42be55e 100644 --- a/src/test/java/org/springframework/data/gemfire/support/CachingWithGemFireIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire.support; +package org.springframework.data.gemfire.cache; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -22,9 +22,12 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.util.Map; + import javax.annotation.PostConstruct; import javax.annotation.Resource; +import com.gemstone.gemfire.cache.Region; + import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -34,8 +37,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.Region; - /** * The CachingWithGemFireIntegrationTest class is a test suite of test cases testing the contract and functionality * of Spring Framework's Cache Abstraction using GemFire as a caching provider applied with Spring Data GemFire. @@ -157,5 +158,4 @@ public class CachingWithGemFireIntegrationTest { return localCacheMiss; } } - } diff --git a/src/test/java/org/springframework/data/gemfire/support/ClientCacheManagerTest.java b/src/test/java/org/springframework/data/gemfire/cache/ClientCacheManagerTest.java similarity index 88% rename from src/test/java/org/springframework/data/gemfire/support/ClientCacheManagerTest.java rename to src/test/java/org/springframework/data/gemfire/cache/ClientCacheManagerTest.java index 494b0faa..eb35e8dd 100644 --- a/src/test/java/org/springframework/data/gemfire/support/ClientCacheManagerTest.java +++ b/src/test/java/org/springframework/data/gemfire/cache/ClientCacheManagerTest.java @@ -10,7 +10,7 @@ * 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.support; +package org.springframework.data.gemfire.cache; import static org.junit.Assert.assertNotNull; @@ -25,10 +25,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @author John Blum */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration("/org/springframework/data/gemfire/support/cache-manager-client-cache.xml") +@ContextConfiguration("/org/springframework/data/gemfire/cache/cache-manager-client-cache.xml") public class ClientCacheManagerTest { - @Autowired + @Autowired GemfireCacheManager cacheManager; @Test diff --git a/src/test/java/org/springframework/data/gemfire/support/CompoundCachePutCacheEvictIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java similarity index 98% rename from src/test/java/org/springframework/data/gemfire/support/CompoundCachePutCacheEvictIntegrationTests.java rename to src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java index af5784dd..76de0b71 100644 --- a/src/test/java/org/springframework/data/gemfire/support/CompoundCachePutCacheEvictIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java @@ -15,7 +15,7 @@ * */ -package org.springframework.data.gemfire.support; +package org.springframework.data.gemfire.cache; import static org.assertj.core.api.Assertions.assertThat; @@ -68,8 +68,8 @@ import lombok.RequiredArgsConstructor; * @see org.springframework.cache.annotation.EnableCaching * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see org.springframework.data.gemfire.support.GemfireCache#evict(Object) - * @see org.springframework.data.gemfire.support.GemfireCache#put(Object, Object) + * @see GemfireCache#evict(Object) + * @see GemfireCache#put(Object, Object) * @see Gemfire EntryNotFoundException on @CacheEvict * @see Change GemfireCache.evict(key) to call Region.remove(key) * @since 1.9.0 diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfireCacheIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java similarity index 98% rename from src/test/java/org/springframework/data/gemfire/support/GemfireCacheIntegrationTests.java rename to src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java index 3f0251d4..bafeacd1 100644 --- a/src/test/java/org/springframework/data/gemfire/support/GemfireCacheIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire.support; +package org.springframework.data.gemfire.cache; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; @@ -34,6 +34,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.cache.Cache; import org.springframework.data.gemfire.GemfireUtils; +import org.springframework.data.gemfire.support.AbstractNativeCacheTests; /** * Integration Tests for {@link GemfireCache}. diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfireCacheManagerUnitTests.java b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java similarity index 99% rename from src/test/java/org/springframework/data/gemfire/support/GemfireCacheManagerUnitTests.java rename to src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java index 2302e023..6a1c1fb0 100644 --- a/src/test/java/org/springframework/data/gemfire/support/GemfireCacheManagerUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java @@ -15,7 +15,7 @@ * */ -package org.springframework.data.gemfire.support; +package org.springframework.data.gemfire.cache; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfireCacheUnitTests.java b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java similarity index 98% rename from src/test/java/org/springframework/data/gemfire/support/GemfireCacheUnitTests.java rename to src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java index f3fff7cf..9f4ea40e 100644 --- a/src/test/java/org/springframework/data/gemfire/support/GemfireCacheUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java @@ -15,7 +15,7 @@ * */ -package org.springframework.data.gemfire.support; +package org.springframework.data.gemfire.cache; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -50,7 +50,7 @@ import org.springframework.cache.Cache; * @see org.junit.Test * @see org.mockito.Mock * @see org.mockito.runners.MockitoJUnitRunner - * @see org.springframework.data.gemfire.support.GemfireCache + * @see GemfireCache * @see com.gemstone.gemfire.cache.Region * @since 1.9.0 */ diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java index 62d40869..b7d67631 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java @@ -26,6 +26,12 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; +import com.gemstone.gemfire.cache.GemFireCache; +import com.gemstone.gemfire.cache.client.ClientCache; +import com.gemstone.gemfire.cache.query.Index; +import com.gemstone.gemfire.cache.query.IndexType; +import com.gemstone.gemfire.cache.query.QueryService; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -40,12 +46,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.IndexType; -import com.gemstone.gemfire.cache.query.QueryService; - /** * The ClientCacheIndexingTest class is a test suite of test cases testing the creation and application of indexes * on client Regions of a GemFire ClientCache using the <gfe:index/> tag element in the Spring Data GemFire diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java b/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java index d03f1aeb..b97c85d1 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java @@ -23,6 +23,11 @@ import static org.junit.Assert.assertThat; import javax.annotation.Resource; +import com.gemstone.gemfire.cache.CacheLoader; +import com.gemstone.gemfire.cache.CacheLoaderException; +import com.gemstone.gemfire.cache.LoaderHelper; +import com.gemstone.gemfire.cache.Region; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -33,11 +38,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; - /** * The ClientCachePoolTests class... * diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityTest.java index 7fae0a15..3256752e 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityTest.java @@ -25,8 +25,14 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; + import javax.annotation.Resource; +import com.gemstone.gemfire.cache.CacheLoader; +import com.gemstone.gemfire.cache.CacheLoaderException; +import com.gemstone.gemfire.cache.LoaderHelper; +import com.gemstone.gemfire.cache.Region; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -40,11 +46,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; - /** * The ClientCacheSecurityTest class is a test suite with test cases testing SSL configuration between a GemFire client * and server using the cluster-ssl-* GemFire System properties. diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheTest.java index 8f4d8431..5aa3576b 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheTest.java @@ -21,6 +21,9 @@ import static org.junit.Assert.assertThat; import javax.annotation.Resource; +import com.gemstone.gemfire.cache.Cache; +import com.gemstone.gemfire.cache.Region; + import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.context.ConfigurableApplicationContext; @@ -29,9 +32,6 @@ import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitia import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.Region; - /** * @author David Turanski * @author John Blum diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java index 96917bc0..e551adb4 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java @@ -26,8 +26,14 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; + import javax.annotation.Resource; +import com.gemstone.gemfire.cache.CacheLoader; +import com.gemstone.gemfire.cache.CacheLoaderException; +import com.gemstone.gemfire.cache.LoaderHelper; +import com.gemstone.gemfire.cache.Region; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -41,11 +47,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; - /** * The ClientCacheVariableLocatorsTest class is a test suite of test cases testing the use of variable "locators" * attribute on <gfe:pool/< in Spring (Data GemFire) configuration meta-data when connecting a client/server. diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java index f1b5e65d..4c77a0f9 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java @@ -26,8 +26,14 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; + import javax.annotation.Resource; +import com.gemstone.gemfire.cache.CacheLoader; +import com.gemstone.gemfire.cache.CacheLoaderException; +import com.gemstone.gemfire.cache.LoaderHelper; +import com.gemstone.gemfire.cache.Region; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -41,11 +47,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; - /** * The ClientCacheVariableServersTest class is a test suite of test cases testing the use of variable "servers" * attribute on <gfe:pool/< in Spring (Data GemFire) configuration meta-data when connecting a client/server. diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java index eac9ef0a..9becd614 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java @@ -37,14 +37,6 @@ import static org.mockito.Mockito.when; import java.io.InputStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.springframework.beans.factory.BeanFactory; -import org.springframework.core.io.Resource; -import org.springframework.data.gemfire.TestUtils; -import org.springframework.data.gemfire.config.xml.GemfireConstants; - import com.gemstone.gemfire.cache.DataPolicy; import com.gemstone.gemfire.cache.EvictionAttributes; import com.gemstone.gemfire.cache.ExpirationAttributes; @@ -57,6 +49,14 @@ import com.gemstone.gemfire.cache.client.ClientRegionShortcut; import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.compression.Compressor; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.springframework.beans.factory.BeanFactory; +import org.springframework.core.io.Resource; +import org.springframework.data.gemfire.TestUtils; +import org.springframework.data.gemfire.config.xml.GemfireConstants; + /** * @author David Turanski * @author John Blum diff --git a/src/test/java/org/springframework/data/gemfire/ClientRegionShortcutConverterTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java similarity index 93% rename from src/test/java/org/springframework/data/gemfire/ClientRegionShortcutConverterTest.java rename to src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java index 6536d07b..964527f9 100644 --- a/src/test/java/org/springframework/data/gemfire/ClientRegionShortcutConverterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.client; import static org.junit.Assert.assertEquals; -import org.junit.Test; - import com.gemstone.gemfire.cache.client.ClientRegionShortcut; +import org.junit.Test; + /** - * The ClientRegionShortcutConverterTest class is a test suite of test cases testing the contract and functionality + * The ClientRegionShortcutConverterTest class is a test suite of test cases testing the contract and functionality * of the ClientRegionShortcutConverter class * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.ClientRegionShortcutConverter + * @see ClientRegionShortcutConverter * @see com.gemstone.gemfire.cache.client.ClientRegionShortcut * @since 1.3.4 */ diff --git a/src/test/java/org/springframework/data/gemfire/support/ClientRegionShortcutWrapperTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java similarity index 98% rename from src/test/java/org/springframework/data/gemfire/support/ClientRegionShortcutWrapperTest.java rename to src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java index ad99cef2..7b6e2e43 100644 --- a/src/test/java/org/springframework/data/gemfire/support/ClientRegionShortcutWrapperTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package org.springframework.data.gemfire.support; +package org.springframework.data.gemfire.client; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import org.junit.Test; - import com.gemstone.gemfire.cache.client.ClientRegionShortcut; +import org.junit.Test; + /** * The ClientRegionShortcutWrapperTest class is a test suite of test cases testing the contract and functionality of the * ClientRegionShortcutWrapper enum class type. * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.support.ClientRegionShortcutWrapper + * @see ClientRegionShortcutWrapper * @see com.gemstone.gemfire.cache.client.ClientRegionShortcut * @since 1.4.0 */ @@ -148,5 +148,4 @@ public class ClientRegionShortcutWrapperTest { assertTrue(ClientRegionShortcutWrapper.PROXY.isProxy()); assertFalse(ClientRegionShortcutWrapper.UNSPECIFIED.isProxy()); } - } diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java index 8fa49b96..a3fa8ca9 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java @@ -22,14 +22,8 @@ import static org.junit.Assert.assertNotNull; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.Resource; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import javax.annotation.Resource; import com.gemstone.gemfire.cache.CacheLoader; import com.gemstone.gemfire.cache.CacheLoaderException; @@ -39,6 +33,13 @@ import com.gemstone.gemfire.cache.LoaderHelper; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.util.CacheWriterAdapter; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + /** * The ClientRegionWithCacheLoaderWriterTest class is a test suite of test cases testing the addition of CacheLoaders * and CacheWriters to a client, local Region inside a GemFire Cache. diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionTest.java index f762b364..b4eaf426 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionTest.java @@ -22,6 +22,9 @@ import static org.junit.Assert.assertSame; import javax.annotation.Resource; +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.client.ClientCache; + import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,9 +35,6 @@ import org.springframework.data.gemfire.fork.SpringCacheServerProcess; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.ClientCache; - /** * The ClientSubRegionTest class is a test suite of test cases testing SubRegion functionality from a client * GemFire Cache. diff --git a/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java index f30315fe..93c58fd2 100644 --- a/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java @@ -32,8 +32,18 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.Resource; +import com.gemstone.gemfire.cache.DataPolicy; +import com.gemstone.gemfire.cache.EntryEvent; +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.client.ClientCache; +import com.gemstone.gemfire.cache.client.ClientCacheFactory; +import com.gemstone.gemfire.cache.client.ClientRegionShortcut; +import com.gemstone.gemfire.cache.client.Pool; +import com.gemstone.gemfire.cache.util.CacheListenerAdapter; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -55,15 +65,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; import org.springframework.util.SocketUtils; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientCacheFactory; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.util.CacheListenerAdapter; - /** * The DurableClientCacheIntegrationTest class is a test suite of test cases testing GemFire's Durable Client * functionality in the context of Spring Data GemFire. diff --git a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java index 6816d41d..9e9cc75e 100644 --- a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java @@ -28,8 +28,12 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; + import javax.annotation.Resource; +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.client.ClientCache; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -45,9 +49,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.ClientCache; - /** * The GemFireDataSourceIntegrationTest class is a test suite of test cases testing the contract and functionality * of the <gfe-data:datasource> element in the context of a GemFire cluster running both native, diff --git a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceTest.java b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceTest.java index 428403af..aacdab6a 100644 --- a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceTest.java @@ -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,6 +18,11 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.List; +import com.gemstone.gemfire.cache.Cache; +import com.gemstone.gemfire.cache.DataPolicy; +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.client.Pool; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -31,11 +36,6 @@ import org.springframework.data.gemfire.repository.sample.PersonRepository; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.Pool; - /** * @author David Turanski * diff --git a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java index 157aefa3..5d506d85 100644 --- a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java @@ -29,8 +29,13 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; + import javax.annotation.Resource; +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.client.ClientCache; +import com.gemstone.gemfire.distributed.ServerLauncher; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -49,10 +54,6 @@ import org.springframework.util.Assert; import org.springframework.util.FileCopyUtils; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.distributed.ServerLauncher; - /** * The GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest class is a test suite of test cases * testing the contract and functionality of the GemfireDataSourcePostProcessor using the <gfe-data:datasource> diff --git a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceWithLocalRegionTest.java b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceWithLocalRegionTest.java index 206d420c..87deeba1 100644 --- a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceWithLocalRegionTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceWithLocalRegionTest.java @@ -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,6 +14,9 @@ package org.springframework.data.gemfire.client; import static org.junit.Assert.assertEquals; +import com.gemstone.gemfire.cache.DataPolicy; +import com.gemstone.gemfire.cache.Region; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -25,9 +28,6 @@ import org.springframework.data.gemfire.fork.SpringCacheServerProcess; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; - /** * @author David Turanski * @@ -35,26 +35,26 @@ import com.gemstone.gemfire.cache.Region; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("/org/springframework/data/gemfire/client/datasource-client-with-regions.xml") public class GemFireDataSourceWithLocalRegionTest { - @Autowired + @Autowired ApplicationContext ctx; - + @BeforeClass public static void startUp() throws Exception { - ForkUtil.startCacheServer(SpringCacheServerProcess.class.getName() + " " + ForkUtil.startCacheServer(SpringCacheServerProcess.class.getName() + " " + "/org/springframework/data/gemfire/client/datasource-server.xml"); } - - + + @Test public void testRegionDefinitionNotOverridden() { Region simple = ctx.getBean("simple",Region.class); assertEquals(DataPolicy.NORMAL, simple.getAttributes().getDataPolicy()); } - - - - + + + + @AfterClass public static void cleanUp() { ForkUtil.sendSignal(); diff --git a/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java b/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java index f4a9d99c..5df121a0 100644 --- a/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java @@ -42,14 +42,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; -import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.data.gemfire.support.ListRegionsOnServerFunction; - import com.gemstone.gemfire.cache.DataPolicy; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionAttributes; @@ -61,6 +53,14 @@ 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.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; +import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; +import org.springframework.data.gemfire.support.ListRegionsOnServerFunction; + /** * The GemfireDataSourcePostProcessor class is a test suite of test cases testing the contract and functionality * of the GemfireDataSourcePostProcessor class, which is responsible for creating client PROXY Regions diff --git a/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java b/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java index 27cc0c26..0c846614 100644 --- a/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java @@ -21,10 +21,10 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; -import org.junit.Test; - import com.gemstone.gemfire.cache.InterestResultPolicy; +import org.junit.Test; + /** * The InterestResultPolicyTypeTest class is a test suite of test cases testing the contract and functionality * of the InterestResultPolicyType enum. diff --git a/src/test/java/org/springframework/data/gemfire/client/InterestTest.java b/src/test/java/org/springframework/data/gemfire/client/InterestTest.java index 91b8fefe..e4047b11 100644 --- a/src/test/java/org/springframework/data/gemfire/client/InterestTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/InterestTest.java @@ -21,11 +21,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import com.gemstone.gemfire.cache.InterestResultPolicy; + import org.junit.Test; import org.springframework.core.ConstantException; -import com.gemstone.gemfire.cache.InterestResultPolicy; - /** * The InterestTest class is a test suite of test cases testing the contract and functionality of the Interest class. * diff --git a/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTest.java index 7079f7f1..ae75b9ff 100644 --- a/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTest.java @@ -24,8 +24,15 @@ import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertThat; import java.util.Properties; + import javax.annotation.Resource; +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.ClientRegionShortcut; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -38,12 +45,6 @@ import org.springframework.data.gemfire.RegionAttributesFactoryBean; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -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.ClientRegionShortcut; - /** * The LocalOnlyClientCacheIntegrationTest class... * diff --git a/src/test/java/org/springframework/data/gemfire/client/MultipleClientCacheTest.java b/src/test/java/org/springframework/data/gemfire/client/MultipleClientCacheTest.java index 1494bf61..e34ddcb5 100644 --- a/src/test/java/org/springframework/data/gemfire/client/MultipleClientCacheTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/MultipleClientCacheTest.java @@ -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,13 +16,13 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; +import com.gemstone.gemfire.cache.Cache; +import com.gemstone.gemfire.cache.Region; + import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.Region; - /** * @author David Turanski * @author John Blum diff --git a/src/test/java/org/springframework/data/gemfire/client/RegionIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/RegionIntegrationTest.java index b40d6628..42a5ea38 100644 --- a/src/test/java/org/springframework/data/gemfire/client/RegionIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/RegionIntegrationTest.java @@ -21,16 +21,6 @@ import static org.junit.Assert.assertSame; import java.util.Arrays; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.beans.factory.support.BeanDefinitionRegistry; -import org.springframework.context.ApplicationContext; -import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - import com.gemstone.gemfire.cache.CacheListener; import com.gemstone.gemfire.cache.CacheLoader; import com.gemstone.gemfire.cache.CacheLoaderException; @@ -41,6 +31,16 @@ import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.cache.util.CacheWriterAdapter; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.beans.factory.support.BeanDefinitionRegistry; +import org.springframework.context.ApplicationContext; +import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + /** * @author Costin Leau * @author David Turanski @@ -71,7 +71,7 @@ public class RegionIntegrationTest { @Autowired private ApplicationContext ctx; - + @Test public void testBasicRegion() throws Exception { @SuppressWarnings("rawtypes") @@ -123,4 +123,4 @@ public class RegionIntegrationTest { assertEquals(512, pa.getLocalMaxMemory()); assertEquals(1, pa.getRedundantCopies()); } -} \ No newline at end of file +} diff --git a/src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java index e594eed3..bd0d5eb1 100644 --- a/src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java @@ -22,6 +22,7 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertThat; import java.util.Properties; + import javax.annotation.Resource; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java b/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java index c25acf46..13a2a361 100644 --- a/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java @@ -33,6 +33,9 @@ import java.net.InetSocketAddress; import java.util.Collections; import java.util.List; +import com.gemstone.gemfire.cache.client.Pool; +import com.gemstone.gemfire.cache.query.QueryService; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -42,9 +45,6 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.data.gemfire.GemfireUtils; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.query.QueryService; - /** * The DefaultableDelegatingPoolAdapterTest class is a default suite of default cases testing the contract and functionality * of the {@link DefaultableDelegatingPoolAdapter} class. diff --git a/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java b/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java index 9baa0e95..b1263232 100644 --- a/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java @@ -32,6 +32,10 @@ import static org.mockito.Mockito.when; import java.net.InetSocketAddress; import java.util.Collections; +import com.gemstone.gemfire.cache.client.Pool; +import com.gemstone.gemfire.cache.client.PoolFactory; +import com.gemstone.gemfire.cache.query.QueryService; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -41,10 +45,6 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.data.gemfire.GemfireUtils; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.client.PoolFactory; -import com.gemstone.gemfire.cache.query.QueryService; - /** * The DelegatingPoolAdapterTest class is a test suite of test cases testing the contract and functionality * of the {@link DelegatingPoolAdapter} class. diff --git a/src/test/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapterTest.java b/src/test/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapterTest.java index 0bd18702..c0a5c466 100644 --- a/src/test/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapterTest.java @@ -25,13 +25,13 @@ import static org.junit.Assert.assertThat; import java.net.InetSocketAddress; import java.util.Collections; +import com.gemstone.gemfire.cache.client.PoolFactory; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.data.gemfire.GemfireUtils; -import com.gemstone.gemfire.cache.client.PoolFactory; - /** * The FactoryDefaultsPoolAdapterTest class is a test suite of test cases testing the contract and functionality * of the {@link FactoryDefaultsPoolAdapter} class. diff --git a/src/test/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessorUnitTests.java index 43a79a0b..28fb3fe1 100644 --- a/src/test/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessorUnitTests.java @@ -32,10 +32,10 @@ import com.gemstone.gemfire.cache.util.Gateway; import org.junit.Test; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.data.gemfire.EvictionActionConverter; -import org.springframework.data.gemfire.EvictionPolicyConverter; -import org.springframework.data.gemfire.EvictionPolicyType; -import org.springframework.data.gemfire.ExpirationActionConverter; +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; diff --git a/src/test/java/org/springframework/data/gemfire/EvictionActionConverterUnitTests.java b/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionConverterUnitTests.java similarity index 96% rename from src/test/java/org/springframework/data/gemfire/EvictionActionConverterUnitTests.java rename to src/test/java/org/springframework/data/gemfire/eviction/EvictionActionConverterUnitTests.java index 5a93638d..4b16217b 100644 --- a/src/test/java/org/springframework/data/gemfire/EvictionActionConverterUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionConverterUnitTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.eviction; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; @@ -32,7 +32,7 @@ import org.junit.rules.ExpectedException; * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.EvictionActionConverter + * @see EvictionActionConverter * @see com.gemstone.gemfire.cache.EvictionAction * @since 1.6.0 */ diff --git a/src/test/java/org/springframework/data/gemfire/EvictionActionTypeTest.java b/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionTypeTest.java similarity index 97% rename from src/test/java/org/springframework/data/gemfire/EvictionActionTypeTest.java rename to src/test/java/org/springframework/data/gemfire/eviction/EvictionActionTypeTest.java index 7cdc0507..aa516b77 100644 --- a/src/test/java/org/springframework/data/gemfire/EvictionActionTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionTypeTest.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.eviction; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; -import org.junit.Test; - import com.gemstone.gemfire.cache.EvictionAction; +import org.junit.Test; + /** * The EvictionActionTypeTest class is a test suite of test cases testing the contract and functionality * of the EvictionActionType enum. * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.EvictionActionType + * @see EvictionActionType * @see com.gemstone.gemfire.cache.EvictionAction * @since 1.6.0 */ diff --git a/src/test/java/org/springframework/data/gemfire/EvictionAttributesFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java similarity index 98% rename from src/test/java/org/springframework/data/gemfire/EvictionAttributesFactoryBeanTest.java rename to src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java index e0a9af50..eaf54b6c 100644 --- a/src/test/java/org/springframework/data/gemfire/EvictionAttributesFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.eviction; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -23,22 +23,22 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - import com.gemstone.gemfire.cache.EvictionAction; import com.gemstone.gemfire.cache.EvictionAlgorithm; import com.gemstone.gemfire.cache.EvictionAttributes; import com.gemstone.gemfire.cache.util.ObjectSizer; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + /** * The EvictionAttributesFactoryBeanTest class is a test suite of test cases testing the contract and functionality * of the EvictionAttributesFactoryBean class used to create Region Eviction configuration settings. * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.EvictionAttributesFactoryBean + * @see EvictionAttributesFactoryBean * @see com.gemstone.gemfire.cache.EvictionAttributes * @since 1.3.4 */ diff --git a/src/test/java/org/springframework/data/gemfire/EvictionPolicyConverterUnitTests.java b/src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyConverterUnitTests.java similarity index 93% rename from src/test/java/org/springframework/data/gemfire/EvictionPolicyConverterUnitTests.java rename to src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyConverterUnitTests.java index 2e0996ea..57aa0038 100644 --- a/src/test/java/org/springframework/data/gemfire/EvictionPolicyConverterUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyConverterUnitTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.eviction; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; @@ -30,8 +30,8 @@ import org.junit.rules.ExpectedException; * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.EvictionPolicyConverter - * @see org.springframework.data.gemfire.EvictionPolicyType + * @see EvictionPolicyConverter + * @see EvictionPolicyType * @since 1.6.0 */ public class EvictionPolicyConverterUnitTests { diff --git a/src/test/java/org/springframework/data/gemfire/EvictionPolicyTypeTest.java b/src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyTypeTest.java similarity index 98% rename from src/test/java/org/springframework/data/gemfire/EvictionPolicyTypeTest.java rename to src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyTypeTest.java index 010cc388..e67ec5a1 100644 --- a/src/test/java/org/springframework/data/gemfire/EvictionPolicyTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyTypeTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.eviction; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import org.junit.Test; - import com.gemstone.gemfire.cache.EvictionAlgorithm; +import org.junit.Test; + /** * The EvictionTypeTest class is a test suite of test cases testing the contract and functionality * of the EvictionType enum. diff --git a/src/test/java/org/springframework/data/gemfire/support/AnnotationBasedExpirationConfigurationIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest.java similarity index 98% rename from src/test/java/org/springframework/data/gemfire/support/AnnotationBasedExpirationConfigurationIntegrationTest.java rename to src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest.java index 9b0346e1..d11b2849 100644 --- a/src/test/java/org/springframework/data/gemfire/support/AnnotationBasedExpirationConfigurationIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire.support; +package org.springframework.data.gemfire.expiration; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; @@ -29,6 +29,11 @@ import static org.mockito.Mockito.when; import javax.annotation.Resource; +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.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -41,11 +46,6 @@ import org.springframework.expression.EvaluationException; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.CustomExpiry; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.Region; - /** * The AnnotationBasedExpirationConfigurationIntegrationTest class is a test suite of test cases testing * the configuration of Annotation-defined expiration policies on Region Entry TTL and TTI @@ -55,7 +55,7 @@ import com.gemstone.gemfire.cache.Region; * @see org.junit.Test * @see org.junit.runner.RunWith * @see org.mockito.Mockito - * @see org.springframework.data.gemfire.support.AnnotationBasedExpiration + * @see AnnotationBasedExpiration * @see org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner @@ -237,5 +237,4 @@ public class AnnotationBasedExpirationConfigurationIntegrationTest { action = "@expirationProperties['gemfire.region.entry.expiration.action.spring.type']") protected static class RegionEntryWithInvalidExpirationTimeout { } - } diff --git a/src/test/java/org/springframework/data/gemfire/support/AnnotationBasedExpirationTest.java b/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationTest.java similarity index 98% rename from src/test/java/org/springframework/data/gemfire/support/AnnotationBasedExpirationTest.java rename to src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationTest.java index d6853fb9..97336b4e 100644 --- a/src/test/java/org/springframework/data/gemfire/support/AnnotationBasedExpirationTest.java +++ b/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire.support; +package org.springframework.data.gemfire.expiration; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; @@ -31,7 +31,11 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.springframework.data.gemfire.support.AnnotationBasedExpiration.ExpirationMetaData; +import static org.springframework.data.gemfire.expiration.AnnotationBasedExpiration.ExpirationMetaData; + +import com.gemstone.gemfire.cache.ExpirationAction; +import com.gemstone.gemfire.cache.ExpirationAttributes; +import com.gemstone.gemfire.cache.Region; import org.junit.Test; import org.mockito.Matchers; @@ -40,7 +44,6 @@ import org.mockito.stubbing.Answer; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.core.convert.ConversionService; -import org.springframework.data.gemfire.ExpirationActionType; import org.springframework.data.gemfire.TestUtils; import org.springframework.expression.BeanResolver; import org.springframework.expression.PropertyAccessor; @@ -48,10 +51,6 @@ import org.springframework.expression.TypeConverter; import org.springframework.expression.TypeLocator; import org.springframework.expression.spel.support.StandardEvaluationContext; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.Region; - /** * The AnnotationBasedExpirationTest class is a test suite of test cases testing the contract and functionality * of the AnnotationBasedExpirationTest. @@ -59,7 +58,7 @@ import com.gemstone.gemfire.cache.Region; * @author John Blum * @see org.junit.Test * @see org.mockito.Mockito - * @see org.springframework.data.gemfire.support.AnnotationBasedExpiration + * @see AnnotationBasedExpiration * @since 1.7.0 */ @SuppressWarnings({ "rawtypes", "unchecked", "unused" }) diff --git a/src/test/java/org/springframework/data/gemfire/ExpirationActionConverterUnitTests.java b/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionConverterUnitTests.java similarity index 96% rename from src/test/java/org/springframework/data/gemfire/ExpirationActionConverterUnitTests.java rename to src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionConverterUnitTests.java index 93b82c98..e7da16b0 100644 --- a/src/test/java/org/springframework/data/gemfire/ExpirationActionConverterUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionConverterUnitTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.expiration; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; @@ -32,7 +32,7 @@ import org.junit.rules.ExpectedException; * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.ExpirationActionConverter + * @see ExpirationActionConverter * @since 1.6.0 */ public class ExpirationActionConverterUnitTests { diff --git a/src/test/java/org/springframework/data/gemfire/ExpirationActionTypeTest.java b/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionTypeTest.java similarity index 97% rename from src/test/java/org/springframework/data/gemfire/ExpirationActionTypeTest.java rename to src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionTypeTest.java index 7c546aad..97df3c80 100644 --- a/src/test/java/org/springframework/data/gemfire/ExpirationActionTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionTypeTest.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.expiration; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; -import org.junit.Test; - import com.gemstone.gemfire.cache.ExpirationAction; +import org.junit.Test; + /** * The ExpirationActionTypeTest class is a test suite of test cases testing the contract and functionality * of the ExpirationActionType enum. * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.ExpirationActionType + * @see ExpirationActionType * @see com.gemstone.gemfire.cache.ExpirationAction * @since 1.6.0 */ diff --git a/src/test/java/org/springframework/data/gemfire/ExpirationAttributesFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBeanTest.java similarity index 96% rename from src/test/java/org/springframework/data/gemfire/ExpirationAttributesFactoryBeanTest.java rename to src/test/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBeanTest.java index 5e02c845..70a66a20 100644 --- a/src/test/java/org/springframework/data/gemfire/ExpirationAttributesFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBeanTest.java @@ -14,25 +14,25 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.expiration; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import org.junit.Test; - import com.gemstone.gemfire.cache.ExpirationAction; import com.gemstone.gemfire.cache.ExpirationAttributes; +import org.junit.Test; + /** * The ExpirationAttributesFactoryBeanTest class is a test suite of test cases testing the contract and functionality * of the ExpirationAttributesFactoryBean class. * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.ExpirationAttributesFactoryBean + * @see ExpirationAttributesFactoryBean * @since 1.6.0 */ public class ExpirationAttributesFactoryBeanTest { diff --git a/src/test/java/org/springframework/data/gemfire/util/ArrayUtilsUnitTests.java b/src/test/java/org/springframework/data/gemfire/util/ArrayUtilsUnitTests.java index 297f2f0c..f3f9133f 100644 --- a/src/test/java/org/springframework/data/gemfire/util/ArrayUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/util/ArrayUtilsUnitTests.java @@ -32,6 +32,11 @@ import org.junit.Test; */ public class ArrayUtilsUnitTests { + @SafeVarargs + protected static T[] asArray(T... array) { + return array; + } + @Test public void asArrayRetursEmptyArray() { Object[] array = ArrayUtils.asArray(); @@ -60,13 +65,12 @@ public class ArrayUtilsUnitTests { @Test public void getFirstWithNonNullArray() { - assertThat(ArrayUtils.getFirst(1, 2, 3)).isEqualTo(1); + assertThat(ArrayUtils.getFirst(asArray(1, 2, 3))).isEqualTo(1); } @Test public void getFirstWithNullOrEmptyArrayAndNoDefaultReturnsNull() { - assertThat(ArrayUtils.getFirst((Object[]) null)).isNull(); - assertThat(ArrayUtils.getFirst()).isNull(); + assertThat((Object) ArrayUtils.getFirst(null)).isNull(); } @Test diff --git a/src/test/resources/org/springframework/data/gemfire/basic-subregion.xml b/src/test/resources/org/springframework/data/gemfire/basic-subregion.xml deleted file mode 100644 index 059573f7..00000000 --- a/src/test/resources/org/springframework/data/gemfire/basic-subregion.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - BasicSubRegionConfig - 0 - warning - - - - - - - - - - - - diff --git a/src/test/resources/org/springframework/data/gemfire/support/CachingWithGemFireIntegrationTest-context.xml b/src/test/resources/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest-context.xml similarity index 93% rename from src/test/resources/org/springframework/data/gemfire/support/CachingWithGemFireIntegrationTest-context.xml rename to src/test/resources/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest-context.xml index b865a24f..1b46384d 100644 --- a/src/test/resources/org/springframework/data/gemfire/support/CachingWithGemFireIntegrationTest-context.xml +++ b/src/test/resources/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest-context.xml @@ -26,7 +26,7 @@ - + @@ -44,11 +44,11 @@ - + - + diff --git a/src/test/resources/org/springframework/data/gemfire/support/cache-manager-client-cache.xml b/src/test/resources/org/springframework/data/gemfire/cache/cache-manager-client-cache.xml similarity index 92% rename from src/test/resources/org/springframework/data/gemfire/support/cache-manager-client-cache.xml rename to src/test/resources/org/springframework/data/gemfire/cache/cache-manager-client-cache.xml index 30340e3c..4d199b2c 100644 --- a/src/test/resources/org/springframework/data/gemfire/support/cache-manager-client-cache.xml +++ b/src/test/resources/org/springframework/data/gemfire/cache/cache-manager-client-cache.xml @@ -17,7 +17,7 @@ - + diff --git a/src/test/resources/org/springframework/data/gemfire/support/AnnotationBasedExpirationConfigurationIntegrationTest-context.xml b/src/test/resources/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest-context.xml similarity index 91% rename from src/test/resources/org/springframework/data/gemfire/support/AnnotationBasedExpirationConfigurationIntegrationTest-context.xml rename to src/test/resources/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest-context.xml index e455be48..41af72ea 100644 --- a/src/test/resources/org/springframework/data/gemfire/support/AnnotationBasedExpirationConfigurationIntegrationTest-context.xml +++ b/src/test/resources/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest-context.xml @@ -15,7 +15,7 @@ 60 LOCAL_INVALIDATE #{T(com.gemstone.gemfire.cache.ExpirationAction).INVALIDATE} - #{T(org.springframework.data.gemfire.ExpirationActionType).DESTROY} + #{T(org.springframework.data.gemfire.expiration.ExpirationActionType).DESTROY} @@ -33,12 +33,12 @@ - + - -