#9 - Expose getElementType and getMapKeyType from MemberDetails

Author: sebersole

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

@@ -7,6 +7,8 @@
 package org.hibernate.models.spi;
 
 import java.lang.reflect.Member;
+import java.util.Collection;
+import java.util.Map;
 
 import org.hibernate.models.internal.ModifierUtils;
 
@@ -36,6 +38,91 @@ public interface MemberDetails extends AnnotationTarget {
 	 */
 	TypeDetails getType();
 
+	/**
+	 * Get the plural element type for this member.  If the member does not have a type or the
+	 * member is not plural, a {@code null} is returned.
+	 * <p/>
+	 * For arrays, lists and sets the element type is returned.
+	 * <p/>
+	 * For maps, the value type is returned.
+	 */
+	default TypeDetails getElementType() {
+		final TypeDetails memberType = getType();
+		if ( memberType == null ) {
+			return null;
+		}
+
+		if ( memberType.getTypeKind() == TypeDetails.Kind.ARRAY ) {
+			return memberType.asArrayType().getConstituentType();
+		}
+
+		if ( memberType.isImplementor( Collection.class ) ) {
+			if ( memberType.getTypeKind() == TypeDetails.Kind.CLASS ) {
+				// raw use
+				return ClassBasedTypeDetails.OBJECT_TYPE_DETAILS;
+			}
+			if ( memberType.getTypeKind() == TypeDetails.Kind.PARAMETERIZED_TYPE ) {
+				final ParameterizedTypeDetails parameterizedType = memberType.asParameterizedType();
+				assert parameterizedType.getArguments().size() == 1;
+				return parameterizedType.getArguments().get( 0 );
+			}
+			if ( memberType.getTypeKind() == TypeDetails.Kind.TYPE_VARIABLE ) {
+				final TypeVariableDetails typeVariable = memberType.asTypeVariable();
+				assert typeVariable.getBounds().size() == 1;
+				return typeVariable.getBounds().get( 0 );
+			}
+		}
+
+		if ( memberType.isImplementor( Map.class ) ) {
+			if ( memberType.getTypeKind() == TypeDetails.Kind.CLASS ) {
+				// raw use
+				return ClassBasedTypeDetails.OBJECT_TYPE_DETAILS;
+			}
+			if ( memberType.getTypeKind() == TypeDetails.Kind.PARAMETERIZED_TYPE ) {
+				final ParameterizedTypeDetails parameterizedType = memberType.asParameterizedType();
+				assert parameterizedType.getArguments().size() == 2;
+				return parameterizedType.getArguments().get( 1 );
+			}
+			if ( memberType.getTypeKind() == TypeDetails.Kind.TYPE_VARIABLE ) {
+				final TypeVariableDetails typeVariable = memberType.asTypeVariable();
+				assert typeVariable.getBounds().size() == 2;
+				return typeVariable.getBounds().get( 1 );
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Get the map key type for this member.  If the member does not have a type or the
+	 * member is not a map, a {@code null} is returned.
+	 */
+	default TypeDetails getMapKeyType() {
+		final TypeDetails memberType = getType();
+		if ( memberType == null ) {
+			return null;
+		}
+
+		if ( memberType.isImplementor( Map.class ) ) {
+			if ( memberType.getTypeKind() == TypeDetails.Kind.CLASS ) {
+				// raw use
+				return ClassBasedTypeDetails.OBJECT_TYPE_DETAILS;
+			}
+			if ( memberType.getTypeKind() == TypeDetails.Kind.PARAMETERIZED_TYPE ) {
+				final ParameterizedTypeDetails parameterizedType = memberType.asParameterizedType();
+				assert parameterizedType.getArguments().size() == 2;
+				return parameterizedType.getArguments().get( 0 );
+			}
+			if ( memberType.getTypeKind() == TypeDetails.Kind.TYPE_VARIABLE ) {
+				final TypeVariableDetails typeVariable = memberType.asTypeVariable();
+				assert typeVariable.getBounds().size() == 2;
+				return typeVariable.getBounds().get( 0 );
+			}
+		}
+
+		return null;
+	}
+
 	/**
 	 * The class which declares this member
 	 */

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

@@ -212,6 +212,7 @@ void testWildcard(Index index) {
 		assertThat( extendsStuffFieldWildcardType.isExtends() ).isTrue();
 		assertThat( extendsStuffFieldWildcardType.getBound().getTypeKind() ).isEqualTo( TypeDetails.Kind.CLASS );
 		assertThat( extendsStuffFieldWildcardType.getBound().asClassType().getClassDetails().getName() ).endsWith( "Stuff" );
+		assertThat( extendsStuffField.getElementType() ).isSameAs( extendsStuffFieldWildcardType );
 
 		final FieldDetails superStuffField = classDetails.findFieldByName( "superStuff" );
 		final TypeDetails superStuffFieldType = superStuffField.getType();
@@ -229,6 +230,7 @@ void testWildcard(Index index) {
 		assertThat( superStuffFieldWildcardType.isExtends() ).isFalse();
 		assertThat( superStuffFieldWildcardType.getBound().getTypeKind() ).isEqualTo( TypeDetails.Kind.CLASS );
 		assertThat( superStuffFieldWildcardType.getBound().asClassType().getClassDetails().getName() ).endsWith( "Stuff" );
+		assertThat( superStuffField.getElementType() ).isSameAs( superStuffFieldWildcardType );
 
 		final FieldDetails namedStuffField = classDetails.findFieldByName( "namedStuff" );
 		final TypeDetails namedStuffFieldType = namedStuffField.getType();
@@ -248,6 +250,9 @@ void testWildcard(Index index) {
 		assertThat( namedStuffFieldValueWildcardType.isExtends() ).isTrue();
 		assertThat( namedStuffFieldValueWildcardType.getBound().getTypeKind() ).isEqualTo( TypeDetails.Kind.CLASS );
 		assertThat( namedStuffFieldValueWildcardType.getBound().asClassType().getClassDetails().getName() ).endsWith( "Stuff" );
+		assertThat( namedStuffField.getElementType() ).isSameAs( namedStuffFieldValueWildcardType );
+		assertThat( namedStuffField.getMapKeyType().getTypeKind() ).isEqualTo( TypeDetails.Kind.CLASS );
+		assertThat( namedStuffField.getMapKeyType().asClassType().getClassDetails().toJavaClass() ).isEqualTo( String.class );
 	}
 
 	@SuppressWarnings("unused")

src/test/java/org/hibernate/models/generics/ParameterizedHierarchyTests.java renamed to src/test/java/org/hibernate/models/generics/InheritanceTypeVariableTests.java

@@ -25,7 +25,7 @@
 /**
  * @author Steve Ebersole
  */
-public class ParameterizedHierarchyTests {
+public class InheritanceTypeVariableTests {
 
 	@Test
 	void testParameterizedHierarchyWithJandex() {

src/test/java/org/hibernate/models/generics/TypeVariableReferenceTests.java renamed to src/test/java/org/hibernate/models/generics/RecursiveTypeVariableTests.java

@@ -22,7 +22,7 @@
 /**
  * @author Steve Ebersole
  */
-public class TypeVariableReferenceTests {
+public class RecursiveTypeVariableTests {
 
 	@Test
 	void testTypeVariableReferenceJandex() {

src/test/java/org/hibernate/models/generics/GenericTypeTests.java renamed to src/test/java/org/hibernate/models/generics/SimpleTypeVariableTests.java

@@ -8,7 +8,6 @@
 package org.hibernate.models.generics;
 
 import org.hibernate.models.SourceModelTestHelper;
-import org.hibernate.models.internal.ClassTypeDetailsImpl;
 import org.hibernate.models.internal.SourceModelBuildingContextImpl;
 import org.hibernate.models.spi.ClassBasedTypeDetails;
 import org.hibernate.models.spi.ClassDetails;
@@ -26,7 +25,7 @@
 /**
  * @author Steve Ebersole
  */
-public class GenericTypeTests {
+public class SimpleTypeVariableTests {
 
 	@Test
 	void testParameterizedClassWithJandex() {