Compatibility with core 3.6.0

pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2018-2025 the original author or authors.
+       Copyright 2018-2026 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.
@@ -71,7 +71,7 @@
     <java.release.version>11</java.release.version>
 
     <!-- Dependencies artifact version -->
-    <mybatis.version>3.5.19</mybatis.version>
+    <mybatis.version>3.6.0-SNAPSHOT</mybatis.version>
     <thymeleaf.version>3.1.3.RELEASE</thymeleaf.version>
 
     <!-- Dependencies plugin version -->
@@ -214,4 +214,12 @@
     </profile>
   </profiles>
 
+  <repositories>
+    <repository>
+      <id>sonatype-oss-snapshots</id>
+      <name>Sonatype OSS Snapshots Repository</name>
+      <url>https://central.sonatype.com/repository/maven-snapshots/</url>
+    </repository>
+  </repositories>
+
 </project>

src/main/java/org/mybatis/scripting/thymeleaf/ThymeleafLanguageDriver.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2018-2022 the original author or authors.
+ *    Copyright 2018-2026 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.
@@ -20,6 +20,7 @@
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.SqlSource;
 import org.apache.ibatis.parsing.XNode;
+import org.apache.ibatis.reflection.ParamNameResolver;
 import org.apache.ibatis.scripting.LanguageDriver;
 import org.apache.ibatis.scripting.defaults.DefaultParameterHandler;
 import org.apache.ibatis.session.Configuration;
@@ -84,15 +85,27 @@ public ParameterHandler createParameterHandler(MappedStatement mappedStatement,
    */
   @Override
   public SqlSource createSqlSource(Configuration configuration, XNode script, Class<?> parameterType) {
-    return createSqlSource(configuration, script.getNode().getTextContent(), parameterType);
+    return createSqlSource(configuration, script.getNode().getTextContent(), parameterType, null);
   }
 
   /**
    * {@inheritDoc}
    */
   @Override
   public SqlSource createSqlSource(Configuration configuration, String script, Class<?> parameterType) {
-    return new ThymeleafSqlSource(configuration, sqlGenerator, script.trim(), parameterType);
+    return createSqlSource(configuration, script, parameterType, null);
+  }
+
+  @Override
+  public SqlSource createSqlSource(Configuration configuration, XNode script, Class<?> parameterType,
+      ParamNameResolver paramNameResolver) {
+    return createSqlSource(configuration, script.getNode().getTextContent(), parameterType, paramNameResolver);
+  }
+
+  @Override
+  public SqlSource createSqlSource(Configuration configuration, String script, Class<?> parameterType,
+      ParamNameResolver paramNameResolver) {
+    return new ThymeleafSqlSource(configuration, sqlGenerator, script.trim(), parameterType, paramNameResolver);
   }
 
 }

src/main/java/org/mybatis/scripting/thymeleaf/ThymeleafSqlSource.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2018-2022 the original author or authors.
+ *    Copyright 2018-2026 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.
@@ -16,20 +16,27 @@
 package org.mybatis.scripting.thymeleaf;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
 import java.util.function.BiFunction;
 
+import org.apache.ibatis.builder.ParameterMappingTokenHandler;
 import org.apache.ibatis.builder.SqlSourceBuilder;
 import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.ParameterMapping;
 import org.apache.ibatis.mapping.SqlSource;
+import org.apache.ibatis.parsing.GenericTokenParser;
 import org.apache.ibatis.reflection.MetaClass;
+import org.apache.ibatis.reflection.ParamNameResolver;
 import org.apache.ibatis.scripting.xmltags.DynamicContext;
 import org.apache.ibatis.session.Configuration;
 import org.thymeleaf.context.IContext;
