HHH-19630 Adjust how Hibernate Processor determines the entity type

Author: marko-bekhta

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/constraint/DataTest.java

@@ -19,6 +19,6 @@ void test() {
 		System.out.println( getMetaModelSourceAsString( MyEntity.class ) );
 		System.out.println( getMetaModelSourceAsString( MyConstrainedRepository.class ) );
 		assertMetamodelClassGeneratedFor( MyEntity.class );
-//		assertMetamodelClassGeneratedFor( MyConstrainedRepository.class );
+		assertMetamodelClassGeneratedFor( MyConstrainedRepository.class );
 	}
 }

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/constraint/MyConstrainedRepository.java

@@ -7,12 +7,15 @@
 import jakarta.data.repository.CrudRepository;
 import jakarta.data.repository.Find;
 import jakarta.data.repository.Repository;
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 
 @Repository
 public interface MyConstrainedRepository extends CrudRepository<MyEntity, Long> {
 
+	@Valid
+	@NotNull
 	@Find
 	MyEntity findByName(@NotNull @Size(min = 5) String name);
 }

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/constraint/MyEntity.java

@@ -4,6 +4,7 @@
  */
 package org.hibernate.processor.test.data.constraint;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
@@ -12,5 +13,6 @@ public class MyEntity {
 
 	@Id
 	private Long id;
+	@Column(unique = true)
 	private String name;
 }

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

@@ -62,7 +62,6 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import jakarta.persistence.AccessType;
@@ -2066,7 +2065,7 @@ private void createCriteriaFinder(
 				new CriteriaFinderMethod(
 						this, method,
 						methodName,
-						returnType.toString(),
+						typeAsString( returnType, false ),
 						containerType,
 						paramNames,
 						paramTypes,
@@ -2379,7 +2378,7 @@ && matchesNaturalKey( entity, fieldTypes ) ) {
 					new CriteriaFinderMethod(
 							this, method,
 							methodName,
-							returnType.toString(),
+							typeAsString( returnType, false ),
 							containerType,
 							paramNames,
 							paramTypes,
@@ -2483,7 +2482,7 @@ private void createSingleParameterFinder(
 							new CriteriaFinderMethod(
 									this, method,
 									methodName,
-									returnType.toString(),
+									typeAsString( returnType, false ),
 									containerType,
 									paramNames,
 									paramTypes,
@@ -3427,25 +3426,35 @@ private List<String> parameterTypes(ExecutableElement method) {
 	 * Workaround for a bug in Java 20/21. Should not be necessary!
 	 */
 	private String typeAsString(TypeMirror type) {
-		String result;
+		return typeAsString( type, true );
+	}
+
+	private String typeAsString(TypeMirror type, boolean includeAnnotations) {
 		if ( type instanceof DeclaredType dt && dt.asElement() instanceof TypeElement te ) {
+			StringBuilder result = new StringBuilder();
+			if ( includeAnnotations ) {
+				for ( AnnotationMirror annotation : type.getAnnotationMirrors() ) {
+					result.append( annotation.toString() ).append( ' ' );
+				}
+			}
 			// get the "fqcn" without any type arguments
-			result = te.getQualifiedName().toString();
+			result.append( te.getQualifiedName().toString() );
 			// add the < ? ,? ....> as necessary:
 			if ( !dt.getTypeArguments().isEmpty() ) {
-				result += dt.getTypeArguments().stream()
-						.map( this::typeAsString )
-						.collect( Collectors.joining( ",", "<", ">" ) );
+				result.append( "<" );
+				int index = 0;
+				for ( ; index < dt.getTypeArguments().size() - 1; index++ ) {
+					result.append( typeAsString( dt.getTypeArguments().get( index ), true ) )
+							.append( ", " );
+				}
+				result.append( typeAsString( dt.getTypeArguments().get( index ), true ) );
+				result.append( ">" );
 			}
+			return result.toString();
 		}
 		else {
-			result = type.toString();
+			return type.toString();
 		}
-
-		for ( AnnotationMirror annotation : type.getAnnotationMirrors() ) {
-			result = annotation.toString() + ' ' + result;
-		}
-		return result;
 	}
 
 	private TypeMirror parameterType(VariableElement parameter) {