diff --git a/src/main/java/org/springframework/data/repository/init/ResourceReaderRepositoryPopulator.java b/src/main/java/org/springframework/data/repository/init/ResourceReaderRepositoryPopulator.java index 9228a6b19..e560c5755 100644 --- a/src/main/java/org/springframework/data/repository/init/ResourceReaderRepositoryPopulator.java +++ b/src/main/java/org/springframework/data/repository/init/ResourceReaderRepositoryPopulator.java @@ -26,10 +26,10 @@ import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; -import org.springframework.data.repository.invoker.DefaultRepositoryInvokerFactory; -import org.springframework.data.repository.invoker.RepositoryInvoker; -import org.springframework.data.repository.invoker.RepositoryInvokerFactory; +import org.springframework.data.repository.support.DefaultRepositoryInvokerFactory; import org.springframework.data.repository.support.Repositories; +import org.springframework.data.repository.support.RepositoryInvoker; +import org.springframework.data.repository.support.RepositoryInvokerFactory; import org.springframework.util.Assert; /** diff --git a/src/main/java/org/springframework/data/repository/invoker/CrudRepositoryInvoker.java b/src/main/java/org/springframework/data/repository/support/CrudRepositoryInvoker.java similarity index 98% rename from src/main/java/org/springframework/data/repository/invoker/CrudRepositoryInvoker.java rename to src/main/java/org/springframework/data/repository/support/CrudRepositoryInvoker.java index ab5ec4b50..9b928bd7f 100644 --- a/src/main/java/org/springframework/data/repository/invoker/CrudRepositoryInvoker.java +++ b/src/main/java/org/springframework/data/repository/support/CrudRepositoryInvoker.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.repository.invoker; +package org.springframework.data.repository.support; import java.io.Serializable; import java.lang.reflect.Method; diff --git a/src/main/java/org/springframework/data/repository/invoker/DefaultRepositoryInvokerFactory.java b/src/main/java/org/springframework/data/repository/support/DefaultRepositoryInvokerFactory.java similarity index 97% rename from src/main/java/org/springframework/data/repository/invoker/DefaultRepositoryInvokerFactory.java rename to src/main/java/org/springframework/data/repository/support/DefaultRepositoryInvokerFactory.java index 13db53f8a..baa369c24 100644 --- a/src/main/java/org/springframework/data/repository/invoker/DefaultRepositoryInvokerFactory.java +++ b/src/main/java/org/springframework/data/repository/support/DefaultRepositoryInvokerFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.repository.invoker; +package org.springframework.data.repository.support; import java.io.Serializable; import java.util.HashMap; @@ -23,7 +23,6 @@ import org.springframework.core.convert.ConversionService; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.core.RepositoryInformation; -import org.springframework.data.repository.support.Repositories; import org.springframework.format.support.DefaultFormattingConversionService; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/repository/support/DomainClassConverter.java b/src/main/java/org/springframework/data/repository/support/DomainClassConverter.java index c4ce8799a..77aa64102 100644 --- a/src/main/java/org/springframework/data/repository/support/DomainClassConverter.java +++ b/src/main/java/org/springframework/data/repository/support/DomainClassConverter.java @@ -26,9 +26,6 @@ import org.springframework.core.convert.converter.ConditionalGenericConverter; import org.springframework.core.convert.converter.ConverterRegistry; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.core.RepositoryInformation; -import org.springframework.data.repository.invoker.DefaultRepositoryInvokerFactory; -import org.springframework.data.repository.invoker.RepositoryInvoker; -import org.springframework.data.repository.invoker.RepositoryInvokerFactory; import org.springframework.util.StringUtils; /** diff --git a/src/main/java/org/springframework/data/repository/support/DomainClassPropertyEditor.java b/src/main/java/org/springframework/data/repository/support/DomainClassPropertyEditor.java index 197faef0e..cb871711d 100644 --- a/src/main/java/org/springframework/data/repository/support/DomainClassPropertyEditor.java +++ b/src/main/java/org/springframework/data/repository/support/DomainClassPropertyEditor.java @@ -23,7 +23,6 @@ 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.data.repository.invoker.RepositoryInvoker; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/src/main/java/org/springframework/data/repository/support/DomainClassPropertyEditorRegistrar.java b/src/main/java/org/springframework/data/repository/support/DomainClassPropertyEditorRegistrar.java index 0e016e689..ba1d806b5 100644 --- a/src/main/java/org/springframework/data/repository/support/DomainClassPropertyEditorRegistrar.java +++ b/src/main/java/org/springframework/data/repository/support/DomainClassPropertyEditorRegistrar.java @@ -22,9 +22,6 @@ import org.springframework.beans.PropertyEditorRegistry; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.data.repository.core.RepositoryInformation; -import org.springframework.data.repository.invoker.DefaultRepositoryInvokerFactory; -import org.springframework.data.repository.invoker.RepositoryInvoker; -import org.springframework.data.repository.invoker.RepositoryInvokerFactory; import org.springframework.web.servlet.DispatcherServlet; /** diff --git a/src/main/java/org/springframework/data/repository/invoker/PagingAndSortingRepositoryInvoker.java b/src/main/java/org/springframework/data/repository/support/PagingAndSortingRepositoryInvoker.java similarity index 98% rename from src/main/java/org/springframework/data/repository/invoker/PagingAndSortingRepositoryInvoker.java rename to src/main/java/org/springframework/data/repository/support/PagingAndSortingRepositoryInvoker.java index 33d27e05b..16800d32e 100644 --- a/src/main/java/org/springframework/data/repository/invoker/PagingAndSortingRepositoryInvoker.java +++ b/src/main/java/org/springframework/data/repository/support/PagingAndSortingRepositoryInvoker.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.repository.invoker; +package org.springframework.data.repository.support; import java.io.Serializable; import java.lang.reflect.Method; diff --git a/src/main/java/org/springframework/data/repository/invoker/ReflectionRepositoryInvoker.java b/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java similarity index 99% rename from src/main/java/org/springframework/data/repository/invoker/ReflectionRepositoryInvoker.java rename to src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java index 8fafdf27c..a0087bbbf 100644 --- a/src/main/java/org/springframework/data/repository/invoker/ReflectionRepositoryInvoker.java +++ b/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.repository.invoker; +package org.springframework.data.repository.support; import java.io.Serializable; import java.lang.reflect.Method; diff --git a/src/main/java/org/springframework/data/repository/invoker/RepositoryInvocationInformation.java b/src/main/java/org/springframework/data/repository/support/RepositoryInvocationInformation.java similarity index 96% rename from src/main/java/org/springframework/data/repository/invoker/RepositoryInvocationInformation.java rename to src/main/java/org/springframework/data/repository/support/RepositoryInvocationInformation.java index ad47023a5..4d5a8c3f0 100644 --- a/src/main/java/org/springframework/data/repository/invoker/RepositoryInvocationInformation.java +++ b/src/main/java/org/springframework/data/repository/support/RepositoryInvocationInformation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.repository.invoker; +package org.springframework.data.repository.support; /** * Meta-information about the methods a repository exposes. diff --git a/src/main/java/org/springframework/data/repository/invoker/RepositoryInvoker.java b/src/main/java/org/springframework/data/repository/support/RepositoryInvoker.java similarity index 98% rename from src/main/java/org/springframework/data/repository/invoker/RepositoryInvoker.java rename to src/main/java/org/springframework/data/repository/support/RepositoryInvoker.java index b0cd63c58..d0e008249 100644 --- a/src/main/java/org/springframework/data/repository/invoker/RepositoryInvoker.java +++ b/src/main/java/org/springframework/data/repository/support/RepositoryInvoker.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.repository.invoker; +package org.springframework.data.repository.support; import java.io.Serializable; import java.lang.reflect.Method; diff --git a/src/main/java/org/springframework/data/repository/invoker/RepositoryInvokerFactory.java b/src/main/java/org/springframework/data/repository/support/RepositoryInvokerFactory.java similarity index 95% rename from src/main/java/org/springframework/data/repository/invoker/RepositoryInvokerFactory.java rename to src/main/java/org/springframework/data/repository/support/RepositoryInvokerFactory.java index a3ae666fa..a55345a28 100644 --- a/src/main/java/org/springframework/data/repository/invoker/RepositoryInvokerFactory.java +++ b/src/main/java/org/springframework/data/repository/support/RepositoryInvokerFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.repository.invoker; +package org.springframework.data.repository.support; /** * Interface for a factory to create {@link RepositoryInvoker} instances for repositories managing a particular domain diff --git a/src/test/java/org/springframework/data/repository/invoker/CrudRepositoryInvokerUnitTests.java b/src/test/java/org/springframework/data/repository/support/CrudRepositoryInvokerUnitTests.java similarity index 95% rename from src/test/java/org/springframework/data/repository/invoker/CrudRepositoryInvokerUnitTests.java rename to src/test/java/org/springframework/data/repository/support/CrudRepositoryInvokerUnitTests.java index ed3be660a..724134fa0 100644 --- a/src/test/java/org/springframework/data/repository/invoker/CrudRepositoryInvokerUnitTests.java +++ b/src/test/java/org/springframework/data/repository/support/CrudRepositoryInvokerUnitTests.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.repository.invoker; +package org.springframework.data.repository.support; import static org.mockito.Mockito.*; -import static org.springframework.data.repository.invoker.RepositoryInvocationTestUtils.*; +import static org.springframework.data.repository.support.RepositoryInvocationTestUtils.*; import java.io.Serializable; import java.lang.reflect.Method; @@ -36,8 +36,10 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.core.RepositoryMetadata; import org.springframework.data.repository.core.support.DefaultRepositoryMetadata; -import org.springframework.data.repository.invoker.RepositoryInvocationTestUtils.VerifyingMethodInterceptor; import org.springframework.data.repository.query.Param; +import org.springframework.data.repository.support.CrudRepositoryInvoker; +import org.springframework.data.repository.support.RepositoryInvoker; +import org.springframework.data.repository.support.RepositoryInvocationTestUtils.VerifyingMethodInterceptor; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat.ISO; import org.springframework.format.support.DefaultFormattingConversionService; diff --git a/src/test/java/org/springframework/data/repository/invoker/DefaultRepositoryInvokerFactoryIntegrationTests.java b/src/test/java/org/springframework/data/repository/support/DefaultRepositoryInvokerFactoryIntegrationTests.java similarity index 87% rename from src/test/java/org/springframework/data/repository/invoker/DefaultRepositoryInvokerFactoryIntegrationTests.java rename to src/test/java/org/springframework/data/repository/support/DefaultRepositoryInvokerFactoryIntegrationTests.java index 2155f1f22..79ecdf75c 100644 --- a/src/test/java/org/springframework/data/repository/invoker/DefaultRepositoryInvokerFactoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/repository/support/DefaultRepositoryInvokerFactoryIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.repository.invoker; +package org.springframework.data.repository.support; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -30,7 +30,13 @@ import org.springframework.data.repository.sample.Product; import org.springframework.data.repository.sample.ProductRepository; import org.springframework.data.repository.sample.SampleConfiguration; import org.springframework.data.repository.sample.User; +import org.springframework.data.repository.support.CrudRepositoryInvoker; +import org.springframework.data.repository.support.DefaultRepositoryInvokerFactory; +import org.springframework.data.repository.support.PagingAndSortingRepositoryInvoker; +import org.springframework.data.repository.support.ReflectionRepositoryInvoker; import org.springframework.data.repository.support.Repositories; +import org.springframework.data.repository.support.RepositoryInvoker; +import org.springframework.data.repository.support.RepositoryInvokerFactory; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/src/test/java/org/springframework/data/repository/support/DomainClassPropertyEditorUnitTests.java b/src/test/java/org/springframework/data/repository/support/DomainClassPropertyEditorUnitTests.java index 9cee0ff43..62ff9ef2a 100644 --- a/src/test/java/org/springframework/data/repository/support/DomainClassPropertyEditorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/support/DomainClassPropertyEditorUnitTests.java @@ -29,7 +29,6 @@ import org.mockito.runners.MockitoJUnitRunner; import org.springframework.beans.PropertyEditorRegistry; import org.springframework.data.domain.Persistable; import org.springframework.data.repository.core.EntityInformation; -import org.springframework.data.repository.invoker.RepositoryInvoker; /** * Unit test for {@link DomainClassPropertyEditor}. diff --git a/src/test/java/org/springframework/data/repository/invoker/PaginginAndSortingRepositoryInvokerUnitTests.java b/src/test/java/org/springframework/data/repository/support/PaginginAndSortingRepositoryInvokerUnitTests.java similarity index 92% rename from src/test/java/org/springframework/data/repository/invoker/PaginginAndSortingRepositoryInvokerUnitTests.java rename to src/test/java/org/springframework/data/repository/support/PaginginAndSortingRepositoryInvokerUnitTests.java index 89083d159..df063d1d9 100644 --- a/src/test/java/org/springframework/data/repository/invoker/PaginginAndSortingRepositoryInvokerUnitTests.java +++ b/src/test/java/org/springframework/data/repository/support/PaginginAndSortingRepositoryInvokerUnitTests.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.repository.invoker; +package org.springframework.data.repository.support; import static org.mockito.Mockito.*; -import static org.springframework.data.repository.invoker.RepositoryInvocationTestUtils.*; +import static org.springframework.data.repository.support.RepositoryInvocationTestUtils.*; import java.lang.reflect.Method; @@ -29,7 +29,9 @@ import org.springframework.data.domain.Sort; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.core.RepositoryMetadata; import org.springframework.data.repository.core.support.DefaultRepositoryMetadata; -import org.springframework.data.repository.invoker.RepositoryInvocationTestUtils.VerifyingMethodInterceptor; +import org.springframework.data.repository.support.PagingAndSortingRepositoryInvoker; +import org.springframework.data.repository.support.RepositoryInvoker; +import org.springframework.data.repository.support.RepositoryInvocationTestUtils.VerifyingMethodInterceptor; import org.springframework.format.support.DefaultFormattingConversionService; /** diff --git a/src/test/java/org/springframework/data/repository/invoker/ReflectionRepositoryInvokerUnitTests.java b/src/test/java/org/springframework/data/repository/support/ReflectionRepositoryInvokerUnitTests.java similarity index 95% rename from src/test/java/org/springframework/data/repository/invoker/ReflectionRepositoryInvokerUnitTests.java rename to src/test/java/org/springframework/data/repository/support/ReflectionRepositoryInvokerUnitTests.java index 40ba574c2..36508c739 100644 --- a/src/test/java/org/springframework/data/repository/invoker/ReflectionRepositoryInvokerUnitTests.java +++ b/src/test/java/org/springframework/data/repository/support/ReflectionRepositoryInvokerUnitTests.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.repository.invoker; +package org.springframework.data.repository.support; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; import static org.mockito.Mockito.*; -import static org.springframework.data.repository.invoker.RepositoryInvocationTestUtils.*; +import static org.springframework.data.repository.support.RepositoryInvocationTestUtils.*; import java.lang.reflect.Method; import java.util.Collections; @@ -41,9 +41,11 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.Repository; import org.springframework.data.repository.core.RepositoryMetadata; import org.springframework.data.repository.core.support.DefaultRepositoryMetadata; -import org.springframework.data.repository.invoker.CrudRepositoryInvokerUnitTests.Person; -import org.springframework.data.repository.invoker.CrudRepositoryInvokerUnitTests.PersonRepository; -import org.springframework.data.repository.invoker.RepositoryInvocationTestUtils.VerifyingMethodInterceptor; +import org.springframework.data.repository.support.ReflectionRepositoryInvoker; +import org.springframework.data.repository.support.RepositoryInvoker; +import org.springframework.data.repository.support.CrudRepositoryInvokerUnitTests.Person; +import org.springframework.data.repository.support.CrudRepositoryInvokerUnitTests.PersonRepository; +import org.springframework.data.repository.support.RepositoryInvocationTestUtils.VerifyingMethodInterceptor; import org.springframework.format.support.DefaultFormattingConversionService; /** diff --git a/src/test/java/org/springframework/data/repository/invoker/RepositoryInvocationTestUtils.java b/src/test/java/org/springframework/data/repository/support/RepositoryInvocationTestUtils.java similarity index 95% rename from src/test/java/org/springframework/data/repository/invoker/RepositoryInvocationTestUtils.java rename to src/test/java/org/springframework/data/repository/support/RepositoryInvocationTestUtils.java index 9de6a0109..21a7bbf7b 100644 --- a/src/test/java/org/springframework/data/repository/invoker/RepositoryInvocationTestUtils.java +++ b/src/test/java/org/springframework/data/repository/support/RepositoryInvocationTestUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.repository.invoker; +package org.springframework.data.repository.support; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -25,6 +25,7 @@ import java.util.List; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.springframework.aop.framework.ProxyFactory; +import org.springframework.data.repository.support.RepositoryInvoker; /** * Utility methods to create {@link RepositoryInvoker} instances that get a verifying proxy attached so that the