diff --git a/persistence-modules/querydsl/README.md b/persistence-modules/querydsl/README.md index 77b9fd6baf..03e113795d 100644 --- a/persistence-modules/querydsl/README.md +++ b/persistence-modules/querydsl/README.md @@ -1,3 +1,3 @@ ### Relevant Articles: -- [Intro to Querydsl](http://www.baeldung.com/intro-to-querydsl) -- [A Guide to Querydsl with JPA](http://www.baeldung.com/querydsl-with-jpa-tutorial) +- [Intro to Querydsl](https://www.baeldung.com/intro-to-querydsl) +- [A Guide to Querydsl with JPA](https://www.baeldung.com/querydsl-with-jpa-tutorial) diff --git a/persistence-modules/querydsl/src/main/java/org/baeldung/dao/PersonDao.java b/persistence-modules/querydsl/src/main/java/com/baeldung/dao/PersonDao.java similarity index 88% rename from persistence-modules/querydsl/src/main/java/org/baeldung/dao/PersonDao.java rename to persistence-modules/querydsl/src/main/java/com/baeldung/dao/PersonDao.java index 7df4ebb22d..fb39821981 100644 --- a/persistence-modules/querydsl/src/main/java/org/baeldung/dao/PersonDao.java +++ b/persistence-modules/querydsl/src/main/java/com/baeldung/dao/PersonDao.java @@ -1,9 +1,9 @@ -package org.baeldung.dao; +package com.baeldung.dao; import java.util.List; import java.util.Map; -import org.baeldung.entity.Person; +import com.baeldung.entity.Person; public interface PersonDao { diff --git a/persistence-modules/querydsl/src/main/java/org/baeldung/dao/PersonDaoImpl.java b/persistence-modules/querydsl/src/main/java/com/baeldung/dao/PersonDaoImpl.java similarity index 95% rename from persistence-modules/querydsl/src/main/java/org/baeldung/dao/PersonDaoImpl.java rename to persistence-modules/querydsl/src/main/java/com/baeldung/dao/PersonDaoImpl.java index 9acaf1dd18..20ebe0e3fe 100644 --- a/persistence-modules/querydsl/src/main/java/org/baeldung/dao/PersonDaoImpl.java +++ b/persistence-modules/querydsl/src/main/java/com/baeldung/dao/PersonDaoImpl.java @@ -1,17 +1,15 @@ -package org.baeldung.dao; +package com.baeldung.dao; -import java.util.List; -import java.util.Map; +import com.baeldung.entity.Person; +import com.baeldung.entity.QPerson; +import com.querydsl.core.group.GroupBy; +import com.querydsl.jpa.impl.JPAQuery; +import org.springframework.stereotype.Repository; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; - -import org.baeldung.entity.Person; -import org.baeldung.entity.QPerson; -import org.springframework.stereotype.Repository; - -import com.querydsl.core.group.GroupBy; -import com.querydsl.jpa.impl.JPAQuery; +import java.util.List; +import java.util.Map; @Repository public class PersonDaoImpl implements PersonDao { diff --git a/persistence-modules/querydsl/src/main/java/org/baeldung/entity/Person.java b/persistence-modules/querydsl/src/main/java/com/baeldung/entity/Person.java similarity index 97% rename from persistence-modules/querydsl/src/main/java/org/baeldung/entity/Person.java rename to persistence-modules/querydsl/src/main/java/com/baeldung/entity/Person.java index 6f04210d90..310f21ab2a 100644 --- a/persistence-modules/querydsl/src/main/java/org/baeldung/entity/Person.java +++ b/persistence-modules/querydsl/src/main/java/com/baeldung/entity/Person.java @@ -1,4 +1,4 @@ -package org.baeldung.entity; +package com.baeldung.entity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/persistence-modules/querydsl/src/main/java/org/baeldung/querydsl/intro/entities/BlogPost.java b/persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/BlogPost.java similarity index 95% rename from persistence-modules/querydsl/src/main/java/org/baeldung/querydsl/intro/entities/BlogPost.java rename to persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/BlogPost.java index 241bc50b03..6712ad08d5 100644 --- a/persistence-modules/querydsl/src/main/java/org/baeldung/querydsl/intro/entities/BlogPost.java +++ b/persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/BlogPost.java @@ -1,7 +1,7 @@ /* * (c) Центр ИТ, 2016. Все права защищены. */ -package org.baeldung.querydsl.intro.entities; +package com.baeldung.querydsl.intro.entities; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/persistence-modules/querydsl/src/main/java/org/baeldung/querydsl/intro/entities/User.java b/persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/User.java similarity index 95% rename from persistence-modules/querydsl/src/main/java/org/baeldung/querydsl/intro/entities/User.java rename to persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/User.java index c0681e15d1..4111284d5a 100644 --- a/persistence-modules/querydsl/src/main/java/org/baeldung/querydsl/intro/entities/User.java +++ b/persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/User.java @@ -1,7 +1,7 @@ /* * (c) Центр ИТ, 2016. Все права защищены. */ -package org.baeldung.querydsl.intro.entities; +package com.baeldung.querydsl.intro.entities; import java.util.HashSet; import java.util.Set; diff --git a/persistence-modules/querydsl/src/main/resources/META-INF/persistence.xml b/persistence-modules/querydsl/src/main/resources/META-INF/persistence.xml index 2964382d48..4b51cb444b 100644 --- a/persistence-modules/querydsl/src/main/resources/META-INF/persistence.xml +++ b/persistence-modules/querydsl/src/main/resources/META-INF/persistence.xml @@ -17,7 +17,7 @@ - + org.hibernate.jpa.HibernatePersistenceProvider diff --git a/persistence-modules/querydsl/src/test/java/org/baeldung/dao/PersonDaoIntegrationTest.java b/persistence-modules/querydsl/src/test/java/com/baeldung/dao/PersonDaoIntegrationTest.java similarity index 97% rename from persistence-modules/querydsl/src/test/java/org/baeldung/dao/PersonDaoIntegrationTest.java rename to persistence-modules/querydsl/src/test/java/com/baeldung/dao/PersonDaoIntegrationTest.java index a666aea8da..cf4e9ab872 100644 --- a/persistence-modules/querydsl/src/test/java/org/baeldung/dao/PersonDaoIntegrationTest.java +++ b/persistence-modules/querydsl/src/test/java/com/baeldung/dao/PersonDaoIntegrationTest.java @@ -1,8 +1,8 @@ -package org.baeldung.dao; +package com.baeldung.dao; import java.util.Map; -import org.baeldung.entity.Person; +import com.baeldung.entity.Person; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/persistence-modules/querydsl/src/test/java/org/baeldung/querydsl/intro/QueryDSLIntegrationTest.java b/persistence-modules/querydsl/src/test/java/com/baeldung/querydsl/intro/QueryDSLIntegrationTest.java similarity index 94% rename from persistence-modules/querydsl/src/test/java/org/baeldung/querydsl/intro/QueryDSLIntegrationTest.java rename to persistence-modules/querydsl/src/test/java/com/baeldung/querydsl/intro/QueryDSLIntegrationTest.java index 15a32b8df5..7ae97c2880 100644 --- a/persistence-modules/querydsl/src/test/java/org/baeldung/querydsl/intro/QueryDSLIntegrationTest.java +++ b/persistence-modules/querydsl/src/test/java/com/baeldung/querydsl/intro/QueryDSLIntegrationTest.java @@ -1,17 +1,17 @@ /* * (c) Центр ИТ, 2016. Все права защищены. */ -package org.baeldung.querydsl.intro; +package com.baeldung.querydsl.intro; +import com.baeldung.querydsl.intro.entities.BlogPost; +import com.baeldung.querydsl.intro.entities.QBlogPost; +import com.baeldung.querydsl.intro.entities.QUser; +import com.baeldung.querydsl.intro.entities.User; import com.querydsl.core.Tuple; import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.NumberPath; import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.impl.JPAQueryFactory; -import org.baeldung.querydsl.intro.entities.BlogPost; -import org.baeldung.querydsl.intro.entities.QBlogPost; -import org.baeldung.querydsl.intro.entities.QUser; -import org.baeldung.querydsl.intro.entities.User; import org.junit.*; import javax.persistence.EntityManager; @@ -31,7 +31,7 @@ public class QueryDSLIntegrationTest { @BeforeClass public static void populateDatabase() { - emf = Persistence.createEntityManagerFactory("org.baeldung.querydsl.intro"); + emf = Persistence.createEntityManagerFactory("com.baeldung.querydsl.intro"); EntityManager em = emf.createEntityManager(); em.getTransaction().begin(); diff --git a/persistence-modules/querydsl/src/test/resources/test-context.xml b/persistence-modules/querydsl/src/test/resources/test-context.xml index 13d823a857..1503364320 100644 --- a/persistence-modules/querydsl/src/test/resources/test-context.xml +++ b/persistence-modules/querydsl/src/test/resources/test-context.xml @@ -13,7 +13,7 @@ > - +