#31 - Fix bug in TypeDetails#determineRawClass for parameterized types

Author: sebersole

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

@@ -232,10 +232,7 @@ public static ClassDetails resolveRawClass(TypeDetails typeDetails) {
 			}
 			case PARAMETERIZED_TYPE -> {
 				final ParameterizedTypeDetails parameterizedType = typeDetails.asParameterizedType();
-				if ( CollectionHelper.size( parameterizedType.getArguments() ) == 1 ) {
-					return parameterizedType.getArguments().get( 0 ).determineRawClass();
-				}
-				return ClassDetails.OBJECT_CLASS_DETAILS;
+				return parameterizedType.getRawClassDetails();
 			}
 			case WILDCARD_TYPE -> {
 				final WildcardTypeDetails wildcardType = typeDetails.asWildcardType();

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

@@ -57,7 +57,7 @@ void testCollections(Index index) {
 			final FieldDetails listOfString = classDetails.findFieldByName( "listOfString" );
 
 			assertThat( listOfString.getType() ).isInstanceOf( ParameterizedTypeDetails.class );
-			final ParameterizedTypeDetails type = (ParameterizedTypeDetails) listOfString.getType();
+			final ParameterizedTypeDetails type = listOfString.getType().asParameterizedType();
 			assertThat( type.isImplementor( Collection.class ) ).isTrue();
 			assertThat( type.isImplementor( List.class ) ).isTrue();
 			assertThat( type.isImplementor( Set.class ) ).isFalse();
@@ -68,6 +68,8 @@ void testCollections(Index index) {
 			final ClassTypeDetails elementType = (ClassTypeDetails) type.getArguments().get( 0);
 			assertThat( elementType.isImplementor( String.class ) ).isTrue();
 			assertThat( type.isResolved() ).isTrue();
+			assertThat( type.getRawClassDetails().toJavaClass() ).isEqualTo( List.class );
+			assertThat( type.determineRawClass().toJavaClass() ).isEqualTo( List.class );
 		}
 
 		{
@@ -86,6 +88,8 @@ void testCollections(Index index) {
 			assertThat( elementType.isImplementor( String.class ) ).isFalse();
 			assertThat( elementType.getIdentifier() ).isEqualTo( "T" );
 			assertThat( type.isResolved() ).isFalse();
+			assertThat( type.getRawClassDetails().toJavaClass() ).isEqualTo( List.class );
+			assertThat( type.determineRawClass().toJavaClass() ).isEqualTo( List.class );
 		}
 
 		{
@@ -100,6 +104,8 @@ void testCollections(Index index) {
 
 			assertThat( type.getArguments() ).hasSize( 2 );
 			assertThat( type.isResolved() ).isTrue();
+			assertThat( type.getRawClassDetails().toJavaClass() ).isEqualTo( Map.class );
+			assertThat( type.determineRawClass().toJavaClass() ).isEqualTo( Map.class );
 
 			// key
 			assertThat( type.getArguments().get(0) ).isInstanceOf( ClassTypeDetails.class );
@@ -126,6 +132,8 @@ void testCollections(Index index) {
 
 			assertThat( type.getArguments() ).hasSize( 2 );
 			assertThat( type.isResolved() ).isFalse();
+			assertThat( type.getRawClassDetails().toJavaClass() ).isEqualTo( Map.class );
+			assertThat( type.determineRawClass().toJavaClass() ).isEqualTo( Map.class );
 
 			// key
 			assertThat( type.getArguments().get(0) ).isInstanceOf( ClassTypeDetails.class );