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 a00767a2..60065511 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(org.apache.geode.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 7f549305..bfcd20ef 100644 --- a/src/main/java/org/springframework/data/gemfire/LocalRegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/LocalRegionFactoryBean.java @@ -18,7 +18,6 @@ package org.springframework.data.gemfire; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.RegionFactory; import org.apache.geode.cache.Scope; -import org.springframework.data.gemfire.support.RegionShortcutWrapper; import org.springframework.util.Assert; /** diff --git a/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java index a29a21fa..e9ae755d 100644 --- a/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java @@ -43,7 +43,6 @@ 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.data.gemfire.util.ArrayUtils; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; 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 96% rename from src/main/java/org/springframework/data/gemfire/support/RegionShortcutWrapper.java rename to src/main/java/org/springframework/data/gemfire/RegionShortcutWrapper.java index ab49ee78..02a34c41 100644 --- a/src/main/java/org/springframework/data/gemfire/support/RegionShortcutWrapper.java +++ b/src/main/java/org/springframework/data/gemfire/RegionShortcutWrapper.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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.support; +package org.springframework.data.gemfire; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.RegionShortcut; 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 b5715a5e..00000000 --- a/src/main/java/org/springframework/data/gemfire/SubRegionFactoryBean.java +++ /dev/null @@ -1,175 +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.apache.geode.cache.CacheListener; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.asyncqueue.AsyncEventQueue; -import org.apache.geode.cache.wan.GatewaySender; -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; - -/** - * 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 org.apache.geode.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(org.apache.geode.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 98% 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 fffe62b2..dbd047b2 100644 --- a/src/main/java/org/springframework/data/gemfire/support/GemfireCache.java +++ b/src/main/java/org/springframework/data/gemfire/cache/GemfireCache.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 the original author or authors. + * Copyright 2016 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. @@ -12,9 +12,10 @@ * 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 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 4ab15385..bb46171b 100644 --- a/src/main/java/org/springframework/data/gemfire/support/GemfireCacheManager.java +++ b/src/main/java/org/springframework/data/gemfire/cache/GemfireCacheManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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. @@ -12,9 +12,10 @@ * 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 java.util.Collection; import java.util.HashSet; @@ -140,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 org.apache.geode.cache.Region */ protected GemfireCache newGemfireCache(Region region) { 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 93% rename from src/main/java/org/springframework/data/gemfire/ClientRegionShortcutConverter.java rename to src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverter.java index 68f3d4a9..83201de8 100644 --- a/src/main/java/org/springframework/data/gemfire/ClientRegionShortcutConverter.java +++ b/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverter.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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; +package org.springframework.data.gemfire.client; import org.apache.geode.cache.client.ClientRegionShortcut; 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 95% 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 d7eebff2..20eb3e22 100644 --- a/src/main/java/org/springframework/data/gemfire/support/ClientRegionShortcutWrapper.java +++ b/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapper.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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.support; +package org.springframework.data.gemfire.client; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.client.ClientRegionShortcut; 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 dde4bb4b..e3245bce 100644 --- a/src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java +++ b/src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java @@ -28,8 +28,8 @@ import org.apache.geode.management.internal.cli.functions.GetRegionsFunction; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.data.gemfire.function.execution.GemfireOnServersFunctionTemplate; import org.springframework.data.gemfire.client.function.ListRegionsOnServerFunction; +import org.springframework.data.gemfire.function.execution.GemfireOnServersFunctionTemplate; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEviction.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEviction.java index 1db955ba..17d3ed27 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEviction.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEviction.java @@ -28,8 +28,8 @@ import org.apache.geode.cache.EvictionAttributes; import org.apache.geode.cache.Region; import org.apache.geode.cache.util.ObjectSizer; import org.springframework.context.annotation.Import; -import org.springframework.data.gemfire.EvictionActionType; -import org.springframework.data.gemfire.EvictionPolicyType; +import org.springframework.data.gemfire.eviction.EvictionActionType; +import org.springframework.data.gemfire.eviction.EvictionPolicyType; /** * The {@link EnableEviction} annotation marks a Spring {@link org.springframework.context.annotation.Configuration @Configuration} @@ -73,7 +73,7 @@ public @interface EnableEviction { * * Defaults to {@link EvictionActionType#LOCAL_DESTROY}. * - * @see org.springframework.data.gemfire.EvictionActionType + * @see EvictionActionType */ EvictionActionType action() default EvictionActionType.LOCAL_DESTROY; @@ -106,7 +106,7 @@ public @interface EnableEviction { * * Defaults to {@link EvictionPolicyType#ENTRY_COUNT}. * - * @see org.springframework.data.gemfire.EvictionPolicyType + * @see EvictionPolicyType */ EvictionPolicyType type() default EvictionPolicyType.ENTRY_COUNT; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableExpiration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableExpiration.java index c47dd4ef..0db42159 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableExpiration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableExpiration.java @@ -28,10 +28,10 @@ import java.lang.annotation.Target; import org.apache.geode.cache.Region; import org.springframework.context.annotation.Import; -import org.springframework.data.gemfire.ExpirationActionType; -import org.springframework.data.gemfire.support.Expiration; -import org.springframework.data.gemfire.support.IdleTimeoutExpiration; -import org.springframework.data.gemfire.support.TimeToLiveExpiration; +import org.springframework.data.gemfire.expiration.Expiration; +import org.springframework.data.gemfire.expiration.ExpirationActionType; +import org.springframework.data.gemfire.expiration.IdleTimeoutExpiration; +import org.springframework.data.gemfire.expiration.TimeToLiveExpiration; /** * The {@link EnableExpiration} annotation marks a Spring {@link org.springframework.context.annotation.Configuration @Configuration} @@ -41,9 +41,9 @@ import org.springframework.data.gemfire.support.TimeToLiveExpiration; * @author John Blum * @see org.springframework.context.annotation.Import * @see org.springframework.data.gemfire.config.annotation.ExpirationConfiguration - * @see org.springframework.data.gemfire.support.Expiration - * @see org.springframework.data.gemfire.support.IdleTimeoutExpiration - * @see org.springframework.data.gemfire.support.TimeToLiveExpiration + * @see Expiration + * @see IdleTimeoutExpiration + * @see TimeToLiveExpiration * @see org.apache.geode.cache.Region * @see Annotation-based Data Expiration * @see GemFire Expiration diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EvictionConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EvictionConfiguration.java index 38e477d4..491b2310 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EvictionConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EvictionConfiguration.java @@ -38,12 +38,12 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportAware; import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.core.type.AnnotationMetadata; -import org.springframework.data.gemfire.EvictionActionType; -import org.springframework.data.gemfire.EvictionAttributesFactoryBean; -import org.springframework.data.gemfire.EvictionPolicyType; import org.springframework.data.gemfire.RegionFactoryBean; import org.springframework.data.gemfire.RegionLookupFactoryBean; import org.springframework.data.gemfire.client.ClientRegionFactoryBean; +import org.springframework.data.gemfire.eviction.EvictionActionType; +import org.springframework.data.gemfire.eviction.EvictionAttributesFactoryBean; +import org.springframework.data.gemfire.eviction.EvictionPolicyType; import org.springframework.data.gemfire.util.ArrayUtils; import org.springframework.data.gemfire.util.CollectionUtils; import org.springframework.util.Assert; @@ -60,9 +60,9 @@ import org.springframework.util.StringUtils; * @see org.springframework.context.annotation.Bean * @see org.springframework.context.annotation.Configuration * @see org.springframework.context.annotation.ImportAware - * @see org.springframework.data.gemfire.EvictionActionType - * @see org.springframework.data.gemfire.EvictionAttributesFactoryBean - * @see org.springframework.data.gemfire.EvictionPolicyType + * @see EvictionActionType + * @see EvictionAttributesFactoryBean + * @see EvictionPolicyType * @see org.springframework.data.gemfire.RegionFactoryBean * @see org.springframework.data.gemfire.client.ClientRegionFactoryBean * @see org.apache.geode.cache.EvictionAttributes @@ -345,7 +345,7 @@ public class EvictionConfiguration implements ApplicationContextAware, ImportAwa * @param maximum integer value specifying the configured Eviction threshold. * @param type {@link EvictionPolicyType} specifying the type of Eviction algorithm. * @return a resolved value for the Eviction maximum/threshold. - * @see org.springframework.data.gemfire.EvictionPolicyType + * @see EvictionPolicyType */ protected static Integer resolveThreshold(int maximum, EvictionPolicyType type) { return (EvictionPolicyType.HEAP_PERCENTAGE.equals(type) ? null : maximum); diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ExpirationConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/ExpirationConfiguration.java index d547b0c0..1de1b538 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/ExpirationConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/ExpirationConfiguration.java @@ -37,8 +37,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportAware; import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.core.type.AnnotationMetadata; -import org.springframework.data.gemfire.ExpirationActionType; -import org.springframework.data.gemfire.support.AnnotationBasedExpiration; +import org.springframework.data.gemfire.expiration.AnnotationBasedExpiration; +import org.springframework.data.gemfire.expiration.ExpirationActionType; import org.springframework.data.gemfire.util.ArrayUtils; import org.springframework.data.gemfire.util.CollectionUtils; import org.springframework.data.gemfire.util.SpringUtils; @@ -370,7 +370,7 @@ public class ExpirationConfiguration implements ImportAware { * meta-data. * @throws IllegalArgumentException if the {@link ExpirationType} array is empty. * @see org.springframework.data.gemfire.config.annotation.EnableExpiration.ExpirationType - * @see org.springframework.data.gemfire.ExpirationActionType + * @see ExpirationActionType * @see #ExpirationPolicyMetaData(ExpirationAttributes, Set, Set) * @see #newExpirationAttributes(int, ExpirationActionType) */ @@ -388,7 +388,7 @@ public class ExpirationConfiguration implements ImportAware { * * @param action given {@link ExpirationActionType} to evaluate. * @return the resolved {@link ExpirationActionType} or the default if {@code action} is {@literal null}. - * @see org.springframework.data.gemfire.ExpirationActionType + * @see ExpirationActionType */ protected static ExpirationActionType resolveAction(ExpirationActionType action) { return SpringUtils.defaultIfNull(action, DEFAULT_ACTION); @@ -415,7 +415,7 @@ public class ExpirationConfiguration implements ImportAware { * @param types type of expiration algorithm/behavior (TTI/TTL) configured for the {@link Region}. * @throws IllegalArgumentException if the {@link ExpirationType} {@link Set} is empty. * @see org.springframework.data.gemfire.config.annotation.EnableExpiration.ExpirationType - * @see org.springframework.data.gemfire.ExpirationActionType + * @see ExpirationActionType * @see #ExpirationPolicyMetaData(ExpirationAttributes, Set, Set) * @see #newExpirationAttributes(int, ExpirationActionType) * @see #resolveAction(ExpirationActionType) 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 78c53e19..08112416 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 @@ -28,10 +28,6 @@ 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.IndexMaintenancePolicyConverter; import org.springframework.data.gemfire.IndexMaintenancePolicyType; import org.springframework.data.gemfire.IndexType; @@ -39,6 +35,10 @@ import org.springframework.data.gemfire.IndexTypeConverter; import org.springframework.data.gemfire.InterestPolicyConverter; import org.springframework.data.gemfire.ScopeConverter; import org.springframework.data.gemfire.client.InterestResultPolicyConverter; +import org.springframework.data.gemfire.eviction.EvictionActionConverter; +import org.springframework.data.gemfire.eviction.EvictionPolicyConverter; +import org.springframework.data.gemfire.eviction.EvictionPolicyType; +import org.springframework.data.gemfire.expiration.ExpirationActionConverter; import org.springframework.data.gemfire.server.SubscriptionEvictionPolicy; import org.springframework.data.gemfire.server.SubscriptionEvictionPolicyConverter; import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/ClientRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/ClientRegionParser.java index 62d7fd5b..100e14ec 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/ClientRegionParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/ClientRegionParser.java @@ -23,10 +23,8 @@ import org.springframework.beans.factory.support.ManagedList; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.RegionAttributesFactoryBean; import org.springframework.data.gemfire.client.ClientRegionFactoryBean; -import org.springframework.data.gemfire.client.Interest; import org.springframework.data.gemfire.client.KeyInterest; import org.springframework.data.gemfire.client.RegexInterest; -import org.springframework.data.repository.query.QueryLookupStrategy; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; import org.w3c.dom.Element; 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/ParsingUtils.java b/src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java index 89d032ba..38f2a0ec 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 @@ -28,11 +28,11 @@ 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.config.support.GemfireFeature; +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 89% rename from src/main/java/org/springframework/data/gemfire/EvictionActionConverter.java rename to src/main/java/org/springframework/data/gemfire/eviction/EvictionActionConverter.java index 2fe2faa4..40eaf2e1 100644 --- a/src/main/java/org/springframework/data/gemfire/EvictionActionConverter.java +++ b/src/main/java/org/springframework/data/gemfire/eviction/EvictionActionConverter.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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; +package org.springframework.data.gemfire.eviction; import org.apache.geode.cache.EvictionAction; import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; @@ -24,7 +25,7 @@ import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterS * 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 org.apache.geode.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 95% rename from src/main/java/org/springframework/data/gemfire/EvictionActionType.java rename to src/main/java/org/springframework/data/gemfire/eviction/EvictionActionType.java index f8b8993f..4ddebbcf 100644 --- a/src/main/java/org/springframework/data/gemfire/EvictionActionType.java +++ b/src/main/java/org/springframework/data/gemfire/eviction/EvictionActionType.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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; +package org.springframework.data.gemfire.eviction; import org.apache.geode.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 98% rename from src/main/java/org/springframework/data/gemfire/EvictionAttributesFactoryBean.java rename to src/main/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBean.java index 8457e0ca..de3b6ce1 100644 --- a/src/main/java/org/springframework/data/gemfire/EvictionAttributesFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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. @@ -12,9 +12,10 @@ * 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; +package org.springframework.data.gemfire.eviction; import org.apache.geode.cache.EvictionAction; import org.apache.geode.cache.EvictionAttributes; 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 91% 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..86b3712a 100644 --- a/src/main/java/org/springframework/data/gemfire/EvictionPolicyConverter.java +++ b/src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyConverter.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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; +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 97% rename from src/main/java/org/springframework/data/gemfire/EvictionPolicyType.java rename to src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyType.java index df0d22fd..4867dc1f 100644 --- a/src/main/java/org/springframework/data/gemfire/EvictionPolicyType.java +++ b/src/main/java/org/springframework/data/gemfire/eviction/EvictionPolicyType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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. @@ -12,9 +12,10 @@ * 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; +package org.springframework.data.gemfire.eviction; import org.apache.geode.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 93% 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 a480cb25..ce7102ff 100644 --- a/src/main/java/org/springframework/data/gemfire/support/AnnotationBasedExpiration.java +++ b/src/main/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpiration.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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.support; +package org.springframework.data.gemfire.expiration; import java.lang.annotation.Annotation; import java.util.concurrent.atomic.AtomicReference; @@ -33,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; @@ -56,10 +55,10 @@ import org.springframework.util.ObjectUtils; * @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 org.apache.geode.cache.CustomExpiry * @see org.apache.geode.cache.ExpirationAction * @see org.apache.geode.cache.ExpirationAttributes @@ -105,8 +104,8 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * @param {@link Class} type of the {@link Region} entry value. * @return an {@link AnnotationBasedExpiration} instance to process expired annotated {@link Region} entries * using Idle Timeout expiration. - * @see org.springframework.data.gemfire.support.AnnotationBasedExpiration - * @see org.springframework.data.gemfire.support.IdleTimeoutExpiration + * @see AnnotationBasedExpiration + * @see IdleTimeoutExpiration * @see #forIdleTimeout(org.apache.geode.cache.ExpirationAttributes) */ public static AnnotationBasedExpiration forIdleTimeout() { @@ -124,8 +123,8 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * was specified on the {@link Region}. * @return an {@link AnnotationBasedExpiration} instance to process expired annotated {@link Region} entries * using Idle Timeout expiration. - * @see org.springframework.data.gemfire.support.AnnotationBasedExpiration - * @see org.springframework.data.gemfire.support.IdleTimeoutExpiration + * @see AnnotationBasedExpiration + * @see IdleTimeoutExpiration * @see #AnnotationBasedExpiration(ExpirationAttributes) */ public static AnnotationBasedExpiration forIdleTimeout(ExpirationAttributes defaultExpirationAttributes) { @@ -146,8 +145,8 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * @param {@link Class} type of the {@link Region} entry value. * @return an {@link AnnotationBasedExpiration} instance to process expired annotated {@link Region} entries * using Time-To-Live expiration. - * @see org.springframework.data.gemfire.support.AnnotationBasedExpiration - * @see org.springframework.data.gemfire.support.TimeToLiveExpiration + * @see AnnotationBasedExpiration + * @see TimeToLiveExpiration * @see #forTimeToLive(org.apache.geode.cache.ExpirationAttributes) */ public static AnnotationBasedExpiration forTimeToLive() { @@ -165,8 +164,8 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * was specified on the {@link Region}. * @return an {@link AnnotationBasedExpiration} instance to process expired annotated {@link Region} entries * using Time-To-Live expiration. - * @see org.springframework.data.gemfire.support.AnnotationBasedExpiration - * @see org.springframework.data.gemfire.support.TimeToLiveExpiration + * @see AnnotationBasedExpiration + * @see TimeToLiveExpiration * @see #AnnotationBasedExpiration(ExpirationAttributes) */ public static AnnotationBasedExpiration forTimeToLive(ExpirationAttributes defaultExpirationAttributes) { @@ -288,7 +287,7 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * @param entry {@link Region} entry used as the source of the expiration policy meta-data. * @return {@link ExpirationMetaData} extracted from the {@link Region} entry or {@literal null} * if the expiration policy meta-data could not be determined from the {@link Region} entry. - * @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); @@ -304,7 +303,7 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * @return custom {@link ExpirationAttributes} configured from 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 org.apache.geode.cache.ExpirationAttributes * @see #getDefaultExpirationAttributes() */ @@ -318,7 +317,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) { @@ -336,7 +335,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) { @@ -353,7 +352,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) { @@ -371,7 +370,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) { @@ -388,7 +387,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) { @@ -406,7 +405,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 84% 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..ada5b661 100644 --- a/src/main/java/org/springframework/data/gemfire/support/Expiration.java +++ b/src/main/java/org/springframework/data/gemfire/expiration/Expiration.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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.support; +package org.springframework.data.gemfire.expiration; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -28,7 +29,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 84% rename from src/main/java/org/springframework/data/gemfire/ExpirationActionConverter.java rename to src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionConverter.java index e5ee5709..0bcecf2a 100644 --- a/src/main/java/org/springframework/data/gemfire/ExpirationActionConverter.java +++ b/src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionConverter.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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; +package org.springframework.data.gemfire.expiration; import org.apache.geode.cache.ExpirationAction; import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; @@ -26,7 +27,7 @@ import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterS * @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 { @@ -37,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 org.apache.geode.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 96% rename from src/main/java/org/springframework/data/gemfire/ExpirationActionType.java rename to src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionType.java index 24eb036e..21711d43 100644 --- a/src/main/java/org/springframework/data/gemfire/ExpirationActionType.java +++ b/src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionType.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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; +package org.springframework.data.gemfire.expiration; import org.apache.geode.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 92% rename from src/main/java/org/springframework/data/gemfire/ExpirationAttributesFactoryBean.java rename to src/main/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBean.java index 3556f2bb..88bab4d0 100644 --- a/src/main/java/org/springframework/data/gemfire/ExpirationAttributesFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBean.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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; +package org.springframework.data.gemfire.expiration; import org.apache.geode.cache.ExpirationAction; import org.apache.geode.cache.ExpirationAttributes; @@ -78,7 +79,7 @@ public class ExpirationAttributesFactoryBean implements FactoryBean, public boolean isSingleton() { return true; } - } 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 98% rename from src/test/java/org/springframework/data/gemfire/support/RegionShortcutWrapperTest.java rename to src/test/java/org/springframework/data/gemfire/RegionShortcutWrapperTest.java index 38b2f4e1..7be1c727 100644 --- a/src/test/java/org/springframework/data/gemfire/support/RegionShortcutWrapperTest.java +++ b/src/test/java/org/springframework/data/gemfire/RegionShortcutWrapperTest.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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.support; +package org.springframework.data.gemfire; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -30,7 +31,7 @@ import org.junit.Test; * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.support.RegionShortcutWrapper + * @see RegionShortcutWrapper * @see org.apache.geode.cache.RegionShortcut * @since 1.4.0 */ @@ -300,5 +301,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 8e0c1200..00000000 --- a/src/test/java/org/springframework/data/gemfire/SubRegionTest.java +++ /dev/null @@ -1,98 +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.apache.geode.cache.GemFireCache; -import org.apache.geode.cache.Region; -import org.junit.Test; - -/** - * - * @author David Turanski - * @author John Blum - */ -public class SubRegionTest extends RecreatingSpringApplicationContextTest { - @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 = applicationContext.getBean("parent", Region.class); - Region child = applicationContext.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 = applicationContext.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 97% 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 ea8c4311..6d2524fd 100644 --- a/src/test/java/org/springframework/data/gemfire/support/CachingWithGemFireIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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.support; +package org.springframework.data.gemfire.cache; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; 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 54% 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..5ffa0b5a 100644 --- a/src/test/java/org/springframework/data/gemfire/support/ClientCacheManagerTest.java +++ b/src/test/java/org/springframework/data/gemfire/cache/ClientCacheManagerTest.java @@ -1,16 +1,20 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2016 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 + * 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 + * 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. * - * 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.support; +package org.springframework.data.gemfire.cache; import static org.junit.Assert.assertNotNull; @@ -25,10 +29,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 97% 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 eee81457..cd206e91 100644 --- a/src/test/java/org/springframework/data/gemfire/support/CompoundCachePutCacheEvictIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 the original author or authors. + * Copyright 2016 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. @@ -15,7 +15,7 @@ * */ -package org.springframework.data.gemfire.support; +package org.springframework.data.gemfire.cache; import static org.assertj.core.api.Assertions.assertThat; @@ -67,8 +67,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 17273e3d..9d495927 100644 --- a/src/test/java/org/springframework/data/gemfire/support/GemfireCacheIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-104 the original author or authors. + * Copyright 2016 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. @@ -12,9 +12,10 @@ * 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.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; 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 4aac79e8..78f29058 100644 --- a/src/test/java/org/springframework/data/gemfire/support/GemfireCacheManagerUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 the original author or authors. + * Copyright 2016 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. @@ -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 97% 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 7fbd4194..06523b51 100644 --- a/src/test/java/org/springframework/data/gemfire/support/GemfireCacheUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 the original author or authors. + * Copyright 2016 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. @@ -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; @@ -49,7 +49,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 org.apache.geode.cache.Region * @since 1.9.0 */ 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 90% rename from src/test/java/org/springframework/data/gemfire/ClientRegionShortcutConverterTest.java rename to src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java index e741ee68..10728ce0 100644 --- a/src/test/java/org/springframework/data/gemfire/ClientRegionShortcutConverterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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; +package org.springframework.data.gemfire.client; import static org.junit.Assert.assertEquals; @@ -27,7 +28,7 @@ import org.junit.Test; * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.ClientRegionShortcutConverter + * @see ClientRegionShortcutConverter * @see org.apache.geode.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 96% 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 c94bbcea..7eb2527b 100644 --- a/src/test/java/org/springframework/data/gemfire/support/ClientRegionShortcutWrapperTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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.support; +package org.springframework.data.gemfire.client; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -30,7 +31,7 @@ import org.junit.Test; * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.support.ClientRegionShortcutWrapper + * @see ClientRegionShortcutWrapper * @see org.apache.geode.cache.client.ClientRegionShortcut * @since 1.4.0 */ diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsConfigurationUnitTests.java index 64e5b98c..a69121a0 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsConfigurationUnitTests.java @@ -52,6 +52,7 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Lazy; +import org.springframework.data.gemfire.client.ClientRegionShortcutWrapper; import org.springframework.data.gemfire.config.annotation.test.entities.ClientRegionEntity; import org.springframework.data.gemfire.config.annotation.test.entities.CollocatedPartitionRegionEntity; import org.springframework.data.gemfire.config.annotation.test.entities.GenericRegionEntity; @@ -61,7 +62,6 @@ import org.springframework.data.gemfire.mapping.annotation.ClientRegion; import org.springframework.data.gemfire.mapping.annotation.LocalRegion; import org.springframework.data.gemfire.mapping.annotation.PartitionRegion; import org.springframework.data.gemfire.mapping.annotation.ReplicateRegion; -import org.springframework.data.gemfire.support.ClientRegionShortcutWrapper; import org.springframework.data.gemfire.util.CollectionUtils; /** diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationUnitTests.java index 11f2ee1c..2d45862e 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationUnitTests.java @@ -40,11 +40,11 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.gemfire.EvictionActionType; -import org.springframework.data.gemfire.EvictionAttributesFactoryBean; -import org.springframework.data.gemfire.EvictionPolicyType; import org.springframework.data.gemfire.PartitionedRegionFactoryBean; import org.springframework.data.gemfire.ReplicatedRegionFactoryBean; +import org.springframework.data.gemfire.eviction.EvictionActionType; +import org.springframework.data.gemfire.eviction.EvictionAttributesFactoryBean; +import org.springframework.data.gemfire.eviction.EvictionPolicyType; import org.springframework.data.gemfire.util.ArrayUtils; /** @@ -55,7 +55,7 @@ import org.springframework.data.gemfire.util.ArrayUtils; * @see org.mockito.Mockito * @see org.springframework.data.gemfire.config.annotation.EnableEviction * @see org.springframework.data.gemfire.config.annotation.EvictionConfiguration - * @see org.springframework.data.gemfire.EvictionAttributesFactoryBean + * @see EvictionAttributesFactoryBean * @see org.apache.geode.cache.Region * @see org.apache.geode.cache.EvictionAttributes * @since 1.9.0 diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationUnitTests.java index 20361645..e5be8413 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationUnitTests.java @@ -41,7 +41,7 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.gemfire.ExpirationActionType; +import org.springframework.data.gemfire.expiration.ExpirationActionType; import org.springframework.data.gemfire.util.ArrayUtils; /** 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 92ed23eb..46764e24 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 @@ -31,10 +31,6 @@ import org.apache.geode.cache.Scope; import org.apache.geode.cache.wan.GatewaySender; 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.IndexMaintenancePolicyConverter; import org.springframework.data.gemfire.IndexMaintenancePolicyType; import org.springframework.data.gemfire.IndexType; @@ -42,6 +38,10 @@ import org.springframework.data.gemfire.IndexTypeConverter; import org.springframework.data.gemfire.InterestPolicyConverter; import org.springframework.data.gemfire.ScopeConverter; import org.springframework.data.gemfire.client.InterestResultPolicyConverter; +import org.springframework.data.gemfire.eviction.EvictionActionConverter; +import org.springframework.data.gemfire.eviction.EvictionPolicyConverter; +import org.springframework.data.gemfire.eviction.EvictionPolicyType; +import org.springframework.data.gemfire.expiration.ExpirationActionConverter; import org.springframework.data.gemfire.server.SubscriptionEvictionPolicy; import org.springframework.data.gemfire.server.SubscriptionEvictionPolicyConverter; import org.springframework.data.gemfire.support.ConnectionEndpoint; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/TxManagerNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/TxManagerNamespaceTest.java index 9c7124d2..64519bdc 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/TxManagerNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/TxManagerNamespaceTest.java @@ -23,8 +23,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.data.gemfire.transaction.GemfireTransactionManager; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; +import org.springframework.data.gemfire.transaction.GemfireTransactionManager; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; 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 92% rename from src/test/java/org/springframework/data/gemfire/EvictionActionConverterUnitTests.java rename to src/test/java/org/springframework/data/gemfire/eviction/EvictionActionConverterUnitTests.java index 55c42932..ceeb72bd 100644 --- a/src/test/java/org/springframework/data/gemfire/EvictionActionConverterUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionConverterUnitTests.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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; +package org.springframework.data.gemfire.eviction; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; @@ -31,7 +32,7 @@ import org.junit.rules.ExpectedException; * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.EvictionActionConverter + * @see EvictionActionConverter * @see org.apache.geode.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 94% rename from src/test/java/org/springframework/data/gemfire/EvictionActionTypeTest.java rename to src/test/java/org/springframework/data/gemfire/eviction/EvictionActionTypeTest.java index c8f4d3cf..16bd93b7 100644 --- a/src/test/java/org/springframework/data/gemfire/EvictionActionTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionTypeTest.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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; +package org.springframework.data.gemfire.eviction; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -29,7 +30,7 @@ import org.junit.Test; * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.EvictionActionType + * @see EvictionActionType * @see org.apache.geode.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 97% rename from src/test/java/org/springframework/data/gemfire/EvictionAttributesFactoryBeanTest.java rename to src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java index 039f70d6..7dc2df3e 100644 --- a/src/test/java/org/springframework/data/gemfire/EvictionAttributesFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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; +package org.springframework.data.gemfire.eviction; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -37,7 +38,7 @@ import org.junit.Test; * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.EvictionAttributesFactoryBean + * @see EvictionAttributesFactoryBean * @see org.apache.geode.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 90% 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..d6bb53f9 100644 --- a/src/test/java/org/springframework/data/gemfire/EvictionPolicyConverterUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyConverterUnitTests.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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; +package org.springframework.data.gemfire.eviction; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; @@ -30,8 +31,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 95% rename from src/test/java/org/springframework/data/gemfire/EvictionPolicyTypeTest.java rename to src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyTypeTest.java index d8cd18f3..b7c11899 100644 --- a/src/test/java/org/springframework/data/gemfire/EvictionPolicyTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyTypeTest.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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; +package org.springframework.data.gemfire.eviction; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; 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 97% 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 6cca8ca9..01635e89 100644 --- a/src/test/java/org/springframework/data/gemfire/support/AnnotationBasedExpirationConfigurationIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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.support; +package org.springframework.data.gemfire.expiration; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; @@ -54,7 +55,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @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 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 a5d7813b..61029ae8 100644 --- a/src/test/java/org/springframework/data/gemfire/support/AnnotationBasedExpirationTest.java +++ b/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationTest.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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.support; +package org.springframework.data.gemfire.expiration; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; @@ -31,7 +32,7 @@ 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 org.apache.geode.cache.ExpirationAction; import org.apache.geode.cache.ExpirationAttributes; @@ -43,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; @@ -58,7 +58,7 @@ import org.springframework.expression.spel.support.StandardEvaluationContext; * @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 92% rename from src/test/java/org/springframework/data/gemfire/ExpirationActionConverterUnitTests.java rename to src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionConverterUnitTests.java index c8d1d5b8..0c397a9c 100644 --- a/src/test/java/org/springframework/data/gemfire/ExpirationActionConverterUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionConverterUnitTests.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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; +package org.springframework.data.gemfire.expiration; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; @@ -31,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 95% rename from src/test/java/org/springframework/data/gemfire/ExpirationActionTypeTest.java rename to src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionTypeTest.java index 3ab4411d..1c6c13b7 100644 --- a/src/test/java/org/springframework/data/gemfire/ExpirationActionTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionTypeTest.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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; +package org.springframework.data.gemfire.expiration; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -30,7 +31,7 @@ import org.junit.Test; * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.ExpirationActionType + * @see ExpirationActionType * @see org.apache.geode.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 93% rename from src/test/java/org/springframework/data/gemfire/ExpirationAttributesFactoryBeanTest.java rename to src/test/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBeanTest.java index 5c1cc450..13a074c3 100644 --- a/src/test/java/org/springframework/data/gemfire/ExpirationAttributesFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBeanTest.java @@ -1,20 +1,21 @@ /* - * Copyright 2010-2013 the original author or authors. + * Copyright 2016 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 + * 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; +package org.springframework.data.gemfire.expiration; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -31,7 +32,7 @@ import org.junit.Test; * * @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/test/support/AbstractRegionFactoryBeanTests.java b/src/test/java/org/springframework/data/gemfire/test/support/AbstractRegionFactoryBeanTests.java index c912abcf..bb52a5c5 100644 --- a/src/test/java/org/springframework/data/gemfire/test/support/AbstractRegionFactoryBeanTests.java +++ b/src/test/java/org/springframework/data/gemfire/test/support/AbstractRegionFactoryBeanTests.java @@ -18,7 +18,6 @@ package org.springframework.data.gemfire.test.support; import java.io.File; -import java.io.FilenameFilter; import java.util.HashMap; import java.util.Map; 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 6cbdae67..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 74e92810..0ac0627c 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 7873f48b..650203c5 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 d5c91847..85d3292b 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(org.apache.geode.cache.ExpirationAction).INVALIDATE} - #{T(org.springframework.data.gemfire.ExpirationActionType).DESTROY} + #{T(org.springframework.data.gemfire.expiration.ExpirationActionType).DESTROY} @@ -33,12 +33,12 @@ - + - -