Improve error message for indexed property

Author: harawata

src/main/java/org/apache/ibatis/reflection/wrapper/BaseWrapper.java

@@ -43,6 +43,10 @@ protected Object resolveCollection(PropertyTokenizer prop, Object object) {
   }
 
   protected Object getCollectionValue(PropertyTokenizer prop, Object collection) {
+    if (collection == null) {
+      throw new ReflectionException("Cannot get the value '" + prop.getIndexedName() + "' because the property '"
+          + prop.getName() + "' is null.");
+    }
     if (collection instanceof Map) {
       return ((Map) collection).get(prop.getIndex());
     }
@@ -68,12 +72,16 @@ protected Object getCollectionValue(PropertyTokenizer prop, Object collection) {
     } else if (collection instanceof short[]) {
       return ((short[]) collection)[i];
     } else {
-      throw new ReflectionException(
-          "The '" + prop.getName() + "' property of " + collection + " is not a List or Array.");
+      throw new ReflectionException("Cannot get the value '" + prop.getIndexedName() + "' because the property '"
+          + prop.getName() + "' is not Map, List or Array.");
     }
   }
 
   protected void setCollectionValue(PropertyTokenizer prop, Object collection, Object value) {
+    if (collection == null) {
+      throw new ReflectionException("Cannot set the value '" + prop.getIndexedName() + "' because the property '"
+          + prop.getName() + "' is null.");
+    }
     if (collection instanceof Map) {
       ((Map) collection).put(prop.getIndex(), value);
     } else {
@@ -99,8 +107,8 @@ protected void setCollectionValue(PropertyTokenizer prop, Object collection, Obj
       } else if (collection instanceof short[]) {
         ((short[]) collection)[i] = (Short) value;
       } else {
-        throw new ReflectionException(
-            "The '" + prop.getName() + "' property of " + collection + " is not a List or Array.");
+        throw new ReflectionException("Cannot set the value '" + prop.getIndexedName() + "' because the property '"
+            + prop.getName() + "' is not Map, List or Array.");
       }
     }
   }

src/test/java/org/apache/ibatis/reflection/wrapper/BeanWrapperTest.java

@@ -59,8 +59,13 @@ void assertBasicOperations() {
       metaObj.getValue("bean2List[0]");
       fail();
     } catch (ReflectionException e) {
-      // TODO: more accurate message
-      assertEquals("The 'bean2List' property of null is not a List or Array.", e.getMessage());
+      assertEquals("Cannot get the value 'bean2List[0]' because the property 'bean2List' is null.", e.getMessage());
+    }
+    try {
+      metaObj.setValue("bean2List[0]", new Bean2());
+      fail();
+    } catch (ReflectionException e) {
+      assertEquals("Cannot set the value 'bean2List[0]' because the property 'bean2List' is null.", e.getMessage());
     }
     assertTrue(metaObj.hasSetter("bean2List[0]"));
 
@@ -77,6 +82,20 @@ void assertBasicOperations() {
 
     metaObj.setValue("attrVal", "value");
     assertEquals("value", bean.getAttrVal());
+    try {
+      metaObj.getValue("attrVal[0]");
+      fail();
+    } catch (ReflectionException e) {
+      assertEquals("Cannot get the value 'attrVal[0]' because the property 'attrVal' is not Map, List or Array.",
+          e.getMessage());
+    }
+    try {
+      metaObj.setValue("attrVal[0]", "blur");
+      fail();
+    } catch (ReflectionException e) {
+      assertEquals("Cannot set the value 'attrVal[0]' because the property 'attrVal' is not Map, List or Array.",
+          e.getMessage());
+    }
 
     metaObj.setValue("bean2List[1].name", "new name 1");
     assertEquals("new name 1", bean.getBean2List().get(1).getName());
@@ -144,7 +163,6 @@ void assertBasicOperations() {
     } catch (UnsupportedOperationException e) {
       // pass
     }
-
   }
 
   static class Bean1 {