Adapted package refactorings in Spring Data Commons.

Resolved package dependencies as well.

src/main/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategy.java

@@ -20,10 +20,10 @@ import java.lang.reflect.Method;
 import javax.persistence.EntityManager;
 
 import org.springframework.data.jpa.repository.Query;
+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.RepositoryQuery;
-import org.springframework.data.repository.support.RepositoryMetadata;
 
 
 /**

src/main/java/org/springframework/data/jpa/repository/query/JpaQueryMethod.java

@@ -28,9 +28,9 @@ import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.jpa.repository.QueryHints;
+import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.query.Parameters;
 import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.support.RepositoryMetadata;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 

src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java

@@ -21,11 +21,11 @@ import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaQuery;
 
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.core.EntityMetadata;
 import org.springframework.data.repository.query.ParameterAccessor;
 import org.springframework.data.repository.query.ParametersParameterAccessor;
 import org.springframework.data.repository.query.QueryMethod;
 import org.springframework.data.repository.query.parser.PartTree;
-import org.springframework.data.repository.support.EntityMetadata;
 
 
 /**

src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformation.java

@@ -19,7 +19,7 @@ import java.io.Serializable;
 
 import javax.persistence.metamodel.SingularAttribute;
 
-import org.springframework.data.repository.support.EntityInformation;
+import org.springframework.data.repository.core.EntityInformation;
 
 
 /**

src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java

@@ -24,8 +24,8 @@ import javax.persistence.metamodel.EntityType;
 import javax.persistence.metamodel.Metamodel;
 import javax.persistence.metamodel.SingularAttribute;
 
-import org.springframework.data.repository.support.AbstractEntityInformation;
-import org.springframework.data.repository.support.EntityInformation;
+import org.springframework.data.repository.core.EntityInformation;
+import org.springframework.data.repository.core.support.AbstractEntityInformation;
 import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
 

src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java

@@ -25,10 +25,10 @@ import org.springframework.data.jpa.repository.query.JpaQueryLookupStrategy;
 import org.springframework.data.jpa.repository.query.QueryExtractor;
 import org.springframework.data.jpa.repository.utils.JpaClassUtils;
 import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import org.springframework.data.repository.core.RepositoryMetadata;
+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.support.RepositoryFactorySupport;
-import org.springframework.data.repository.support.RepositoryMetadata;
 import org.springframework.util.Assert;
 
 

src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBean.java

@@ -22,8 +22,8 @@ import javax.persistence.PersistenceContext;
 
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.repository.support.RepositoryFactorySupport;
-import org.springframework.data.repository.support.TransactionalRepositoryFactoryBeanSupport;
+import org.springframework.data.repository.core.support.RepositoryFactorySupport;
+import org.springframework.data.repository.core.support.TransactionalRepositoryFactoryBeanSupport;
 import org.springframework.util.Assert;
 
 

src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java

@@ -23,7 +23,7 @@ import javax.persistence.EntityManager;
 
 import org.springframework.data.jpa.repository.support.JpaEntityInformation;
 import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
-import org.springframework.data.repository.support.RepositoryMetadata;
+import org.springframework.data.repository.core.RepositoryMetadata;
 
 
 /**

src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactoryBean.java

@@ -21,7 +21,7 @@ import javax.persistence.EntityManager;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
-import org.springframework.data.repository.support.RepositoryFactorySupport;
+import org.springframework.data.repository.core.support.RepositoryFactorySupport;
 
 
 /**

src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java

@@ -34,10 +34,10 @@ import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.sample.User;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.sample.UserRepository;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
 import org.springframework.data.repository.query.QueryMethod;
 import org.springframework.data.repository.query.QueryMethod.Type;
-import org.springframework.data.repository.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.support.RepositoryMetadata;
 
 
 /**

src/test/java/org/springframework/data/jpa/repository/query/NamedQueryUnitTests.java

@@ -28,8 +28,8 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.query.QueryCreationException;
-import org.springframework.data.repository.support.RepositoryMetadata;
 
 
 /**

src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java

@@ -33,7 +33,7 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.data.jpa.repository.sample.UserRepository;
-import org.springframework.data.repository.support.RepositoryMetadata;
+import org.springframework.data.repository.core.RepositoryMetadata;
 
 
 /**

src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java

@@ -29,7 +29,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.support.EntityInformation;
+import org.springframework.data.repository.core.EntityInformation;
 
 
 /**

src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBeanUnitTests.java

@@ -36,7 +36,7 @@ import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.domain.Persistable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.support.RepositoryFactorySupport;
+import org.springframework.data.repository.core.support.RepositoryFactorySupport;
 
 
 /**

src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryUnitTests.java

@@ -34,7 +34,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.custom.CustomGenericJpaRepositoryFactory;
 import org.springframework.data.jpa.repository.custom.UserCustomExtendedRepository;
 import org.springframework.data.querydsl.QueryDslPredicateExecutor;
-import org.springframework.data.repository.support.DefaultRepositoryMetadata;
+import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
 import org.springframework.transaction.annotation.Transactional;