Fixed http://code.google.com/p/mybatis/issues/detail?id=180 . Modified StrictMap so that statements/fragments cannot be references by their short name when a long name is specified.

Author: christianpoitras

src/main/java/org/apache/ibatis/session/Configuration.java

@@ -77,7 +77,7 @@ public class Configuration {
   protected final TypeHandlerRegistry typeHandlerRegistry = new TypeHandlerRegistry();
   protected final TypeAliasRegistry typeAliasRegistry = new TypeAliasRegistry();
   protected final Map<String, MappedStatement> mappedStatements = new StrictMap<String, MappedStatement>("Mapped Statements collection");
-  protected final Map<String, Cache> caches = new StrictMap<String, Cache>("Caches collection");
+  protected final Map<String, Cache> caches = new CacheMap<String, Cache>("Caches collection");
   protected final Map<String, ResultMap> resultMaps = new StrictMap<String, ResultMap>("Result Maps collection");
   protected final Map<String, ParameterMap> parameterMaps = new StrictMap<String, ParameterMap>("Parameter Maps collection");
   protected final Map<String, KeyGenerator> keyGenerators = new StrictMap<String, KeyGenerator>("Key Generators collection");
@@ -511,26 +511,26 @@ protected void checkLocallyForDiscriminatedNestedResultMaps(ResultMap rm) {
     }
   }
 
