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

@@ -551,7 +551,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) {
@@ -563,6 +564,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,