@@ -53,9 +60,9 @@ private static class TemporaryTakeoverKeys {
 
   private final Configuration configuration;
   private final SqlGenerator sqlGenerator;
-  private final SqlSourceBuilder sqlSourceBuilder;
   private final String sqlTemplate;
   private final Class<?> parameterType;
+  private final ParamNameResolver paramNameResolver;
 
   /**
    * Constructor for for integrating with template engine provide by Thymeleaf.
@@ -69,13 +76,23 @@ private static class TemporaryTakeoverKeys {
    * @param parameterType
    *          A parameter type that specified at mapper method argument or xml element
    */
+  ThymeleafSqlSource(Configuration configuration, SqlGenerator sqlGenerator, String sqlTemplate, Class<?> parameterType,
+      ParamNameResolver paramNameResolver) {
+    this.configuration = configuration;
+    this.sqlGenerator = sqlGenerator;
+    this.sqlTemplate = sqlTemplate;
+    this.parameterType = parameterType;
+    this.paramNameResolver = paramNameResolver;
+  }
+
+  @Deprecated
   ThymeleafSqlSource(Configuration configuration, SqlGenerator sqlGenerator, String sqlTemplate,
       Class<?> parameterType) {
     this.configuration = configuration;
     this.sqlGenerator = sqlGenerator;
     this.sqlTemplate = sqlTemplate;
     this.parameterType = parameterType;
-    this.sqlSourceBuilder = new SqlSourceBuilder(configuration);
+    this.paramNameResolver = null;
   }
 
   /**
@@ -90,20 +107,33 @@ public BoundSql getBoundSql(Object parameterObject) {
       processingParameterType = parameterType;
     }
 
-    DynamicContext dynamicContext = new DynamicContext(configuration, parameterObject);
-    Map<String, Object> customVariables = dynamicContext.getBindings();
+    Map<String, Object> bindings = new HashMap<>();
+    bindings.put(DynamicContext.PARAMETER_OBJECT_KEY, parameterObject);
+    bindings.put(DynamicContext.DATABASE_ID_KEY, configuration.getDatabaseId());
+
+    Map<String, Object> customVariables = bindings;
     customVariables.put(TemporaryTakeoverKeys.CONFIGURATION, configuration);
-    customVariables.put(TemporaryTakeoverKeys.DYNAMIC_CONTEXT, dynamicContext);
+    customVariables.put(TemporaryTakeoverKeys.DYNAMIC_CONTEXT, bindings);
     customVariables.put(TemporaryTakeoverKeys.PROCESSING_PARAMETER_TYPE, processingParameterType);
-    String sql = sqlGenerator.generate(sqlTemplate, parameterObject, dynamicContext::bind, customVariables);
+    String sql = sqlGenerator.generate(sqlTemplate, parameterObject, bindings::put, customVariables);
 
-    SqlSource sqlSource = sqlSourceBuilder.parse(sql, processingParameterType, dynamicContext.getBindings());
+    SqlSource sqlSource = parse(configuration, sql, parameterObject, bindings, paramNameResolver);
     BoundSql boundSql = sqlSource.getBoundSql(parameterObject);
-    dynamicContext.getBindings().forEach(boundSql::setAdditionalParameter);
+    bindings.forEach(boundSql::setAdditionalParameter);
 
     return boundSql;
   }
 
+  private static SqlSource parse(Configuration configuration, String originalSql, Object parameterObject,
+      Map<String, Object> additionalParameters, ParamNameResolver pnResolver) {
+    Class<?> parameterType = parameterObject == null ? Object.class : parameterObject.getClass();
+    List<ParameterMapping> parameterMappings = new ArrayList<>();
+    ParameterMappingTokenHandler handler = new ParameterMappingTokenHandler(parameterMappings, configuration,
+        parameterObject, parameterType, additionalParameters, pnResolver, false);
+    GenericTokenParser parser = new GenericTokenParser("#{", "}", handler);
+    return SqlSourceBuilder.buildSqlSource(configuration, parser.parse(originalSql), parameterMappings);
+  }
+
   /**
    * The factory class for Thymeleaf's context.
    *
@@ -116,20 +146,20 @@ static class ContextFactory implements BiFunction<Object, Map<String, Object>, I
     @Override
     public IContext apply(Object parameter, Map<String, Object> customVariable) {
       Configuration configuration = (Configuration) customVariable.remove(TemporaryTakeoverKeys.CONFIGURATION);
-      DynamicContext dynamicContext = (DynamicContext) customVariable.remove(TemporaryTakeoverKeys.DYNAMIC_CONTEXT);
+      Map<String, Object> bindings = (Map<String, Object>) customVariable.remove(TemporaryTakeoverKeys.DYNAMIC_CONTEXT);
       Class<?> processingParameterType = (Class<?>) customVariable
           .remove(TemporaryTakeoverKeys.PROCESSING_PARAMETER_TYPE);
       MyBatisBindingContext bindingContext = new MyBatisBindingContext(
           parameter != null && configuration.getTypeHandlerRegistry().hasTypeHandler(processingParameterType));
-      dynamicContext.bind(MyBatisBindingContext.CONTEXT_VARIABLE_NAME, bindingContext);
+      bindings.put(MyBatisBindingContext.CONTEXT_VARIABLE_NAME, bindingContext);
       IContext context;
       if (parameter instanceof Map) {
         @SuppressWarnings(value = "unchecked")
         Map<String, Object> map = (Map<String, Object>) parameter;
-        context = new MapBasedContext(map, dynamicContext, configuration.getVariables());
+        context = new MapBasedContext(map, bindings, configuration.getVariables());
       } else {
         MetaClass metaClass = MetaClass.forClass(processingParameterType, configuration.getReflectorFactory());
-        context = new MetaClassBasedContext(parameter, metaClass, processingParameterType, dynamicContext,
+        context = new MetaClassBasedContext(parameter, metaClass, processingParameterType, bindings,
             configuration.getVariables());
       }
       return context;
@@ -138,15 +168,15 @@ public IContext apply(Object parameter, Map<String, Object> customVariable) {
 
   private abstract static class AbstractContext implements IContext {
 
-    private final DynamicContext dynamicContext;
+    private final Map<String, Object> dynamicContext;
     private final Properties configurationProperties;
     private final Set<String> variableNames;
 
-    private AbstractContext(DynamicContext dynamicContext, Properties configurationProperties) {
+    private AbstractContext(Map<String, Object> dynamicContext, Properties configurationProperties) {
       this.dynamicContext = dynamicContext;
       this.configurationProperties = configurationProperties;
       this.variableNames = new HashSet<>();
-      addVariableNames(dynamicContext.getBindings().keySet());
+      addVariableNames(dynamicContext.keySet());
       Optional.ofNullable(configurationProperties).ifPresent(v -> addVariableNames(v.stringPropertyNames()));
     }
 
@@ -183,8 +213,8 @@ public Set<String> getVariableNames() {
      */
     @Override
     public Object getVariable(String name) {
-      if (dynamicContext.getBindings().containsKey(name)) {
-        return dynamicContext.getBindings().get(name);
+      if (dynamicContext.containsKey(name)) {
+        return dynamicContext.get(name);
       }
       if (configurationProperties != null && configurationProperties.containsKey(name)) {
         return configurationProperties.getProperty(name);
@@ -200,7 +230,7 @@ private static class MapBasedContext extends AbstractContext {
 
     private final Map<String, Object> variables;
 
-    private MapBasedContext(Map<String, Object> parameterMap, DynamicContext dynamicContext,
+    private MapBasedContext(Map<String, Object> parameterMap, Map<String, Object> dynamicContext,
         Properties configurationProperties) {
       super(dynamicContext, configurationProperties);
       this.variables = parameterMap;
@@ -224,7 +254,7 @@ private static class MetaClassBasedContext extends AbstractContext {
     private final Class<?> parameterType;
 
     private MetaClassBasedContext(Object parameterObject, MetaClass parameterMetaClass, Class<?> parameterType,
-        DynamicContext dynamicContext, Properties configurationProperties) {
+        Map<String, Object> dynamicContext, Properties configurationProperties) {
       super(dynamicContext, configurationProperties);
       this.parameterObject = parameterObject;
       this.parameterMetaClass = parameterMetaClass;