HHH-16755 Add test for issue

hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/EmbeddableGenericsAndInterfaceTest.java

@@ -0,0 +1,70 @@
+/*
+ * 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.component.genericinheritance;
+
+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.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Marco Belladelli
+ */
+@SessionFactory
+@DomainModel( annotatedClasses = {
+		UserEntity.class,
+		ExampleSuperClassEmbedded.class,
+		ExampleEmbedded.class,
+		ExampleEntity.class,
+} )
+@Jira( "https://hibernate.atlassian.net/browse/HHH-16755" )
+public class EmbeddableGenericsAndInterfaceTest {
+	@BeforeAll
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final UserEntity user = new UserEntity();
+			user.setName( "Debbie" );
+			session.persist( user );
+			final ExampleEmbedded<?> embedded = new ExampleEmbedded<>();
+			embedded.setUser( user );
+			final ExampleEntity entity = new ExampleEntity();
+			entity.setExampleEmbedded( embedded );
+			session.persist( entity );
+		} );
+	}
+
+	@AfterAll
+	public void tearDown(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			session.createMutationQuery( "delete from ExampleEntity" ).executeUpdate();
+			session.createMutationQuery( "delete from UserEntity" ).executeUpdate();
+		} );
+	}
+
+	@Test
+	public void testMetamodelCriteria(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final CriteriaBuilder cb = session.getCriteriaBuilder();
+			final CriteriaQuery<ExampleEntity> cq = cb.createQuery( ExampleEntity.class );
+			final Root<ExampleEntity> root = cq.from( ExampleEntity.class );
+			cq.select( root ).where( cb.isNotNull(
+					root.get( ExampleEntity_.exampleEmbedded ).get( ExampleEmbedded_.user )
+			) );
+			final ExampleEntity result = session.createQuery( cq ).getSingleResult();
+			assertThat( result.getExampleEmbedded().getUser().getName() ).isEqualTo( "Debbie" );
+		} );
+	}
+}

hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/ExampleEmbedded.java

@@ -0,0 +1,13 @@
+/*
+ * 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.component.genericinheritance;
+
+import jakarta.persistence.Embeddable;
+
+@Embeddable
+public class ExampleEmbedded<T> extends ExampleSuperClassEmbedded<T> {
+}

hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/ExampleEntity.java

@@ -0,0 +1,37 @@
+/*
+ * 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.component.genericinheritance;
+
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+
+@Entity
+public class ExampleEntity {
+	private int id;
+
+	private ExampleEmbedded<?> exampleEmbedded;
+
+	@Id
+	@GeneratedValue
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	@Embedded
+	public ExampleEmbedded<?> getExampleEmbedded() {
+		return exampleEmbedded;
+	}
+	public void setExampleEmbedded(ExampleEmbedded<?> exampleEmbedded) {
+		this.exampleEmbedded = exampleEmbedded;
+	}
+}

hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/ExampleSuperClassEmbedded.java

@@ -0,0 +1,24 @@
+/*
+ * 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.component.genericinheritance;
+
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MappedSuperclass;
+
+@MappedSuperclass
+public class ExampleSuperClassEmbedded<T> {
+	private UserEntity user;
+
+	@ManyToOne( fetch = FetchType.LAZY )
+	public UserEntity getUser() {
+		return user;
+	}
+	public void setUser(UserEntity user) {
+		this.user = user;
+	}
+}

hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/UserEntity.java

@@ -0,0 +1,35 @@
+/*
+ * 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.component.genericinheritance;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+
+@Entity
+public class UserEntity {
+	private int id;
+	private String name;
+
+	@Id
+	@GeneratedValue
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+}