#24 - Add TypeDetails#determineRawClass

Author: sebersole

src/main/java/org/hibernate/models/spi/TypeDetails.java

@@ -135,6 +135,16 @@ default TypeDetails determineRelativeType(ClassDetails container) {
 		return TypeDetailsHelper.resolveRelativeType( this, container );
 	}
 
+	/**
+	 * Determine the raw {@linkplain ClassDetails class} for the given type.  Never returns {@code null}, opting
+	 * to return {@linkplain ClassDetails#OBJECT_CLASS_DETAILS Object} instead if the raw class is not known
+	 *
+	 * @return The raw class details, or {@linkplain ClassDetails#OBJECT_CLASS_DETAILS Object} if "not known".
+	 */
+	default ClassDetails determineRawClass() {
+		return TypeDetailsHelper.resolveRawClass( this );
+	}
+
 
 	enum Kind {
 

src/main/java/org/hibernate/models/spi/TypeDetailsHelper.java

@@ -215,30 +215,40 @@ else if ( typeDetails.getTypeKind() == TypeDetails.Kind.TYPE_VARIABLE ) {
 
 	/**
 	 * Given a type, resolve the underlying ClassDetails
+	 *
+	 * @see TypeDetails#determineRawClass()
 	 */
-	public static ClassDetails resolveRawClass(
-			TypeDetails typeDetails,
-			@SuppressWarnings("unused") SourceModelBuildingContext buildingContext) {
+	public static ClassDetails resolveRawClass(TypeDetails typeDetails) {
 		switch ( typeDetails.getTypeKind() ) {
 			case CLASS, PRIMITIVE, VOID, ARRAY -> {
 				return ( (ClassBasedTypeDetails) typeDetails ).getClassDetails();
 			}
 			case TYPE_VARIABLE -> {
 				final TypeVariableDetails resolvedTypeVariable = typeDetails.asTypeVariable();
 				if ( CollectionHelper.size( resolvedTypeVariable.getBounds() ) == 1 ) {
-					// and assume the bound is a class
-					return resolvedTypeVariable.getBounds().get( 0 ).asClassType().getClassDetails();
+					return resolvedTypeVariable.getBounds().get( 0 ).determineRawClass();
 				}
 				return ClassDetails.OBJECT_CLASS_DETAILS;
 			}
 			case PARAMETERIZED_TYPE -> {
 				final ParameterizedTypeDetails parameterizedType = typeDetails.asParameterizedType();
 				if ( CollectionHelper.size( parameterizedType.getArguments() ) == 1 ) {
-					// and assume the bound is a class
-					return parameterizedType.getArguments().get( 0 ).asClassType().getClassDetails();
+					return parameterizedType.getArguments().get( 0 ).determineRawClass();
 				}
 				return ClassDetails.OBJECT_CLASS_DETAILS;
 			}
+			case WILDCARD_TYPE -> {
+				final WildcardTypeDetails wildcardType = typeDetails.asWildcardType();
+				if ( wildcardType.getBound() != null ) {
+					return wildcardType.getBound().determineRawClass();
+				}
+				return ClassDetails.OBJECT_CLASS_DETAILS;
+			}
+			case TYPE_VARIABLE_REFERENCE -> {
+				final String identifier = typeDetails.asTypeVariableReference().getIdentifier();
+				final TypeDetails identifiedTypeDetails = typeDetails.resolveTypeVariable( identifier );
+				return identifiedTypeDetails.determineRawClass();
+			}
 		}
 		return ClassDetails.OBJECT_CLASS_DETAILS;
 	}
@@ -256,7 +266,7 @@ public static ArrayTypeDetails arrayOf(TypeDetails constituentType, SourceModelB
 					.resolveClassDetails( "[" + primitiveKind.getJavaTypeChar() );
 		}
 		else {
-			final ClassDetails rawComponentType = TypeDetailsHelper.resolveRawClass( constituentType, buildingContext );
+			final ClassDetails rawComponentType = constituentType.determineRawClass();
 			final String arrayClassName = "[L" + rawComponentType.getName().replace( '.', '/' ) + ";";
 			arrayClassDetails = buildingContext
 					.getClassDetailsRegistry()

src/test/java/org/hibernate/models/generics/CollectionTests.java

@@ -20,7 +20,6 @@
 import org.hibernate.models.spi.FieldDetails;
 import org.hibernate.models.spi.ParameterizedTypeDetails;
 import org.hibernate.models.spi.TypeDetails;
-import org.hibernate.models.spi.TypeDetailsHelper;
 import org.hibernate.models.spi.TypeVariableDetails;
 import org.hibernate.models.spi.WildcardTypeDetails;
 
@@ -225,6 +224,7 @@ void testWildcard(Index index) {
 		assertThat( extendsStuffFieldWildcardType.getBound().asClassType().getClassDetails().getName() ).endsWith( "Stuff" );
 		assertThat( extendsStuffField.getElementType() ).isSameAs( extendsStuffFieldWildcardType );
 		assertThat( extendsStuffFieldType.isResolved() ).isTrue();
+		assertThat( extendsStuffFieldWildcardType.determineRawClass() ).isNotNull();
 
 		final FieldDetails superStuffField = classDetails.findFieldByName( "superStuff" );
 		final TypeDetails superStuffFieldType = superStuffField.getType();
@@ -244,6 +244,7 @@ void testWildcard(Index index) {
 		assertThat( superStuffFieldWildcardType.getBound().asClassType().getClassDetails().getName() ).endsWith( "Stuff" );
 		assertThat( superStuffField.getElementType() ).isSameAs( superStuffFieldWildcardType );
 		assertThat( superStuffFieldWildcardType.isResolved() ).isTrue();
+		assertThat( superStuffFieldWildcardType.determineRawClass() ).isNotNull();
 
 		final FieldDetails namedStuffField = classDetails.findFieldByName( "namedStuff" );
 		final TypeDetails namedStuffFieldType = namedStuffField.getType();
@@ -267,6 +268,7 @@ void testWildcard(Index index) {
 		assertThat( namedStuffField.getMapKeyType().getTypeKind() ).isEqualTo( TypeDetails.Kind.CLASS );
 		assertThat( namedStuffField.getMapKeyType().asClassType().getClassDetails().toJavaClass() ).isEqualTo( String.class );
 		assertThat( namedStuffFieldType.isResolved() ).isTrue();
+		assertThat( namedStuffFieldValueWildcardType.determineRawClass() ).isNotNull();
 	}
 
 	@SuppressWarnings("unused")
@@ -295,12 +297,15 @@ static class Item {
 	static class Stuff extends Item {
 	}
 
+	@SuppressWarnings("unused")
 	static class Coat extends Stuff {
 	}
 
+	@SuppressWarnings("unused")
 	static class Hat extends Stuff {
 	}
 
+	@SuppressWarnings("unused")
 	static class Things {
 		List<? extends Stuff> extendsStuff;
 		List<? super Stuff> superStuff;