Blazebit#328 aligned spring data and deltaspike data package names

Mobe91 · Nov 26, 2017 · f88dec4 · f88dec4
1 parent f1170c8
commit f88dec4
Show file tree

Hide file tree

Showing 81 changed files with 174 additions and 174 deletions.
diff --git a/.../main/resources/archetype-resources/src/main/java/repository/CatSimpleViewRepository.java b/.../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
@@ -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
@@ -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/...amples/springdata/SpringDataShowcase.java → ...mples/spring/data/SpringDataShowcase.java b/...amples/springdata/SpringDataShowcase.java → ...mples/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/.../springdata/SpringDataShowcaseConfig.java → ...spring/data/SpringDataShowcaseConfig.java b/.../springdata/SpringDataShowcaseConfig.java → ...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/...es/springdata/data/TestDataGenerator.java → ...s/spring/data/data/TestDataGenerator.java b/...es/springdata/data/TestDataGenerator.java → ...s/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/.../springdata/repository/CatRepository.java → ...spring/data/repository/CatRepository.java b/.../springdata/repository/CatRepository.java → ...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/...nce/examples/springdata/view/CatView.java → ...ce/examples/spring/data/view/CatView.java b/...nce/examples/springdata/view/CatView.java → ...ce/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/...xamples/springdata/view/IdHolderView.java → ...amples/spring/data/view/IdHolderView.java b/...xamples/springdata/view/IdHolderView.java → ...amples/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/...wcase/src/main/resources/META-INF/services/com.blazebit.persistence.examples.spi.Showcase b/...wcase/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
+com.blazebit.persistence.examples.spring.data.SpringDataShowcase
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
@@ -19,5 +19,5 @@
        xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
 
-    <bean class="com.blazebit.persistence.examples.springdata.data.TestDataGenerator" />
+    <bean class="com.blazebit.persistence.examples.spring.data.data.TestDataGenerator" />
 </beans>
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
@@ -24,6 +24,6 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
     <bean class="com.blazebit.persistence.examples.basic.data.TestDataGenerator"/>
     <bean class="com.blazebit.persistence.examples.cte.data.CatDataAccess"/>
     <bean class="com.blazebit.persistence.examples.cte.data.TestDataGenerator"/>
-    <bean class="com.blazebit.persistence.examples.springdata.data.TestDataGenerator"/>
+    <bean class="com.blazebit.persistence.examples.spring.data.data.TestDataGenerator"/>
 
 </beans>
diff --git a/...e/deltaspikedata/api/CriteriaSupport.java → .../deltaspike/data/api/CriteriaSupport.java b/...e/deltaspikedata/api/CriteriaSupport.java → .../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/...taspikedata/api/EntityViewRepository.java → ...aspike/data/api/EntityViewRepository.java b/...taspikedata/api/EntityViewRepository.java → ...aspike/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/...ikedata/api/FullEntityViewRepository.java → ...ke/data/api/FullEntityViewRepository.java b/...ikedata/api/FullEntityViewRepository.java → ...ke/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/...ence/deltaspikedata/api/package-info.java → ...nce/deltaspike/data/api/package-info.java b/...ence/deltaspikedata/api/package-info.java → ...nce/deltaspike/data/api/package-info.java
@@ -20,4 +20,4 @@
  * @author Moritz Becker
  * @since 1.2.0
  */
-package com.balzebit.persistence.deltaspikedata.api;
+package com.balzebit.persistence.deltaspike.data.api;
diff --git a/...pl/CustomPartialBeanBindingExtension.java → ...pl/CustomPartialBeanBindingExtension.java b/...pl/CustomPartialBeanBindingExtension.java → ...pl/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/.../impl/DeltaspikeExtensionDeactivator.java → .../impl/DeltaspikeExtensionDeactivator.java b/.../impl/DeltaspikeExtensionDeactivator.java → .../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/...a/impl/EntityViewRepositoryExtension.java → ...a/impl/EntityViewRepositoryExtension.java b/...a/impl/EntityViewRepositoryExtension.java → ...a/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/...r/EntityViewAwareQueryBuilderFactory.java → ...r/EntityViewAwareQueryBuilderFactory.java b/...r/EntityViewAwareQueryBuilderFactory.java → ...r/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/...ilder/EntityViewDelegateQueryBuilder.java → ...ilder/EntityViewDelegateQueryBuilder.java b/...ilder/EntityViewDelegateQueryBuilder.java → ...ilder/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/...builder/EntityViewMethodQueryBuilder.java → ...builder/EntityViewMethodQueryBuilder.java b/...builder/EntityViewMethodQueryBuilder.java → ...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/.../impl/builder/EntityViewQueryBuilder.java → .../impl/builder/EntityViewQueryBuilder.java b/.../impl/builder/EntityViewQueryBuilder.java → .../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/...uilder/EntityViewQueryBuilderContext.java → ...uilder/EntityViewQueryBuilderContext.java b/...uilder/EntityViewQueryBuilderContext.java → ...uilder/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/...uilder/WrappedEntityViewQueryBuilder.java → ...uilder/WrappedEntityViewQueryBuilder.java b/...uilder/WrappedEntityViewQueryBuilder.java → ...uilder/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/.../builder/part/EntityViewAndQueryPart.java → .../builder/part/EntityViewAndQueryPart.java b/.../builder/part/EntityViewAndQueryPart.java → .../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/...part/EntityViewBasePropertyQueryPart.java → ...part/EntityViewBasePropertyQueryPart.java b/...part/EntityViewBasePropertyQueryPart.java → ...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/...r/part/EntityViewConnectingQueryPart.java → ...r/part/EntityViewConnectingQueryPart.java b/...r/part/EntityViewConnectingQueryPart.java → ...r/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/...l/builder/part/EntityViewOrQueryPart.java → ...l/builder/part/EntityViewOrQueryPart.java b/...l/builder/part/EntityViewOrQueryPart.java → ...l/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/...lder/part/EntityViewOrderByQueryPart.java → ...lder/part/EntityViewOrderByQueryPart.java b/...lder/part/EntityViewOrderByQueryPart.java → ...lder/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/...der/part/EntityViewPropertyQueryPart.java → ...der/part/EntityViewPropertyQueryPart.java b/...der/part/EntityViewPropertyQueryPart.java → ...der/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/...mpl/builder/part/EntityViewQueryPart.java → ...mpl/builder/part/EntityViewQueryPart.java b/...mpl/builder/part/EntityViewQueryPart.java → ...mpl/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/...mpl/builder/part/EntityViewQueryRoot.java → ...mpl/builder/part/EntityViewQueryRoot.java b/...mpl/builder/part/EntityViewQueryRoot.java → ...mpl/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/...data/impl/builder/part/QueryOperator.java → ...data/impl/builder/part/QueryOperator.java b/...data/impl/builder/part/QueryOperator.java → ...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