Merge pull request #1575 from shootercheng/master

Include statement ID in the error message when a referenced result map is missing

Author: harawata

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

@@ -337,7 +337,7 @@ private List<ResultMap> getStatementResultMaps(
         try {
           resultMaps.add(configuration.getResultMap(resultMapName.trim()));
         } catch (IllegalArgumentException e) {
-          throw new IncompleteElementException("Could not find result map " + resultMapName, e);
+          throw new IncompleteElementException("Could not find result map '" + resultMapName + "' referenced from '" + statementId + "'", e);
         }
       }
     } else if (resultType != null) {

src/test/java/org/apache/ibatis/builder/ProblemResultMapper.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+       Copyright 2009-2018 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.
+
+-->
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.mybatis.spring.ErrorProblemMapper">
+
+    <select id="findProblemResultMapTest" resultMap="java.lang.String">
+        SELECT *
+        FROM table_test WHERE id = #{id}
+    </select>
+</mapper>

src/test/java/org/apache/ibatis/builder/XmlMapperBuilderTest.java

@@ -191,4 +191,21 @@ void shouldFailedLoadXMLMapperFile() throws Exception {
 //    builder2.parse();
 //  }
 
+   @Test
+   public void erorrResultMapLocation() throws Exception {
+     Configuration configuration = new Configuration();
+     String resource = "org/apache/ibatis/builder/ProblemResultMapper.xml";
+     try (InputStream inputStream = Resources.getResourceAsStream(resource)) {
+       XMLMapperBuilder builder = new XMLMapperBuilder(inputStream, configuration, resource, configuration.getSqlFragments());
+       builder.parse();
+       String resultMapName = "java.lang.String";
+       // namespace + "." + id
+       String statementId = "org.mybatis.spring.ErrorProblemMapper" + "." + "findProblemResultMapTest";
+       // same as MapperBuilderAssistant.getStatementResultMaps Exception message
+       String message = "Could not find result map '" + resultMapName + "' referenced from '" + statementId + "'";
+       IncompleteElementException exception = Assertions.assertThrows(IncompleteElementException.class,
+         ()-> configuration.getMappedStatement("findProblemTypeTest"));
+       assertThat(exception.getMessage()).isEqualTo(message);
+     }
+   }
 }