#9 - Add details about "index" and "element"/"component" types to MemberDetails

#21 - Work on generics / parameterized-types

Author: sebersole

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

@@ -83,6 +83,14 @@ public boolean isImplementor(Class<?> checkType) {
 		return constituentType.isImplementor( checkType.getComponentType() );
 	}
 
+	@Override
+	public TypeDetails resolveTypeVariable(String identifier) {
+		if ( constituentType.getTypeKind() == Kind.PARAMETERIZED_TYPE ) {
+			return constituentType.asParameterizedType().resolveTypeVariable( identifier );
+		}
+		return null;
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if ( this == o ) {

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

@@ -11,6 +11,7 @@
 
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.ClassTypeDetails;
+import org.hibernate.models.spi.TypeDetails;
 
 /**
  * @author Steve Ebersole
@@ -40,6 +41,11 @@ public Kind getTypeKind() {
 		return kind;
 	}
 
+	@Override
+	public TypeDetails resolveTypeVariable(String identifier) {
+		return getClassDetails().resolveTypeVariable( identifier );
+	}
+
 	@Override
 	public String toString() {
 		return "ClassTypeDetails(" + classDetails.getName() + ")";

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

@@ -12,6 +12,8 @@
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.ParameterizedTypeDetails;
 import org.hibernate.models.spi.TypeDetails;
+import org.hibernate.models.spi.TypeDetailsHelper;
+import org.hibernate.models.spi.TypeVariableDetails;
 
 /**
  * @author Steve Ebersole
@@ -28,7 +30,7 @@ public ParameterizedTypeDetailsImpl(ClassDetails genericClassDetails, List<TypeD
 	}
 
 	@Override
-	public ClassDetails getGenericClassDetails() {
+	public ClassDetails getRawClassDetails() {
 		return genericClassDetails;
 	}
 
@@ -41,4 +43,18 @@ public List<TypeDetails> getArguments() {
 	public TypeDetails getOwner() {
 		return owner;
 	}
+
+	@Override
+	public TypeDetails resolveTypeVariable(String identifier) {
+		final List<TypeVariableDetails> typeParameters = genericClassDetails.getTypeParameters();
+		assert typeParameters.size() == arguments.size();
+
+		for ( int i = 0; i < typeParameters.size(); i++ ) {
+			if ( typeParameters.get( i ).getIdentifier().equals( identifier ) ) {
+				return arguments.get( i );
+			}
+		}
+
+		return null;
+	}
 }

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

@@ -9,6 +9,7 @@
 
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.PrimitiveTypeDetails;
+import org.hibernate.models.spi.TypeDetails;
 
 /**
  * @author Steve Ebersole
@@ -28,6 +29,11 @@ public PrimitiveTypeDetails asPrimitiveType() {
 		return this;
 	}
 
+	@Override
+	public TypeDetails resolveTypeVariable(String identifier) {
+		return this;
+	}
+
 	@Override
 	public ClassDetails getClassDetails() {
 		return classDetails();

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

@@ -16,26 +16,30 @@
 import org.hibernate.models.internal.util.IndexedConsumer;
 import org.hibernate.models.spi.AnnotationDescriptor;
 import org.hibernate.models.spi.AnnotationUsage;
+import org.hibernate.models.spi.ClassBasedTypeDetails;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.FieldDetails;
 import org.hibernate.models.spi.MethodDetails;
 import org.hibernate.models.spi.RecordComponentDetails;
 import org.hibernate.models.spi.TypeDetails;
+import org.hibernate.models.spi.TypeVariableDetails;
 
 /**
  * @author Steve Ebersole
  */
 public class SimpleClassDetails implements ClassDetails {
 	private final Class<?> clazz;
 	private final ClassDetails superTypeDetails;
+	private final TypeDetails genericSuperTypeDetails;
 
 	public SimpleClassDetails(Class<?> clazz) {
-		this( clazz, ClassDetails.OBJECT_CLASS_DETAILS );
+		this( clazz, ClassDetails.OBJECT_CLASS_DETAILS, null );
 	}
 
-	public SimpleClassDetails(Class<?> clazz, ClassDetails superTypeDetails) {
+	public SimpleClassDetails(Class<?> clazz, ClassDetails superTypeDetails, TypeDetails genericSuperTypeDetails) {
 		this.clazz = clazz;
 		this.superTypeDetails = superTypeDetails;
+		this.genericSuperTypeDetails = genericSuperTypeDetails;
 	}
 
 	@Override
@@ -53,6 +57,11 @@ public ClassDetails getSuperType() {
 		return superTypeDetails;
 	}
 
+	@Override
+	public TypeDetails getGenericSuperType() {
+		return genericSuperTypeDetails;
+	}
+
 	@Override
 	public <X> Class<X> toJavaClass() {
 		//noinspection unchecked
@@ -84,6 +93,11 @@ public List<TypeDetails> getImplementedInterfaceTypes() {
 		return Collections.emptyList();
 	}
 
+	@Override
+	public List<TypeVariableDetails> getTypeParameters() {
+		return Collections.emptyList();
+	}
+
 	@Override
 	public boolean isImplementor(Class<?> checkType) {
 		return checkType.isAssignableFrom( clazz );

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

@@ -56,6 +56,11 @@ public boolean isImplementor(Class<?> checkType) {
 		return checkType == Object.class;
 	}
 
+	@Override
+	public TypeDetails resolveTypeVariable(String identifier) {
+		return this.identifier.equals( identifier ) ? this : null;
+	}
+
 	@Override
 	public String toString() {
 		return "TypeVariableDetails(" + identifier + " : " + name + ")";

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

@@ -7,6 +7,7 @@
 
 package org.hibernate.models.internal;
 
+import org.hibernate.models.spi.TypeDetails;
 import org.hibernate.models.spi.TypeVariableDetails;
 import org.hibernate.models.spi.TypeVariableReferenceDetails;
 
@@ -58,4 +59,9 @@ public String getName() {
 	public boolean isImplementor(Class<?> checkType) {
 		return getTarget().isImplementor( checkType );
 	}
+
+	@Override
+	public TypeDetails resolveTypeVariable(String identifier) {
+		return this.identifier.equals( identifier ) ? target : null;
+	}
 }

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

@@ -10,6 +10,7 @@
 import java.util.Objects;
 
 import org.hibernate.models.spi.ClassDetails;
+import org.hibernate.models.spi.TypeDetails;
 import org.hibernate.models.spi.VoidTypeDetails;
 
 /**
@@ -39,6 +40,11 @@ public VoidTypeDetails asVoidType() {
 		return this;
 	}
 
+	@Override
+	public TypeDetails resolveTypeVariable(String identifier) {
+		return this;
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if ( this == o ) {

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

@@ -72,4 +72,9 @@ public boolean isImplementor(Class<?> checkType) {
 		}
 		return getExtendsBound().isImplementor( checkType );
 	}
+
+	@Override
+	public TypeDetails resolveTypeVariable(String identifier) {
+		return null;
+	}
 }

src/main/java/org/hibernate/models/internal/dynamic/DynamicClassDetails.java

@@ -17,6 +17,7 @@
 import org.hibernate.models.spi.RecordComponentDetails;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 import org.hibernate.models.spi.TypeDetails;
+import org.hibernate.models.spi.TypeVariableDetails;
 
 /**
  * @author Steve Ebersole
@@ -26,31 +27,34 @@ public class DynamicClassDetails extends AbstractAnnotationTarget implements Cla
 	private final String className;
 	private final boolean isAbstract;
 	private final ClassDetails superType;
+	private final TypeDetails genericSuperType;
 
 	private List<FieldDetails> fields;
 	private List<MethodDetails> methods;
 
 	private Class<?> javaType;
 
 	public DynamicClassDetails(String name, SourceModelBuildingContext buildingContext) {
-		this( name, null, buildingContext );
+		this( name, null, null, buildingContext );
 	}
 
-	public DynamicClassDetails(String name, ClassDetails superType, SourceModelBuildingContext buildingContext) {
-		this( name, null, false, superType, buildingContext );
+	public DynamicClassDetails(String name, ClassDetails superType, TypeDetails genericSuperType, SourceModelBuildingContext buildingContext) {
+		this( name, null, false, superType, genericSuperType, buildingContext );
 	}
 
 	public DynamicClassDetails(
 			String name,
 			String className,
 			boolean isAbstract,
 			ClassDetails superType,
+			TypeDetails genericSuperType,
 			SourceModelBuildingContext buildingContext) {
 		super( buildingContext );
 		this.name = name;
 		this.className = className;
 		this.isAbstract = isAbstract;
 		this.superType = superType;
+		this.genericSuperType = genericSuperType;
 	}
 
 	@Override
@@ -83,12 +87,22 @@ public ClassDetails getSuperType() {
 		return superType;
 	}
 
+	@Override
+	public TypeDetails getGenericSuperType() {
+		return genericSuperType;
+	}
+
 	@Override
 	public List<TypeDetails> getImplementedInterfaceTypes() {
 		// todo : do we need these for dynamic classes?
 		return null;
 	}
 
+	@Override
+	public List<TypeVariableDetails> getTypeParameters() {
+		return Collections.emptyList();
+	}
+
 	@Override
 	public boolean isImplementor(Class<?> checkType) {
 		return checkType.isAssignableFrom( javaType );