From 41360f428cd2e34cce9cc0a11ce6e778f9cb3e43 Mon Sep 17 00:00:00 2001
From: Marco Belladelli <marcobladel@gmail.com>
Date: Tue, 4 Jun 2024 11:24:03 +0200
Subject: [PATCH] HHH-18218 Add test for issue

---
 .../InstantiationWithGenericsTest.java        | 141 ++++++++++++++++++
 1 file changed, 141 insertions(+)
 create mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithGenericsTest.java

diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithGenericsTest.java
new file mode 100644
index 0000000000..3554566f04
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithGenericsTest.java
@@ -0,0 +1,141 @@
+/*
+ * 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.query.hql.instantiation;
+
+import java.io.Serializable;
+
+import org.hibernate.annotations.Imported;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Marco Belladelli
+ */
+@DomainModel( annotatedClasses = {
+		InstantiationWithGenericsTest.AbstractEntity.class,
+		InstantiationWithGenericsTest.ConcreteEntity.class,
+		InstantiationWithGenericsTest.ConstructorDto.class,
+		InstantiationWithGenericsTest.InjectionDto.class,
+} )
+@SessionFactory
+@Jira( "https://hibernate.atlassian.net/browse/HHH-18218" )
+public class InstantiationWithGenericsTest {
+	@Test
+	public void testConstructor(SessionFactoryScope scope) {
+		scope.inTransaction( session -> assertThat( session.createQuery(
+				"select new ConstructorDto(e.id, e.data) from ConcreteEntity e",
+				ConstructorDto.class
+		).getSingleResult() ).extracting( ConstructorDto::getId, ConstructorDto::getData )
+				.containsExactly( 1L, "entity_1" ) );
+	}
+
+	@Test
+	public void testInjection(SessionFactoryScope scope) {
+		scope.inTransaction( session -> assertThat( session.createQuery(
+				"select new InjectionDto(e.id as id, e.data as data) from ConcreteEntity e",
+				InjectionDto.class
+		).getSingleResult() ).extracting( InjectionDto::getId, InjectionDto::getData )
+				.containsExactly( 1L, "entity_1" ) );
+	}
+
+	@BeforeAll
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final ConcreteEntity entity = new ConcreteEntity();
+			entity.setId( 1L );
+			entity.setData( "entity_1" );
+			session.persist( entity );
+		} );
+	}
+
+	@AfterAll
+	public void tearDown(SessionFactoryScope scope) {
+		scope.inTransaction( session -> session.createMutationQuery( "delete from ConcreteEntity" ).executeUpdate() );
+	}
+
+	@MappedSuperclass
+	static abstract class AbstractEntity<K extends Serializable> {
+		@Id
+		protected K id;
+
+		protected K getId() {
+			return id;
+		}
+
+		protected void setId(K id) {
+			this.id = id;
+		}
+	}
+
+	@Entity( name = "ConcreteEntity" )
+	static class ConcreteEntity extends AbstractEntity<Long> {
+		protected String data;
+
+		public String getData() {
+			return data;
+		}
+
+		public void setData(String data) {
+			this.data = data;
+		}
+	}
+
+	@Imported
+	public static class ConstructorDto {
+		private final Long id;
+
+		private final String data;
+
+		public ConstructorDto(Long id, String data) {
+			this.id = id;
+			this.data = data;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public String getData() {
+			return data;
+		}
+	}
+
+	@Imported
+	public static class InjectionDto {
+		private long id;
+
+		private String data;
+
+		public long getId() {
+			return id;
+		}
+
+		public void setId(long id) {
+			this.id = id;
+		}
+
+		public String getData() {
+			return data;
+		}
+
+		public void setData(String data) {
+			this.data = data;
+		}
+	}
+}