Fix for http://code.google.com/p/mybatis/issues/detail?id=203 - parameterMap fails with type="map" and no declared javaType

Author: jeffgbutler

src/main/java/org/apache/ibatis/builder/MapperBuilderAssistant.java

@@ -353,6 +353,8 @@ private Class<?> resolveParameterJavaType(Class<?> resultType, String property,
     if (javaType == null) {
       if (JdbcType.CURSOR.equals(jdbcType)) {
         javaType = java.sql.ResultSet.class;
+      } else if (Map.class.isAssignableFrom(resultType)) {
+        javaType = Object.class;
       } else {
         MetaClass metaResultType = MetaClass.forClass(resultType);
         javaType = metaResultType.getGetterType(property);

src/test/java/org/apache/ibatis/submitted/sptests/SPMapper.java

@@ -6,6 +6,7 @@
 public interface SPMapper {
     Object adder(Parameter parameter);
     void adder2(Parameter parameter);
+    void adder3(Map<String, Object> parameter);
     Name getName(Integer id);
     List<Name> getNames(Map<String, Object> parms);
     List<Name> getNamesWithArray(Map<String, Object> parms);

src/test/java/org/apache/ibatis/submitted/sptests/SPMapper.xml

@@ -7,6 +7,12 @@
     <result column="LAST_NAME" property="lastName"/>
   </resultMap>
 
+  <parameterMap type="map" id="testParameterMap">
+    <parameter property="addend1" jdbcType="INTEGER" mode="IN"/>
+    <parameter property="addend2" jdbcType="INTEGER" mode="IN"/>
+    <parameter property="sum" jdbcType="INTEGER" mode="OUT"/>
+  </parameterMap>
+
   <!-- Important things for stored procedures:
     1. Must set the statement type to CALLABLE
     2. Must use the JDBC standard escape sequence for stored procedures:
@@ -37,6 +43,10 @@
     )}
   </update>
 
+  <update id="adder3" parameterMap="testParameterMap" statementType="CALLABLE">
+    {call sptest.adder(?, ?, ?)}
+  </update>
+  
   <select id="getName" parameterType="java.lang.Integer" statementType="CALLABLE"
     resultMap="nameResult">
     {call sptest.getname(

src/test/java/org/apache/ibatis/submitted/sptests/SPTest.java

@@ -82,9 +82,6 @@ public void testAdderAsSelect() {
      * in a stored procedure.
      * This procedure does not return a result set.
      * 
-     * Currently this test will fail without clearing the cache because
-     * of a MyBatis cache issue.
-     * 
      * This test shows using a multi-property parameter.
      */
     @Test
@@ -100,9 +97,6 @@ public void testAdderAsSelectDoubleCall1() {
             spMapper.adder(parameter);
             assertEquals((Integer) 5, parameter.getSum());
 
-            // Resolved Output Parameter Caching Issue for Callable statements
-            // sqlSession.clearCache();
-            
             parameter = new Parameter();
             parameter.setAddend1(2);
             parameter.setAddend2(3);
@@ -119,10 +113,10 @@ public void testAdderAsSelectDoubleCall1() {
      * in a stored procedure.
      * This procedure does not return a result set.
      * 
-     * This test shows using a multi-property parameter.
+     * This test also demonstrates session level cache for
+     * output parameters.
      * 
-     * This test shows that the cache problem does not manifest if
-     * the input parameters are different.
+     * This test shows using a multi-property parameter.
      */
     @Test
     public void testAdderAsSelectDoubleCall2() {
@@ -149,8 +143,7 @@ public void testAdderAsSelectDoubleCall2() {
     }
 
     /**
-     * This test shows that the cache problem is not in effect if
-     * stored procedures with out parms are defined as <update> rather
+     * This test shows how to call a stored procedure defined as <update> rather
      * then <select>.  Of course, this only works if you are not returning
      * a result set.
      * 
@@ -180,6 +173,36 @@ public void testAdderAsUpdate() {
         }
     }
 
+    /**
+     * This test shows the use of a declared parameter map.
+     * We generally prefer inline parameters, because the syntax
+     * is more intuitive (no pesky question marks), but a parameter map
+     * will work.
+     */
+    @Test
+    public void testAdderAsUpdateWithParameterMap() {
+        SqlSession sqlSession = sqlSessionFactory.openSession();
+        try {
+            Map<String, Object> parms = new HashMap<String, Object>();
+            parms.put("addend1", 3);
+            parms.put("addend2", 4);
+            
+            SPMapper spMapper = sqlSession.getMapper(SPMapper.class);
+            
+            spMapper.adder3(parms);
+            assertEquals(7, parms.get("sum"));
+            
+            parms = new HashMap<String, Object>();
+            parms.put("addend1", 2);
+            parms.put("addend2", 3);
+            spMapper.adder3(parms);
+            assertEquals(5, parms.get("sum"));
+            
+        } finally {
+            sqlSession.close();
+        }
+    }
+    
     /**
      * This test shows how to use an input parameter and return a result
      * set from a stored procedure.
@@ -229,9 +252,6 @@ public void testCallWithResultSet2() {
      * return a result set from a stored procedure.
      * 
      * This test shows using a Map parameter.
-     * 
-     * This test shows that the cache problem does not manifest if
-     * the input parameters are different.
      */
     @Test
     @Ignore("until hsqldb 2.0.1 is released")
@@ -261,9 +281,6 @@ public void testCallWithResultSet3() {
      * return a result set from a stored procedure.
      * 
      * This test shows using a Map parameter.
-     * 
-     * Currently this test will fail without clearing the cache because
-     * of a MyBatis cache issue.
      */
     @Test
     @Ignore("until hsqldb 2.0.1 is released")
@@ -278,9 +295,6 @@ public void testCallWithResultSet4() {
             assertEquals(2, parms.get("totalRows"));
             assertEquals(2, names.size());
 
-            // Resolved Output Parameter Caching Issue for Callable statements
-            // sqlSession.clearCache();
-            
             parms = new HashMap<String, Object>();
             parms.put("lowestId", 2);
             names = spMapper.getNames(parms);
@@ -291,6 +305,12 @@ public void testCallWithResultSet4() {
         }
     }
 
+    /**
+     * This test shows how to use the ARRAY JDBC type
+     * with MyBatis.
+     * 
+     * @throws SQLException
+     */
     @Test
     @Ignore("until hsqldb 2.0.1 is released")
     public void testGetNamesWithArray() throws SQLException {