BoundSql#hasAdditionalParameter should check only the existence of the parent parameter. This should yield more accurate error message in cases like #411

Author: harawata

src/main/java/org/apache/ibatis/mapping/BoundSql.java

@@ -20,6 +20,7 @@
 import java.util.Map;
 
 import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.reflection.property.PropertyTokenizer;
 import org.apache.ibatis.session.Configuration;
 
 /**
@@ -62,7 +63,9 @@ public Object getParameterObject() {
   }
 
   public boolean hasAdditionalParameter(String name) {
-    return metaParameters.hasGetter(name);
+    PropertyTokenizer prop = new PropertyTokenizer(name);
+    String indexedName = prop.getIndexedName();
+    return additionalParameters.containsKey(indexedName);
   }
 
   public void setAdditionalParameter(String name, Object value) {

src/test/java/org/apache/ibatis/mapping/BoundSqlTest.java

@@ -0,0 +1,59 @@
+/**
+ *    Copyright 2009-2015 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.apache.ibatis.mapping;
+
+import static org.junit.Assert.*;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.session.Configuration;
+import org.junit.Test;
+
+public class BoundSqlTest {
+
+  @Test
+  public void testHasAdditionalParameter() throws Exception {
+    List<ParameterMapping> params = Collections.emptyList();
+    BoundSql boundSql = new BoundSql(new Configuration(), "some sql", params, new Object());
+
+    Map<String, String> map = new HashMap<String, String>();
+    map.put("key1", "value1");
+    boundSql.setAdditionalParameter("map", map);
+
+    Person bean = new Person();
+    bean.id = 1;
+    boundSql.setAdditionalParameter("person", bean);
+
+    assertFalse(boundSql.hasAdditionalParameter("pet"));
+    assertFalse(boundSql.hasAdditionalParameter("pet.name"));
+
+    assertTrue(boundSql.hasAdditionalParameter("map"));
+    assertTrue(boundSql.hasAdditionalParameter("map.key1"));
+    assertTrue("should return true even if the child property does not exists.", boundSql.hasAdditionalParameter("map.key2"));
+
+    assertTrue(boundSql.hasAdditionalParameter("person"));
+    assertTrue(boundSql.hasAdditionalParameter("person.id"));
+    assertTrue("should return true even if the child property does not exists.", boundSql.hasAdditionalParameter("person.name"));
+  }
+
+  public static class Person {
+    public Integer id;
+  }
+
+}