#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/jandex/JandexMethodDetails.java

@@ -58,13 +58,20 @@ public JandexMethodDetails(
 			argumentTypes.add( classDetailsRegistry.resolveClassDetails( methodInfo.parameterType( i ).name().toString() ) );
 		}
 
-		if ( type != null ) {
-			this.isArray = methodInfo.returnType().kind() == Type.Kind.ARRAY;
-			this.isPlural = isArray || type.isImplementor( Collection.class ) || type.isImplementor( Map.class );
-		}
-		else {
-			this.isArray = false;
-			this.isPlural = false;
+		switch ( methodKind ) {
+			case GETTER -> {
+				this.isArray = methodInfo.returnType().kind() == Type.Kind.ARRAY;
+				this.isPlural = isArray || type.isImplementor( Collection.class ) || type.isImplementor( Map.class );
+			}
+			case SETTER -> {
+				assert methodInfo.parametersCount() == 1;
+				this.isArray = methodInfo.parameterType( 0 ).kind() == Type.Kind.ARRAY;
+				this.isPlural = isArray || type.isImplementor( Collection.class ) || type.isImplementor( Map.class );
+			}
+			default -> {
+				this.isArray = false;
+				this.isPlural = false;
+			}
 		}
 	}
 

src/main/java/org/hibernate/models/internal/jdk/JdkMethodDetails.java

@@ -19,6 +19,8 @@
 import org.hibernate.models.spi.MethodDetails;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 
+import org.jboss.jandex.Type;
+
 /**
  * @author Steve Ebersole
  */
@@ -55,15 +57,21 @@ public JdkMethodDetails(
 			argumentTypes.add( classDetailsRegistry.resolveClassDetails( method.getParameterTypes()[i].getName() ) );
 		}
 
-		if ( type != null ) {
-			this.isArray = method.getReturnType().isArray();
-			this.isPlural = isArray
-					|| Collection.class.isAssignableFrom( method.getReturnType() )
-					|| Map.class.isAssignableFrom( method.getReturnType() );
-		}
-		else {
-			this.isArray = false;
-			this.isPlural = false;
+
+		switch ( methodKind ) {
+			case GETTER -> {
+				this.isArray = method.getReturnType().isArray();
+				this.isPlural = isArray || type.isImplementor( Collection.class ) || type.isImplementor( Map.class );
+			}
+			case SETTER -> {
+				assert method.getParameterCount() == 1;
+				this.isArray = method.getParameterTypes()[0].isArray();
+				this.isPlural = isArray || type.isImplementor( Collection.class ) || type.isImplementor( Map.class );
+			}
+			default -> {
+				this.isArray = false;
+				this.isPlural = false;
+			}
 		}
 	}