From f88dec4dc5b46fd4f60cbd470479380df98b291c Mon Sep 17 00:00:00 2001 From: Moritz Becker Date: Sun, 26 Nov 2017 14:29:45 +0100 Subject: [PATCH] #328 aligned spring data and deltaspike data package names --- .../repository/CatSimpleViewRepository.java | 2 +- .../manual/en_US/11_spring_data.adoc | 2 +- .../manual/en_US/12_deltaspike_data.adoc | 6 +++--- .../data}/SpringDataShowcase.java | 6 +++--- .../data}/SpringDataShowcaseConfig.java | 4 ++-- .../data}/data/TestDataGenerator.java | 2 +- .../data}/repository/CatRepository.java | 4 ++-- .../data}/view/CatView.java | 2 +- .../data}/view/IdHolderView.java | 2 +- ...blazebit.persistence.examples.spi.Showcase | 2 +- .../main/resources/META-INF/spring-beans.xml | 2 +- .../test/resources/META-INF/spring-beans.xml | 2 +- .../data}/api/CriteriaSupport.java | 2 +- .../data}/api/EntityViewRepository.java | 2 +- .../data}/api/FullEntityViewRepository.java | 2 +- .../data}/api/package-info.java | 2 +- .../CustomPartialBeanBindingExtension.java | 2 +- .../impl/DeltaspikeExtensionDeactivator.java | 2 +- .../impl/EntityViewRepositoryExtension.java | 4 ++-- .../EntityViewAwareQueryBuilderFactory.java | 6 +++--- .../EntityViewDelegateQueryBuilder.java | 6 +++--- .../builder/EntityViewMethodQueryBuilder.java | 8 ++++---- .../impl/builder/EntityViewQueryBuilder.java | 4 ++-- .../EntityViewQueryBuilderContext.java | 2 +- .../WrappedEntityViewQueryBuilder.java | 6 +++--- .../builder/part/EntityViewAndQueryPart.java | 6 +++--- .../part/EntityViewBasePropertyQueryPart.java | 4 ++-- .../part/EntityViewConnectingQueryPart.java | 2 +- .../builder/part/EntityViewOrQueryPart.java | 6 +++--- .../part/EntityViewOrderByQueryPart.java | 6 +++--- .../part/EntityViewPropertyQueryPart.java | 6 +++--- .../builder/part/EntityViewQueryPart.java | 6 +++--- .../builder/part/EntityViewQueryRoot.java | 6 +++--- .../impl/builder/part/QueryOperator.java | 2 +- .../postprocessor/FlushModePostProcessor.java | 6 +++--- .../postprocessor/HintPostProcessor.java | 6 +++--- .../postprocessor/LockModePostProcessor.java | 6 +++--- .../OrderByCriteriaBuilderPostProcessor.java | 4 ++-- ...aginationCriteriaBuilderPostProcessor.java | 4 ++-- .../result/EntityViewDefaultQueryResult.java | 20 +++++++++---------- .../data}/impl/criteria/QueryCriteria.java | 2 +- .../handler/CriteriaBuilderPostProcessor.java | 2 +- .../impl/handler/CriteriaSupportHandler.java | 6 +++--- .../impl/handler/EntityManagerRefLookup.java | 4 ++-- .../handler/EntityViewAwareQueryHandler.java | 12 +++++------ .../EntityViewCdiQueryInvocationContext.java | 6 +++--- ...tyViewCdiQueryInvocationContextHolder.java | 2 +- .../data}/impl/handler/EntityViewContext.java | 2 +- .../EntityViewDelegateQueryHandler.java | 2 +- .../EntityViewJpaQueryPostProcessor.java | 2 +- .../handler/EntityViewQueryProcessor.java | 2 +- .../EntityViewQueryProcessorFactory.java | 2 +- .../impl/handler/EntityViewQueryRunner.java | 4 ++-- .../handler/EntityViewRepositoryHandler.java | 4 ++-- .../TransactionalEntityViewQueryRunner.java | 6 +++--- .../meta/EntityViewRepositoryComponent.java | 2 +- .../meta/EntityViewRepositoryComponents.java | 8 ++++---- ...EntityViewRepositoryComponentsFactory.java | 4 ++-- .../impl/meta/EntityViewRepositoryMethod.java | 10 +++++----- .../data}/impl/meta/RepositoryEntityView.java | 2 +- ...EntityViewAnnotationMetadataExtractor.java | 4 ++-- .../EntityViewMetadataExtractor.java | 4 ++-- .../EntityViewTypeMetadataExtractor.java | 4 ++-- .../data}/impl/param/Parameters.java | 4 ++-- .../EntityViewInvocationContextWrapper.java | 4 ++-- .../META-INF/apache-deltaspike.properties | 2 +- .../data}/testsuite/entity/Address.java | 2 +- .../data}/testsuite/entity/Person.java | 2 +- .../main/resources/META-INF/persistence.xml | 4 ++-- .../AbstractEntityViewRepositoryTest.java | 4 ++-- .../data}/testsuite/CriteriaSupportTest.java | 4 ++-- .../ExtendedEntityViewRepositoryTest.java | 6 +++--- .../FullEntityViewRepositoryTest.java | 8 ++++---- .../testsuite/FullPersonViewRepository.java | 8 ++++---- .../data}/testsuite/PersonRepository.java | 4 ++-- .../PersonViewCriteriaRepository.java | 10 +++++----- .../testsuite/SimplePersonViewRepository.java | 4 ++-- .../producer/BlazePersistenceProducer.java | 2 +- .../producer/EntityManagerProducer.java | 2 +- .../data}/testsuite/view/ChildView.java | 4 ++-- .../data}/testsuite/view/PersonView.java | 4 ++-- 81 files changed, 174 insertions(+), 174 deletions(-) rename examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/{springdata => spring/data}/SpringDataShowcase.java (83%) rename examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/{springdata => spring/data}/SpringDataShowcaseConfig.java (94%) rename examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/{springdata => spring/data}/data/TestDataGenerator.java (96%) rename examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/{springdata => spring/data}/repository/CatRepository.java (87%) rename examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/{springdata => spring/data}/view/CatView.java (94%) rename examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/{springdata => spring/data}/view/IdHolderView.java (92%) rename integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/{deltaspikedata => deltaspike/data}/api/CriteriaSupport.java (97%) rename integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/{deltaspikedata => deltaspike/data}/api/EntityViewRepository.java (98%) rename integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/{deltaspikedata => deltaspike/data}/api/FullEntityViewRepository.java (94%) rename integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/{deltaspikedata => deltaspike/data}/api/package-info.java (92%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/CustomPartialBeanBindingExtension.java (99%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/DeltaspikeExtensionDeactivator.java (95%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/EntityViewRepositoryExtension.java (97%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/EntityViewAwareQueryBuilderFactory.java (89%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/EntityViewDelegateQueryBuilder.java (95%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/EntityViewMethodQueryBuilder.java (89%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/EntityViewQueryBuilder.java (92%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/EntityViewQueryBuilderContext.java (95%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/WrappedEntityViewQueryBuilder.java (82%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/part/EntityViewAndQueryPart.java (85%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/part/EntityViewBasePropertyQueryPart.java (93%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/part/EntityViewConnectingQueryPart.java (93%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/part/EntityViewOrQueryPart.java (87%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/part/EntityViewOrderByQueryPart.java (95%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/part/EntityViewPropertyQueryPart.java (89%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/part/EntityViewQueryPart.java (84%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/part/EntityViewQueryRoot.java (93%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/part/QueryOperator.java (97%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/postprocessor/FlushModePostProcessor.java (82%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/postprocessor/HintPostProcessor.java (82%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/postprocessor/LockModePostProcessor.java (82%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java (92%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/postprocessor/PaginationCriteriaBuilderPostProcessor.java (87%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/builder/result/EntityViewDefaultQueryResult.java (90%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/criteria/QueryCriteria.java (98%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/handler/CriteriaBuilderPostProcessor.java (92%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/handler/CriteriaSupportHandler.java (91%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/handler/EntityManagerRefLookup.java (96%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/handler/EntityViewAwareQueryHandler.java (89%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/handler/EntityViewCdiQueryInvocationContext.java (97%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/handler/EntityViewCdiQueryInvocationContextHolder.java (96%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/handler/EntityViewContext.java (94%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/handler/EntityViewDelegateQueryHandler.java (91%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/handler/EntityViewJpaQueryPostProcessor.java (93%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/handler/EntityViewQueryProcessor.java (93%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/handler/EntityViewQueryProcessorFactory.java (98%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/handler/EntityViewQueryRunner.java (86%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/handler/EntityViewRepositoryHandler.java (97%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/handler/TransactionalEntityViewQueryRunner.java (92%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/meta/EntityViewRepositoryComponent.java (99%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/meta/EntityViewRepositoryComponents.java (92%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/meta/EntityViewRepositoryComponentsFactory.java (91%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/meta/EntityViewRepositoryMethod.java (94%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/meta/RepositoryEntityView.java (97%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/meta/extractor/EntityViewAnnotationMetadataExtractor.java (91%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/meta/extractor/EntityViewMetadataExtractor.java (85%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/meta/extractor/EntityViewTypeMetadataExtractor.java (95%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/param/Parameters.java (97%) rename integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/{deltaspikedata => deltaspike/data}/impl/tx/EntityViewInvocationContextWrapper.java (88%) rename integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/{impl/deltaspikedata => deltaspike/data}/testsuite/entity/Address.java (92%) rename integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/{impl/deltaspikedata => deltaspike/data}/testsuite/entity/Person.java (97%) rename integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/{impl/deltaspikedata => deltaspike/data}/testsuite/AbstractEntityViewRepositoryTest.java (96%) rename integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/{impl/deltaspikedata => deltaspike/data}/testsuite/CriteriaSupportTest.java (91%) rename integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/{impl/deltaspikedata => deltaspike/data}/testsuite/ExtendedEntityViewRepositoryTest.java (97%) rename integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/{impl/deltaspikedata => deltaspike/data}/testsuite/FullEntityViewRepositoryTest.java (93%) rename integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/{impl/deltaspikedata => deltaspike/data}/testsuite/FullPersonViewRepository.java (86%) rename integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/{impl/deltaspikedata => deltaspike/data}/testsuite/PersonRepository.java (85%) rename integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/{impl/deltaspikedata => deltaspike/data}/testsuite/PersonViewCriteriaRepository.java (75%) rename integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/{impl/deltaspikedata => deltaspike/data}/testsuite/SimplePersonViewRepository.java (85%) rename integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/{impl/deltaspikedata => deltaspike/data}/testsuite/producer/BlazePersistenceProducer.java (96%) rename integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/{impl/deltaspikedata => deltaspike/data}/testsuite/producer/EntityManagerProducer.java (94%) rename integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/{impl/deltaspikedata => deltaspike/data}/testsuite/view/ChildView.java (85%) rename integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/{impl/deltaspikedata => deltaspike/data}/testsuite/view/PersonView.java (85%) diff --git a/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/java/repository/CatSimpleViewRepository.java b/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/java/repository/CatSimpleViewRepository.java index 786afe5d9f..67adeef7b4 100644 --- a/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/java/repository/CatSimpleViewRepository.java +++ b/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/java/repository/CatSimpleViewRepository.java @@ -19,7 +19,7 @@ import com.blazebit.persistence.view.*; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import com.blazebit.persistence.impl.springdata.repository.EntityViewRepository; +import com.blazebit.persistence.impl.spring.data.repository.EntityViewRepository; import ${package}.view.*; @Repository diff --git a/documentation/src/main/asciidoc/entity-view/manual/en_US/11_spring_data.adoc b/documentation/src/main/asciidoc/entity-view/manual/en_US/11_spring_data.adoc index 0363b1cf57..8684195b4e 100644 --- a/documentation/src/main/asciidoc/entity-view/manual/en_US/11_spring_data.adoc +++ b/documentation/src/main/asciidoc/entity-view/manual/en_US/11_spring_data.adoc @@ -131,7 +131,7 @@ public class MyCatController { } ---- -Support for https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#specifications[Spring Data Specifications] can be added to an entity view repository by extending from `com.blazebit.persistence.impl.springdata.repository.EntityViewSpecificationExecutor`. +Support for https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#specifications[Spring Data Specifications] can be added to an entity view repository by extending from `com.blazebit.persistence.impl.spring.data.repository.EntityViewSpecificationExecutor`. [source,java] ---- diff --git a/documentation/src/main/asciidoc/entity-view/manual/en_US/12_deltaspike_data.adoc b/documentation/src/main/asciidoc/entity-view/manual/en_US/12_deltaspike_data.adoc index 1dcf570544..9d43345518 100644 --- a/documentation/src/main/asciidoc/entity-view/manual/en_US/12_deltaspike_data.adoc +++ b/documentation/src/main/asciidoc/entity-view/manual/en_US/12_deltaspike_data.adoc @@ -46,11 +46,11 @@ public interface PersonViewRepository { The integration provides the following base interfaces that you may optionally extend to define entity view repositories: -* `com.balzebit.persistence.impl.deltaspikedata.api.EntityViewRepository` provides simple base methods. -* `com.balzebit.persistence.impl.deltaspikedata.api.CriteriaSupport` adds support for the JPA Criteria API to an entity view +* `com.balzebit.persistence.impl.deltaspike.data.api.EntityViewRepository` provides simple base methods. +* `com.balzebit.persistence.impl.deltaspike.data.api.CriteriaSupport` adds support for the JPA Criteria API to an entity view repository. See the https://deltaspike.apache.org/documentation/data.html#_jpa_criteria_api_support[DeltaSpike documentation] for more details. -* `com.balzebit.persistence.impl.deltaspikedata.api.FullEntityViewRepository` combines the capabilities of the above +* `com.balzebit.persistence.impl.deltaspike.data.api.FullEntityViewRepository` combines the capabilities of the above interfaces. [source,java] diff --git a/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/SpringDataShowcase.java b/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/SpringDataShowcase.java similarity index 83% rename from examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/SpringDataShowcase.java rename to examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/SpringDataShowcase.java index 64aff71543..ccf73c6707 100644 --- a/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/SpringDataShowcase.java +++ b/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/SpringDataShowcase.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.blazebit.persistence.examples.springdata; +package com.blazebit.persistence.examples.spring.data; import com.blazebit.persistence.examples.spi.AbstractShowcase; -import com.blazebit.persistence.examples.springdata.data.TestDataGenerator; -import com.blazebit.persistence.examples.springdata.repository.CatRepository; +import com.blazebit.persistence.examples.spring.data.data.TestDataGenerator; +import com.blazebit.persistence.examples.spring.data.repository.CatRepository; import javax.inject.Inject; diff --git a/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/SpringDataShowcaseConfig.java b/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/SpringDataShowcaseConfig.java similarity index 94% rename from examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/SpringDataShowcaseConfig.java rename to examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/SpringDataShowcaseConfig.java index df985bea93..2fd6722920 100644 --- a/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/SpringDataShowcaseConfig.java +++ b/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/SpringDataShowcaseConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.examples.springdata; +package com.blazebit.persistence.examples.spring.data; import com.blazebit.persistence.spring.data.impl.repository.EntityViewRepositoryFactoryBean; import org.springframework.context.annotation.Configuration; @@ -26,7 +26,7 @@ */ @Configuration @EnableJpaRepositories( - basePackages = "com.blazebit.persistence.examples.springdata.repository", + basePackages = "com.blazebit.persistence.examples.spring.data.repository", entityManagerFactoryRef = "myEmf", repositoryFactoryBeanClass = EntityViewRepositoryFactoryBean.class) public class SpringDataShowcaseConfig { diff --git a/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/data/TestDataGenerator.java b/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/data/TestDataGenerator.java similarity index 96% rename from examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/data/TestDataGenerator.java rename to examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/data/TestDataGenerator.java index 3dd7394925..9631b5776f 100644 --- a/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/data/TestDataGenerator.java +++ b/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/data/TestDataGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.examples.springdata.data; +package com.blazebit.persistence.examples.spring.data.data; import com.blazebit.persistence.examples.base.bean.EntityManagerHolder; import com.blazebit.persistence.examples.base.model.Cat; diff --git a/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/repository/CatRepository.java b/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/repository/CatRepository.java similarity index 87% rename from examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/repository/CatRepository.java rename to examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/repository/CatRepository.java index c13e85b67e..0eccc320b8 100644 --- a/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/repository/CatRepository.java +++ b/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/repository/CatRepository.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.blazebit.persistence.examples.springdata.repository; +package com.blazebit.persistence.examples.spring.data.repository; -import com.blazebit.persistence.examples.springdata.view.CatView; +import com.blazebit.persistence.examples.spring.data.view.CatView; import com.blazebit.persistence.spring.data.api.repository.EntityViewRepository; import java.util.List; diff --git a/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/view/CatView.java b/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/view/CatView.java similarity index 94% rename from examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/view/CatView.java rename to examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/view/CatView.java index 3dc97826e7..7f075e49ca 100644 --- a/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/view/CatView.java +++ b/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/view/CatView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.examples.springdata.view; +package com.blazebit.persistence.examples.spring.data.view; import com.blazebit.persistence.examples.base.model.Cat; import com.blazebit.persistence.view.EntityView; diff --git a/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/view/IdHolderView.java b/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/view/IdHolderView.java similarity index 92% rename from examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/view/IdHolderView.java rename to examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/view/IdHolderView.java index 9411547af7..7778c4e4db 100644 --- a/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/springdata/view/IdHolderView.java +++ b/examples/spring-data-showcase/src/main/java/com/blazebit/persistence/examples/spring/data/view/IdHolderView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.examples.springdata.view; +package com.blazebit.persistence.examples.spring.data.view; import com.blazebit.persistence.view.IdMapping; diff --git a/examples/spring-data-showcase/src/main/resources/META-INF/services/com.blazebit.persistence.examples.spi.Showcase b/examples/spring-data-showcase/src/main/resources/META-INF/services/com.blazebit.persistence.examples.spi.Showcase index 25bf2e0709..ac8a257957 100644 --- a/examples/spring-data-showcase/src/main/resources/META-INF/services/com.blazebit.persistence.examples.spi.Showcase +++ b/examples/spring-data-showcase/src/main/resources/META-INF/services/com.blazebit.persistence.examples.spi.Showcase @@ -30,4 +30,4 @@ # limitations under the License. # -com.blazebit.persistence.examples.springdata.SpringDataShowcase \ No newline at end of file +com.blazebit.persistence.examples.spring.data.SpringDataShowcase \ No newline at end of file diff --git a/examples/spring-data-showcase/src/main/resources/META-INF/spring-beans.xml b/examples/spring-data-showcase/src/main/resources/META-INF/spring-beans.xml index 6fffe5bba5..57c82c0cae 100644 --- a/examples/spring-data-showcase/src/main/resources/META-INF/spring-beans.xml +++ b/examples/spring-data-showcase/src/main/resources/META-INF/spring-beans.xml @@ -19,5 +19,5 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"> - + \ No newline at end of file diff --git a/examples/spring-showcase/src/test/resources/META-INF/spring-beans.xml b/examples/spring-showcase/src/test/resources/META-INF/spring-beans.xml index b24e876069..c898dd7bf4 100644 --- a/examples/spring-showcase/src/test/resources/META-INF/spring-beans.xml +++ b/examples/spring-showcase/src/test/resources/META-INF/spring-beans.xml @@ -24,6 +24,6 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem - + \ No newline at end of file diff --git a/integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspikedata/api/CriteriaSupport.java b/integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspike/data/api/CriteriaSupport.java similarity index 97% rename from integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspikedata/api/CriteriaSupport.java rename to integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspike/data/api/CriteriaSupport.java index dbb173828c..825cfe0f52 100644 --- a/integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspikedata/api/CriteriaSupport.java +++ b/integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspike/data/api/CriteriaSupport.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.balzebit.persistence.deltaspikedata.api; +package com.balzebit.persistence.deltaspike.data.api; import org.apache.deltaspike.data.api.criteria.Criteria; diff --git a/integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspikedata/api/EntityViewRepository.java b/integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspike/data/api/EntityViewRepository.java similarity index 98% rename from integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspikedata/api/EntityViewRepository.java rename to integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspike/data/api/EntityViewRepository.java index 724da4c852..2d06b71bff 100644 --- a/integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspikedata/api/EntityViewRepository.java +++ b/integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspike/data/api/EntityViewRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.balzebit.persistence.deltaspikedata.api; +package com.balzebit.persistence.deltaspike.data.api; import org.apache.deltaspike.core.spi.activation.Deactivatable; diff --git a/integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspikedata/api/FullEntityViewRepository.java b/integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspike/data/api/FullEntityViewRepository.java similarity index 94% rename from integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspikedata/api/FullEntityViewRepository.java rename to integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspike/data/api/FullEntityViewRepository.java index 9f71ed5aa2..887341df27 100644 --- a/integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspikedata/api/FullEntityViewRepository.java +++ b/integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspike/data/api/FullEntityViewRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.balzebit.persistence.deltaspikedata.api; +package com.balzebit.persistence.deltaspike.data.api; import java.io.Serializable; diff --git a/integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspikedata/api/package-info.java b/integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspike/data/api/package-info.java similarity index 92% rename from integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspikedata/api/package-info.java rename to integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspike/data/api/package-info.java index 523966207d..b5b2d4ccba 100644 --- a/integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspikedata/api/package-info.java +++ b/integration/deltaspike-data/api/src/main/java/com/balzebit/persistence/deltaspike/data/api/package-info.java @@ -20,4 +20,4 @@ * @author Moritz Becker * @since 1.2.0 */ -package com.balzebit.persistence.deltaspikedata.api; \ No newline at end of file +package com.balzebit.persistence.deltaspike.data.api; \ No newline at end of file diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/CustomPartialBeanBindingExtension.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java similarity index 99% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/CustomPartialBeanBindingExtension.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java index a3afc84015..19e18def18 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/CustomPartialBeanBindingExtension.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl; +package com.blazebit.persistence.deltaspike.data.impl; import com.blazebit.apt.service.ServiceProvider; import org.apache.deltaspike.data.api.Repository; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/DeltaspikeExtensionDeactivator.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java similarity index 95% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/DeltaspikeExtensionDeactivator.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java index b2df2b41cd..d9ce0b4755 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/DeltaspikeExtensionDeactivator.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl; +package com.blazebit.persistence.deltaspike.data.impl; import org.apache.deltaspike.core.spi.activation.ClassDeactivator; import org.apache.deltaspike.core.spi.activation.Deactivatable; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/EntityViewRepositoryExtension.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/EntityViewRepositoryExtension.java similarity index 97% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/EntityViewRepositoryExtension.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/EntityViewRepositoryExtension.java index 77a36c84a5..30b2e2e8f7 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/EntityViewRepositoryExtension.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/EntityViewRepositoryExtension.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl; +package com.blazebit.persistence.deltaspike.data.impl; import com.blazebit.apt.service.ServiceProvider; -import com.blazebit.persistence.deltaspikedata.impl.meta.EntityViewRepositoryComponents; +import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryComponents; import org.apache.deltaspike.core.spi.activation.Deactivatable; import org.apache.deltaspike.core.util.ClassDeactivationUtils; import org.apache.deltaspike.data.api.AbstractEntityRepository; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/EntityViewAwareQueryBuilderFactory.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java similarity index 89% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/EntityViewAwareQueryBuilderFactory.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java index 0182999ebc..a02438f282 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/EntityViewAwareQueryBuilderFactory.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder; +package com.blazebit.persistence.deltaspike.data.impl.builder; -import com.blazebit.persistence.deltaspikedata.impl.handler.EntityViewCdiQueryInvocationContext; -import com.blazebit.persistence.deltaspikedata.impl.meta.EntityViewRepositoryMethod; +import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext; +import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryMethod; import org.apache.deltaspike.core.api.provider.BeanProvider; import org.apache.deltaspike.data.api.QueryResult; import org.apache.deltaspike.data.impl.meta.MethodType; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/EntityViewDelegateQueryBuilder.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java similarity index 95% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/EntityViewDelegateQueryBuilder.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java index 7aceb956be..b3315490e8 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/EntityViewDelegateQueryBuilder.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder; +package com.blazebit.persistence.deltaspike.data.impl.builder; -import com.blazebit.persistence.deltaspikedata.impl.handler.EntityViewCdiQueryInvocationContext; -import com.blazebit.persistence.deltaspikedata.impl.handler.EntityViewDelegateQueryHandler; +import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext; +import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewDelegateQueryHandler; import org.apache.deltaspike.core.api.provider.BeanProvider; import org.apache.deltaspike.core.util.ClassUtils; import org.apache.deltaspike.core.util.OptionalUtil; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/EntityViewMethodQueryBuilder.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java similarity index 89% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/EntityViewMethodQueryBuilder.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java index e7058b7fdb..b4f4cc2b93 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/EntityViewMethodQueryBuilder.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder; +package com.blazebit.persistence.deltaspike.data.impl.builder; import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.FullQueryBuilder; -import com.blazebit.persistence.deltaspikedata.impl.builder.part.EntityViewQueryRoot; -import com.blazebit.persistence.deltaspikedata.impl.handler.EntityViewCdiQueryInvocationContext; -import com.blazebit.persistence.deltaspikedata.impl.param.Parameters; +import com.blazebit.persistence.deltaspike.data.impl.builder.part.EntityViewQueryRoot; +import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext; +import com.blazebit.persistence.deltaspike.data.impl.param.Parameters; import com.blazebit.persistence.view.EntityViewSetting; import org.apache.deltaspike.data.impl.meta.MethodType; import org.apache.deltaspike.data.impl.meta.QueryInvocation; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/EntityViewQueryBuilder.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java similarity index 92% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/EntityViewQueryBuilder.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java index 64f497aa30..8400c5e19e 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/EntityViewQueryBuilder.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder; +package com.blazebit.persistence.deltaspike.data.impl.builder; -import com.blazebit.persistence.deltaspikedata.impl.handler.EntityViewCdiQueryInvocationContext; +import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext; import org.apache.deltaspike.data.api.QueryResult; import org.apache.deltaspike.data.api.mapping.QueryInOutMapper; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/EntityViewQueryBuilderContext.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilderContext.java similarity index 95% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/EntityViewQueryBuilderContext.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilderContext.java index de152114f4..c498ecb73c 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/EntityViewQueryBuilderContext.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilderContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder; +package com.blazebit.persistence.deltaspike.data.impl.builder; import com.blazebit.persistence.CriteriaBuilder; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/WrappedEntityViewQueryBuilder.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java similarity index 82% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/WrappedEntityViewQueryBuilder.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java index 8623d0c054..2087ec44cf 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/WrappedEntityViewQueryBuilder.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder; +package com.blazebit.persistence.deltaspike.data.impl.builder; -import com.blazebit.persistence.deltaspikedata.impl.builder.result.EntityViewDefaultQueryResult; -import com.blazebit.persistence.deltaspikedata.impl.handler.EntityViewCdiQueryInvocationContext; +import com.blazebit.persistence.deltaspike.data.impl.builder.result.EntityViewDefaultQueryResult; +import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext; /** * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.WrappedQueryBuilder} but was modified to diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewAndQueryPart.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewAndQueryPart.java similarity index 85% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewAndQueryPart.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewAndQueryPart.java index deec27a50f..be50d32f8e 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewAndQueryPart.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewAndQueryPart.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder.part; +package com.blazebit.persistence.deltaspike.data.impl.builder.part; -import com.blazebit.persistence.deltaspikedata.impl.builder.EntityViewQueryBuilderContext; -import com.blazebit.persistence.deltaspikedata.impl.meta.EntityViewRepositoryComponent; +import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilderContext; +import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryComponent; /** * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.part.AndQueryPart} but was modified to diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewBasePropertyQueryPart.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewBasePropertyQueryPart.java similarity index 93% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewBasePropertyQueryPart.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewBasePropertyQueryPart.java index e2d35c0aba..e3481d0ca7 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewBasePropertyQueryPart.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewBasePropertyQueryPart.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder.part; +package com.blazebit.persistence.deltaspike.data.impl.builder.part; -import com.blazebit.persistence.deltaspikedata.impl.meta.EntityViewRepositoryComponent; +import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryComponent; import org.apache.deltaspike.data.impl.builder.MethodExpressionException; import org.apache.deltaspike.data.impl.property.Property; import org.apache.deltaspike.data.impl.property.query.NamedPropertyCriteria; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewConnectingQueryPart.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewConnectingQueryPart.java similarity index 93% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewConnectingQueryPart.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewConnectingQueryPart.java index 1506e2d01b..4bdb2c26c1 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewConnectingQueryPart.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewConnectingQueryPart.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder.part; +package com.blazebit.persistence.deltaspike.data.impl.builder.part; /** * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.part.ConnectingQueryPart} but was modified to diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewOrQueryPart.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrQueryPart.java similarity index 87% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewOrQueryPart.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrQueryPart.java index 7473365e97..796cc0b482 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewOrQueryPart.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrQueryPart.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder.part; +package com.blazebit.persistence.deltaspike.data.impl.builder.part; -import com.blazebit.persistence.deltaspikedata.impl.builder.EntityViewQueryBuilderContext; -import com.blazebit.persistence.deltaspikedata.impl.meta.EntityViewRepositoryComponent; +import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilderContext; +import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryComponent; import static org.apache.deltaspike.data.impl.util.QueryUtils.splitByKeyword; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewOrderByQueryPart.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrderByQueryPart.java similarity index 95% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewOrderByQueryPart.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrderByQueryPart.java index 54fde3aa8b..4315480d45 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewOrderByQueryPart.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewOrderByQueryPart.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder.part; +package com.blazebit.persistence.deltaspike.data.impl.builder.part; -import com.blazebit.persistence.deltaspikedata.impl.builder.EntityViewQueryBuilderContext; -import com.blazebit.persistence.deltaspikedata.impl.meta.EntityViewRepositoryComponent; +import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilderContext; +import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryComponent; import java.util.Collection; import java.util.Iterator; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewPropertyQueryPart.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewPropertyQueryPart.java similarity index 89% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewPropertyQueryPart.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewPropertyQueryPart.java index 8eac72f812..33a9b656ea 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewPropertyQueryPart.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewPropertyQueryPart.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder.part; +package com.blazebit.persistence.deltaspike.data.impl.builder.part; -import com.blazebit.persistence.deltaspikedata.impl.builder.EntityViewQueryBuilderContext; -import com.blazebit.persistence.deltaspikedata.impl.meta.EntityViewRepositoryComponent; +import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilderContext; +import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryComponent; import java.text.MessageFormat; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewQueryPart.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryPart.java similarity index 84% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewQueryPart.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryPart.java index 31ea04fc3b..2d9802a4ef 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewQueryPart.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryPart.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder.part; +package com.blazebit.persistence.deltaspike.data.impl.builder.part; -import com.blazebit.persistence.deltaspikedata.impl.builder.EntityViewQueryBuilderContext; -import com.blazebit.persistence.deltaspikedata.impl.meta.EntityViewRepositoryComponent; +import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilderContext; +import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryComponent; import java.util.LinkedList; import java.util.List; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewQueryRoot.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java similarity index 93% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewQueryRoot.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java index 8fb5b0ae95..b85f883e40 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/EntityViewQueryRoot.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder.part; +package com.blazebit.persistence.deltaspike.data.impl.builder.part; import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.deltaspikedata.impl.builder.EntityViewQueryBuilderContext; -import com.blazebit.persistence.deltaspikedata.impl.meta.EntityViewRepositoryComponent; +import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilderContext; +import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryComponent; import org.apache.deltaspike.data.impl.builder.MethodExpressionException; import org.apache.deltaspike.data.impl.meta.MethodPrefix; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/QueryOperator.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/QueryOperator.java similarity index 97% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/QueryOperator.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/QueryOperator.java index a2a7441a5b..5ec3765ce3 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/part/QueryOperator.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/QueryOperator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder.part; +package com.blazebit.persistence.deltaspike.data.impl.builder.part; /** * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.QueryOperator} but altered diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/postprocessor/FlushModePostProcessor.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java similarity index 82% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/postprocessor/FlushModePostProcessor.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java index 99ebc4a1de..78b6ff3700 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/postprocessor/FlushModePostProcessor.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder.postprocessor; +package com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor; -import com.blazebit.persistence.deltaspikedata.impl.handler.EntityViewCdiQueryInvocationContext; -import com.blazebit.persistence.deltaspikedata.impl.handler.EntityViewJpaQueryPostProcessor; +import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext; +import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewJpaQueryPostProcessor; import javax.persistence.FlushModeType; import javax.persistence.Query; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/postprocessor/HintPostProcessor.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java similarity index 82% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/postprocessor/HintPostProcessor.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java index 2eebc40f22..a2d1c65d96 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/postprocessor/HintPostProcessor.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder.postprocessor; +package com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor; -import com.blazebit.persistence.deltaspikedata.impl.handler.EntityViewCdiQueryInvocationContext; -import com.blazebit.persistence.deltaspikedata.impl.handler.EntityViewJpaQueryPostProcessor; +import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext; +import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewJpaQueryPostProcessor; import javax.persistence.Query; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/postprocessor/LockModePostProcessor.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java similarity index 82% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/postprocessor/LockModePostProcessor.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java index 58b9d47710..fa45e59031 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/postprocessor/LockModePostProcessor.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder.postprocessor; +package com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor; -import com.blazebit.persistence.deltaspikedata.impl.handler.EntityViewCdiQueryInvocationContext; -import com.blazebit.persistence.deltaspikedata.impl.handler.EntityViewJpaQueryPostProcessor; +import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext; +import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewJpaQueryPostProcessor; import javax.persistence.LockModeType; import javax.persistence.Query; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java similarity index 92% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java index 958486f897..c408721fc7 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder.postprocessor; +package com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor; import com.blazebit.persistence.FullQueryBuilder; -import com.blazebit.persistence.deltaspikedata.impl.handler.CriteriaBuilderPostProcessor; +import com.blazebit.persistence.deltaspike.data.impl.handler.CriteriaBuilderPostProcessor; import org.apache.deltaspike.data.impl.builder.OrderDirection; import javax.persistence.metamodel.SingularAttribute; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/postprocessor/PaginationCriteriaBuilderPostProcessor.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/PaginationCriteriaBuilderPostProcessor.java similarity index 87% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/postprocessor/PaginationCriteriaBuilderPostProcessor.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/PaginationCriteriaBuilderPostProcessor.java index 0f5d567d2d..fced8e8fe3 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/postprocessor/PaginationCriteriaBuilderPostProcessor.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/PaginationCriteriaBuilderPostProcessor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder.postprocessor; +package com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor; import com.blazebit.persistence.FullQueryBuilder; -import com.blazebit.persistence.deltaspikedata.impl.handler.CriteriaBuilderPostProcessor; +import com.blazebit.persistence.deltaspike.data.impl.handler.CriteriaBuilderPostProcessor; /** * @author Moritz Becker diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/result/EntityViewDefaultQueryResult.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java similarity index 90% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/result/EntityViewDefaultQueryResult.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java index d959e33f3a..f6ec6b3ca0 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/builder/result/EntityViewDefaultQueryResult.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.builder.result; - -import com.blazebit.persistence.deltaspikedata.impl.builder.EntityViewQueryBuilder; -import com.blazebit.persistence.deltaspikedata.impl.builder.postprocessor.HintPostProcessor; -import com.blazebit.persistence.deltaspikedata.impl.builder.postprocessor.LockModePostProcessor; -import com.blazebit.persistence.deltaspikedata.impl.builder.postprocessor.PaginationCriteriaBuilderPostProcessor; -import com.blazebit.persistence.deltaspikedata.impl.handler.CriteriaBuilderPostProcessor; -import com.blazebit.persistence.deltaspikedata.impl.handler.EntityViewCdiQueryInvocationContext; -import com.blazebit.persistence.deltaspikedata.impl.builder.postprocessor.FlushModePostProcessor; -import com.blazebit.persistence.deltaspikedata.impl.builder.postprocessor.OrderByCriteriaBuilderPostProcessor; +package com.blazebit.persistence.deltaspike.data.impl.builder.result; + +import com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor.FlushModePostProcessor; +import com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor.LockModePostProcessor; +import com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor.PaginationCriteriaBuilderPostProcessor; +import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext; +import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilder; +import com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor.HintPostProcessor; +import com.blazebit.persistence.deltaspike.data.impl.handler.CriteriaBuilderPostProcessor; +import com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor.OrderByCriteriaBuilderPostProcessor; import org.apache.deltaspike.data.api.QueryResult; import org.apache.deltaspike.data.impl.builder.OrderDirection; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/criteria/QueryCriteria.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/criteria/QueryCriteria.java similarity index 98% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/criteria/QueryCriteria.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/criteria/QueryCriteria.java index cb1dcacbf6..09ae0bf7db 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/criteria/QueryCriteria.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/criteria/QueryCriteria.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.criteria; +package com.blazebit.persistence.deltaspike.data.impl.criteria; import com.blazebit.persistence.CriteriaBuilderFactory; import com.blazebit.persistence.criteria.BlazeCriteriaBuilder; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/CriteriaBuilderPostProcessor.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaBuilderPostProcessor.java similarity index 92% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/CriteriaBuilderPostProcessor.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaBuilderPostProcessor.java index f951c78deb..44bb6853ff 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/CriteriaBuilderPostProcessor.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaBuilderPostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.handler; +package com.blazebit.persistence.deltaspike.data.impl.handler; import com.blazebit.persistence.FullQueryBuilder; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/CriteriaSupportHandler.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java similarity index 91% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/CriteriaSupportHandler.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java index b0b39ad237..f589f30cf7 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/CriteriaSupportHandler.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.handler; +package com.blazebit.persistence.deltaspike.data.impl.handler; -import com.balzebit.persistence.deltaspikedata.api.CriteriaSupport; +import com.balzebit.persistence.deltaspike.data.api.CriteriaSupport; import com.blazebit.persistence.CriteriaBuilderFactory; -import com.blazebit.persistence.deltaspikedata.impl.criteria.QueryCriteria; +import com.blazebit.persistence.deltaspike.data.impl.criteria.QueryCriteria; import com.blazebit.persistence.view.EntityViewManager; import org.apache.deltaspike.data.api.criteria.Criteria; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityManagerRefLookup.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityManagerRefLookup.java similarity index 96% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityManagerRefLookup.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityManagerRefLookup.java index f0dcc4b3e4..bdab3fb7fe 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityManagerRefLookup.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityManagerRefLookup.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.handler; +package com.blazebit.persistence.deltaspike.data.impl.handler; -import com.blazebit.persistence.deltaspikedata.impl.meta.EntityViewRepositoryComponent; +import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryComponent; import org.apache.deltaspike.core.api.provider.BeanManagerProvider; import org.apache.deltaspike.core.api.provider.BeanProvider; import org.apache.deltaspike.data.impl.handler.EntityManagerRef; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewAwareQueryHandler.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java similarity index 89% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewAwareQueryHandler.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java index 98559eff75..bd94427378 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewAwareQueryHandler.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.handler; +package com.blazebit.persistence.deltaspike.data.impl.handler; import com.blazebit.persistence.CriteriaBuilderFactory; -import com.blazebit.persistence.deltaspikedata.impl.builder.EntityViewAwareQueryBuilderFactory; -import com.blazebit.persistence.deltaspikedata.impl.builder.EntityViewQueryBuilder; -import com.blazebit.persistence.deltaspikedata.impl.meta.EntityViewRepositoryComponents; -import com.blazebit.persistence.deltaspikedata.impl.meta.EntityViewRepositoryMethod; -import com.blazebit.persistence.deltaspikedata.impl.meta.EntityViewRepositoryComponent; +import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewAwareQueryBuilderFactory; +import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilder; +import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryComponents; +import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryMethod; +import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryComponent; import com.blazebit.persistence.view.EntityViewManager; import org.apache.deltaspike.core.api.lifecycle.Initialized; import org.apache.deltaspike.core.util.ProxyUtils; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewCdiQueryInvocationContext.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java similarity index 97% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewCdiQueryInvocationContext.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java index ee0965ebfb..73b4fe4f42 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewCdiQueryInvocationContext.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.handler; +package com.blazebit.persistence.deltaspike.data.impl.handler; import com.blazebit.persistence.CriteriaBuilderFactory; import com.blazebit.persistence.FullQueryBuilder; -import com.blazebit.persistence.deltaspikedata.impl.meta.EntityViewRepositoryMethod; -import com.blazebit.persistence.deltaspikedata.impl.param.Parameters; +import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryMethod; +import com.blazebit.persistence.deltaspike.data.impl.param.Parameters; import com.blazebit.persistence.view.EntityViewManager; import org.apache.deltaspike.data.api.EntityGraph; import org.apache.deltaspike.data.api.SingleResultType; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewCdiQueryInvocationContextHolder.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java similarity index 96% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewCdiQueryInvocationContextHolder.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java index 3c56dbee7f..003bc9bd30 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewCdiQueryInvocationContextHolder.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.handler; +package com.blazebit.persistence.deltaspike.data.impl.handler; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewContext.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewContext.java similarity index 94% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewContext.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewContext.java index 1e02e2f2f0..3220881674 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewContext.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.handler; +package com.blazebit.persistence.deltaspike.data.impl.handler; import javax.inject.Qualifier; import java.lang.annotation.ElementType; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewDelegateQueryHandler.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewDelegateQueryHandler.java similarity index 91% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewDelegateQueryHandler.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewDelegateQueryHandler.java index db2ad82571..50415cffd5 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewDelegateQueryHandler.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewDelegateQueryHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.handler; +package com.blazebit.persistence.deltaspike.data.impl.handler; /** * @author Moritz Becker diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewJpaQueryPostProcessor.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewJpaQueryPostProcessor.java similarity index 93% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewJpaQueryPostProcessor.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewJpaQueryPostProcessor.java index c63a9aae92..22f83908e4 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewJpaQueryPostProcessor.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewJpaQueryPostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.handler; +package com.blazebit.persistence.deltaspike.data.impl.handler; import javax.persistence.Query; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewQueryProcessor.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessor.java similarity index 93% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewQueryProcessor.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessor.java index 9e6718aa82..8f53fb3f35 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewQueryProcessor.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.handler; +package com.blazebit.persistence.deltaspike.data.impl.handler; import javax.persistence.Query; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewQueryProcessorFactory.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessorFactory.java similarity index 98% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewQueryProcessorFactory.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessorFactory.java index 904e235c7c..2a9cb0ec51 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewQueryProcessorFactory.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessorFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.handler; +package com.blazebit.persistence.deltaspike.data.impl.handler; import org.apache.deltaspike.core.util.OptionalUtil; import org.apache.deltaspike.core.util.StreamUtil; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewQueryRunner.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java similarity index 86% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewQueryRunner.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java index ae1e04066a..cbeefdbfa9 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewQueryRunner.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.handler; +package com.blazebit.persistence.deltaspike.data.impl.handler; -import com.blazebit.persistence.deltaspikedata.impl.builder.EntityViewQueryBuilder; +import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilder; /** * Implementation is similar to {@link org.apache.deltaspike.data.impl.handler.QueryRunner} but was modified to diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewRepositoryHandler.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java similarity index 97% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewRepositoryHandler.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java index f477cb2afd..d956a84e10 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/EntityViewRepositoryHandler.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.handler; +package com.blazebit.persistence.deltaspike.data.impl.handler; -import com.balzebit.persistence.deltaspikedata.api.EntityViewRepository; +import com.balzebit.persistence.deltaspike.data.api.EntityViewRepository; import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.CriteriaBuilderFactory; import com.blazebit.persistence.PaginatedCriteriaBuilder; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/TransactionalEntityViewQueryRunner.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java similarity index 92% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/TransactionalEntityViewQueryRunner.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java index f41a3f35fc..c49a5a4bd6 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/handler/TransactionalEntityViewQueryRunner.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.handler; +package com.blazebit.persistence.deltaspike.data.impl.handler; -import com.blazebit.persistence.deltaspikedata.impl.builder.EntityViewQueryBuilder; -import com.blazebit.persistence.deltaspikedata.impl.tx.EntityViewInvocationContextWrapper; +import com.blazebit.persistence.deltaspike.data.impl.tx.EntityViewInvocationContextWrapper; +import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilder; import org.apache.deltaspike.core.util.ClassUtils; import org.apache.deltaspike.data.impl.handler.EntityRepositoryHandler; import org.apache.deltaspike.data.impl.meta.RequiresTransaction; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/EntityViewRepositoryComponent.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponent.java similarity index 99% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/EntityViewRepositoryComponent.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponent.java index d026d19690..c77ebb45f2 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/EntityViewRepositoryComponent.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.meta; +package com.blazebit.persistence.deltaspike.data.impl.meta; import org.apache.deltaspike.core.api.provider.BeanManagerProvider; import org.apache.deltaspike.data.api.EntityManagerConfig; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/EntityViewRepositoryComponents.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponents.java similarity index 92% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/EntityViewRepositoryComponents.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponents.java index a4eb139edd..7656b4b112 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/EntityViewRepositoryComponents.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponents.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.meta; +package com.blazebit.persistence.deltaspike.data.impl.meta; -import com.blazebit.persistence.deltaspikedata.impl.meta.extractor.EntityViewAnnotationMetadataExtractor; -import com.blazebit.persistence.deltaspikedata.impl.meta.extractor.EntityViewTypeMetadataExtractor; -import com.blazebit.persistence.deltaspikedata.impl.meta.extractor.EntityViewMetadataExtractor; +import com.blazebit.persistence.deltaspike.data.impl.meta.extractor.EntityViewMetadataExtractor; +import com.blazebit.persistence.deltaspike.data.impl.meta.extractor.EntityViewTypeMetadataExtractor; +import com.blazebit.persistence.deltaspike.data.impl.meta.extractor.EntityViewAnnotationMetadataExtractor; import org.apache.deltaspike.data.impl.RepositoryDefinitionException; import org.apache.deltaspike.data.impl.meta.RepositoryComponent; import org.apache.deltaspike.data.impl.meta.RepositoryMethod; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/EntityViewRepositoryComponentsFactory.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponentsFactory.java similarity index 91% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/EntityViewRepositoryComponentsFactory.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponentsFactory.java index b5e9f2c774..d76bf67700 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/EntityViewRepositoryComponentsFactory.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponentsFactory.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.meta; +package com.blazebit.persistence.deltaspike.data.impl.meta; -import com.blazebit.persistence.deltaspikedata.impl.EntityViewRepositoryExtension; +import com.blazebit.persistence.deltaspike.data.impl.EntityViewRepositoryExtension; import org.apache.deltaspike.core.api.lifecycle.Initialized; import org.apache.deltaspike.data.impl.meta.RepositoryComponents; import org.apache.deltaspike.data.impl.meta.RepositoryComponentsFactory; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/EntityViewRepositoryMethod.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryMethod.java similarity index 94% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/EntityViewRepositoryMethod.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryMethod.java index 3d4af2560e..1098ae7a2f 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/EntityViewRepositoryMethod.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryMethod.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.meta; +package com.blazebit.persistence.deltaspike.data.impl.meta; -import com.blazebit.persistence.deltaspikedata.impl.handler.EntityViewQueryProcessor; -import com.blazebit.persistence.deltaspikedata.impl.handler.EntityViewQueryProcessorFactory; -import com.blazebit.persistence.deltaspikedata.impl.builder.part.EntityViewQueryRoot; -import com.blazebit.persistence.deltaspikedata.impl.handler.EntityViewCdiQueryInvocationContext; +import com.blazebit.persistence.deltaspike.data.impl.builder.part.EntityViewQueryRoot; +import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext; +import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewQueryProcessorFactory; +import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewQueryProcessor; import org.apache.deltaspike.core.api.provider.BeanManagerProvider; import org.apache.deltaspike.core.api.provider.BeanProvider; import org.apache.deltaspike.core.api.provider.DependentProvider; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/RepositoryEntityView.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/RepositoryEntityView.java similarity index 97% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/RepositoryEntityView.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/RepositoryEntityView.java index 45e8b9325f..6aa7143d6d 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/RepositoryEntityView.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/RepositoryEntityView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.meta; +package com.blazebit.persistence.deltaspike.data.impl.meta; import com.blazebit.persistence.view.EntityView; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/extractor/EntityViewAnnotationMetadataExtractor.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/extractor/EntityViewAnnotationMetadataExtractor.java similarity index 91% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/extractor/EntityViewAnnotationMetadataExtractor.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/extractor/EntityViewAnnotationMetadataExtractor.java index 3cf89e936a..073538a1bf 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/extractor/EntityViewAnnotationMetadataExtractor.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/extractor/EntityViewAnnotationMetadataExtractor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.meta.extractor; +package com.blazebit.persistence.deltaspike.data.impl.meta.extractor; -import com.blazebit.persistence.deltaspikedata.impl.meta.RepositoryEntityView; +import com.blazebit.persistence.deltaspike.data.impl.meta.RepositoryEntityView; import com.blazebit.persistence.view.EntityView; import org.apache.deltaspike.data.api.Repository; import org.apache.deltaspike.data.impl.util.EntityUtils; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/extractor/EntityViewMetadataExtractor.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/extractor/EntityViewMetadataExtractor.java similarity index 85% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/extractor/EntityViewMetadataExtractor.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/extractor/EntityViewMetadataExtractor.java index fd98b15fe3..fad54b0a66 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/extractor/EntityViewMetadataExtractor.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/extractor/EntityViewMetadataExtractor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.meta.extractor; +package com.blazebit.persistence.deltaspike.data.impl.meta.extractor; -import com.blazebit.persistence.deltaspikedata.impl.meta.RepositoryEntityView; +import com.blazebit.persistence.deltaspike.data.impl.meta.RepositoryEntityView; /** * Implementation is similar to {@link org.apache.deltaspike.data.impl.meta.extractor.MetadataExtractor} but was modified to diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/extractor/EntityViewTypeMetadataExtractor.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/extractor/EntityViewTypeMetadataExtractor.java similarity index 95% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/extractor/EntityViewTypeMetadataExtractor.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/extractor/EntityViewTypeMetadataExtractor.java index 0c78db802a..ede7e6d02a 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/meta/extractor/EntityViewTypeMetadataExtractor.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/extractor/EntityViewTypeMetadataExtractor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.meta.extractor; +package com.blazebit.persistence.deltaspike.data.impl.meta.extractor; -import com.blazebit.persistence.deltaspikedata.impl.meta.RepositoryEntityView; +import com.blazebit.persistence.deltaspike.data.impl.meta.RepositoryEntityView; import com.blazebit.persistence.view.EntityView; import java.io.Serializable; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/param/Parameters.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/param/Parameters.java similarity index 97% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/param/Parameters.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/param/Parameters.java index 1bcf4742fb..065b2c367d 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/param/Parameters.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/param/Parameters.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.param; +package com.blazebit.persistence.deltaspike.data.impl.param; import com.blazebit.persistence.FullQueryBuilder; -import com.blazebit.persistence.deltaspikedata.impl.meta.EntityViewRepositoryMethod; +import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryMethod; import org.apache.deltaspike.data.api.FirstResult; import org.apache.deltaspike.data.api.MaxResults; import org.apache.deltaspike.data.api.QueryParam; diff --git a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/tx/EntityViewInvocationContextWrapper.java b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java similarity index 88% rename from integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/tx/EntityViewInvocationContextWrapper.java rename to integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java index a3d52b8fe4..e3a76bd2c9 100644 --- a/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspikedata/impl/tx/EntityViewInvocationContextWrapper.java +++ b/integration/deltaspike-data/impl/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.blazebit.persistence.deltaspikedata.impl.tx; +package com.blazebit.persistence.deltaspike.data.impl.tx; -import com.blazebit.persistence.deltaspikedata.impl.handler.EntityViewCdiQueryInvocationContext; +import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext; import org.apache.deltaspike.core.util.interceptor.AbstractInvocationContext; /** diff --git a/integration/deltaspike-data/impl/src/main/resources/META-INF/apache-deltaspike.properties b/integration/deltaspike-data/impl/src/main/resources/META-INF/apache-deltaspike.properties index c266ccd548..c69d8b89ff 100644 --- a/integration/deltaspike-data/impl/src/main/resources/META-INF/apache-deltaspike.properties +++ b/integration/deltaspike-data/impl/src/main/resources/META-INF/apache-deltaspike.properties @@ -1 +1 @@ -org.apache.deltaspike.core.spi.activation.ClassDeactivator=com.blazebit.persistence.deltaspikedata.impl.DeltaspikeExtensionDeactivator \ No newline at end of file +org.apache.deltaspike.core.spi.activation.ClassDeactivator=com.blazebit.persistence.deltaspike.data.impl.DeltaspikeExtensionDeactivator \ No newline at end of file diff --git a/integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/entity/Address.java b/integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/deltaspike/data/testsuite/entity/Address.java similarity index 92% rename from integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/entity/Address.java rename to integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/deltaspike/data/testsuite/entity/Address.java index 09a8252992..7bb8faec0b 100644 --- a/integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/entity/Address.java +++ b/integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/deltaspike/data/testsuite/entity/Address.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.impl.deltaspikedata.testsuite.entity; +package com.blazebit.persistence.deltaspike.data.testsuite.entity; import javax.persistence.Embeddable; diff --git a/integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/entity/Person.java b/integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/deltaspike/data/testsuite/entity/Person.java similarity index 97% rename from integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/entity/Person.java rename to integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/deltaspike/data/testsuite/entity/Person.java index d6f8307de7..aa27a4b9e6 100644 --- a/integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/entity/Person.java +++ b/integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/deltaspike/data/testsuite/entity/Person.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.impl.deltaspikedata.testsuite.entity; +package com.blazebit.persistence.deltaspike.data.testsuite.entity; import javax.persistence.Column; import javax.persistence.Embedded; diff --git a/integration/deltaspike-data/testsuite/src/main/resources/META-INF/persistence.xml b/integration/deltaspike-data/testsuite/src/main/resources/META-INF/persistence.xml index 250eab4b1b..83f1ed78b7 100644 --- a/integration/deltaspike-data/testsuite/src/main/resources/META-INF/persistence.xml +++ b/integration/deltaspike-data/testsuite/src/main/resources/META-INF/persistence.xml @@ -17,8 +17,8 @@ - com.blazebit.persistence.impl.deltaspikedata.testsuite.entity.Person - com.blazebit.persistence.impl.deltaspikedata.testsuite.entity.Address + com.blazebit.persistence.deltaspike.data.testsuite.entity.Person + com.blazebit.persistence.deltaspike.data.testsuite.entity.Address true diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/AbstractEntityViewRepositoryTest.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/AbstractEntityViewRepositoryTest.java similarity index 96% rename from integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/AbstractEntityViewRepositoryTest.java rename to integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/AbstractEntityViewRepositoryTest.java index 46cbe8aee0..0c643e4492 100644 --- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/AbstractEntityViewRepositoryTest.java +++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/AbstractEntityViewRepositoryTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.blazebit.persistence.impl.deltaspikedata.testsuite; +package com.blazebit.persistence.deltaspike.data.testsuite; import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.CriteriaBuilderFactory; -import com.blazebit.persistence.impl.deltaspikedata.testsuite.entity.Person; +import com.blazebit.persistence.deltaspike.data.testsuite.entity.Person; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; import com.blazebit.persistence.view.metamodel.ViewType; diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/CriteriaSupportTest.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/CriteriaSupportTest.java similarity index 91% rename from integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/CriteriaSupportTest.java rename to integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/CriteriaSupportTest.java index 46794f2f69..ac3b69827b 100644 --- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/CriteriaSupportTest.java +++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/CriteriaSupportTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.blazebit.persistence.impl.deltaspikedata.testsuite; +package com.blazebit.persistence.deltaspike.data.testsuite; -import com.blazebit.persistence.impl.deltaspikedata.testsuite.view.PersonView; +import com.blazebit.persistence.deltaspike.data.testsuite.view.PersonView; import org.junit.Test; import javax.inject.Inject; diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/ExtendedEntityViewRepositoryTest.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/ExtendedEntityViewRepositoryTest.java similarity index 97% rename from integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/ExtendedEntityViewRepositoryTest.java rename to integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/ExtendedEntityViewRepositoryTest.java index 1d2334d9ff..eb4cc1e8ed 100644 --- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/ExtendedEntityViewRepositoryTest.java +++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/ExtendedEntityViewRepositoryTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.blazebit.persistence.impl.deltaspikedata.testsuite; +package com.blazebit.persistence.deltaspike.data.testsuite; -import com.blazebit.persistence.impl.deltaspikedata.testsuite.entity.Person; -import com.blazebit.persistence.impl.deltaspikedata.testsuite.view.PersonView; +import com.blazebit.persistence.deltaspike.data.testsuite.entity.Person; +import com.blazebit.persistence.deltaspike.data.testsuite.view.PersonView; import org.apache.deltaspike.data.api.QueryResult; import org.junit.Test; diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/FullEntityViewRepositoryTest.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/FullEntityViewRepositoryTest.java similarity index 93% rename from integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/FullEntityViewRepositoryTest.java rename to integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/FullEntityViewRepositoryTest.java index 42dad511ca..515d86fa95 100644 --- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/FullEntityViewRepositoryTest.java +++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/FullEntityViewRepositoryTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.blazebit.persistence.impl.deltaspikedata.testsuite; +package com.blazebit.persistence.deltaspike.data.testsuite; -import com.blazebit.persistence.impl.deltaspikedata.testsuite.entity.Person; -import com.blazebit.persistence.impl.deltaspikedata.testsuite.entity.Person_; -import com.blazebit.persistence.impl.deltaspikedata.testsuite.view.PersonView; +import com.blazebit.persistence.deltaspike.data.testsuite.entity.Person; +import com.blazebit.persistence.deltaspike.data.testsuite.entity.Person_; +import com.blazebit.persistence.deltaspike.data.testsuite.view.PersonView; import org.junit.Test; import javax.inject.Inject; diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/FullPersonViewRepository.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/FullPersonViewRepository.java similarity index 86% rename from integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/FullPersonViewRepository.java rename to integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/FullPersonViewRepository.java index 47620fb430..7d53f4c019 100644 --- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/FullPersonViewRepository.java +++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/FullPersonViewRepository.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.blazebit.persistence.impl.deltaspikedata.testsuite; +package com.blazebit.persistence.deltaspike.data.testsuite; -import com.balzebit.persistence.deltaspikedata.api.FullEntityViewRepository; -import com.blazebit.persistence.impl.deltaspikedata.testsuite.entity.Person; -import com.blazebit.persistence.impl.deltaspikedata.testsuite.view.PersonView; +import com.balzebit.persistence.deltaspike.data.api.FullEntityViewRepository; +import com.blazebit.persistence.deltaspike.data.testsuite.entity.Person; +import com.blazebit.persistence.deltaspike.data.testsuite.view.PersonView; import org.apache.deltaspike.data.api.FirstResult; import org.apache.deltaspike.data.api.MaxResults; import org.apache.deltaspike.data.api.QueryResult; diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/PersonRepository.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/PersonRepository.java similarity index 85% rename from integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/PersonRepository.java rename to integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/PersonRepository.java index 17b144149c..35058a7fb3 100644 --- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/PersonRepository.java +++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/PersonRepository.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.blazebit.persistence.impl.deltaspikedata.testsuite; +package com.blazebit.persistence.deltaspike.data.testsuite; -import com.blazebit.persistence.impl.deltaspikedata.testsuite.entity.Person; +import com.blazebit.persistence.deltaspike.data.testsuite.entity.Person; import org.apache.deltaspike.data.api.FullEntityRepository; import org.apache.deltaspike.data.api.Repository; diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/PersonViewCriteriaRepository.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/PersonViewCriteriaRepository.java similarity index 75% rename from integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/PersonViewCriteriaRepository.java rename to integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/PersonViewCriteriaRepository.java index 9439e5cb3a..3e00c7ac95 100644 --- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/PersonViewCriteriaRepository.java +++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/PersonViewCriteriaRepository.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.blazebit.persistence.impl.deltaspikedata.testsuite; +package com.blazebit.persistence.deltaspike.data.testsuite; -import com.balzebit.persistence.deltaspikedata.api.CriteriaSupport; -import com.blazebit.persistence.impl.deltaspikedata.testsuite.entity.Person; -import com.blazebit.persistence.impl.deltaspikedata.testsuite.entity.Person_; -import com.blazebit.persistence.impl.deltaspikedata.testsuite.view.PersonView; +import com.balzebit.persistence.deltaspike.data.api.CriteriaSupport; +import com.blazebit.persistence.deltaspike.data.testsuite.entity.Person; +import com.blazebit.persistence.deltaspike.data.testsuite.entity.Person_; +import com.blazebit.persistence.deltaspike.data.testsuite.view.PersonView; import org.apache.deltaspike.data.api.Repository; import java.util.List; diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/SimplePersonViewRepository.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/SimplePersonViewRepository.java similarity index 85% rename from integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/SimplePersonViewRepository.java rename to integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/SimplePersonViewRepository.java index b38a8eb914..62bb8e9c48 100644 --- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/SimplePersonViewRepository.java +++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/SimplePersonViewRepository.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.blazebit.persistence.impl.deltaspikedata.testsuite; +package com.blazebit.persistence.deltaspike.data.testsuite; -import com.blazebit.persistence.impl.deltaspikedata.testsuite.view.PersonView; +import com.blazebit.persistence.deltaspike.data.testsuite.view.PersonView; import org.apache.deltaspike.data.api.Repository; /** diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/producer/BlazePersistenceProducer.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/BlazePersistenceProducer.java similarity index 96% rename from integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/producer/BlazePersistenceProducer.java rename to integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/BlazePersistenceProducer.java index 2c1bda5725..9929462949 100644 --- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/producer/BlazePersistenceProducer.java +++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/BlazePersistenceProducer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.impl.deltaspikedata.testsuite.producer; +package com.blazebit.persistence.deltaspike.data.testsuite.producer; import com.blazebit.persistence.Criteria; import com.blazebit.persistence.CriteriaBuilderFactory; diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/producer/EntityManagerProducer.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/EntityManagerProducer.java similarity index 94% rename from integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/producer/EntityManagerProducer.java rename to integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/EntityManagerProducer.java index d725e31fd2..a139e79ec8 100644 --- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/producer/EntityManagerProducer.java +++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/EntityManagerProducer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.blazebit.persistence.impl.deltaspikedata.testsuite.producer; +package com.blazebit.persistence.deltaspike.data.testsuite.producer; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/view/ChildView.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/view/ChildView.java similarity index 85% rename from integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/view/ChildView.java rename to integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/view/ChildView.java index 46a55a1689..4e46d70a92 100644 --- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/view/ChildView.java +++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/view/ChildView.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.blazebit.persistence.impl.deltaspikedata.testsuite.view; +package com.blazebit.persistence.deltaspike.data.testsuite.view; -import com.blazebit.persistence.impl.deltaspikedata.testsuite.entity.Person; +import com.blazebit.persistence.deltaspike.data.testsuite.entity.Person; import com.blazebit.persistence.view.EntityView; import com.blazebit.persistence.view.IdMapping; diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/view/PersonView.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/view/PersonView.java similarity index 85% rename from integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/view/PersonView.java rename to integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/view/PersonView.java index 0772b75f3a..98420d7df3 100644 --- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/impl/deltaspikedata/testsuite/view/PersonView.java +++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/view/PersonView.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.blazebit.persistence.impl.deltaspikedata.testsuite.view; +package com.blazebit.persistence.deltaspike.data.testsuite.view; -import com.blazebit.persistence.impl.deltaspikedata.testsuite.entity.Person; +import com.blazebit.persistence.deltaspike.data.testsuite.entity.Person; import com.blazebit.persistence.view.EntityView; import java.util.Set;