Split or move persistence-modules/java-jpa module (#7887)

persistence-modules/java-jpa-2/README.md

@@ -1,4 +1,8 @@
 # Relevant Articles
 
-- [JPA Query Parameters Usage](http://www.baeldung.com/jpa-query-parameters-usage)
+- [JPA Query Parameters Usage](https://www.baeldung.com/jpa-query-parameters-usage)
 - [Mapping Entitiy Class Names to SQL Table Names with JPA](https://www.baeldung.com/jpa-entity-table-names)
+- [Default Column Values in JPA](https://www.baeldung.com/jpa-default-column-values)
+- [Types of JPA Queries](https://www.baeldung.com/jpa-queries)
+- [JPA/Hibernate Projections](https://www.baeldung.com/jpa-hibernate-projections)
+- [Combining JPA And/Or Criteria Predicates](https://www.baeldung.com/jpa-and-or-criteria-predicates)

persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/criteria/CustomItemRepository.java

@@ -1,9 +1,7 @@
-package com.baeldung.jpa.criteria.repository;
+package com.baeldung.jpa.criteria;
 
 import java.util.List;
 
-import com.baeldung.jpa.criteria.entity.Item;
-
 public interface CustomItemRepository {
 
     List<Item> findItemsByColorAndGrade();

persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/criteria/CustomItemRepositoryImpl.java

@@ -1,8 +1,6 @@
-package com.baeldung.jpa.criteria.repository.impl;
+package com.baeldung.jpa.criteria;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
@@ -12,9 +10,6 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import com.baeldung.jpa.criteria.entity.Item;
-import com.baeldung.jpa.criteria.repository.CustomItemRepository;
-
 public class CustomItemRepositoryImpl implements CustomItemRepository {
 
     private EntityManager entityManager;

persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/criteria/Item.java

@@ -1,4 +1,4 @@
-package com.baeldung.jpa.criteria.entity;
+package com.baeldung.jpa.criteria;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;

persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml

@@ -32,4 +32,91 @@
                 value="queryparams.sql" />
         </properties>
     </persistence-unit>
+
+    <persistence-unit name="entity-default-values">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+        <class>com.baeldung.jpa.defaultvalues.User</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver"
+                      value="org.h2.Driver" />
+            <property name="javax.persistence.jdbc.url"
+                      value="jdbc:h2:mem:test" />
+            <property name="javax.persistence.jdbc.user" value="sa" />
+            <property name="javax.persistence.jdbc.password" value="" />
+            <property name="hibernate.dialect"
+                      value="org.hibernate.dialect.H2Dialect" />
+            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+            <property name="show_sql" value="true" />
+            <property name="hibernate.temp.use_jdbc_metadata_defaults"
+                      value="false" />
+        </properties>
+    </persistence-unit>
+
+    <persistence-unit name="jpa-query-types">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+        <class>com.baeldung.jpa.querytypes.UserEntity</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver"
+                      value="org.h2.Driver" />
+            <property name="javax.persistence.jdbc.url"
+                      value="jdbc:h2:mem:test" />
+            <property name="javax.persistence.jdbc.user" value="sa" />
+            <property name="javax.persistence.jdbc.password" value="" />
+            <property name="hibernate.dialect"
+                      value="org.hibernate.dialect.H2Dialect" />
+            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+            <property name="show_sql" value="true" />
+            <property name="hibernate.temp.use_jdbc_metadata_defaults"
+                      value="false" />
+            <property name="javax.persistence.sql-load-script-source"
+                      value="users.sql" />
+        </properties>
+    </persistence-unit>
+
+    <persistence-unit name="jpa-projections">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+        <class>com.baeldung.jpa.projections.Product</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver"
+                      value="org.h2.Driver" />
+            <property name="javax.persistence.jdbc.url"
+                      value="jdbc:h2:mem:test" />
+            <property name="javax.persistence.jdbc.user" value="sa" />
+            <property name="javax.persistence.jdbc.password" value="" />
+            <property name="hibernate.dialect"
+                      value="org.hibernate.dialect.H2Dialect" />
+            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+            <property name="show_sql" value="true" />
+            <property name="hibernate.temp.use_jdbc_metadata_defaults"
+                      value="false" />
+            <property name="javax.persistence.sql-load-script-source"
+                      value="products_jpa.sql" />
+        </properties>
+    </persistence-unit>
+
+    <persistence-unit name="jpa-h2-criteria">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+        <class>com.baeldung.jpa.criteria.Item</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver"
+                      value="org.h2.Driver" />
+            <property name="javax.persistence.jdbc.url"
+                      value="jdbc:h2:mem:test" />
+            <property name="javax.persistence.jdbc.user" value="sa" />
+            <property name="javax.persistence.jdbc.password" value="" />
+            <property name="hibernate.dialect"
+                      value="org.hibernate.dialect.H2Dialect" />
+            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+            <property name="show_sql" value="true" />
+            <property name="hibernate.temp.use_jdbc_metadata_defaults"
+                      value="false" />
+            <property name="javax.persistence.sql-load-script-source"
+                      value="item.sql" />
+        </properties>
+    </persistence-unit>
+
 </persistence>

persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/criteria/CustomItemRepositoryIntegrationTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.jpa.criteria.repository.impl;
+package com.baeldung.jpa.criteria;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -7,8 +7,8 @@ import java.util.List;
 
 import org.junit.Test;
 
-import com.baeldung.jpa.criteria.entity.Item;
-import com.baeldung.jpa.criteria.repository.CustomItemRepository;
+import com.baeldung.jpa.criteria.Item;
+import com.baeldung.jpa.criteria.CustomItemRepository;
 
 public class CustomItemRepositoryIntegrationTest {
 

persistence-modules/java-jpa/README.md

@@ -1,16 +1,12 @@
 # Relevant Articles
 
-- [A Guide to SqlResultSetMapping](http://www.baeldung.com/jpa-sql-resultset-mapping)
-- [A Guide to Stored Procedures with JPA](http://www.baeldung.com/jpa-stored-procedures)
+- [A Guide to SqlResultSetMapping](https://www.baeldung.com/jpa-sql-resultset-mapping)
+- [A Guide to Stored Procedures with JPA](https://www.baeldung.com/jpa-stored-procedures)
 - [Fixing the JPA error “java.lang.String cannot be cast to Ljava.lang.String;”](https://www.baeldung.com/jpa-error-java-lang-string-cannot-be-cast)
 - [JPA Entity Graph](https://www.baeldung.com/jpa-entity-graph)
 - [JPA 2.2 Support for Java 8 Date/Time Types](https://www.baeldung.com/jpa-java-time)
 - [Converting Between LocalDate and SQL Date](https://www.baeldung.com/java-convert-localdate-sql-date)
-- [Combining JPA And/Or Criteria Predicates](https://www.baeldung.com/jpa-and-or-criteria-predicates)
-- [Types of JPA Queries](https://www.baeldung.com/jpa-queries)
-- [JPA/Hibernate Projections](https://www.baeldung.com/jpa-hibernate-projections)
 - [Composite Primary Keys in JPA](https://www.baeldung.com/jpa-composite-primary-keys)
 - [Defining JPA Entities](https://www.baeldung.com/jpa-entities)
 - [JPA @Basic Annotation](https://www.baeldung.com/jpa-basic-annotation)
-- [Default Column Values in JPA](https://www.baeldung.com/jpa-default-column-values)
 - [Persisting Enums in JPA](https://www.baeldung.com/jpa-persisting-enums-in-jpa)

persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/convertdates/LocalDateConverter.java

@@ -1,4 +1,4 @@
-package com.baeldung.util;
+package com.baeldung.jpa.convertdates;
 
 import javax.persistence.AttributeConverter;
 import javax.persistence.Converter;

persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Gender.java

@@ -1,4 +1,4 @@
-package com.baeldung.util;
+package com.baeldung.jpa.entity;
 
 public enum Gender {
 	MALE,

persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Student.java

@@ -14,8 +14,6 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 
-import com.baeldung.util.Gender;
-
 @Entity
 @Table(name="STUDENT")
 public class Student {

persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/primarykeys/Account.java

@@ -1,4 +1,4 @@
-package com.baeldung.jpa.entity;
+package com.baeldung.jpa.primarykeys;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;

persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/primarykeys/AccountId.java

@@ -1,4 +1,4 @@
-package com.baeldung.jpa.entity;
+package com.baeldung.jpa.primarykeys;
 
 import java.io.Serializable;
 

persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/primarykeys/Book.java

@@ -1,4 +1,4 @@
-package com.baeldung.jpa.entity;
+package com.baeldung.jpa.primarykeys;
 
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;

persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/primarykeys/BookId.java

@@ -1,4 +1,4 @@
-package com.baeldung.jpa.entity;
+package com.baeldung.jpa.primarykeys;
 
 import java.io.Serializable;
 

persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/sqlresultsetmapping/Employee.java

@@ -1,4 +1,4 @@
-package com.baeldung.sqlresultsetmapping;
+package com.baeldung.jpa.sqlresultsetmapping;
 
 import javax.persistence.*;
 
@@ -7,7 +7,7 @@ import javax.persistence.*;
         name="EmployeeResult",
         entities={
                 @EntityResult(
-                        entityClass = com.baeldung.sqlresultsetmapping.Employee.class,
+                        entityClass = com.baeldung.jpa.sqlresultsetmapping.Employee.class,
                         fields={@FieldResult(name="id",column="employeeNumber"),
                                  @FieldResult(name="name", column="name")}
                 )

persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/sqlresultsetmapping/ScheduledDay.java

@@ -1,18 +1,18 @@
-package com.baeldung.sqlresultsetmapping;
+package com.baeldung.jpa.sqlresultsetmapping;
 
 import javax.persistence.*;
 
 @SqlResultSetMappings(value = {
     @SqlResultSetMapping(name = "ScheduleResult",
-        classes = { @ConstructorResult(targetClass = com.baeldung.sqlresultsetmapping.ScheduledDay.class,
+        classes = { @ConstructorResult(targetClass = com.baeldung.jpa.sqlresultsetmapping.ScheduledDay.class,
         columns = { @ColumnResult(name = "id", type = Long.class),
                     @ColumnResult(name = "employeeId", type = Long.class),
                     @ColumnResult(name = "dayOfWeek") }) }),
     @SqlResultSetMapping(name = "FridayEmployeeResult",
                          columns = { @ColumnResult(name = "employeeId") }),
     @SqlResultSetMapping(name = "EmployeeScheduleResults",
-                         entities = { @EntityResult(entityClass = com.baeldung.sqlresultsetmapping.Employee.class),
-                                      @EntityResult(entityClass = com.baeldung.sqlresultsetmapping.ScheduledDay.class)
+                         entities = { @EntityResult(entityClass = com.baeldung.jpa.sqlresultsetmapping.Employee.class),
+                                      @EntityResult(entityClass = com.baeldung.jpa.sqlresultsetmapping.ScheduledDay.class)
     }) })
 @NamedNativeQuery(name = "FridayEmployees",
         query = "SELECT employeeId FROM schedule_days WHERE dayOfWeek = 'FRIDAY'",

persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml

@@ -7,8 +7,8 @@
 
 	<persistence-unit name="java-jpa-scheduled-day">
 		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-		<class>com.baeldung.sqlresultsetmapping.ScheduledDay</class>
-		<class>com.baeldung.sqlresultsetmapping.Employee</class>
+		<class>com.baeldung.jpa.sqlresultsetmapping.ScheduledDay</class>
+		<class>com.baeldung.jpa.sqlresultsetmapping.Employee</class>
 		<class>com.baeldung.jpa.basicannotation.Course</class>
 		<exclude-unlisted-classes>true</exclude-unlisted-classes>
 		<properties>
@@ -115,77 +115,13 @@
 		</properties>
 	</persistence-unit>
 
-	<persistence-unit name="jpa-h2-criteria">
-		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-		<class>com.baeldung.jpa.criteria.entity.Item</class>
-		<exclude-unlisted-classes>true</exclude-unlisted-classes>
-		<properties>
-			<property name="javax.persistence.jdbc.driver"
-				value="org.h2.Driver" />
-			<property name="javax.persistence.jdbc.url"
-				value="jdbc:h2:mem:test" />
-			<property name="javax.persistence.jdbc.user" value="sa" />
-			<property name="javax.persistence.jdbc.password" value="" />
-			<property name="hibernate.dialect"
-				value="org.hibernate.dialect.H2Dialect" />
-			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
-			<property name="show_sql" value="true" />
-			<property name="hibernate.temp.use_jdbc_metadata_defaults"
-				value="false" />
-			<property name="javax.persistence.sql-load-script-source"
-				value="item.sql" />
-		</properties>
-	</persistence-unit>
-
-	<persistence-unit name="jpa-query-types">
-		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-		<class>com.baeldung.jpa.querytypes.UserEntity</class>
-		<exclude-unlisted-classes>true</exclude-unlisted-classes>
-		<properties>
-			<property name="javax.persistence.jdbc.driver"
-				value="org.h2.Driver" />
-			<property name="javax.persistence.jdbc.url"
-				value="jdbc:h2:mem:test" />
-			<property name="javax.persistence.jdbc.user" value="sa" />
-			<property name="javax.persistence.jdbc.password" value="" />
-			<property name="hibernate.dialect"
-				value="org.hibernate.dialect.H2Dialect" />
-			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
-			<property name="show_sql" value="true" />
-			<property name="hibernate.temp.use_jdbc_metadata_defaults"
-				value="false" />
-			<property name="javax.persistence.sql-load-script-source"
-				value="users.sql" />
-		</properties>
-	</persistence-unit>
-
-	<persistence-unit name="entity-default-values">
-		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-		<class>com.baeldung.jpa.defaultvalues.User</class>
-		<exclude-unlisted-classes>true</exclude-unlisted-classes>
-		<properties>
-			<property name="javax.persistence.jdbc.driver"
-				value="org.h2.Driver" />
-			<property name="javax.persistence.jdbc.url"
-				value="jdbc:h2:mem:test" />
-			<property name="javax.persistence.jdbc.user" value="sa" />
-			<property name="javax.persistence.jdbc.password" value="" />
-			<property name="hibernate.dialect"
-				value="org.hibernate.dialect.H2Dialect" />
-			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
-			<property name="show_sql" value="true" />
-			<property name="hibernate.temp.use_jdbc_metadata_defaults"
-				value="false" />
-		</properties>
-	</persistence-unit>
-
 	<persistence-unit name="jpa-entity-definition">
 		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
 		<class>com.baeldung.jpa.entity.Student</class>
-		<class>com.baeldung.jpa.entity.Book</class>
-		<class>com.baeldung.jpa.entity.BookId</class>
-		<class>com.baeldung.jpa.entity.Account</class>
-		<class>com.baeldung.jpa.entity.AccountId</class>
+		<class>com.baeldung.jpa.primarykeys.Book</class>
+		<class>com.baeldung.jpa.primarykeys.BookId</class>
+		<class>com.baeldung.jpa.primarykeys.Account</class>
+		<class>com.baeldung.jpa.primarykeys.AccountId</class>
 		<exclude-unlisted-classes>true</exclude-unlisted-classes>
 		<properties>
 			<property name="javax.persistence.jdbc.driver"
@@ -203,25 +139,4 @@
 		</properties>
 	</persistence-unit>
 
-	<persistence-unit name="jpa-projections">
-		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-		<class>com.baeldung.jpa.projections.Product</class>
-		<exclude-unlisted-classes>true</exclude-unlisted-classes>
-		<properties>
-			<property name="javax.persistence.jdbc.driver"
-				value="org.h2.Driver" />
-			<property name="javax.persistence.jdbc.url"
-				value="jdbc:h2:mem:test" />
-			<property name="javax.persistence.jdbc.user" value="sa" />
-			<property name="javax.persistence.jdbc.password" value="" />
-			<property name="hibernate.dialect"
-				value="org.hibernate.dialect.H2Dialect" />
-			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
-			<property name="show_sql" value="true" />
-			<property name="hibernate.temp.use_jdbc_metadata_defaults"
-				value="false" />
-			<property name="javax.persistence.sql-load-script-source"
-				value="products_jpa.sql" />
-		</properties>
-	</persistence-unit>
 </persistence>

persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/entity/StudentEntityIntegrationTest.java

@@ -16,8 +16,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.baeldung.util.Gender;
-
 public class StudentEntityIntegrationTest {
 
 	private EntityManagerFactory emf;

persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/primarykeys/CompositeKeysIntegrationTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.jpa.entity;
+package com.baeldung.jpa.primarykeys;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -7,6 +7,10 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
+import com.baeldung.jpa.primarykeys.Account;
+import com.baeldung.jpa.primarykeys.AccountId;
+import com.baeldung.jpa.primarykeys.Book;
+import com.baeldung.jpa.primarykeys.BookId;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;

persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/sqlresultsetmapping/SqlResultSetMappingUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.sqlresultsetmapping;
+package com.baeldung.jpa.sqlresultsetmapping;
 
 import static org.junit.Assert.*;