Merge pull request #2841 from harawata/gh-2834-result-map-regression

gh-2834 result map regression

Author: harawata

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

@@ -437,7 +437,7 @@ private Class<?> resolveResultJavaType(Class<?> resultType, String property, Cla
     if (javaType == null && property != null) {
       try {
         MetaClass metaResultType = MetaClass.forClass(resultType, configuration.getReflectorFactory());
-        javaType = metaResultType.getGetterType(property);
+        javaType = metaResultType.getSetterType(property);
       } catch (Exception e) {
         // ignore, following null check statement will deal with the situation
       }

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

@@ -129,7 +129,7 @@ public ResultMap build() {
         if (actualArgNames == null) {
           throw new BuilderException("Error in result map '" + resultMap.id + "'. Failed to find a constructor in '"
               + resultMap.getType().getName() + "' with arg names " + constructorArgNames
-              + ". Note that 'javaType' is required when there is no readable property with the same name ('name' is optional, BTW). There might be more info in debug log.");
+              + ". Note that 'javaType' is required when there is no writable property with the same name ('name' is optional, BTW). There might be more info in debug log.");
         }
         resultMap.constructorResultMappings.sort((o1, o2) -> {
           int paramIdx1 = actualArgNames.indexOf(o1.getProperty());

src/site/es/xdoc/sqlmap-xml.xml

@@ -986,7 +986,7 @@ public class User {
 </constructor>]]></source>
 
         <p>
-          <code>javaType</code> can be omitted if there is a property with the same name and type.
+          <code>javaType</code> can be omitted if there is a writable property with the same name and type.
         </p>
 
         <p>El resto de atributos son los mismos que los de los elementos id y result.</p>

src/site/ja/xdoc/sqlmap-xml.xml

@@ -1102,7 +1102,7 @@ public class User {
 </constructor>]]></source>
 
         <p>
-          引数と同じ名前、同じ型を持つプロパティが存在する場合 <code>javaType</code> は省略可能です。
+          引数と同じ名前、同じ型を持つ書き込み可能なプロパティが存在する場合 <code>javaType</code> は省略可能です。
         </p>
 
         <p>

src/site/ko/xdoc/sqlmap-xml.xml

@@ -986,7 +986,7 @@ public class User {
 </constructor>]]></source>
 
         <p>
-          같은 이름과 형태의 property 가 있는 경우는 <code>javaType</code> 를 생략 할 수 있다.
+          같은 이름과 형태의 쓰기 가능한 property 가 있는 경우는 <code>javaType</code> 를 생략 할 수 있다.
         </p>
 
         <p>나머지 속성과 규칙은 id와 result엘리먼트와 동일하다.</p>

src/site/xdoc/sqlmap-xml.xml

@@ -1190,7 +1190,7 @@ public class User {
 </constructor>]]></source>
 
         <p>
-          <code>javaType</code> can be omitted if there is a property with the same name and type.
+          <code>javaType</code> can be omitted if there is a writable property with the same name and type.
         </p>
 
         <p>

src/site/zh/xdoc/sqlmap-xml.xml

@@ -1135,7 +1135,7 @@ public class User {
 </constructor>]]></source>
 
         <p>
-          如果存在名称和类型相同的属性，那么可以省略 <code>javaType</code> 。
+          如果存在名称和类型相同的可写属性，那么可以省略 <code>javaType</code> 。
         </p>
 
         <p>

src/test/java/org/apache/ibatis/submitted/record_type/RecordTypeMapper.java

@@ -32,12 +32,6 @@ public interface RecordTypeMapper {
   @Select("select val, id, url from prop where id = #{id}")
   Property selectProperty(int id);
 
-  @Arg(name = "id", column = "id", id = true)
-  @Arg(name = "value", column = "val")
-  @Arg(name = "URL", column = "url")
-  @Select("select val, id, url from prop where id = #{id}")
-  Property selectPropertyNoJavaType(int id);
-
   @Insert("insert into prop (id, val, url) values (#{id}, #{value}, #{URL})")
   int insertProperty(Property property);
 

src/test/java/org/apache/ibatis/submitted/record_type/RecordTypeTest.java

@@ -52,16 +52,6 @@ void testSelectRecord() {
     }
   }
 
-  @Test
-  void shouldResolveConstructorArgType() {
-    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
-      RecordTypeMapper mapper = sqlSession.getMapper(RecordTypeMapper.class);
-      Property prop = mapper.selectPropertyNoJavaType(1);
-      assertEquals("Val1!", prop.value());
-      assertEquals("https://www.google.com", prop.URL());
-    }
-  }
-
   @Test
   void testSelectRecordAutomapping() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {

src/test/java/org/apache/ibatis/submitted/unmatched_prop_type/UnmatchedPropTypeMapper.java

@@ -0,0 +1,31 @@
+/*
+ *    Copyright 2009-2022 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
+ *
+ *       https://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.submitted.unmatched_prop_type;
+
+import org.apache.ibatis.annotations.Arg;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Select;
+
+public interface UnmatchedPropTypeMapper {
+
+  // javaType is required for 'id'
+  @Arg(id = true, column = "id", name = "id", javaType = String.class)
+  @Arg(column = "name", name = "name")
+  @Result(column = "dob", property = "dob")
+  @Select("select * from users where id = #{id}")
+  User getUser(Integer id);
+
+}