Fixes #121. @lang class is never registered.

Author: emacarron

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

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2013 the original author or authors.
+ *    Copyright 2009-2014 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.
@@ -505,33 +505,42 @@ public ResultMapping buildResultMapping(
         resultType, property, column, javaType, jdbcType, nestedSelect, 
         nestedResultMap, notNullColumn, columnPrefix, typeHandler, flags, null, null);
   }  
-  
-  /** Backward compatibility signature */
-    public MappedStatement addMappedStatement(
-      String id,
-      SqlSource sqlSource,
-      StatementType statementType,
-      SqlCommandType sqlCommandType,
-      Integer fetchSize,
-      Integer timeout,
-      String parameterMap,
-      Class<?> parameterType,
-      String resultMap,
-      Class<?> resultType,
-      ResultSetType resultSetType,
-      boolean flushCache,
-      boolean useCache,
-      boolean resultOrdered,
-      KeyGenerator keyGenerator,
-      String keyProperty,
-      String keyColumn,
-      String databaseId,
-      LanguageDriver lang) {
-      return addMappedStatement(
-        id, sqlSource, statementType, sqlCommandType, fetchSize, timeout, 
-        parameterMap, parameterType, resultMap, resultType, resultSetType, 
-        flushCache, useCache, resultOrdered, keyGenerator, keyProperty, 
-        keyColumn, databaseId, lang, null);
+
+  public LanguageDriver getLanguageDriver(Class<?> langClass) {
+    if (langClass != null) {
+      configuration.getLanguageRegistry().register(langClass);
+    } else {
+      langClass = configuration.getLanguageRegistry().getDefaultDriverClass();
     }
+    return configuration.getLanguageRegistry().getDriver(langClass);
+  }
+
+  /** Backward compatibility signature */
+  public MappedStatement addMappedStatement(
+    String id,
+    SqlSource sqlSource,
+    StatementType statementType,
+    SqlCommandType sqlCommandType,
+    Integer fetchSize,
+    Integer timeout,
+    String parameterMap,
+    Class<?> parameterType,
+    String resultMap,
+    Class<?> resultType,
+    ResultSetType resultSetType,
+    boolean flushCache,
+    boolean useCache,
+    boolean resultOrdered,
+    KeyGenerator keyGenerator,
+    String keyProperty,
+    String keyColumn,
+    String databaseId,
+    LanguageDriver lang) {
+    return addMappedStatement(
+      id, sqlSource, statementType, sqlCommandType, fetchSize, timeout, 
+      parameterMap, parameterType, resultMap, resultType, resultSetType, 
+      flushCache, useCache, resultOrdered, keyGenerator, keyProperty, 
+      keyColumn, databaseId, lang, null);
+  }
 
 }

src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2013 the original author or authors.
+ *    Copyright 2009-2014 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.
@@ -323,11 +323,11 @@ void parseStatement(Method method) {
 
   private LanguageDriver getLanguageDriver(Method method) {
     Lang lang = method.getAnnotation(Lang.class);
+    Class<?> langClass = null;
     if (lang != null) {
-      Class<?> languageDriverClass = lang.value();
-      return configuration.getLanguageRegistry().getDriver(languageDriverClass);
+      langClass = lang.value();
     }
-    return configuration.getLanguageRegistry().getDefaultDriver();
+    return assistant.getLanguageDriver(langClass);
   }
 
   private Class<?> getParameterType(Method method) {

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

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2013 the original author or authors.
+ *    Copyright 2009-2014 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.
@@ -177,17 +177,11 @@ private boolean databaseIdMatchesCurrent(String id, String databaseId, String re
   }
 
   private LanguageDriver getLanguageDriver(String lang) {
-    Class<?> langClass;
-    if (lang == null) {
-      langClass = configuration.getLanguageRegistry().getDefaultDriverClass();
-    } else {
+    Class<?> langClass = null;
+    if (lang != null) {
       langClass = resolveClass(lang);
-      configuration.getLanguageRegistry().register(langClass);
-    }
-    if (langClass == null) {
-      langClass = configuration.getLanguageRegistry().getDefaultDriverClass();
     }
-    return configuration.getLanguageRegistry().getDriver(langClass);
+    return builderAssistant.getLanguageDriver(langClass);
   }
 
 }