HHH-18693 Changed code to allow creation of metadata for inner static non-private classes

          Generaed metadate class for inner class A.B is A_.B_

Author: cigaly

tooling/metamodel-generator/src/main/java/org/hibernate/processor/ClassWriter.java

@@ -4,11 +4,16 @@
  */
 package org.hibernate.processor;
 
+import org.hibernate.processor.annotation.InnerClassMetaAttribute;
 import org.hibernate.processor.model.MetaAttribute;
 import org.hibernate.processor.model.Metamodel;
+import org.hibernate.processor.util.StringUtil;
 
 import javax.annotation.processing.FilerException;
+import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
 import javax.tools.Diagnostic;
 import javax.tools.FileObject;
@@ -18,7 +23,12 @@
 import java.io.StringWriter;
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static org.hibernate.processor.util.TypeUtils.isMemberType;
 
 /**
  * Helper class to write the actual metamodel class using the  {@link javax.annotation.processing.Filer} API.
@@ -39,7 +49,7 @@ public static void writeFile(Metamodel entity, Context context) {
 			String body = generateBody( entity, context ).toString();
 
 			FileObject fo = context.getProcessingEnvironment().getFiler().createSourceFile(
-					getFullyQualifiedClassName( entity, metaModelPackage ),
+					getFullyQualifiedClassName( entity ),
 					entity.getElement()
 			);
 			OutputStream os = fo.openOutputStream();
@@ -101,6 +111,15 @@ private static StringBuffer generateBody(Metamodel entity, Context context) {
 			pw.println();
 
 			final List<MetaAttribute> members = entity.getMembers();
+			for ( MetaAttribute metaMember : members ) {
+				if ( metaMember instanceof InnerClassMetaAttribute innerClass ) {
+					generateBody( innerClass.getMetaEntity(), context )
+							.toString().lines()
+							.forEach(line -> pw.println('\t' + line));
+					context.markGenerated( innerClass.getMetaEntity() );
+				}
+			}
+
 			for ( MetaAttribute metaMember : members ) {
 				if ( metaMember.hasStringAttribute() ) {
 					metaMember.getAttributeNameDeclarationString().lines()
@@ -133,16 +152,29 @@ private static StringBuffer generateBody(Metamodel entity, Context context) {
 	}
 
 	private static void printClassDeclaration(Metamodel entity, PrintWriter pw) {
-		pw.print( "public " );
+		if ( isMemberType( entity.getElement() ) ) {
+			final Set<Modifier> modifiers = entity.getElement().getModifiers();
+			if ( modifiers.contains( Modifier.PUBLIC ) ) {
+				pw.print( "public " );
+			}
+			else if ( modifiers.contains( Modifier.PROTECTED ) ) {
+				pw.print( "protected " );
+			}
+			pw.print( "static " );
+		}
+		else {
+			pw.print( "public " );
+		}
 		if ( !entity.isImplementation() && !entity.isJakartaDataStyle() ) {
 			pw.print( "abstract " );
 		}
 		pw.print( entity.isJakartaDataStyle() ? "interface " : "class " );
 		pw.print( getGeneratedClassName(entity) );
 
-		String superClassName = entity.getSupertypeName();
-		if ( superClassName != null ) {
-			pw.print( " extends " + getGeneratedSuperclassName(entity, superClassName) );
+		final Element superTypeElement = entity.getSuperTypeElement();
+		if ( superTypeElement != null ) {
+			pw.print( " extends " +
+					entity.importType(getGeneratedSuperclassName( superTypeElement, entity.isJakartaDataStyle() )) );
 		}
 		if ( entity.isImplementation() ) {
 			pw.print( entity.getElement().getKind() == ElementKind.CLASS ? " extends " : " implements " );
@@ -152,34 +184,36 @@ private static void printClassDeclaration(Metamodel entity, PrintWriter pw) {
 		pw.println( " {" );
 	}
 
-	private static String getFullyQualifiedClassName(Metamodel entity, String metaModelPackage) {
-		String fullyQualifiedClassName = "";
-		if ( !metaModelPackage.isEmpty() ) {
-			fullyQualifiedClassName = fullyQualifiedClassName + metaModelPackage + ".";
+	private static String getFullyQualifiedClassName(Metamodel entity) {
+		final String metaModelPackage = entity.getPackageName();
+		final String packageNamePrefix = !metaModelPackage.isEmpty() ? metaModelPackage + "." : "";
+		final String className;
+		if ( entity.getElement().getKind() == ElementKind.PACKAGE ) {
+			className = getGeneratedClassName( entity );
 		}
-		fullyQualifiedClassName = fullyQualifiedClassName + getGeneratedClassName( entity );
-		return fullyQualifiedClassName;
+		else {
+			className = Arrays.stream(
+							entity.getQualifiedName().substring( packageNamePrefix.length() ).split( "\\." ) )
+					.map( StringUtil::removeDollar )
+					.map( part -> entity.isJakartaDataStyle() ? '_' + part : part + '_' )
+					.collect( Collectors.joining( "." ) );
+		}
+		return packageNamePrefix + className;
 	}
 
 	private static String getGeneratedClassName(Metamodel entity) {
 		final String className = entity.getSimpleName();
 		return entity.isJakartaDataStyle() ? '_' + className : className + '_';
 	}
 
-	private static String getGeneratedSuperclassName(Metamodel entity, String superClassName) {
-		if ( entity.isJakartaDataStyle() ) {
-			int lastDot = superClassName.lastIndexOf('.');
-			if ( lastDot<0 ) {
-				return '_' + superClassName;
-			}
-			else {
-				return superClassName.substring(0,lastDot+1)
-						+ '_' + superClassName.substring(lastDot+1);
-			}
-		}
-		else {
-			return superClassName + '_';
-		}
+	private static String getGeneratedSuperclassName(Element superClassElement, boolean jakartaDataStyle) {
+		final TypeElement typeElement = (TypeElement) superClassElement;
+		final String simpleName = typeElement.getSimpleName().toString();
+		final Element enclosingElement = typeElement.getEnclosingElement();
+		return (enclosingElement instanceof TypeElement
+				? getGeneratedSuperclassName( enclosingElement, jakartaDataStyle )
+				: ((PackageElement) enclosingElement).getQualifiedName().toString())
+				+ "." + (jakartaDataStyle ? '_' + simpleName : simpleName + '_');
 	}
 
 	private static String writeGeneratedAnnotation(Metamodel entity, Context context) {
@@ -227,6 +261,7 @@ private static String writeStaticMetaModelAnnotation(Metamodel entity) {
 		final String annotation = entity.isJakartaDataStyle()
 				? "jakarta.data.metamodel.StaticMetamodel"
 				: "jakarta.persistence.metamodel.StaticMetamodel";
-		return "@" + entity.importType( annotation ) + "(" + entity.getSimpleName() + ".class)";
+		final String simpleName = entity.importType( entity.getQualifiedName() );
+		return "@" + entity.importType( annotation ) + "(" + simpleName + ".class)";
 	}
 }

tooling/metamodel-generator/src/main/java/org/hibernate/processor/Context.java

@@ -304,6 +304,15 @@ public Collection<Metamodel> getDataMetaEmbeddables() {
 		return dataMetaEmbeddables.values();
 	}
 
+	public @Nullable Metamodel getMetamodel(String qualifiedName) {
+		if ( metaEntities.containsKey( qualifiedName ) ) {
+			return metaEntities.get( qualifiedName );
+		}
+		else {
+			return metaEmbeddables.get( qualifiedName );
+		}
+	}
+
 	public @Nullable Metamodel getMetaAuxiliary(String qualifiedName) {
 		return metaAuxiliaries.get( qualifiedName );
 	}