#22 - Further work on generics / parameterized-types

sebersole · sebersole · commit c7a0a36a53c8 · 2024-02-01T00:01:13.000-06:00
diff --git a/src/main/java/org/hibernate/models/internal/jandex/JandexTypeSwitchStandard.java b/src/main/java/org/hibernate/models/internal/jandex/JandexTypeSwitchStandard.java
@@ -7,6 +7,8 @@
 
 package org.hibernate.models.internal.jandex;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -18,6 +20,7 @@
 import org.hibernate.models.internal.TypeVariableDetailsImpl;
 import org.hibernate.models.internal.TypeVariableReferenceDetailsImpl;
 import org.hibernate.models.internal.VoidTypeDetailsImpl;
+import org.hibernate.models.internal.WildcardTypeDetailsImpl;
 import org.hibernate.models.internal.jdk.JdkTrackingTypeSwitch;
 import org.hibernate.models.internal.util.CollectionHelper;
 import org.hibernate.models.spi.ClassDetails;
@@ -85,7 +88,14 @@ public TypeDetails caseParameterizedType(
 
 	@Override
 	public TypeDetails caseWildcardType(WildcardType wildcardType, SourceModelBuildingContext buildingContext) {
-		throw new UnsupportedOperationException( "Not yet implemented - " + this );
+		try {
+			final Type bound = (Type) BOUND_METHOD.invoke( wildcardType );
+			final boolean isExtends = (boolean) IS_EXTENDS_METHOD.invoke( wildcardType );
+			return new WildcardTypeDetailsImpl( switchType( bound, TYPE_SWITCH_STANDARD, buildingContext ), isExtends );
+		}
+		catch (IllegalAccessException | InvocationTargetException e) {
+			throw new RuntimeException( e );
+		}
 	}
 
 	@Override
@@ -146,4 +156,20 @@ public static List<TypeDetails> resolveTypes(
 		}
 		return result;
 	}
+
+	private static final Method BOUND_METHOD;
+	private static final Method IS_EXTENDS_METHOD;
+
+	static {
+		try {
+			BOUND_METHOD = WildcardType.class.getDeclaredMethod( "bound" );
+			IS_EXTENDS_METHOD = WildcardType.class.getDeclaredMethod( "isExtends" );
+
+			BOUND_METHOD.trySetAccessible();
+			IS_EXTENDS_METHOD.trySetAccessible();
+		}
+		catch (NoSuchMethodException e) {
+			throw new RuntimeException( e );
+		}
+	}
 }
diff --git a/src/main/java/org/hibernate/models/internal/jdk/JdkTrackingTypeSwitch.java b/src/main/java/org/hibernate/models/internal/jdk/JdkTrackingTypeSwitch.java
@@ -22,6 +22,7 @@
 import org.hibernate.models.internal.PrimitiveTypeDetailsImpl;
 import org.hibernate.models.internal.TypeVariableDetailsImpl;
 import org.hibernate.models.internal.VoidTypeDetailsImpl;
+import org.hibernate.models.internal.WildcardTypeDetailsImpl;
 import org.hibernate.models.internal.util.CollectionHelper;
 import org.hibernate.models.spi.ArrayTypeDetails;
 import org.hibernate.models.spi.ClassBasedTypeDetails;
