#61 - Correct and simplify TypeDetails#isResolved()

Author: mbellade

src/main/java/org/hibernate/models/internal/IsBoundTypeSwitch.java

@@ -21,8 +21,6 @@
 import org.hibernate.models.spi.VoidTypeDetails;
 import org.hibernate.models.spi.WildcardTypeDetails;
 
-import static org.hibernate.models.internal.IsBoundTypeSwitch.IS_BOUND_SWITCH;
-
 /**
  * TypeDetailsSwitch implementation checking whether a type is resolved (all of its bounds are known)
  *
@@ -31,10 +29,6 @@
 public class IsResolvedTypeSwitch implements TypeDetailsSwitch<Boolean> {
 	public static final IsResolvedTypeSwitch IS_RESOLVED_SWITCH = new IsResolvedTypeSwitch();
 
-	private static boolean isBound(TypeDetails typeDetails, SourceModelBuildingContext buildingContext) {
-		return TypeDetailsSwitch.switchType( typeDetails, IS_BOUND_SWITCH, buildingContext );
-	}
-
 	@Override
 	public Boolean caseClass(ClassTypeDetails classType, SourceModelBuildingContext buildingContext) {
 		return true;
@@ -52,7 +46,7 @@ public Boolean caseVoid(VoidTypeDetails voidType, SourceModelBuildingContext bui
 
 	@Override
 	public Boolean caseArrayType(ArrayTypeDetails arrayType, SourceModelBuildingContext buildingContext) {
-		return isBound( arrayType.getConstituentType(), buildingContext );
+		return arrayType.getConstituentType().isResolved();
 	}
 
 	@Override
@@ -71,24 +65,19 @@ public Boolean caseParameterizedType(
 	@Override
 	public Boolean caseWildcardType(WildcardTypeDetails wildcardType, SourceModelBuildingContext buildingContext) {
 		final TypeDetails bound = wildcardType.getBound();
-		return bound != null && ( bound.getTypeKind() == TypeDetails.Kind.CLASS || isBound( bound, buildingContext ) );
+		return bound != null && bound.isResolved();
 	}
 
 	@Override
 	public Boolean caseTypeVariable(TypeVariableDetails typeVariable, SourceModelBuildingContext buildingContext) {
-		for ( TypeDetails bound : typeVariable.getBounds() ) {
-			if ( !isBound( bound, buildingContext ) ) {
-				return false;
-			}
-		}
-		return true;
+		return false;
 	}
 
 	@Override
 	public Boolean caseTypeVariableReference(
 			TypeVariableReferenceDetails typeVariableReference,
 			SourceModelBuildingContext buildingContext) {
-		return true;
+		return false;
 	}
 
 	@Override

src/main/java/org/hibernate/models/internal/IsResolvedTypeSwitch.java

@@ -60,16 +60,15 @@ void testParameterizedClass(Index index) {
 		assertThat( idFieldType.isImplementor( Number.class ) ).isTrue();
 		assertThat( idFieldType.isImplementor( Object.class ) ).isTrue();
 		assertThat( idFieldType.isImplementor( String.class ) ).isFalse();
-		// resolved because we know it is a Number
-		assertThat( idFieldType.isResolved() ).isTrue();
-		assertThat( idFieldType.determineRelativeType( classDetails ).isResolved() ).isTrue();
+		assertThat( idFieldType.isResolved() ).isFalse();
+		assertThat( idFieldType.determineRelativeType( classDetails ).isResolved() ).isFalse();
 
 		final TypeDetails idFieldConcreteType = idField.resolveRelativeType( classDetails );
 		assertThat( idFieldConcreteType ).isInstanceOf( TypeVariableDetails.class );
 		final TypeVariableDetails typeVariable = idFieldConcreteType.asTypeVariable();
 		assertThat( typeVariable.getBounds() ).hasSize( 1 );
 		assertThat( typeVariable.getBounds().get( 0 ).asClassType().getClassDetails().toJavaClass() ).isEqualTo( Number.class );
-		assertThat( idFieldConcreteType.isResolved() ).isTrue();
+		assertThat( idFieldConcreteType.isResolved() ).isFalse();
 
 		final ClassBasedTypeDetails classBasedTypeDetails = idField.resolveRelativeClassType( classDetails );
 		assertThat( classBasedTypeDetails.getClassDetails().toJavaClass() ).isEqualTo( Number.class );