HHH-19209 Fixed name resolution for autogenerated ID class name when entity class is inner class

Author: cigaly

hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java

@@ -525,7 +525,8 @@ private ClassDetails idClassDetails(InheritanceState inheritanceState, ClassDeta
 		if ( idClassAnn == null ) {
 			try {
 				// look for an Id class generated by Hibernate Processor as an inner class of static metamodel
-				final String generatedIdClassName = inheritanceState.getClassDetails().getClassName() + "_$Id";
+				final Class<Object> javaClass = inheritanceState.getClassDetails().toJavaClass();
+				final String generatedIdClassName = getGeneratedClassName( javaClass ) + "$Id";
 				return classDetailsRegistry.resolveClassDetails( generatedIdClassName );
 			}
 			catch (RuntimeException e) {
@@ -537,6 +538,12 @@ private ClassDetails idClassDetails(InheritanceState inheritanceState, ClassDeta
 		}
 	}
 
+	private static String getGeneratedClassName(Class<?> javaClass) {
+		return javaClass.isMemberClass()
+				? getGeneratedClassName( javaClass.getEnclosingClass() ) + "$" + javaClass.getSimpleName() + "_"
+				: javaClass.getName() + "_";
+	}
+
 	private Component createMapperProperty(
 			Map<ClassDetails, InheritanceState> inheritanceStates,
 			PersistentClass persistentClass,

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

@@ -56,7 +56,7 @@ void setUp(SessionFactoryScope sessionFactoryScope) {
 	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( 1, "John Doe" );
+		final var id = idClass.getConstructors()[0].newInstance( "John Doe", 1 );
 		final var employees = sessionFactoryScope.fromSession(
 				sess -> sess.createQuery( "from EmployeeWithoutIdClass where id=:id", EmployeeWithoutIdClass.class )
 						.setParameter( "id", id )
@@ -70,7 +70,7 @@ public void test(SessionFactoryScope sessionFactoryScope)
 	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 var id = idClass.getConstructors()[0].newInstance( "Dave Default", 13 );
 		final Inner employee = sessionFactoryScope.fromSession(
 				sess -> sess.find( Inner.class, id ) );
 		assertEquals( "1600 Pennsylvania Avenue", employee.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[] {"empId", "empName"} );
+		checkIfIdClassIsGenerated( Employee.class, new String[] {"empName", "empId"} );
 		checkIfIdClassIsGenerated( AnotherEmployee.class, new String[] {"empId", "empName"} );
 
 		final var clazz = getMetamodelClassFor( EmployeeWithIdClass.class );
@@ -46,8 +46,8 @@ public void testInner() {
 		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"} );
+		checkIfIdClassIsGenerated( Outer.Inner.class, new String[] {"empName", "empId"} );
+		checkIfIdClassIsGenerated( Outer.Super.class, new String[] {"empName", "empId"} );
 	}
 
 	private static void checkIfIdClassIsGenerated(Class<?> entityClass, String[] idComponentNames) {