Long cache, fragment and statement names are never replaced by a short name by StrictMap.

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 CacheMap<String, Cache>("Caches collection");
+  protected final Map<String, Cache> caches = new StrictMap<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 CacheMap<J extends String, K extends Object> extends HashMap<J, K> {
+  protected static class StrictMap<J extends String, K extends Object> extends HashMap<J, K> {
 
     private String name;
 
-    public CacheMap(String name, int initialCapacity, float loadFactor) {
+    public StrictMap(String name, int initialCapacity, float loadFactor) {
       super(initialCapacity, loadFactor);
       this.name = name;
     }
 
-    public CacheMap(String name, int initialCapacity) {
+    public StrictMap(String name, int initialCapacity) {
       super(initialCapacity);
       this.name = name;
     }
 
-    public CacheMap(String name) {
+    public StrictMap(String name) {
       super();
       this.name = name;
     }
 
-    public CacheMap(String name, Map<? extends J, ? extends K> m) {
+    public StrictMap(String name, Map<? extends J, ? extends K> m) {
       super(m);
       this.name = name;
     }
@@ -551,10 +551,7 @@ public K put(J key, K value) {
     public K get(Object key) {
       K value = super.get(key);
       if (value == null) {
-        value = super.get(getShortName((J)key));
-        if (value == null) {
-          throw new IllegalArgumentException(name + " does not contain value for " + key);
-        }
+        throw new IllegalArgumentException(name + " does not contain value for " + key);
       }
       if (value instanceof Ambiguity) {
         throw new IllegalArgumentException(((Ambiguity)value).getSubject()
@@ -579,43 +576,5 @@ 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/session/SqlSessionManagerTest.java

@@ -46,7 +46,7 @@ public void shouldResolveBothSimpleNameAndFullyQualifiedName() {
     assertEquals(cache, c.getCache(shortName));
   }
 
-  @Test
+  @Test(expected=IllegalArgumentException.class)
   public void shouldFailOverToMostApplicableSimpleName() {
     Configuration c = new Configuration();
     final String fullName = "com.mycache.MyCache";

src/test/java/org/apache/ibatis/session/SqlSessionTest.java

@@ -35,7 +35,7 @@ public void shouldResolveBothSimpleNameAndFullyQualifiedName() {
     assertEquals(cache, c.getCache(shortName));
   }
 
-  @Test
+  @Test(expected=IllegalArgumentException.class)
   public void shouldFailOverToMostApplicableSimpleName() {
     Configuration c = new Configuration();
     final String fullName = "com.mycache.MyCache";

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

@@ -13,7 +13,7 @@
 import org.junit.Test;
 
 public class ShortNameTest {
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void getStatementByShortName() throws Exception {
         Configuration configuration = getConfiguration();
         // statement can be referenced by its short name.