Refactored package structure.

Resolved dependency cycles in repository and mapping packages. Introduced repository.core package as well as core.support where most of the type of former repository.support is in now. New repository.support only contains additional stuff built on top of core repository abstraction (e.g. Converters, PropertyEditors). Added some more unit tests to core mapping abstractions and removed not needed methods from its API.

spring-data-commons-core/src/main/java/org/springframework/data/mapping/Association.java

@@ -14,16 +14,26 @@
  * limitations under the License.
  */
 
-package org.springframework.data.mapping.model;
+package org.springframework.data.mapping;
+
 
 /**
+ * Value object to capture {@link Association}s.
+ * 
+ * @param the {@link PersistentProperty}s the association connects.
  * @author Jon Brisbin <jbrisbin@vmware.com>
  */
 public class Association<P extends PersistentProperty<P>> {
 
-	protected P inverse;
-	protected P obverse;
+	private final P inverse;
+	private final P obverse;
 
+	/**
+	 * Creates a new {@link Association} between the two given {@link PersistentProperty}s.
+	 * 
+	 * @param inverse
+	 * @param obverse
+	 */
 	public Association(P inverse, P obverse) {
 		this.inverse = inverse;
 		this.obverse = obverse;

spring-data-commons-core/src/main/java/org/springframework/data/mapping/AssociationHandler.java

@@ -16,12 +16,20 @@
 
 package org.springframework.data.mapping;
 
-import org.springframework.data.mapping.model.Association;
-import org.springframework.data.mapping.model.PersistentProperty;
+
 
 /**
+ * Callback interface to implement functionality to be applied to a collection of {@link Association}s.
+ * 
  * @author Jon Brisbin <jbrisbin@vmware.com>
+ * @author Oliver Gierke
  */
 public interface AssociationHandler<P extends PersistentProperty<P>> {
+	
+	/**
+	 * Processes the given {@link Association}.
+	 * 
+	 * @param association
+	 */
 	void doWithAssociation(Association<P> association);
 }

spring-data-commons-core/src/main/java/org/springframework/data/mapping/PersistentEntity.java

@@ -0,0 +1,81 @@
+package org.springframework.data.mapping;
+
+import java.util.Collection;
+
+import org.springframework.data.util.TypeInformation;
+
+/**
+ * Represents a persistent entity
+ * 
+ * @author Graeme Rocher
+ * @author Jon Brisbin
+ * @author Oliver Gierke
+ */
+public interface PersistentEntity<T, P extends PersistentProperty<P>> {
+
+	/**
+	 * The entity name including any package prefix
+	 * 
+	 * @return must never return {@literal null}
+	 */
+	String getName();
+
+	/**
+	 * Returns the {@link PreferredConstructor} to be used to instantiate objects of this {@link PersistentEntity}.
+	 * 
+	 * @return must never return {@literal null}.
+	 */
+	PreferredConstructor<T> getPreferredConstructor();
+
+	/**
+	 * Returns the id property of the {@link PersistentEntity}. Must never return {@literal null} as a
+	 * {@link PersistentEntity} instance must not be created if there is no id property.
+	 * 
+	 * @return the id property of the {@link PersistentEntity}.
+	 */
+	P getIdProperty();
+
+	/**
+	 * Obtains a PersistentProperty instance by name.
+	 * 
+	 * @param name The name of the property
+	 * @return The {@link PersistentProperty} or {@literal null} if it doesn't exist
+	 */
+	P getPersistentProperty(String name);
+
+	/**
+	 * Returns the resolved Java type of this entity.
+	 * 
+	 * @return The underlying Java class for this entity
+	 */
+	Class<T> getType();
+
+	/**
+	 * Returns the {@link TypeInformation} backing this {@link PersistentEntity}.
+	 * 
+	 * @return
+	 */
+	TypeInformation<T> getTypeInformation();
+
+	/**
+	 * A list of property names
+	 * 
+	 * @return A List of strings
+	 */
+	Collection<String> getPersistentPropertyNames();
+
+	/**
+	 * Applies the given {@link PropertyHandler} to all {@link PersistentProperty}s contained in this
+	 * {@link PersistentEntity}.
+	 * 
+	 * @param handler must not be {@literal null}.
+	 */
+	void doWithProperties(PropertyHandler<P> handler);
+
+	/**
+	 * Applies the given {@link AssociationHandler} to all {@link Association} contained in this {@link PersistentEntity}.
+	 * 
+	 * @param handler must not be {@literal null}.
+	 */
+	void doWithAssociations(AssociationHandler<P> handler);
+}

spring-data-commons-core/src/main/java/org/springframework/data/mapping/PersistentProperty.java

@@ -1,4 +1,4 @@
-package org.springframework.data.mapping.model;
+package org.springframework.data.mapping;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;

spring-data-commons-core/src/main/java/org/springframework/data/mapping/PreferredConstructor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping.model;
+package org.springframework.data.mapping;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;

spring-data-commons-core/src/main/java/org/springframework/data/mapping/PropertyHandler.java

@@ -13,14 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.mapping;
 
-import org.springframework.data.mapping.model.PersistentProperty;
-
 /**
  * Callback interface to do something with all plain {@link PersistentProperty}
- * instances <em>except</em> associations, transient properties and the id-property.
+ * instances <em>except</em> associations and transient properties.
  *
  * @author Jon Brisbin <jbrisbin@vmware.com>
  */

spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping;
+package org.springframework.data.mapping.context;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
@@ -35,11 +35,12 @@ import java.util.concurrent.ConcurrentMap;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
+import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.event.MappingContextEvent;
-import org.springframework.data.mapping.model.MappingContext;
 import org.springframework.data.mapping.model.MappingException;
-import org.springframework.data.mapping.model.PersistentEntity;
-import org.springframework.data.mapping.model.PersistentProperty;
+import org.springframework.data.mapping.model.MutablePersistentEntity;
+import org.springframework.data.mapping.model.SimpleTypeHolder;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.util.ReflectionUtils;

spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/MappingContext.java

@@ -12,11 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping.model;
+package org.springframework.data.mapping.context;
 
 import java.util.Collection;
 import java.util.List;
 
+import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.validation.Validator;
 

spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/MappingContextAware.java

@@ -16,7 +16,6 @@
 
 package org.springframework.data.mapping.context;
 
-import org.springframework.data.mapping.model.MappingContext;
 
 /**
  * An interface to make beans aware of the active MappingContext in the current ApplicationContext.

spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/MappingContextAwareBeanPostProcessor.java

@@ -22,7 +22,6 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.data.mapping.model.MappingContext;
 
 /**
  * BeanPostProcessor to make Spring beans aware of the current MappingContext. If a MappingContext exists with the

spring-data-commons-core/src/main/java/org/springframework/data/mapping/event/MappingContextEvent.java

@@ -17,8 +17,8 @@
 package org.springframework.data.mapping.event;
 
 import org.springframework.context.ApplicationEvent;
-import org.springframework.data.mapping.model.PersistentEntity;
-import org.springframework.data.mapping.model.PersistentProperty;
+import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.util.TypeInformation;
 
 /**

spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.mapping;
+package org.springframework.data.mapping.model;
 
 import java.beans.PropertyDescriptor;
 import java.lang.annotation.Annotation;
@@ -24,9 +24,9 @@ import java.util.Collection;
 import java.util.Map;
 
 import org.springframework.data.annotation.Reference;
-import org.springframework.data.mapping.model.Association;
-import org.springframework.data.mapping.model.PersistentEntity;
-import org.springframework.data.mapping.model.PersistentProperty;
+import org.springframework.data.mapping.Association;
+import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.util.Assert;
 

spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/AnnotationBasedPersistentProperty.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping;
+package org.springframework.data.mapping.model;
 
 import java.beans.PropertyDescriptor;
 import java.lang.annotation.Annotation;
@@ -24,9 +24,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Reference;
 import org.springframework.data.annotation.Transient;
-import org.springframework.data.mapping.model.Association;
-import org.springframework.data.mapping.model.PersistentEntity;
-import org.springframework.data.mapping.model.PersistentProperty;
+import org.springframework.data.mapping.Association;
+import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.PersistentProperty;
 
 
 /**
@@ -56,7 +56,7 @@ public abstract class AnnotationBasedPersistentProperty<P extends PersistentProp
 	 * Inspects a potentially available {@link Value} annotation at the property and returns the {@link String} value of
 	 * it.
 	 *
-	 * @see org.springframework.data.mapping.AbstractPersistentProperty#getSpelExpression()
+	 * @see org.springframework.data.mapping.model.AbstractPersistentProperty#getSpelExpression()
 	 */
 	public String getSpelExpression() {
 		return value == null ? null : value.value();

spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java

@@ -13,17 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping;
+package org.springframework.data.mapping.model;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.data.mapping.model.Association;
-import org.springframework.data.mapping.model.PersistentEntity;
-import org.springframework.data.mapping.model.PersistentProperty;
-import org.springframework.data.mapping.model.PreferredConstructor;
+import org.springframework.data.mapping.Association;
+import org.springframework.data.mapping.AssociationHandler;
+import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.PersistentProperty;
+import org.springframework.data.mapping.PreferredConstructor;
+import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.util.TypeInformation;
+import org.springframework.util.Assert;
 
 /**
  * Simple value object to capture information of {@link PersistentEntity}s.
@@ -45,44 +48,52 @@ public class BasicPersistentEntity<T, P extends PersistentProperty<P>> implement
 	 * @param information
 	 */
 	public BasicPersistentEntity(TypeInformation<T> information) {
+		Assert.notNull(information);
 		this.information = information;
 		this.preferredConstructor = new PreferredConstructorDiscoverer<T>(information).getConstructor();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mapping.PersistentEntity#getPreferredConstructor()
+	 */
 	public PreferredConstructor<T> getPreferredConstructor() {
 		return preferredConstructor;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mapping.PersistentEntity#getName()
+	 */
 	public String getName() {
 		return getType().getName();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mapping.PersistentEntity#getIdProperty()
+	 */
 	public P getIdProperty() {
 		return idProperty;
 	}
 
-	/* (non-Javadoc)
+	/* 
+	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.MutablePersistentEntity#setIdProperty(P)
 	 */
 	public void setIdProperty(P property) {
 		idProperty = property;
 	}
 
-	public Collection<P> getPersistentProperties() {
-		return persistentProperties.values();
-	}
-
-	/* (non-Javadoc)
+	/* 
+	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.MutablePersistentEntity#addPersistentProperty(P)
 	 */
 	public void addPersistentProperty(P property) {
+		Assert.notNull(property);
 		persistentProperties.put(property.getName(), property);
 	}
 
-	public Collection<Association<P>> getAssociations() {
-		return associations.values();
-	}
-
 	/* (non-Javadoc)
 	 * @see org.springframework.data.mapping.MutablePersistentEntity#addAssociation(org.springframework.data.mapping.model.Association)
 	 */
@@ -90,23 +101,44 @@ public class BasicPersistentEntity<T, P extends PersistentProperty<P>> implement
 		associations.put(association.getInverse().getName(), association);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mapping.PersistentEntity#getPersistentProperty(java.lang.String)
+	 */
 	public P getPersistentProperty(String name) {
 		return persistentProperties.get(name);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mapping.PersistentEntity#getType()
+	 */
 	public Class<T> getType() {
 		return information.getType();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mapping.PersistentEntity#getTypeInformation()
+	 */
 	public TypeInformation<T> getTypeInformation() {
 		return information;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mapping.PersistentEntity#getPersistentPropertyNames()
+	 */
 	public Collection<String> getPersistentPropertyNames() {
 		return persistentProperties.keySet();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mapping.PersistentEntity#doWithProperties(org.springframework.data.mapping.PropertyHandler)
+	 */
 	public void doWithProperties(PropertyHandler<P> handler) {
+		Assert.notNull(handler);
 		for (P property : persistentProperties.values()) {
 			if (!property.isTransient() && !property.isAssociation()) {
 				handler.doWithPersistentProperty(property);
@@ -114,7 +146,12 @@ public class BasicPersistentEntity<T, P extends PersistentProperty<P>> implement
 		}
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mapping.PersistentEntity#doWithAssociations(org.springframework.data.mapping.AssociationHandler)
+	 */
 	public void doWithAssociations(AssociationHandler<P> handler) {
+		Assert.notNull(handler);
 		for (Association<P> association : associations.values()) {
 			handler.doWithAssociation(association);
 		}

spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/BeanWrapper.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping;
+package org.springframework.data.mapping.model;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
@@ -25,12 +25,10 @@ import java.util.List;
 import org.springframework.beans.BeanInstantiationException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.data.mapping.model.MappingInstantiationException;
-import org.springframework.data.mapping.model.ParameterValueProvider;
-import org.springframework.data.mapping.model.PersistentEntity;
-import org.springframework.data.mapping.model.PersistentProperty;
-import org.springframework.data.mapping.model.PreferredConstructor;
-import org.springframework.data.mapping.model.PreferredConstructor.Parameter;
+import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.PersistentProperty;
+import org.springframework.data.mapping.PreferredConstructor;
+import org.springframework.data.mapping.PreferredConstructor.Parameter;
 import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
 

spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MutablePersistentEntity.java

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping;
+package org.springframework.data.mapping.model;
+
+import org.springframework.data.mapping.Association;
+import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.PersistentProperty;
 
-import org.springframework.data.mapping.model.Association;
-import org.springframework.data.mapping.model.PersistentEntity;
-import org.springframework.data.mapping.model.PersistentProperty;
 
 
 /**

spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/ParameterValueProvider.java

@@ -15,7 +15,8 @@
  */
 package org.springframework.data.mapping.model;
 
-import org.springframework.data.mapping.model.PreferredConstructor.Parameter;
+import org.springframework.data.mapping.PreferredConstructor;
+import org.springframework.data.mapping.PreferredConstructor.Parameter;
 
 /**
  * Callback interface to lookup values for a given {@link Parameter}.

spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/PersistentEntity.java

@@ -1,77 +0,0 @@
-package org.springframework.data.mapping.model;
-
-import java.util.Collection;
-
-import org.springframework.data.mapping.AssociationHandler;
-import org.springframework.data.mapping.PropertyHandler;
-import org.springframework.data.util.TypeInformation;
-
-
-/**
- * Represents a persistent entity
- *
- * @author Graeme Rocher
- * @author Jon Brisbin
- * @author Oliver Gierke
- */
-public interface PersistentEntity<T, P extends PersistentProperty<P>> {
-
-	/**
-	 * The entity name including any package prefix
-	 *
-	 * @return The entity name
-	 */
-	String getName();
-
-	PreferredConstructor<T> getPreferredConstructor();
-
-
-	/**
-	 * Returns the id property of the {@link PersistentEntity}. Must never
-	 * return {@literal null} as a {@link PersistentEntity} instance must not be
-	 * created if there is no id property.
-	 *
-	 * @return the id property of the {@link PersistentEntity}.
-	 */
-	P getIdProperty();
-
-	/**
-	 * A list of properties to be persisted
-	 *
-	 * @return A list of PersistentProperty instances
-	 */
-	Collection<P> getPersistentProperties();
-
-	/**
-	 * A list of the associations for this entity. This is typically a subset of the list returned by {@link #getPersistentProperties()}
-	 *
-	 * @return A list of associations
-	 */
-	Collection<Association<P>> getAssociations();
-
-	/**
-	 * Obtains a PersistentProperty instance by name
-	 *
-	 * @param name The name of the property
-	 * @return The PersistentProperty or null if it doesn't exist
-	 */
-	P getPersistentProperty(String name);
-
-	/**
-	 * @return The underlying Java class for this entity
-	 */
-	Class<T> getType();
-
-	TypeInformation<T> getTypeInformation();
-
-	/**
-	 * A list of property names
-	 *
-	 * @return A List of strings
-	 */
-	Collection<String> getPersistentPropertyNames();
-
-	void doWithProperties(PropertyHandler<P> handler);
-
-	void doWithAssociations(AssociationHandler<P> handler);
-}

spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/PreferredConstructorDiscoverer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping;
+package org.springframework.data.mapping.model;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
@@ -21,8 +21,8 @@ import java.util.List;
 
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.core.ParameterNameDiscoverer;
-import org.springframework.data.mapping.model.PreferredConstructor;
-import org.springframework.data.mapping.model.PreferredConstructor.Parameter;
+import org.springframework.data.mapping.PreferredConstructor;
+import org.springframework.data.mapping.PreferredConstructor.Parameter;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
 

spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping;
+package org.springframework.data.mapping.model;
 
 import java.util.Collections;
 import java.util.Date;

spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/SpELAwareParameterValueProvider.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mapping.model;
 
-import org.springframework.data.mapping.model.PreferredConstructor.Parameter;
+import org.springframework.data.mapping.PreferredConstructor.Parameter;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;

spring-data-commons-core/src/main/java/org/springframework/data/repository/config/AbstractRepositoryConfigDefinitionParser.java

@@ -66,7 +66,7 @@ public abstract class AbstractRepositoryConfigDefinitionParser<S extends GlobalR
 			AbstractRepositoryConfigDefinitionParser.class);
 
 	private static final String REPOSITORY_INTERFACE_POST_PROCESSOR =
-			"org.springframework.data.repository.support.RepositoryInterfaceAwareBeanPostProcessor";
+			"org.springframework.data.repository.core.support.RepositoryInterfaceAwareBeanPostProcessor";
 
 
 	/*

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/EntityInformation.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core;
 
 import java.io.Serializable;
 

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/EntityMetadata.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core;
 
 /**
  * Metadata for entity types.

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/RepositoryInformation.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core;
 
 import java.lang.reflect.Method;
 

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/RepositoryMetadata.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core;
 
 
 /**

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/AbstractEntityInformation.java

@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import java.io.Serializable;
 
+import org.springframework.data.repository.core.EntityInformation;
 import org.springframework.util.Assert;
 
 

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/AnnotationRepositoryMetadata.java

@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import org.springframework.data.repository.RepositoryDefinition;
+import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.util.Assert;
 
 /**

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/DefaultRepositoryInformation.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import static org.springframework.data.repository.util.ClassUtils.*;
 
@@ -26,6 +26,8 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.core.RepositoryInformation;
+import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.util.Assert;
 
 /**

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/DefaultRepositoryMetadata.java

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import static org.springframework.core.GenericTypeResolver.*;
 
 import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.util.Assert;
 
 /**

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/PersistableEntityInformation.java

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import java.io.Serializable;
 
 import org.springframework.core.GenericTypeResolver;
 import org.springframework.data.domain.Persistable;
+import org.springframework.data.repository.core.EntityMetadata;
 
 
 /**

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/QueryCreationListener.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import org.springframework.data.repository.query.RepositoryQuery;
 

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupport.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import java.io.Serializable;
 
@@ -21,6 +21,8 @@ import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Required;
 import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.core.EntityInformation;
+import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.query.QueryLookupStrategy;
 import org.springframework.data.repository.query.QueryLookupStrategy.Key;
 import org.springframework.util.Assert;

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/RepositoryFactoryInformation.java

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import java.io.Serializable;
 
 import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.core.EntityInformation;
 
 
 /**

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import static org.springframework.util.ReflectionUtils.*;
 
@@ -29,10 +29,13 @@ import org.aopalliance.intercept.MethodInvocation;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.core.GenericTypeResolver;
 import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.core.EntityInformation;
+import org.springframework.data.repository.core.RepositoryInformation;
+import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryLookupStrategy.Key;
 import org.springframework.data.repository.query.QueryMethod;
 import org.springframework.data.repository.query.RepositoryQuery;
+import org.springframework.data.repository.query.QueryLookupStrategy.Key;
 import org.springframework.data.repository.util.ClassUtils;
 import org.springframework.util.Assert;
 

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/RepositoryInterfaceAwareBeanPostProcessor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.factory.BeanFactory;

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/RepositoryProxyPostProcessor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import org.springframework.aop.framework.ProxyFactory;
 

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/TransactionalRepositoryFactoryBeanSupport.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import java.io.Serializable;
 
@@ -64,7 +64,7 @@ public abstract class TransactionalRepositoryFactoryBeanSupport<T extends Reposi
 	 * {@link TransactionalRepositoryProxyPostProcessor} to the created
 	 * instance.
 	 *
-	 * @see org.springframework.data.repository.support.RepositoryFactoryBeanSupport
+	 * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport
 	 *      #createRepositoryFactory()
 	 */
 	@Override

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/TransactionalRepositoryProxyPostProcessor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import java.io.Serializable;
 import java.lang.reflect.AnnotatedElement;

spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/package-info.java

@@ -1,5 +1,5 @@
 /**
  * Base classes to implement repositories for various data stores.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 

spring-data-commons-core/src/main/java/org/springframework/data/repository/query/QueryLookupStrategy.java

@@ -18,7 +18,7 @@ package org.springframework.data.repository.query;
 import java.lang.reflect.Method;
 import java.util.Locale;
 
-import org.springframework.data.repository.support.RepositoryMetadata;
+import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.util.StringUtils;
 
 

spring-data-commons-core/src/main/java/org/springframework/data/repository/query/QueryMethod.java

@@ -23,8 +23,8 @@ import java.util.List;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
-import org.springframework.data.repository.support.EntityMetadata;
-import org.springframework.data.repository.support.RepositoryMetadata;
+import org.springframework.data.repository.core.EntityMetadata;
+import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.util.ClassUtils;
 import org.springframework.util.Assert;
 

spring-data-commons-core/src/main/java/org/springframework/data/repository/query/RepositoryQuery.java

@@ -16,6 +16,7 @@
 package org.springframework.data.repository.query;
 
 
+
 /**
  * Interface for a query abstraction.
  *

spring-data-commons-core/src/main/java/org/springframework/data/repository/support/DomainClassConverter.java

@@ -29,6 +29,8 @@ import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.ConditionalGenericConverter;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.core.EntityInformation;
+import org.springframework.data.repository.core.support.RepositoryFactoryInformation;
 
 
 /**

spring-data-commons-core/src/main/java/org/springframework/data/repository/support/DomainClassPropertyEditor.java

@@ -22,6 +22,7 @@ import java.io.Serializable;
 import org.springframework.beans.PropertyEditorRegistry;
 import org.springframework.beans.SimpleTypeConverter;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.core.EntityInformation;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 

spring-data-commons-core/src/main/java/org/springframework/data/repository/support/DomainClassPropertyEditorRegistrar.java

@@ -27,6 +27,8 @@ import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.core.EntityInformation;
+import org.springframework.data.repository.core.support.RepositoryFactoryInformation;
 
 
 /**

spring-data-commons-core/src/test/java/org/springframework/data/mapping/MappingMetadataTests.java

@@ -20,12 +20,15 @@ import static org.junit.Assert.*;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
+import java.util.Collections;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.data.mapping.model.Association;
-import org.springframework.data.mapping.model.PersistentEntity;
-import org.springframework.data.mapping.model.PersistentProperty;
+import org.springframework.data.mapping.context.AbstractMappingContext;
+import org.springframework.data.mapping.model.AnnotationBasedPersistentProperty;
+import org.springframework.data.mapping.model.BasicPersistentEntity;
+import org.springframework.data.mapping.model.MutablePersistentEntity;
+import org.springframework.data.mapping.model.SimpleTypeHolder;
 import org.springframework.data.util.TypeInformation;
 
 /**
@@ -43,19 +46,27 @@ public class MappingMetadataTests {
 
 	@Test
 	public void testPojoWithId() {
-		PersistentEntity<?, SampleProperty> person = ctx.addPersistentEntity(PersonWithId.class);
+		
+		ctx.setInitialEntitySet(Collections.singleton(PersonWithId.class));
+		ctx.afterPropertiesSet();
+		
+		PersistentEntity<?, SampleProperty> person = ctx.getPersistentEntity(PersonWithId.class);
 		assertNotNull(person.getIdProperty());
 		assertEquals(String.class, person.getIdProperty().getType());
 	}
 
 	@Test
 	public void testAssociations() {
-		PersistentEntity<?, SampleProperty> person = ctx.addPersistentEntity(PersonWithChildren.class);
-		assertNotNull(person.getAssociations());
-
-		for (Association<SampleProperty> association : person.getAssociations()) {
-			assertEquals(Child.class, association.getInverse().getComponentType());
-		}
+		
+		ctx.setInitialEntitySet(Collections.singleton(PersonWithChildren.class));
+		ctx.afterPropertiesSet();
+		
+		PersistentEntity<?, SampleProperty> person = ctx.getPersistentEntity(PersonWithChildren.class);
+		person.doWithAssociations(new AssociationHandler<MappingMetadataTests.SampleProperty>() {
+			public void doWithAssociation(Association<SampleProperty> association) {
+				assertEquals(Child.class, association.getInverse().getComponentType());
+			}
+		});
 	}
 
 	public interface SampleProperty extends PersistentProperty<SampleProperty> {

spring-data-commons-core/src/test/java/org/springframework/data/mapping/PersistentEntitySpec.java

@@ -0,0 +1,18 @@
+package org.springframework.data.mapping;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+/**
+ * Some test methods that define expected behaviour for {@link PersistentEntity} interface. Implementation test classes
+ * can simply extend that class to get the specs tested against an instance of their implementation.
+ * 
+ * @author Oliver Gierke
+ */
+public abstract class PersistentEntitySpec {
+
+	public static void assertInvariants(PersistentEntity<?, ?> entity) {
+		assertThat(entity.getName(), is(notNullValue()));
+		assertThat(entity.getPreferredConstructor(), is(notNullValue()));
+	}
+}

spring-data-commons-core/src/test/java/org/springframework/data/mapping/PreferredConstructorDiscovererUnitTests.java

@@ -23,8 +23,8 @@ import java.util.List;
 
 import org.junit.Test;
 import org.springframework.data.annotation.PersistenceConstructor;
-import org.springframework.data.mapping.model.PreferredConstructor;
-import org.springframework.data.mapping.model.PreferredConstructor.Parameter;
+import org.springframework.data.mapping.PreferredConstructor.Parameter;
+import org.springframework.data.mapping.model.PreferredConstructorDiscoverer;
 
 
 /**

spring-data-commons-core/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java

@@ -22,6 +22,7 @@ import java.util.Collections;
 import java.util.HashSet;
 
 import org.junit.Test;
+import org.springframework.data.mapping.model.SimpleTypeHolder;
 
 /**
  * Unit tests for {@link SimpleTypeHolder}.

spring-data-commons-core/src/test/java/org/springframework/data/mapping/model/BasicPersistentEntityUnitTests.java

@@ -0,0 +1,37 @@
+package org.springframework.data.mapping.model;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.springframework.data.mapping.PersistentEntitySpec;
+import org.springframework.data.mapping.PersistentProperty;
+import org.springframework.data.mapping.Person;
+import org.springframework.data.util.ClassTypeInformation;
+
+/**
+ * Unit test for {@link BasicPersistentEntity}.
+ *
+ * @author Oliver Gierke
+ */
+public class BasicPersistentEntityUnitTests<T extends PersistentProperty<T>> {
+
+	@Test
+	public void assertInvariants() {
+		PersistentEntitySpec.assertInvariants(createEntity());
+	}
+	
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsNullTypeInformation() {
+		new BasicPersistentEntity<Object, T>(null);
+	}
+	
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsNullProperty() {
+		createEntity().addPersistentProperty(null);
+	}
+	
+	private BasicPersistentEntity<Person, T> createEntity() {
+		return new BasicPersistentEntity<Person, T>(ClassTypeInformation.from(Person.class));
+	}
+}

spring-data-commons-core/src/test/java/org/springframework/data/repository/core/support/AbstractEntityInformationUnitTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -21,6 +21,8 @@ import static org.junit.Assert.*;
 import java.io.Serializable;
 
 import org.junit.Test;
+import org.springframework.data.repository.core.EntityInformation;
+import org.springframework.data.repository.core.support.AbstractEntityInformation;
 
 
 /**

spring-data-commons-core/src/test/java/org/springframework/data/repository/core/support/AnnotationRepositoryMetadataUnitTests.java

@@ -13,12 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.springframework.data.repository.RepositoryDefinition;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.AnnotationRepositoryMetadata;
+import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
 
 
 /**

spring-data-commons-core/src/test/java/org/springframework/data/repository/core/support/CustomAnnotationTransactionAttributeSourceUnitTests.java

@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.springframework.data.repository.support.TransactionalRepositoryProxyPostProcessor.CustomAnnotationTransactionAttributeSource;
+import org.springframework.data.repository.core.support.TransactionalRepositoryProxyPostProcessor;
+import org.springframework.data.repository.core.support.TransactionalRepositoryProxyPostProcessor.CustomAnnotationTransactionAttributeSource;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAttribute;
 

spring-data-commons-core/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryInformationUnitTests.java

@@ -1,4 +1,4 @@
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
@@ -11,7 +11,11 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.support.DefaultRepositoryMetadataUnitTests.DummyGenericRepositorySupport;
+import org.springframework.data.repository.core.RepositoryInformation;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.DefaultRepositoryInformation;
+import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
+import org.springframework.data.repository.core.support.DefaultRepositoryMetadataUnitTests.DummyGenericRepositorySupport;
 
 /**
  * @author Oliver Gierke

spring-data-commons-core/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryMetadataUnitTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import static org.junit.Assert.*;
 
@@ -23,6 +23,8 @@ import org.junit.Test;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
 import org.springframework.data.repository.util.ClassUtils;
 
 

spring-data-commons-core/src/test/java/org/springframework/data/repository/core/support/PersistableEntityInformationUnitTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -24,6 +24,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.data.domain.Persistable;
+import org.springframework.data.repository.core.support.PersistableEntityInformation;
 
 
 /**

spring-data-commons-core/src/test/java/org/springframework/data/repository/core/support/QueryExecuterMethodInterceptorUnitTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
@@ -22,8 +22,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.data.repository.core.RepositoryInformation;
+import org.springframework.data.repository.core.support.RepositoryFactorySupport;
+import org.springframework.data.repository.core.support.RepositoryFactorySupport.QueryExecuterMethodInterceptor;
 import org.springframework.data.repository.query.QueryLookupStrategy.Key;
-import org.springframework.data.repository.support.RepositoryFactorySupport.QueryExecuterMethodInterceptor;
 
 /**
  * Unit test for {@link QueryExecuterMethodInterceptor}.

spring-data-commons-core/src/test/java/org/springframework/data/repository/core/support/RepositoryFactorySupportUnitTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
@@ -27,9 +27,13 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.core.EntityInformation;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.QueryCreationListener;
+import org.springframework.data.repository.core.support.RepositoryFactorySupport;
 import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryLookupStrategy.Key;
 import org.springframework.data.repository.query.RepositoryQuery;
+import org.springframework.data.repository.query.QueryLookupStrategy.Key;
 
 
 /**

spring-data-commons-core/src/test/java/org/springframework/data/repository/core/support/RepositoryInterfaceAwareBeanPostProcessorUnitTests.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -29,6 +29,8 @@ import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport;
+import org.springframework.data.repository.core.support.RepositoryInterfaceAwareBeanPostProcessor;
 
 
 /**

spring-data-commons-core/src/test/java/org/springframework/data/repository/core/support/TransactionRepositoryProxyPostProcessorUnitTests.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.springframework.data.repository.support;
+package org.springframework.data.repository.core.support;
 
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.eq;
@@ -32,6 +32,8 @@ import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.dao.support.PersistenceExceptionTranslationInterceptor;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
+import org.springframework.data.repository.core.support.RepositoryProxyPostProcessor;
+import org.springframework.data.repository.core.support.TransactionalRepositoryProxyPostProcessor;
 import org.springframework.transaction.interceptor.TransactionInterceptor;
 
 

spring-data-commons-core/src/test/java/org/springframework/data/repository/query/QueryMethodUnitTest.java

@@ -22,7 +22,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.repository.support.RepositoryMetadata;
+import org.springframework.data.repository.core.RepositoryMetadata;
 
 /**
  * Unit tests for {@link QueryMethod}.

spring-data-commons-core/src/test/java/org/springframework/data/repository/support/DomainClassConverterUnitTests.java

@@ -36,6 +36,8 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.core.EntityInformation;
+import org.springframework.data.repository.core.support.RepositoryFactoryInformation;
 
 
 /**

spring-data-commons-core/src/test/java/org/springframework/data/repository/support/DomainClassPropertyEditorRegistrarUnitTests.java

@@ -34,6 +34,8 @@ import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.beans.PropertyEditorRegistry;
 import org.springframework.context.ApplicationContext;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.core.EntityInformation;
+import org.springframework.data.repository.core.support.RepositoryFactoryInformation;
 
 
 /**

spring-data-commons-core/src/test/java/org/springframework/data/repository/support/DomainClassPropertyEditorUnitTests.java

@@ -29,6 +29,7 @@ import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.beans.PropertyEditorRegistry;
 import org.springframework.data.domain.Persistable;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.core.EntityInformation;
 
 
 /**