@@ -77,7 +78,21 @@ public ParameterizedTypeDetails caseParameterizedType(ParameterizedType paramete
 	}
 
 	public WildcardTypeDetails caseWildcardType(WildcardType wildcardType) {
-		throw new UnsupportedOperationException( "Not yet implemented" );
+		final Type[] lowerBounds = wildcardType.getLowerBounds();
+		if ( CollectionHelper.isEmpty( lowerBounds ) ) {
+			// should indicate an extends
+			final int numberOfBounds = CollectionHelper.length( wildcardType.getUpperBounds() );
+			final TypeDetails upper = numberOfBounds == 1
+					? switcher.switchType( wildcardType.getUpperBounds()[0] )
+					: ClassBasedTypeDetails.OBJECT_TYPE_DETAILS;
+			return new WildcardTypeDetailsImpl( upper, true );
+		}
+
+		final int numberOfBounds = CollectionHelper.length( lowerBounds );
+		final TypeDetails lower = numberOfBounds == 1
+				? switcher.switchType( lowerBounds[0] )
+				: ClassBasedTypeDetails.OBJECT_TYPE_DETAILS;
+		return new WildcardTypeDetailsImpl( lower, false );
 	}
 
 	public TypeVariableDetails caseTypeVariable(TypeVariable<?> typeVariable) {
diff --git a/src/main/java/org/hibernate/models/spi/ClassTypeDetails.java b/src/main/java/org/hibernate/models/spi/ClassTypeDetails.java
@@ -10,8 +10,8 @@
 /**
  * Models a class type.
  *
- * @see org.jboss.jandex.ClassType
  * @see Class
+ * @see org.jboss.jandex.ClassType
  *
  * @author Steve Ebersole
  */
diff --git a/src/main/java/org/hibernate/models/spi/TypeDetails.java b/src/main/java/org/hibernate/models/spi/TypeDetails.java
@@ -11,6 +11,8 @@
  * Abstraction for what Hibernate understands about a "type", generally before it has access to
  * the actual {@link java.lang.reflect.Type} reference.
  *
+ * @see org.jboss.jandex.Type
+ *
  * @author Steve Ebersole
  */
 public interface TypeDetails extends TypeVariableScope {
diff --git a/src/main/java/org/hibernate/models/spi/TypeVariableDetails.java b/src/main/java/org/hibernate/models/spi/TypeVariableDetails.java
@@ -22,8 +22,8 @@
  * </pre>
  * In this case, the identifier is {@code T}, while the name is {@code java.lang.Number}.
  *
- * @see org.jboss.jandex.TypeVariable
  * @see java.lang.reflect.TypeVariable
+ * @see org.jboss.jandex.TypeVariable
  *
  * @author Steve Ebersole
  */
diff --git a/src/main/java/org/hibernate/models/spi/VoidTypeDetails.java b/src/main/java/org/hibernate/models/spi/VoidTypeDetails.java
@@ -8,7 +8,7 @@
 package org.hibernate.models.spi;
 
 /**
- * Models Java's void (or {@linkplain Void}) type
+ * Models Java's {@code void} (or {@linkplain Void}) type
  *
  * @author Steve Ebersole
  */
diff --git a/src/main/java/org/hibernate/models/spi/WildcardTypeDetails.java b/src/main/java/org/hibernate/models/spi/WildcardTypeDetails.java
@@ -12,6 +12,9 @@
 /**
  * Models a wildcard type declaration.
  *
+ * @see java.lang.reflect.WildcardType
+ * @see org.jboss.jandex.WildcardType
+ *
  * @author Steve Ebersole
  */
 public interface WildcardTypeDetails extends TypeDetails {
diff --git a/src/test/java/org/hibernate/models/generics/CollectionTests.java b/src/test/java/org/hibernate/models/generics/CollectionTests.java
@@ -21,6 +21,7 @@
 import org.hibernate.models.spi.ParameterizedTypeDetails;
 import org.hibernate.models.spi.TypeDetails;
 import org.hibernate.models.spi.TypeVariableDetails;
+import org.hibernate.models.spi.WildcardTypeDetails;
 
 import org.junit.jupiter.api.Test;
 
@@ -177,6 +178,59 @@ void testArrays(Index index) {
 		}
 	}
 
+	@Test
+	void testWildcardWithJandex() {
+		testWildcard( SourceModelTestHelper.buildJandexIndex( Stuff.class, Things.class ) );
+	}
+
+	@Test
+	void testWildcardWithoutJandex() {
+		testWildcard( null );
+	}
+
+	void testWildcard(Index index) {
+		final SourceModelBuildingContextImpl buildingContext = SourceModelTestHelper.createBuildingContext(
+				index,
+				Things.class
+		);
+
+		final ClassDetails classDetails = buildingContext.getClassDetailsRegistry().getClassDetails( Things.class.getName() );
+
+		final FieldDetails extendsStuffField = classDetails.findFieldByName( "extendsStuff" );
+		final TypeDetails extendsStuffFieldType = extendsStuffField.getType();
+		assertThat( extendsStuffFieldType.isImplementor( Collection.class ) ).isTrue();
+		assertThat( extendsStuffFieldType.isImplementor( List.class ) ).isTrue();
+		assertThat( extendsStuffFieldType.isImplementor( Set.class ) ).isFalse();
+		assertThat( extendsStuffFieldType.isImplementor( Map.class ) ).isFalse();
+		assertThat( extendsStuffFieldType.getTypeKind() ).isEqualTo( TypeDetails.Kind.PARAMETERIZED_TYPE );
+		assertThat( extendsStuffFieldType.asParameterizedType().getArguments() ).hasSize( 1 );
+		assertThat( extendsStuffFieldType.asParameterizedType().getArguments().get( 0 ).getTypeKind() ).isEqualTo( TypeDetails.Kind.WILDCARD_TYPE );
+		final WildcardTypeDetails extendsStuffFieldWildcardType = extendsStuffFieldType.asParameterizedType()
+				.getArguments()
+				.get( 0 )
+				.asWildcardType();
+		assertThat( extendsStuffFieldWildcardType.isExtends() ).isTrue();
+		assertThat( extendsStuffFieldWildcardType.getBound().getTypeKind() ).isEqualTo( TypeDetails.Kind.CLASS );
+		assertThat( extendsStuffFieldWildcardType.getBound().asClassType().getClassDetails().getName() ).endsWith( "Stuff" );
+
+		final FieldDetails superStuffField = classDetails.findFieldByName( "superStuff" );
+		final TypeDetails superStuffFieldType = superStuffField.getType();
+		assertThat( superStuffFieldType.isImplementor( Collection.class ) ).isTrue();
+		assertThat( superStuffFieldType.isImplementor( List.class ) ).isTrue();
+		assertThat( superStuffFieldType.isImplementor( Set.class ) ).isFalse();
+		assertThat( superStuffFieldType.isImplementor( Map.class ) ).isFalse();
+		assertThat( superStuffFieldType.getTypeKind() ).isEqualTo( TypeDetails.Kind.PARAMETERIZED_TYPE );
+		assertThat( superStuffFieldType.asParameterizedType().getArguments() ).hasSize( 1 );
+		assertThat( superStuffFieldType.asParameterizedType().getArguments().get( 0 ).getTypeKind() ).isEqualTo( TypeDetails.Kind.WILDCARD_TYPE );
+		final WildcardTypeDetails superStuffFieldWildcardType = superStuffFieldType.asParameterizedType()
+				.getArguments()
+				.get( 0 )
+				.asWildcardType();
+		assertThat( superStuffFieldWildcardType.isExtends() ).isFalse();
+		assertThat( superStuffFieldWildcardType.getBound().getTypeKind() ).isEqualTo( TypeDetails.Kind.CLASS );
+		assertThat( superStuffFieldWildcardType.getBound().asClassType().getClassDetails().getName() ).endsWith( "Stuff" );
+	}
+
 	@SuppressWarnings("unused")
 	static class ClassOfCollections<T> {
 		List<String> listOfString;
@@ -196,4 +250,21 @@ static class ClassOfArrays<T> {
 
 		T[] tArray;
 	}
+
+	static class Item {
+	}
+
+	static class Stuff extends Item {
+	}
+
+	static class Coat extends Stuff {
+	}
+
+	static class Hat extends Stuff {
+	}
+
+	static class Things {
+		List<? extends Stuff> extendsStuff;
+		List<? super Stuff> superStuff;
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@`
`10`	`10`	`/**`
`11`	`11`	`* Models a class type.`
`12`	`12`	`*`
`13`		`- * @see org.jboss.jandex.ClassType`
`14`	`13`	`* @see Class`
	`14`	`+ * @see org.jboss.jandex.ClassType`
`15`	`15`	`*`
`16`	`16`	`* @author Steve Ebersole`
`17`	`17`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`* Abstraction for what Hibernate understands about a "type", generally before it has access to`
`12`	`12`	`* the actual {@link java.lang.reflect.Type} reference.`
`13`	`13`	`*`
	`14`	`+ * @see org.jboss.jandex.Type`
	`15`	`+ *`
`14`	`16`	`* @author Steve Ebersole`
`15`	`17`	`*/`
`16`	`18`	`public interface TypeDetails extends TypeVariableScope {`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@`
`22`	`22`	`* </pre>`
`23`	`23`	`* In this case, the identifier is {@code T}, while the name is {@code java.lang.Number}.`
`24`	`24`	`*`
`25`		`- * @see org.jboss.jandex.TypeVariable`
`26`	`25`	`* @see java.lang.reflect.TypeVariable`
	`26`	`+ * @see org.jboss.jandex.TypeVariable`
`27`	`27`	`*`
`28`	`28`	`* @author Steve Ebersole`
`29`	`29`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`package org.hibernate.models.spi;`
`9`	`9`
`10`	`10`	`/**`
`11`		`- * Models Java's void (or {@linkplain Void}) type`
	`11`	`+ * Models Java's {@code void} (or {@linkplain Void}) type`
`12`	`12`	`*`
`13`	`13`	`* @author Steve Ebersole`
`14`	`14`	`*/`