From 4bb9fa006dff2c756536a0720148571ed908d482 Mon Sep 17 00:00:00 2001
From: timis1 <12120641+timis1@users.noreply.github.com>
Date: Thu, 27 Jul 2023 19:27:17 +0300
Subject: [PATCH] JAVA-23344 Fix failing tests in hibernate-annotations
 (#14468)

---
 .../hibernate-annotations/pom.xml             |  3 ++-
 .../primarykeyjoincolumn/Department.java      |  3 +++
 .../main/resources/META-INF/persistence.xml   | 12 +++++----
 .../PrimaryKeyJoinColumnIntegrationTest.java  | 27 +++++++++----------
 4 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/persistence-modules/hibernate-annotations/pom.xml b/persistence-modules/hibernate-annotations/pom.xml
index 6417421fed..3e33aca5ae 100644
--- a/persistence-modules/hibernate-annotations/pom.xml
+++ b/persistence-modules/hibernate-annotations/pom.xml
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>io.hypersistence</groupId>
             <artifactId>hypersistence-utils-hibernate-60</artifactId>
-            <version>3.3.1</version>
+            <version>${hypersistance-utils-hibernate-60.version}</version>
         </dependency>
     </dependencies>
 
@@ -90,6 +90,7 @@
         <hibernate-core.version>6.1.7.Final</hibernate-core.version>
         <maven.deploy.skip>true</maven.deploy.skip>
         <tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
+        <hypersistance-utils-hibernate-60.version>3.3.1</hypersistance-utils-hibernate-60.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/primarykeyjoincolumn/Department.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/primarykeyjoincolumn/Department.java
index 578cc70e38..d27b0518bf 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/primarykeyjoincolumn/Department.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/primarykeyjoincolumn/Department.java
@@ -1,6 +1,8 @@
 package com.baeldung.hibernate.primarykeyjoincolumn;
 
 import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 
@@ -9,6 +11,7 @@ import jakarta.persistence.Table;
 public class Department {
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     private String name;
diff --git a/persistence-modules/hibernate-annotations/src/main/resources/META-INF/persistence.xml b/persistence-modules/hibernate-annotations/src/main/resources/META-INF/persistence.xml
index 2915125295..81b4bf0669 100644
--- a/persistence-modules/hibernate-annotations/src/main/resources/META-INF/persistence.xml
+++ b/persistence-modules/hibernate-annotations/src/main/resources/META-INF/persistence.xml
@@ -3,14 +3,16 @@
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
              version="2.0">
-    <persistence-unit name="com.baeldung.movie_catalog">
-        <description>Hibernate EntityManager Demo</description> 
+    <persistence-unit name="com.baeldung.department_person">
+        <description>Hibernate EntityManager Demo</description>
+        <class>com.baeldung.hibernate.primarykeyjoincolumn.Person</class>
+        <class>com.baeldung.hibernate.primarykeyjoincolumn.Department</class>
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <properties>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
             <property name="hibernate.hbm2ddl.auto" value="update"/>
-            <property name="jakarta.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
-            <property name="jakarta.persistence.jdbc.url" value="jdbc:mysql://127.0.0.1:3306/moviecatalog"/>
+            <property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver"/>
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:h2:mem:departmentperson"/>
             <property name="jakarta.persistence.jdbc.user" value="root"/>
             <property name="jakarta.persistence.jdbc.password" value="root"/>
         </properties>
diff --git a/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/primarykeyjoincolumn/PrimaryKeyJoinColumnIntegrationTest.java b/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/primarykeyjoincolumn/PrimaryKeyJoinColumnIntegrationTest.java
index 0a595d4052..98f1a274a3 100644
--- a/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/primarykeyjoincolumn/PrimaryKeyJoinColumnIntegrationTest.java
+++ b/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/primarykeyjoincolumn/PrimaryKeyJoinColumnIntegrationTest.java
@@ -1,25 +1,25 @@
 package com.baeldung.hibernate.primarykeyjoincolumn;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.Persistence;
 
-public class PrimaryKeyJoinColumnIntegrationTest {
+class PrimaryKeyJoinColumnIntegrationTest {
 
     private static EntityManagerFactory emf;
 
-    private EntityManager em;
+    private static EntityManager em;
 
-    @Before
-    public void setup() {
-        emf = Persistence.createEntityManagerFactory("com.baeldung.movie_catalog");
+    @BeforeAll
+    public static void setup() {
+        emf = Persistence.createEntityManagerFactory("com.baeldung.department_person");
         em = emf.createEntityManager();
         em.getTransaction()
           .begin();
@@ -34,19 +34,18 @@ public class PrimaryKeyJoinColumnIntegrationTest {
           .commit();
     }
 
-    @After
-    public void teardown() {
+    @AfterAll
+    public static void teardown() {
         em.close();
         emf.close();
     }
 
     @Test
-    public void givenPersonEntity_getDepartment_shouldExist() {
+    void givenPersonEntity_getDepartment_shouldExist() {
         Person person = em.find(Person.class, 1L);
         assertNotNull(person);
         assertEquals("John Doe", person.getName());
         assertNotNull(person.getDepartment());
-        assertEquals("IT", person.getDepartment()
-         .getName());
+        assertEquals("IT", person.getDepartment().getName());
     }
 }