-  protected static class StrictMap<J extends String, K extends Object> extends HashMap<J, K> {
+  protected static class CacheMap<J extends String, K extends Object> extends HashMap<J, K> {
 
     private String name;
 
-    public StrictMap(String name, int initialCapacity, float loadFactor) {
+    public CacheMap(String name, int initialCapacity, float loadFactor) {
       super(initialCapacity, loadFactor);
       this.name = name;
     }
 
-    public StrictMap(String name, int initialCapacity) {
+    public CacheMap(String name, int initialCapacity) {
       super(initialCapacity);
       this.name = name;
     }
 
-    public StrictMap(String name) {
+    public CacheMap(String name) {
       super();
       this.name = name;
     }
 
-    public StrictMap(String name, Map<? extends J, ? extends K> m) {
+    public CacheMap(String name, Map<? extends J, ? extends K> m) {
       super(m);
       this.name = name;
     }
@@ -579,5 +579,43 @@ public String getSubject() {
       }
     }
   }
+  
+  protected static class StrictMap<J extends String, K extends Object> extends HashMap<J, K> {
 
+	  private String name;
+
+	  public StrictMap(String name, int initialCapacity, float loadFactor) {
+	    super(initialCapacity, loadFactor);
+	    this.name = name;
+	  }
+
+	  public StrictMap(String name, int initialCapacity) {
+	    super(initialCapacity);
+	    this.name = name;
+	  }
+
+	  public StrictMap(String name) {
+	    super();
+	    this.name = name;
+	  }
+
+	  public StrictMap(String name, Map<? extends J, ? extends K> m) {
+	    super(m);
+	    this.name = name;
+	  }
+
+	  public K put(J key, K value) {
+	    if (containsKey(key))
+	      throw new IllegalArgumentException(name + " already contains value for " + key);
+	    return super.put(key, value);
+	  }
+
+	  public K get(Object key) {
+	    K value = super.get(key);
+	    if (value == null) {
+	      throw new IllegalArgumentException(name + " does not contain value for " + key);
+	    }
+	    return value;
+	  }
+	}
 }

src/test/java/org/apache/ibatis/submitted/refid_resolution/Mapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.apache.ibatis.submitted.refid_resolution.Mapper">
+	<sql id="columnList">
+		field1, field2
+	</sql>
+	<select id="selectValid" resultType="map">
+		select
+		<include refid="columnList" />
+		from table1
+	</select>
+	<select id="selectInvalid" resultType="map">
+		select
+		<!-- Non-existent refid with the same short name -->
+		<include refid="noSuchMapper.columnList" />
+		from table1
+	</select>
+</mapper>

src/test/java/org/apache/ibatis/submitted/refid_resolution/MapperConfig.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE configuration
+    PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-config.dtd">
+
+<configuration>
+
+	<mappers>
+		<mapper resource="org/apache/ibatis/submitted/refid_resolution/Mapper.xml" />
+	</mappers>
+
+</configuration>

src/test/java/org/apache/ibatis/submitted/refid_resolution/RefidResolutionTest.java

@@ -0,0 +1,20 @@
+package org.apache.ibatis.submitted.refid_resolution;
+
+import java.io.Reader;
+
+import org.apache.ibatis.exceptions.PersistenceException;
+import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
+import org.junit.Test;
+
+public class RefidResolutionTest {
+  @Test(expected = PersistenceException.class)
+  public void testIncludes() throws Exception {
+    String resource = "org/apache/ibatis/submitted/refid_resolution/MapperConfig.xml";
+    Reader reader = Resources.getResourceAsReader(resource);
+    SqlSessionFactoryBuilder builder = new SqlSessionFactoryBuilder();
+    SqlSessionFactory sqlSessionFactory = builder.build(reader);
+    sqlSessionFactory.getConfiguration().getMappedStatementNames();
+  }
+}

src/test/java/org/apache/ibatis/submitted/xml_external_ref/SameIdMapperConfig.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE configuration
+    PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-config.dtd">
+
+<configuration>
+
+  <environments default="development">
+    <environment id="development">
+      <transactionManager type="JDBC">
+        <property name="" value=""/>
+      </transactionManager>
+      <dataSource type="UNPOOLED">
+        <property name="driver" value="org.hsqldb.jdbcDriver"/>
+        <property name="url" value="jdbc:hsqldb:mem:xmlextref"/>
+        <property name="username" value="sa"/>
+      </dataSource>
+    </environment>
+  </environments>
+
+  <mappers>
+    <mapper resource="org/apache/ibatis/submitted/xml_external_ref/SameIdPersonMapper.xml"/>
+    <mapper resource="org/apache/ibatis/submitted/xml_external_ref/SameIdPetMapper.xml"/>
+  </mappers>
+
+</configuration>

src/test/java/org/apache/ibatis/submitted/xml_external_ref/SameIdPersonMapper.java

@@ -0,0 +1,7 @@
+package org.apache.ibatis.submitted.xml_external_ref;
+
+public interface SameIdPersonMapper {
+  Person select(Integer id);
+
+  Pet selectPet(Integer id);
+}

src/test/java/org/apache/ibatis/submitted/xml_external_ref/SameIdPersonMapper.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.apache.ibatis.submitted.xml_external_ref.SameIdPersonMapper">
+	<cache-ref namespace="org.apache.ibatis.submitted.xml_external_ref.SameIdPetMapper" />
+	<resultMap type="org.apache.ibatis.submitted.xml_external_ref.Person"
+		id="personResult">
+		<id property="id" column="person_id" />
+		<result property="name" column="person_name" />
+	</resultMap>
+	<resultMap type="org.apache.ibatis.submitted.xml_external_ref.Person"
+		id="resultWithPets" extends="personResult">
+		<collection property="pets"
+			ofType="org.apache.ibatis.submitted.xml_external_ref.Pet"
+			resultMap="org.apache.ibatis.submitted.xml_external_ref.SameIdPetMapper.petResult" />
+	</resultMap>
+	<sql id="columns">
+		person_id, person_name
+	</sql>
+	<!-- Referencing a sql fragment in another file -->
+	<select id="select" parameterType="java.lang.Integer" resultMap="resultWithPets">
+		SELECT
+		<include refid="columns" />
+		,
+		<include
+			refid="org.apache.ibatis.submitted.xml_external_ref.SameIdPetMapper.columns" />
+		FROM person, pet
+		WHERE person_id = #{id}
+		AND person_id = owner_id
+		ORDER BY pet_id
+	</select>
+	<!-- Referencing a sql fragment and a result map in another file -->
+	<select id="selectPet" parameterType="java.lang.Integer"
+		resultMap="org.apache.ibatis.submitted.xml_external_ref.SameIdPetMapper.petResult">
+		SELECT
+		<include
+			refid="org.apache.ibatis.submitted.xml_external_ref.SameIdPetMapper.columns" />
+		FROM pet
+		WHERE pet_id = #{id}
+	</select>
+</mapper>

src/test/java/org/apache/ibatis/submitted/xml_external_ref/SameIdPetMapper.java

@@ -0,0 +1,5 @@
+package org.apache.ibatis.submitted.xml_external_ref;
+
+public interface SameIdPetMapper {
+  Pet select(Integer id);
+}

src/test/java/org/apache/ibatis/submitted/xml_external_ref/SameIdPetMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.apache.ibatis.submitted.xml_external_ref.SameIdPetMapper">
+	<cache />
+	<resultMap type="org.apache.ibatis.submitted.xml_external_ref.Pet" id="petResult">
+		<id property="id" column="pet_id" />
+		<result property="ownerId" column="owner_id" />
+		<result property="name" column="pet_name" />
+	</resultMap>
+	<resultMap type="org.apache.ibatis.submitted.xml_external_ref.Pet" id="resultWithOwner"
+		extends="petResult">
+		<association property="owner" javaType="org.apache.ibatis.submitted.xml_external_ref.Person"
+			resultMap="org.apache.ibatis.submitted.xml_external_ref.SameIdPersonMapper.personResult" />
+	</resultMap>
+	<sql id="columns">
+		pet_id, owner_id, pet_name
+	</sql>
+	<select id="select" parameterType="java.lang.Integer" resultMap="resultWithOwner">
+		SELECT
+		<include refid="columns" />
+		,
+		<include refid="org.apache.ibatis.submitted.xml_external_ref.SameIdPersonMapper.columns" />
+		FROM pet, person where person_id = owner_id
+		AND pet_id = #{id}
+	</select>
+</mapper>

src/test/java/org/apache/ibatis/submitted/xml_external_ref/SameIdTest.java

@@ -0,0 +1,99 @@
+package org.apache.ibatis.submitted.xml_external_ref;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
+import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.jdbc.ScriptRunner;
+import org.apache.ibatis.mapping.Environment;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
+import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
+import org.junit.Test;
+
+public class SameIdTest {
+
+  @Test
+  public void testCrossReferenceXmlConfig() throws Exception {
+    testCrossReference(getSqlSessionFactoryXmlConfig());
+  }
+
+  @Test
+  public void testCrossReferenceJavaConfig() throws Exception {
+    testCrossReference(getSqlSessionFactoryJavaConfig());
+  }
+
+  private void testCrossReference(SqlSessionFactory sqlSessionFactory) throws Exception {
+    SqlSession sqlSession = sqlSessionFactory.openSession();
+    try {
+      SameIdPersonMapper personMapper = sqlSession.getMapper(SameIdPersonMapper.class);
+      Person person = personMapper.select(1);
+      assertEquals((Integer)1, person.getId());
+      assertEquals(2, person.getPets().size());
+      assertEquals((Integer)2, person.getPets().get(1).getId());
+
+      Pet pet = personMapper.selectPet(1);
+      assertEquals(Integer.valueOf(1), pet.getId());
+
+      SameIdPetMapper petMapper = sqlSession.getMapper(SameIdPetMapper.class);
+      Pet pet2 = petMapper.select(3);
+      assertEquals((Integer)3, pet2.getId());
+      assertEquals((Integer)2, pet2.getOwner().getId());
+    } finally {
+      sqlSession.close();
+    }
+  }
+
+  private SqlSessionFactory getSqlSessionFactoryXmlConfig() throws Exception {
+    Reader configReader = Resources
+        .getResourceAsReader("org/apache/ibatis/submitted/xml_external_ref/SameIdMapperConfig.xml");
+    SqlSessionFactory sqlSessionFactory = new SqlSessionFactoryBuilder().build(configReader);
+    configReader.close();
+
+    Connection conn = sqlSessionFactory.getConfiguration().getEnvironment().getDataSource().getConnection();
+    initDb(conn);
+
+    return sqlSessionFactory;
+  }
+
+  private SqlSessionFactory getSqlSessionFactoryJavaConfig() throws Exception {
+    Class.forName("org.hsqldb.jdbcDriver");
+    Connection c = DriverManager.getConnection("jdbc:hsqldb:mem:xmlextref", "sa", "");
+    initDb(c);
+
+    Configuration configuration = new Configuration();
+    Environment environment = new Environment("development", new JdbcTransactionFactory(), new UnpooledDataSource(
+        "org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:xmlextref", null));
+    configuration.setEnvironment(environment);
+
+    configuration.addMapper(SameIdPersonMapper.class);
+    configuration.addMapper(SameIdPetMapper.class);
+
+    return new SqlSessionFactoryBuilder().build(configuration);
+  }
+
+  private static void initDb(Connection conn) throws IOException, SQLException {
+    try {
+      Reader scriptReader = Resources.getResourceAsReader("org/apache/ibatis/submitted/xml_external_ref/CreateDB.sql");
+      ScriptRunner runner = new ScriptRunner(conn);
+      runner.setLogWriter(null);
+      runner.setErrorLogWriter(null);
+      runner.runScript(scriptReader);
+      conn.commit();
+      scriptReader.close();
+    } finally {
+      if (conn != null) {
+        conn.close();
+      }
+    }
+  }
+
+}