HHH-18945 Import generated class full qualified name to prevent importing other classes with same simple name

Author: cigaly

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

@@ -7,7 +7,6 @@
 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;
@@ -23,11 +22,10 @@
 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.getGeneratedClassFullyQualifiedName;
 import static org.hibernate.processor.util.TypeUtils.isMemberType;
 
 /**
@@ -185,20 +183,10 @@ else if ( modifiers.contains( Modifier.PROTECTED ) ) {
 	}
 
 	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 );
-		}
-		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;
+		return entity.getElement() instanceof PackageElement packageElement
+				? packageElement.getQualifiedName().toString() + "." + getGeneratedClassName( entity )
+				: getGeneratedClassFullyQualifiedName(
+						(TypeElement) entity.getElement(), entity.getPackageName(), entity.isJakartaDataStyle() );
 	}
 
 	private static String getGeneratedClassName(Metamodel entity) {

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

@@ -88,6 +88,7 @@
 import static org.hibernate.processor.util.TypeUtils.findMappedSuperElement;
 import static org.hibernate.processor.util.TypeUtils.getAnnotationMirror;
 import static org.hibernate.processor.util.TypeUtils.getAnnotationValue;
+import static org.hibernate.processor.util.TypeUtils.getGeneratedClassFullyQualifiedName;
 import static org.hibernate.processor.util.TypeUtils.hasAnnotation;
 import static org.hibernate.processor.util.TypeUtils.implementsInterface;
 import static org.hibernate.processor.util.TypeUtils.primitiveClassMatchesKind;
@@ -175,6 +176,9 @@ public AnnotationMetaEntity(
 		this.quarkusInjection = context.isQuarkusInjection();
 		this.importContext = parent != null ? parent : new ImportContextImpl( getPackageName( context, element ) );
 		jakartaDataStaticModel = jakartaDataStaticMetamodel;
+		importContext.importType(
+				getGeneratedClassFullyQualifiedName( element, getPackageName( context, element ),
+						jakartaDataStaticModel ) );
 	}
 
 	public static AnnotationMetaEntity create(TypeElement element, Context context) {

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

@@ -31,12 +31,15 @@
 import javax.tools.Diagnostic;
 
 import jakarta.persistence.AccessType;
+
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import static java.beans.Introspector.decapitalize;
 import static org.hibernate.processor.util.AccessTypeInformation.DEFAULT_ACCESS_TYPE;
@@ -671,6 +674,16 @@ public static boolean isMemberType(Element element) {
 		return element.getEnclosingElement() instanceof TypeElement;
 	}
 
+	public static String getGeneratedClassFullyQualifiedName(TypeElement element, String packageName, boolean jakartaDataStyle) {
+		final String packageNamePrefix = !packageName.isEmpty() ? packageName + "." : "";
+		final String className = Arrays.stream(
+						element.getQualifiedName().toString().substring( packageNamePrefix.length() ).split( "\\." ) )
+				.map( StringUtil::removeDollar )
+				.map( part -> jakartaDataStyle ? '_' + part : part + '_' )
+				.collect( Collectors.joining( "." ) );
+		return packageNamePrefix + className;
+	}
+
 	static class EmbeddedAttributeVisitor extends SimpleTypeVisitor8<@Nullable TypeElement, Element> {
 		private final Context context;