Skip to content

Commit d5a0c66

Browse files
committed
HHH-18693 Fixed name generation for metamodel classes and sources
1 parent 4d4d7cf commit d5a0c66

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationStatement.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@ private List<File> getCompilationUnits(List<Class<?>> classesToCompile, List<Str
100100
}
101101

102102
private String getPathToSource(Class<?> testClass) {
103+
if ( testClass.isMemberClass() ) {
104+
return getPathToSource( testClass.getDeclaringClass() );
105+
}
103106
return TestUtil.getSourceBaseDir( testClass ).getAbsolutePath() + File.separator + testClass.getName()
104107
.replace( PACKAGE_SEPARATOR, File.separator ) + ".java";
105108
}

tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,9 @@ public static File getMetaModelSourceFileFor(String className) {
351351
}
352352

353353
private static String getMetaModelClassName(Class<?> clazz, boolean prefix) {
354-
return prefix
355-
? clazz.getPackageName() + '.' + META_MODEL_CLASS_POSTFIX + clazz.getSimpleName()
356-
: clazz.getName() + META_MODEL_CLASS_POSTFIX;
354+
final String packageName = clazz.getPackageName();
355+
return prefix ? packageName + '.' + META_MODEL_CLASS_POSTFIX + clazz.getSimpleName()
356+
: packageName + clazz.getName().substring( packageName.length() ).replace( '$', '_' ) + META_MODEL_CLASS_POSTFIX;
357357
}
358358

359359
private static String getMetaModelClassName(String className) {

0 commit comments

Comments
 (0)