HHH-19209 Additional test cases

          - check generation of ID class for inner classes
          - check if record components of generated ID class are sorted by name

Author: cigaly

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh18829/AutoGeneratedIdClassTest.java

@@ -4,6 +4,8 @@
  */
 package org.hibernate.orm.test.mapping.hhh18829;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -15,7 +17,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@DomainModel(annotatedClasses = EmployeeWithoutIdClass.class)
+@DomainModel(annotatedClasses = {EmployeeWithoutIdClass.class, AutoGeneratedIdClassTest.Inner.class})
 @JiraKey(" HHH-18829")
 @SessionFactory
 public class AutoGeneratedIdClassTest {
@@ -35,18 +37,51 @@ void setUp(SessionFactoryScope sessionFactoryScope) {
 			two.address = "1600 Pennsylvania Avenue";
 			sess.persist( two );
 		} );
+		sessionFactoryScope.inTransaction( sess -> {
+			final var one = new Inner();
+			one.empName = "John Doe";
+			one.empId = 1;
+			one.address = "10 Downing Street, SW1A 2AA";
+			sess.persist( one );
+
+			final var two = new Inner();
+			two.empName = "Dave Default";
+			two.empId = 13;
+			two.address = "1600 Pennsylvania Avenue";
+			sess.persist( two );
+		} );
 	}
 
 	@Test
 	public void test(SessionFactoryScope sessionFactoryScope)
 			throws ClassNotFoundException, InvocationTargetException, InstantiationException, IllegalAccessException {
 		final var idClass = Class.forName( EmployeeWithoutIdClass.class.getName() + "_$Id" );
-		final var id = idClass.getConstructors()[0].newInstance( "John Doe", 1 );
+		final var id = idClass.getConstructors()[0].newInstance( 1, "John Doe" );
 		final var employees = sessionFactoryScope.fromSession(
-				sess -> sess.createQuery( "from EmployeeWithoutIdClass where id=:id", EmployeeWithoutIdClass.class ).setParameter( "id", id )
+				sess -> sess.createQuery( "from EmployeeWithoutIdClass where id=:id", EmployeeWithoutIdClass.class )
+						.setParameter( "id", id )
 						.getResultList()
 		);
 		assertEquals( 1, employees.size() );
 		assertEquals( "10 Downing Street, SW1A 2AA", employees.get( 0 ).address );
 	}
+
+	@Test
+	public void innerEntityClassTest(SessionFactoryScope sessionFactoryScope)
+			throws ClassNotFoundException, InvocationTargetException, InstantiationException, IllegalAccessException {
+		final var idClass = Class.forName( AutoGeneratedIdClassTest .class.getName() + "_$Inner_$Id" );
+		final var id = idClass.getConstructors()[0].newInstance( 13, "Dave Default" );
+		final Inner employee = sessionFactoryScope.fromSession(
+				sess -> sess.find( Inner.class, id ) );
+		assertEquals( "1600 Pennsylvania Avenue", employee.address );
+	}
+
+	@Entity
+	static class Inner {
+		@Id
+		String empName;
+		@Id
+		Integer empId;
+		String address;
+	}
 }

tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh18829/AutoGeneratedIdClassTest.java

@@ -29,7 +29,7 @@ public void test() {
 		System.out.println( TestUtil.getMetaModelSourceAsString( Address.class ) );
 		System.out.println( TestUtil.getMetaModelSourceAsString( EmployeeWithIdClass.class ) );
 
-		checkIfIdClassIsGenerated( Employee.class, new String[] {"empName", "empId"} );
+		checkIfIdClassIsGenerated( Employee.class, new String[] {"empId", "empName"} );
 		checkIfIdClassIsGenerated( AnotherEmployee.class, new String[] {"empId", "empName"} );
 
 		final var clazz = getMetamodelClassFor( EmployeeWithIdClass.class );
@@ -38,6 +38,18 @@ public void test() {
 				"EmployeeWithIdClass_ should not have inner class Id" );
 	}
 
+	@Test
+	@WithClasses(value = {Outer.Inner.class, Outer.Super.class})
+	@TestForIssue(jiraKey = "HHH-18829")
+	public void testInner() {
+		System.out.println( TestUtil.getMetaModelSourceAsString( Outer.class ) );
+		System.out.println( TestUtil.getMetaModelSourceAsString( Outer.Inner.class ) );
+		System.out.println( TestUtil.getMetaModelSourceAsString( Outer.Super.class ) );
+
+		checkIfIdClassIsGenerated( Outer.Inner.class, new String[] {"empId", "empName"} );
+		checkIfIdClassIsGenerated( Outer.Super.class, new String[] {"empId", "empName"} );
+	}
+
 	private static void checkIfIdClassIsGenerated(Class<?> entityClass, String[] idComponentNames) {
 		final var clazz = getMetamodelClassFor( entityClass );
 		final var maybeIdClass = Arrays.stream( clazz.getClasses() )

tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh18829/Outer.java

@@ -0,0 +1,30 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.hhh18829;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+
+public class Outer {
+
+	@Entity
+	static class Inner {
+		@Id
+		String empName;
+		@Id
+		Integer empId;
+		String address;
+	}
+
+	@MappedSuperclass
+	static class Super {
+		@Id
+		String empName;
+		@Id
+		Integer empId;
+		String address;
+	}
+}