HHH-14416 test cases for re-saving a deleted entity

hibernate-core/src/test/java/org/hibernate/event/ReSaveReferencedDeletedEntity.java

@@ -0,0 +1,95 @@
+package org.hibernate.event;
+
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.junit.Test;
+
+import javax.persistence.*;
+
+import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
+
+public class ReSaveReferencedDeletedEntity extends BaseCoreFunctionalTestCase {
+    @Override
+    protected Class<?>[] getAnnotatedClasses() {
+        return new Class<?>[] { Child.class, Parent.class };
+    }
+
+    @Test
+    @TestForIssue(jiraKey = "HHH-14416")
+    public void testReSaveDeletedEntityWithReferences() {
+        doInHibernate( this::sessionFactory, session -> {
+            Parent parent = new Parent();
+
+            Child child = new Child();
+            parent.setChild( child );
+
+            session.saveOrUpdate( parent );
+            session.saveOrUpdate( child );
+
+            session.remove(child);
+
+            session.save(child);
+        } );
+    }
+
+    @Test
+    @TestForIssue(jiraKey = "HHH-14416")
+    public void testReSaveDeletedEntityWithReferences2() {
+        doInHibernate( this::sessionFactory, session -> {
+            Parent parent = new Parent();
+
+            Child child = new Child();
+            parent.setChild( child );
+
+            session.saveOrUpdate( parent );
+            session.saveOrUpdate( child );
+
+            session.remove(child);
+
+            session.detach(child);
+
+            session.save(child);
+        } );
+    }
+
+    @Entity(name = "Child")
+    public static class Child {
+        @Id
+        @GeneratedValue(strategy = GenerationType.IDENTITY)
+        private Integer id;
+
+        public Integer getId() {
+            return id;
+        }
+
+        public void setId(Integer id) {
+            this.id = id;
+        }
+    }
+
+    @Entity(name = "Parent")
+    public static class Parent {
+        @Id
+        @GeneratedValue(strategy = GenerationType.IDENTITY)
+        private Integer id;
+
+        @OneToOne(cascade = CascadeType.ALL)
+        private Child child;
+
+        public Integer getId() {
+            return id;
+        }
+
+        public void setId(Integer id) {
+            this.id = id;
+        }
+
+        public Child getChild() {
+            return child;
+        }
+
+        public void setChild(Child child) {
+            this.child = child;
+        }
+    }
+}

hibernate-core/src/test/java/org/hibernate/event/ReSaveReferencedDeletedEntityJPA.java

@@ -0,0 +1,100 @@
+package org.hibernate.event;
+
+import org.hibernate.Session;
+import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.testing.TestForIssue;
+import org.junit.Test;
+
+import javax.persistence.*;
+
+public class ReSaveReferencedDeletedEntityJPA extends BaseEntityManagerFunctionalTestCase {
+    @Override
+    protected Class<?>[] getAnnotatedClasses() {
+        return new Class<?>[] { Child.class, Parent.class };
+    }
+
+    @Test
+    @TestForIssue(jiraKey = "HHH-14416")
+    public void testRefreshUnDeletedEntityWithReferencesJPA() {
+        EntityManager em = getOrCreateEntityManager();
+        em.getTransaction().begin();
+
+        Parent parent = new Parent();
+        parent.setId(1);
+
+        Child child = new Child();
+        child.setId(2);
+        parent.setChild( child );
+
+        em.unwrap(Session.class).save( parent );
+
+        em.flush();
+
+        em.remove( parent );
+
+        em.detach( parent );
+
+        em.persist( parent );
+
+        em.refresh( child );
+    }
+
+    @Test
+    @TestForIssue(jiraKey = "HHH-14416")
+    public void testReSaveDeletedEntityWithReferencesJPA() {
+        EntityManager em = getOrCreateEntityManager();
+        em.getTransaction().begin();
+
+        Parent parent = new Parent();
+        parent.setId(1);
+
+        Child child = new Child();
+        child.setId(2);
+        parent.setChild( child );
+
+        em.persist( parent );
+
+        em.remove( child );
+
+        em.unwrap(Session.class).save( child );
+    }
+
+    @Entity(name = "Child")
+    public static class Child {
+        @Id
+        private Integer id;
+
+        public Integer getId() {
+            return id;
+        }
+
+        public void setId(Integer id) {
+            this.id = id;
+        }
+    }
+
+    @Entity(name = "Parent")
+    public static class Parent {
+        @Id
+        private Integer id;
+
+        @OneToOne(cascade = CascadeType.ALL)
+        private Child child;
+
+        public Integer getId() {
+            return id;
+        }
+
+        public void setId(Integer id) {
+            this.id = id;
+        }
+
+        public Child getChild() {
+            return child;
+        }
+
+        public void setChild(Child child) {
+            this.child = child;
+        }
+    }
+}