SGF-548 - Add the org.springframework.data.gemfire.mapping.annotation package.

src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java

@@ -45,7 +45,7 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.gemfire.client.ClientCacheFactoryBean;
 import org.springframework.data.gemfire.client.ClientRegionFactoryBean;
 import org.springframework.data.gemfire.client.PoolFactoryBean;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.process.ProcessExecutor;
 import org.springframework.data.gemfire.process.ProcessWrapper;
 import org.springframework.data.gemfire.server.CacheServerFactoryBean;

src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java

@@ -43,7 +43,7 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.gemfire.CacheFactoryBean;
 import org.springframework.data.gemfire.LocalRegionFactoryBean;
 import org.springframework.data.gemfire.mapping.GemfireMappingContext;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.repository.support.GemfireRepositoryFactoryBean;
 import org.springframework.data.gemfire.test.support.IdentifierSequence;
 import org.springframework.data.repository.CrudRepository;

src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsConfigurationUnitTests.java

@@ -58,10 +58,10 @@ import org.springframework.data.gemfire.config.annotation.test.entities.Collocat
 import org.springframework.data.gemfire.config.annotation.test.entities.GenericRegionEntity;
 import org.springframework.data.gemfire.config.annotation.test.entities.NonEntity;
 import org.springframework.data.gemfire.config.xml.GemfireConstants;
-import org.springframework.data.gemfire.mapping.ClientRegion;
-import org.springframework.data.gemfire.mapping.LocalRegion;
-import org.springframework.data.gemfire.mapping.PartitionRegion;
-import org.springframework.data.gemfire.mapping.ReplicateRegion;
+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.util.CollectionUtils;
 
 /**

src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ClientRegionEntity.java

@@ -19,7 +19,7 @@ package org.springframework.data.gemfire.config.annotation.test.entities;
 
 import org.apache.geode.cache.client.ClientRegionShortcut;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.ClientRegion;
+import org.springframework.data.gemfire.mapping.annotation.ClientRegion;
 
 /**
  * {@link ClientRegionEntity} persistent entity stored in the "Users" {@link org.apache.geode.cache.DataPolicy#NORMAL},

src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/CollocatedPartitionRegionEntity.java

@@ -17,7 +17,7 @@
 
 package org.springframework.data.gemfire.config.annotation.test.entities;
 
-import org.springframework.data.gemfire.mapping.PartitionRegion;
+import org.springframework.data.gemfire.mapping.annotation.PartitionRegion;
 
 /**
  * {@link CollocatedPartitionRegionEntity} persistent entity stored in the "ContactEvents"

src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/GenericRegionEntity.java

@@ -18,7 +18,7 @@
 package org.springframework.data.gemfire.config.annotation.test.entities;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 
 /**
  * {@link GenericRegionEntity} persistent entity stored in the "GenericRegionEntity"

src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/LocalRegionEntity.java

@@ -18,7 +18,7 @@
 package org.springframework.data.gemfire.config.annotation.test.entities;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.LocalRegion;
+import org.springframework.data.gemfire.mapping.annotation.LocalRegion;
 
 /**
  * {@link LocalRegionEntity} persistent entity stored in the "LocalRegionEntity" {@link org.apache.geode.cache.DataPolicy#NORMAL},

src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/PartitionRegionEntity.java

@@ -19,8 +19,8 @@ package org.springframework.data.gemfire.config.annotation.test.entities;
 
 import org.springframework.data.annotation.Id;
 import org.springframework.data.gemfire.IndexType;
-import org.springframework.data.gemfire.mapping.Indexed;
-import org.springframework.data.gemfire.mapping.PartitionRegion;
+import org.springframework.data.gemfire.mapping.annotation.Indexed;
+import org.springframework.data.gemfire.mapping.annotation.PartitionRegion;
 
 /**
  * {@link PartitionRegionEntity} persistent entity stored in the "Customers"

src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ReplicateRegionEntity.java

@@ -18,7 +18,7 @@
 package org.springframework.data.gemfire.config.annotation.test.entities;
 
 import org.springframework.data.gemfire.ScopeType;
-import org.springframework.data.gemfire.mapping.ReplicateRegion;
+import org.springframework.data.gemfire.mapping.annotation.ReplicateRegion;
 
 /**
  * {@link ReplicateRegionEntity} persistent entity stored in the "Accounts"

src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextTest.java

@@ -28,6 +28,7 @@ import java.math.BigInteger;
 
 import org.junit.Test;
 import org.springframework.data.gemfire.TestUtils;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.mapping.model.GemfireSimpleTypeHolder;
 import org.springframework.data.mapping.PersistentEntity;
 

src/test/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntityUnitTests.java

@@ -24,12 +24,13 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 
 import org.junit.Test;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.util.ClassTypeInformation;
 
 /**
  * Unit tests for {@link GemfirePersistentEntity}.
- * 
+ *
  * @author Oliver Gierke
  * @author John Blum
  */

