Polishing gh-44

Author: kazuki43zoo

src/main/java/org/mybatis/scripting/freemarker/FreeMarkerLanguageDriver.java

@@ -138,7 +138,7 @@ public SqlSource createSqlSource(Configuration configuration, String script, Cla
   }
 
   protected SqlSource createSqlSource(Template template, Configuration configuration) {
-    return new FreeMarkerSqlSource(template, configuration);
+    return new FreeMarkerSqlSource(template, configuration, driverConfig.getIncompatibleImprovementsVersion());
   }
 
   private SqlSource createSqlSource(Configuration configuration, String scriptText) {

src/main/java/org/mybatis/scripting/freemarker/FreeMarkerSqlSource.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2015-2018 the original author or authors.
+ *    Copyright 2015-2019 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.
@@ -24,6 +24,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import freemarker.template.Version;
 import org.apache.ibatis.builder.SqlSourceBuilder;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.SqlSource;
@@ -38,12 +39,14 @@
 public class FreeMarkerSqlSource implements SqlSource {
   private final Template template;
   private final Configuration configuration;
+  private final Version incompatibleImprovementsVersion;
 
   public static final String GENERATED_PARAMS_KEY = "__GENERATED__";
 
-  public FreeMarkerSqlSource(Template template, Configuration configuration) {
+  public FreeMarkerSqlSource(Template template, Configuration configuration, Version incompatibleImprovementsVersion) {
     this.template = template;
     this.configuration = configuration;
+    this.incompatibleImprovementsVersion = incompatibleImprovementsVersion;
   }
 
   /**
@@ -72,7 +75,8 @@ public BoundSql getBoundSql(Object parameterObject) {
         map.put(GENERATED_PARAMS_KEY, generatedParams);
         dataContext = preProcessDataContext(map, true);
       } else {
-        ParamObjectAdapter adapter = new ParamObjectAdapter(parameterObject, generatedParams);
+        ParamObjectAdapter adapter = new ParamObjectAdapter(parameterObject, generatedParams,
+            incompatibleImprovementsVersion);
         dataContext = preProcessDataContext(adapter, false);
       }
     } else {

src/main/java/org/mybatis/scripting/freemarker/ParamObjectAdapter.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2015-2018 the original author or authors.
+ *    Copyright 2015-2019 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.
@@ -17,10 +17,10 @@
 
 import freemarker.ext.beans.BeanModel;
 import freemarker.ext.beans.BeansWrapperBuilder;
-import freemarker.template.Configuration;
 import freemarker.template.TemplateHashModel;
 import freemarker.template.TemplateModel;
 import freemarker.template.TemplateModelException;
+import freemarker.template.Version;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -36,8 +36,8 @@ public class ParamObjectAdapter implements TemplateHashModel {
   private final ArrayList generatedParams;
   private HashMap<String, TemplateModel> additionalParams;
 
-  public ParamObjectAdapter(Object paramObject, ArrayList generatedParams) {
-    beanModel = new BeanModel(paramObject, new BeansWrapperBuilder(Configuration.VERSION_2_3_22).build());
+  public ParamObjectAdapter(Object paramObject, ArrayList generatedParams, Version incompatibleImprovementsVersion) {
+    beanModel = new BeanModel(paramObject, new BeansWrapperBuilder(incompatibleImprovementsVersion).build());
     this.generatedParams = generatedParams;
   }
 

src/test/java/org/mybatis/scripting/freemarker/CustomizedDataContextTest.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2015-2018 the original author or authors.
+ *    Copyright 2015-2019 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.
@@ -17,6 +17,7 @@
 
 import freemarker.template.SimpleScalar;
 import freemarker.template.Template;
+import freemarker.template.Version;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.jdbc.ScriptRunner;
 import org.apache.ibatis.mapping.Environment;
@@ -74,8 +75,8 @@ public static void setUp() throws Exception {
   }
 
   public static class CustomSqlSource extends FreeMarkerSqlSource {
-    public CustomSqlSource(Template template, Configuration configuration) {
-      super(template, configuration);
+    public CustomSqlSource(Template template, Configuration configuration, Version version) {
+      super(template, configuration, version);
     }
 
     @Override
@@ -93,7 +94,7 @@ protected Object preProcessDataContext(Object dataContext, boolean isMap) {
   public static class CustomFreeMarkerLanguageDriver extends FreeMarkerLanguageDriver {
     @Override
     protected SqlSource createSqlSource(Template template, Configuration configuration) {
-      return new CustomSqlSource(template, configuration);
+      return new CustomSqlSource(template, configuration, driverConfig.getIncompatibleImprovementsVersion());
     }
   }