From 8f7b8b8fa2ccdb34ae6aca82fe10f70039673113 Mon Sep 17 00:00:00 2001
From: Marco Belladelli <mbellade@redhat.com>
Date: Fri, 23 Dec 2022 12:27:49 +0100
Subject: [PATCH] HHH-15865 Add test for issue

---
 .../OneToManyNestedEmbeddedIdTest.java        | 155 ++++++++++++++++++
 1 file changed, 155 insertions(+)
 create mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyNestedEmbeddedIdTest.java

diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyNestedEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyNestedEmbeddedIdTest.java
new file mode 100644
index 0000000000..06d5fe3872
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyNestedEmbeddedIdTest.java
@@ -0,0 +1,155 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ */
+package org.hibernate.orm.test.compositefk;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @author Marco Belladelli
+ */
+@Jpa(annotatedClasses = {
+		OneToManyNestedEmbeddedIdTest.ChildEntity.class,
+		OneToManyNestedEmbeddedIdTest.ParentEntity.class,
+})
+@JiraKey("HHH-15865")
+public class OneToManyNestedEmbeddedIdTest {
+	@AfterEach
+	public void tearDown(EntityManagerFactoryScope scope) {
+		scope.inTransaction( em -> {
+			em.createQuery( "delete from ChildEntity" ).executeUpdate();
+			em.createQuery( "delete from ParentEntity" ).executeUpdate();
+		} );
+	}
+
+	@Test
+	public void testMergeWithParentEmbeddedId(EntityManagerFactoryScope scope) {
+		ParentEntityIdWrapper idWrapper = new ParentEntityIdWrapper( new ParentEntityId( 1 ) );
+
+		scope.inTransaction( em -> {
+			ParentEntity parentEntity = new ParentEntity( idWrapper, List.of( new ChildEntity() ) );
+			ParentEntity returnedEntity = em.merge( parentEntity );
+			assertEquals( 1, returnedEntity.getParentEntityIdWrapper().getParentEntityId().getId() );
+			// check if persisted entity behaves correctly
+			returnedEntity.getChildEntities().add( new ChildEntity() );
+		} );
+
+		scope.inTransaction( em -> {
+			ParentEntity foundEntity = em.find( ParentEntity.class, idWrapper );
+			assertEquals( 2, foundEntity.getChildEntities().size() );
+		} );
+	}
+
+	@Entity(name = "ChildEntity")
+	public static class ChildEntity {
+		@Id
+		@GeneratedValue(strategy = GenerationType.IDENTITY)
+		private int id;
+
+		public int getId() {
+			return id;
+		}
+
+		public void setId(int id) {
+			this.id = id;
+		}
+	}
+
+	@Embeddable
+	public static class ParentEntityId {
+		private int id;
+
+		public ParentEntityId() {
+		}
+
+		public ParentEntityId(int id) {
+			this.id = id;
+		}
+
+		public int getId() {
+			return id;
+		}
+
+		public void setId(int id) {
+			this.id = id;
+		}
+	}
+
+	@Embeddable
+	public static class ParentEntityIdWrapper implements Serializable {
+		@Embedded
+		private ParentEntityId parentEntityId;
+
+		public ParentEntityIdWrapper() {
+		}
+
+		public ParentEntityIdWrapper(ParentEntityId parentEntityId) {
+			this.parentEntityId = parentEntityId;
+		}
+
+		public ParentEntityId getParentEntityId() {
+			return parentEntityId;
+		}
+
+		public void setParentEntityId(ParentEntityId parentEntityId) {
+			this.parentEntityId = parentEntityId;
+		}
+	}
+
+	@Entity(name = "ParentEntity")
+	public static class ParentEntity {
+		@EmbeddedId
+		private ParentEntityIdWrapper parentEntityIdWrapper;
+
+		@OneToMany(cascade = CascadeType.ALL)
+		@JoinColumn(name = "parent_entity_id", referencedColumnName = "id")
+		private List<ChildEntity> childEntities;
+
+		public ParentEntity() {
+		}
+
+		public ParentEntity(ParentEntityIdWrapper parentEntityIdWrapper, List<ChildEntity> childEntities) {
+			this.parentEntityIdWrapper = parentEntityIdWrapper;
+			this.childEntities = childEntities;
+		}
+
+		public ParentEntityIdWrapper getParentEntityIdWrapper() {
+			return parentEntityIdWrapper;
+		}
+
+		public void setParentEntityIdWrapper(ParentEntityIdWrapper parentEntityIdWrapper) {
+			this.parentEntityIdWrapper = parentEntityIdWrapper;
+		}
+
+		public List<ChildEntity> getChildEntities() {
+			return childEntities;
+		}
+
+		public void setChildEntities(List<ChildEntity> childEntities) {
+			this.childEntities = childEntities;
+		}
+	}
+}