Fix for http://code.google.com/p/mybatis/issues/detail?id=254 . Checks that the namespace of a xml file that is loaded as a result of loading a mapper interface matches the name of the interface.

Excuded cglig-nodep from a test dependency because it collides with cglib (dep).

Author: emacarron

pom.xml

@@ -303,6 +303,12 @@
       <artifactId>jmock-legacy</artifactId>
       <version>2.1.0</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>cglib</groupId>
+          <artifactId>cglib-nodep</artifactId>
+        </exclusion>
+      </exclusions>      
     </dependency>
     <dependency>
       <groupId>commons-dbcp</groupId>

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

@@ -31,20 +31,26 @@ public String getCurrentNamespace() {
   }
 
   public void setCurrentNamespace(String currentNamespace) {
-    if (currentNamespace != null) {
-      this.currentNamespace = currentNamespace;
+    if (currentNamespace == null) {
+      throw new BuilderException(
+          "The mapper element requires a namespace attribute to be specified.");
     }
-    if (this.currentNamespace == null) {
-      throw new BuilderException("The mapper element requires a namespace attribute to be specified.");
+
+    if (this.currentNamespace != null && !this.currentNamespace.equals(currentNamespace)) {
+      throw new BuilderException("Wrong namespace. Expected '"
+          + this.currentNamespace + "' but found '" + currentNamespace + "'");
     }
+
+    this.currentNamespace = currentNamespace;
   }
 
   public String applyCurrentNamespace(String base) {
     if (base == null) return null;
+    // is it qualified with this or other namespace yet?
     if (base.contains(".")) return base;
     return currentNamespace + "." + base;
   }
-
+  
   public Cache useCacheRef(String namespace) {
     if (namespace == null) {
       throw new BuilderException("cache-ref element requires a namespace attribute.");

src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java

@@ -69,12 +69,8 @@ private XMLMapperBuilder(XPathParser parser, Configuration configuration, String
 
   public void parse() {
     XNode context = parser.evalNode("/mapper");
-    // we may inherit a namespace from MapperAnnotationBuilder
-    String namespace = builderAssistant.getCurrentNamespace();
-    if (namespace == null) {
-      namespace = context.getStringAttribute("namespace");
-      builderAssistant.setCurrentNamespace(namespace);
-    }
+    String namespace = context.getStringAttribute("namespace");
+    builderAssistant.setCurrentNamespace(namespace);
     if (!configuration.isResourceLoaded(namespace)) {
       configurationElement(context);
       configuration.addLoadedResource(namespace);

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

@@ -82,6 +82,7 @@ public class Configuration {
   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");
 
+  // list of namespaces loaded from xml files
   protected final Set<String> loadedResources = new HashSet<String>();
   protected final Map<String, XNode> sqlFragments = new StrictMap<String, XNode>("XML fragments parsed from previous mappers");
 
@@ -113,12 +114,12 @@ public Configuration() {
     typeAliasRegistry.registerAlias("WEAK", WeakCache.class.getName());
   }
 
-  public void addLoadedResource(String resource) {
-    loadedResources.add(resource);
+  public void addLoadedResource(String namespace) {
+    loadedResources.add(namespace);
   }
 
-  public boolean isResourceLoaded(String resource) {
-    return loadedResources.contains(resource);
+  public boolean isResourceLoaded(String namespace) {
+    return loadedResources.contains(namespace);
   }
 
   public Environment getEnvironment() {

src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.xml

@@ -4,7 +4,7 @@
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper>
+<mapper namespace="org.apache.ibatis.binding.BoundAuthorMapper">
 
   <insert id="insertAuthor" parameterType="domain.blog.Author">
     <selectKey keyProperty="id" resultType="int" order="BEFORE">

src/test/java/org/apache/ibatis/binding/BoundBlogMapper.xml

@@ -4,7 +4,7 @@
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper>
+<mapper namespace="org.apache.ibatis.binding.BoundBlogMapper">
 
   <select id="selectRandom" resultType="int">
     select CAST(RANDOM()*1000000 as INTEGER) a from SYSIBM.SYSDUMMY1

src/test/java/org/apache/ibatis/binding/MissingNamespaceMapper.java

@@ -0,0 +1,7 @@
+package org.apache.ibatis.binding;
+
+public interface MissingNamespaceMapper {
+  
+  void get();
+
+}

src/test/java/org/apache/ibatis/binding/MissingNamespaceMapper.xml

@@ -0,0 +1,13 @@
+<?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>
+
+  <select id="get" resultType="string">
+    select 1
+  </select>
+
+</mapper>

src/test/java/org/apache/ibatis/binding/WrongNamespaceMapper.java

@@ -0,0 +1,7 @@
+package org.apache.ibatis.binding;
+
+public interface WrongNamespaceMapper {
+  
+  void get();
+
+}

src/test/java/org/apache/ibatis/binding/WrongNamespaceMapper.xml

@@ -0,0 +1,13 @@
+<?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="wrong.namespace">
+
+  <select id="get" resultType="string">
+    select 1
+  </select>
+
+</mapper>