#34 - Add MemberDetails#getAssociatedType

Author: sebersole

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

@@ -38,6 +38,14 @@ public interface MemberDetails extends AnnotationTarget {
 	 */
 	TypeDetails getType();
 
+	/**
+	 * For plural members, the {@linkplain #getElementType "element type"};
+	 * otherwise, the member's {@linkplain #getType() type}
+	 */
+	default TypeDetails getAssociatedType() {
+		return isPlural() ? getElementType() : 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.

src/test/java/org/hibernate/models/members/ArrayTests.java

@@ -41,18 +41,21 @@ private void verify(Index index) {
 			final FieldDetails field = classDetails.findFieldByName( "intArray" );
 			assertThat( field.isPersistable() ).isTrue();
 			assertThat( field.getType().asArrayType().getArrayClassDetails().toJavaClass() ).isEqualTo( int[].class );
+			assertThat( field.getAssociatedType().determineRawClass().toJavaClass() ).isEqualTo( int.class );
 		}
 
 		{
 			final FieldDetails field = classDetails.findFieldByName( "intArray2" );
 			assertThat( field.isPersistable() ).isTrue();
 			assertThat( field.getType().asArrayType().getArrayClassDetails().toJavaClass() ).isEqualTo( int[][].class );
+			assertThat( field.getAssociatedType().determineRawClass().toJavaClass() ).isEqualTo( int[].class );
 		}
 
 		{
 			final FieldDetails field = classDetails.findFieldByName( "intArray3" );
 			assertThat( field.isPersistable() ).isTrue();
 			assertThat( field.getType().asArrayType().getArrayClassDetails().toJavaClass() ).isEqualTo( int[][][].class );
+			assertThat( field.getAssociatedType().determineRawClass().toJavaClass() ).isEqualTo( int[][].class );
 		}
 
 		{

src/test/java/org/hibernate/models/members/FieldDetailsTests.java

@@ -54,20 +54,23 @@ void verify(Index index) {
 		assertThat( propertyField.toJavaMember().getName() ).isEqualTo( "property" );
 		assertThat( propertyField.resolveAttributeName() ).isEqualTo( "property" );
 		assertThat( propertyField.getType().asClassType().getClassDetails().toJavaClass() ).isEqualTo( Integer.class );
+		assertThat( propertyField.getAssociatedType().determineRawClass().toJavaClass() ).isEqualTo( Integer.class );
 		assertThat( propertyField.getVisibility() ).isEqualTo( MemberDetails.Visibility.PUBLIC );
 		assertThat( propertyField.isPersistable() ).isTrue();
 		assertThat( propertyField.getDeclaringType() ).isSameAs( classDetails );
 
 		final FieldDetails somethingField = classDetails.findFieldByName( "something" );
 		assertThat( somethingField.resolveAttributeName() ).isEqualTo( "something" );
 		assertThat( somethingField.getType().asClassType().getClassDetails().toJavaClass() ).isEqualTo( Object.class );
+		assertThat( somethingField.getAssociatedType().determineRawClass().toJavaClass() ).isEqualTo( Object.class );
 		assertThat( somethingField.getVisibility() ).isEqualTo( MemberDetails.Visibility.PUBLIC );
 		assertThat( somethingField.isPersistable() ).isTrue();
 		assertThat( somethingField.getDeclaringType() ).isSameAs( classDetails );
 
 		final FieldDetails activeField = classDetails.findFieldByName( "active" );
 		assertThat( activeField.resolveAttributeName() ).isEqualTo( "active" );
 		assertThat( activeField.getType().asPrimitiveType().getClassDetails().toJavaClass() ).isEqualTo( boolean.class );
+		assertThat( activeField.getAssociatedType().determineRawClass().toJavaClass() ).isEqualTo( boolean.class );
 		assertThat( activeField.getVisibility() ).isEqualTo( MemberDetails.Visibility.PRIVATE );
 		assertThat( activeField.isPersistable() ).isTrue();
 		assertThat( activeField.getDeclaringType() ).isSameAs( classDetails );
@@ -117,6 +120,7 @@ void verify(Index index) {
 		final FieldDetails intValueArrayField = classDetails.findFieldByName( "intValueArray" );
 		assertThat( intValueArrayField.resolveAttributeName() ).isEqualTo( "intValueArray" );
 		assertThat( intValueArrayField.getType().asArrayType().getArrayClassDetails().toJavaClass() ).isEqualTo( int[].class );
+		assertThat( intValueArrayField.getAssociatedType().determineRawClass().toJavaClass() ).isEqualTo( int.class );
 		assertThat( intValueArrayField.getVisibility() ).isEqualTo( MemberDetails.Visibility.PROTECTED );
 		assertThat( intValueArrayField.isPersistable() ).isTrue();
 		assertThat( intValueArrayField.getDeclaringType() ).isSameAs( classDetails );