HHH-18693 Adapted org.hibernate.processor.test.util.TestUtil#getMetaModelClassName(java.lang.String) to handle metamodel classes generated from inner class

cigaly · cigaly · commit f9206876d992 · 2024-10-25T13:30:37.000+02:00
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java
@@ -357,7 +357,9 @@ private static String getMetaModelClassName(Class<?> clazz, boolean prefix) {
 	}
 
 	private static String getMetaModelClassName(String className) {
-		return className + META_MODEL_CLASS_POSTFIX;
+		final int index = className.lastIndexOf( '.' );
+		final String packageName = className.substring( 0, index + 1 );
+		return packageName + className.substring( packageName.length() ).replace( '$', '_' ) + META_MODEL_CLASS_POSTFIX;
 	}
 
 	public static String getMetaModelSourceAsString(Class<?> clazz) {

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,9 @@ private static String getMetaModelClassName(Class<?> clazz, boolean prefix) {`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`private static String getMetaModelClassName(String className) {`
`360`		`- return className + META_MODEL_CLASS_POSTFIX;`
	`360`	`+ final int index = className.lastIndexOf( '.' );`
	`361`	`+ final String packageName = className.substring( 0, index + 1 );`
	`362`	`+ return packageName + className.substring( packageName.length() ).replace( '$', '_' ) + META_MODEL_CLASS_POSTFIX;`
`361`	`363`	`}`
`362`	`364`
`363`	`365`	`public static String getMetaModelSourceAsString(Class<?> clazz) {`