src/test/java/org/springframework/data/gemfire/repository/cdi/SamplePersonRepository.java

@@ -17,7 +17,7 @@
 
 package org.springframework.data.gemfire.repository.cdi;
 
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.repository.GemfireRepository;
 import org.springframework.data.gemfire.repository.sample.Person;
 

src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtensionTest.java

@@ -42,7 +42,7 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.beans.factory.xml.XmlReaderContext;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.repository.GemfireRepository;
 import org.springframework.data.gemfire.repository.support.GemfireRepositoryFactoryBean;
 import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource;

src/test/java/org/springframework/data/gemfire/repository/sample/Account.java

@@ -17,15 +17,15 @@
 package org.springframework.data.gemfire.repository.sample;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.Region;
-import org.springframework.data.gemfire.mapping.ReplicateRegion;
+import org.springframework.data.gemfire.mapping.annotation.Region;
+import org.springframework.data.gemfire.mapping.annotation.ReplicateRegion;
 import org.springframework.util.Assert;
 
 /**
  * The Account class is an abstract data type (ADT) for modeling customer accounts.
  *
  * @author John Blum
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @since 1.0.0
  */
 @ReplicateRegion("Accounts")

src/test/java/org/springframework/data/gemfire/repository/sample/Address.java

@@ -16,10 +16,10 @@
 package org.springframework.data.gemfire.repository.sample;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 
 /**
- * 
+ *
  * @author Oliver Gierke
  */
 @Region("address")

src/test/java/org/springframework/data/gemfire/repository/sample/Algorithm.java

@@ -17,14 +17,14 @@
 package org.springframework.data.gemfire.repository.sample;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 
 /**
  * The Algorithm interface define abstract data type modeling a computer algorithm.
  *
  * @author John Blum
  * @see org.springframework.data.annotation.Id
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @since 1.4.0
  */
 @Region("Algorithms")

src/test/java/org/springframework/data/gemfire/repository/sample/CatRepository.java

@@ -16,7 +16,7 @@
 
 package org.springframework.data.gemfire.repository.sample;
 
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.repository.GemfireRepository;
 import org.springframework.data.gemfire.repository.Query;
 

src/test/java/org/springframework/data/gemfire/repository/sample/Customer.java

@@ -17,8 +17,8 @@
 package org.springframework.data.gemfire.repository.sample;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.Region;
-import org.springframework.data.gemfire.mapping.ReplicateRegion;
+import org.springframework.data.gemfire.mapping.annotation.Region;
+import org.springframework.data.gemfire.mapping.annotation.ReplicateRegion;
 import org.springframework.util.ObjectUtils;
 
 /**
@@ -26,7 +26,7 @@ import org.springframework.util.ObjectUtils;
  *
  * @author John Blum
  * @see org.springframework.data.annotation.Id
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @since 1.0.0
  */
 @ReplicateRegion("Customers")

src/test/java/org/springframework/data/gemfire/repository/sample/DogRepository.java

