Improve TypeParameterResolver#toString() for messaging

Porting harawata/typeparameterresolver#6

Author: harawata

src/main/java/org/apache/ibatis/reflection/TypeParameterResolver.java

@@ -283,8 +283,14 @@ public boolean equals(Object obj) {
 
     @Override
     public String toString() {
-      return "ParameterizedTypeImpl [rawType=" + rawType + ", ownerType=" + ownerType + ", actualTypeArguments="
-          + Arrays.toString(actualTypeArguments) + "]";
+      StringBuilder s = new StringBuilder().append(rawType.getName()).append("<");
+      for (int i = 0; i < actualTypeArguments.length; i++) {
+        if (i > 0) {
+          s.append(", ");
+        }
+        s.append(actualTypeArguments[i].getTypeName());
+      }
+      return s.append(">").toString();
     }
   }
 
@@ -329,6 +335,17 @@ public boolean equals(Object obj) {
       WildcardTypeImpl other = (WildcardTypeImpl) obj;
       return Arrays.equals(lowerBounds, other.lowerBounds) && Arrays.equals(upperBounds, other.upperBounds);
     }
+
+    @Override
+    public String toString() {
+      StringBuilder s = new StringBuilder().append("?");
+      if (lowerBounds.length > 0) {
+        s.append(" super ").append(lowerBounds[0].getTypeName());
+      } else if (upperBounds.length > 0 && upperBounds[0] != Object.class) {
+        s.append(" extends ").append(upperBounds[0].getTypeName());
+      }
+      return s.toString();
+    }
   }
 
   static class GenericArrayTypeImpl implements GenericArrayType {
@@ -360,5 +377,10 @@ public boolean equals(Object obj) {
       GenericArrayTypeImpl other = (GenericArrayTypeImpl) obj;
       return Objects.equals(genericComponentType, other.genericComponentType);
     }
+
+    @Override
+    public String toString() {
+      return new StringBuilder().append(genericComponentType.toString()).append("[]").toString();
+    }
   }
 }

src/test/java/org/apache/ibatis/reflection/TypeParameterResolverTest.java

@@ -97,6 +97,7 @@ void returnSimpleMap() throws Exception {
     assertEquals(2, paramType.getActualTypeArguments().length);
     assertEquals(Integer.class, paramType.getActualTypeArguments()[0]);
     assertEquals(Double.class, paramType.getActualTypeArguments()[1]);
+    assertEquals("java.util.Map<java.lang.Integer, java.lang.Double>", result.toString());
   }
 
   @Test
@@ -111,6 +112,7 @@ void returnSimpleWildcard() throws Exception {
     assertTrue(paramType.getActualTypeArguments()[0] instanceof WildcardType);
     WildcardType wildcard = (WildcardType) paramType.getActualTypeArguments()[0];
     assertEquals(String.class, wildcard.getUpperBounds()[0]);
+    assertEquals("java.util.List<? extends java.lang.String>", paramType.toString());
   }
 
   @Test
@@ -364,6 +366,7 @@ void paramLv1Array() throws Exception {
     assertTrue(result[0] instanceof GenericArrayType);
     GenericArrayType genericArrayType = (GenericArrayType) result[0];
     assertTrue(genericArrayType.getGenericComponentType() instanceof ParameterizedType);
+    assertEquals("java.util.List<java.lang.String>[]", genericArrayType.toString());
     ParameterizedType paramType = (ParameterizedType) genericArrayType.getGenericComponentType();
     assertEquals(List.class, paramType.getRawType());
     assertEquals(String.class, paramType.getActualTypeArguments()[0]);