@@ -16,7 +16,7 @@
 
 package org.springframework.data.gemfire.repository.sample;
 
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.repository.GemfireRepository;
 import org.springframework.data.gemfire.repository.Query;
 

src/test/java/org/springframework/data/gemfire/repository/sample/GuestUser.java

@@ -16,13 +16,13 @@
 
 package org.springframework.data.gemfire.repository.sample;
 
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 
 /**
  * The GuestUser class represents an authorized restricted user of a service or computer system, etc.
  *
  * @author John Blum
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @see org.springframework.data.gemfire.repository.sample.User
  * @since 1.4.0
  */

src/test/java/org/springframework/data/gemfire/repository/sample/Person.java

@@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.PersistenceConstructor;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.util.ObjectUtils;
 
 /**

src/test/java/org/springframework/data/gemfire/repository/sample/Plant.java

@@ -17,7 +17,7 @@
 package org.springframework.data.gemfire.repository.sample;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.util.ObjectUtils;
 
 /**
@@ -25,7 +25,7 @@ import org.springframework.util.ObjectUtils;
  *
  * @author John Blum
  * @see org.springframework.data.annotation.Id
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @since 1.4.0
  */
 @Region("Plants")

src/test/java/org/springframework/data/gemfire/repository/sample/Programmer.java

@@ -16,14 +16,14 @@
 
 package org.springframework.data.gemfire.repository.sample;
 
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.util.StringUtils;
 
 /**
  * The Programmer class is a User representing/modeling a software engineer/developer.
  *
  * @author John J. Blum
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @see org.springframework.data.gemfire.repository.sample.User
  * @since 1.4.0
  */

src/test/java/org/springframework/data/gemfire/repository/sample/RabbitRepository.java

@@ -16,7 +16,7 @@
 
 package org.springframework.data.gemfire.repository.sample;
 
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.repository.GemfireRepository;
 import org.springframework.data.gemfire.repository.Query;
 
@@ -25,7 +25,7 @@ import org.springframework.data.gemfire.repository.Query;
  * from/to an underlying data store (GemFire).
  *
  * @author John Blum
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @see org.springframework.data.gemfire.repository.GemfireRepository
  * @see org.springframework.data.gemfire.repository.Query
  * @since 1.4.0

src/test/java/org/springframework/data/gemfire/repository/sample/RootUser.java

@@ -16,13 +16,13 @@
 
 package org.springframework.data.gemfire.repository.sample;
 
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 
 /**
  * The RootUser class represents an authorized administrative user of a service or computer system, etc.
  *
  * @author John Blum
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @see org.springframework.data.gemfire.repository.sample.User
  * @since 1.4.0
  */

src/test/java/org/springframework/data/gemfire/repository/sample/User.java

@@ -19,7 +19,7 @@ package org.springframework.data.gemfire.repository.sample;
 import java.util.Calendar;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
@@ -29,7 +29,7 @@ import org.springframework.util.ObjectUtils;
  * @author John Blum
  * @see java.lang.Comparable
  * @see org.springframework.data.annotation.Id
- * @see org.springframework.data.gemfire.mapping.Region
+ * @see Region
  * @since 1.4.0
  */
 @Region("Users")

src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java

@@ -314,7 +314,7 @@ public class GemfireRepositoryFactoryUnitTests {
 	interface SampleCustomGemfireRepository extends GemfireRepository<Person, Long>, SampleCustomRepository<Person> {
 	}
 
-	@org.springframework.data.gemfire.mapping.Region("People")
+	@org.springframework.data.gemfire.mapping.annotation.Region("People")
 	interface PersonRepository extends GemfireRepository<Person, Long> {
 	}
 }

src/test/java/org/springframework/data/gemfire/test/model/Person.java

@@ -24,7 +24,7 @@ import java.util.Date;
 
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.PersistenceConstructor;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.gemfire.test.support.IdentifierSequence;
 import org.springframework.data.gemfire.util.SpringUtils;
 import org.springframework.util.Assert;