Merge branch 'feat/followup' into 3.x

Author: GangCheng

mybatis-r2dbc-generator/src/main/java/pro/chenggang/project/reactive/mybatis/support/generator/core/MybatisDynamicCodeGenerator.java

@@ -32,7 +32,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Consumer;
 
 /**
  * The Mybatis dynamic code generator builder.
@@ -43,6 +45,7 @@
 public class MybatisDynamicCodeGenerator {
 
     private final ContextGeneratorFactory contextGeneratorFactory = new ContextGeneratorFactory();
+    private Consumer<Configuration> configurationCustomizer;
 
     private MybatisDynamicCodeGenerator() {
 
@@ -105,13 +108,27 @@ public static MybatisDynamicCodeGenerator withYamlConfiguration(String configura
         return new MybatisDynamicCodeGenerator(new YamlGeneratorPropertiesLoader(configurationFileName));
     }
 
+    /**
+     * Customize configuration mybatis dynamic code generator.
+     *
+     * @param configurationCustomizer the configuration customizer
+     * @return the mybatis dynamic code generator
+     */
+    public MybatisDynamicCodeGenerator customizeConfiguration(Consumer<Configuration> configurationCustomizer) {
+        this.configurationCustomizer = configurationCustomizer;
+        return this;
+    }
+
     /**
      * Execute generate action.
      */
     public void generate() {
         GeneratorProperties generatorProperties = GeneratorPropertiesHolder.getInstance().getGeneratorProperties();
         generatorProperties.validate();
         Configuration configuration = this.getConfiguration(generatorProperties);
+        if (Objects.nonNull(this.configurationCustomizer)) {
+            this.configurationCustomizer.accept(configuration);
+        }
         DefaultShellCallback callback = new DefaultShellCallback(generatorProperties.isOverwrite());
         List<String> warnings = new ArrayList<>();
         try {

mybatis-r2dbc/src/main/java/pro/chenggang/project/reactive/mybatis/support/r2dbc/executor/placeholder/defaults/DefaultPlaceholderFormatter.java

@@ -17,12 +17,16 @@
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.RemovalCause;
+import com.github.benmanes.caffeine.cache.RemovalListener;
+import com.github.benmanes.caffeine.cache.Scheduler;
 import io.r2dbc.spi.ConnectionMetadata;
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.ParameterMapping;
 import org.apache.ibatis.util.MapUtil;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import pro.chenggang.project.reactive.mybatis.support.r2dbc.executor.placeholder.PlaceholderDialect;
 import pro.chenggang.project.reactive.mybatis.support.r2dbc.executor.placeholder.PlaceholderDialectRegistry;
 import pro.chenggang.project.reactive.mybatis.support.r2dbc.executor.placeholder.PlaceholderFormatter;
@@ -60,6 +64,9 @@ public DefaultPlaceholderFormatter(PlaceholderDialectRegistry placeholderDialect
                     .maximumSize(sqlCacheMaxSize)
                     .expireAfterAccess(sqlCacheExpireDuration)
                     .initialCapacity(10)
+                    .evictionListener(new CacheRemovalListener("eviction", placeholderDialectType.getSimpleName()))
+                    .removalListener(new CacheRemovalListener("removal", placeholderDialectType.getSimpleName()))
+                    .scheduler(Scheduler.systemScheduler())
                     .build();
             this.formattedSqlCache.put(placeholderDialectType, cache);
         }
@@ -145,4 +152,20 @@ protected String formatPlaceholderInternal(PlaceholderDialect placeholderDialect
         return builder.toString();
     }
 
+    private static class CacheRemovalListener implements RemovalListener<String, String> {
+
+        private final String listenerType;
+        private final String dialectType;
+
+        private CacheRemovalListener(String listenerType, String dialectType) {
+            this.listenerType = listenerType;
+            this.dialectType = dialectType;
+        }
+
+        @Override
+        public void onRemoval(@Nullable String key, @Nullable String value, RemovalCause cause) {
+            log.debug("Placeholder(" + dialectType + ") cache " + listenerType + " triggered according to " + cause);
+            log.trace("Key : " + key + "\nValue : " + value);
+        }
+    }
 }

mybatis-r2dbc/src/main/java/pro/chenggang/project/reactive/mybatis/support/r2dbc/executor/result/handler/DefaultReactiveResultHandler.java

@@ -558,8 +558,18 @@ private Object applyConstructorAutomapping(ReadableResultWrapper<? extends Reada
 
     private boolean applyColumnOrderBasedConstructorAutomapping(ReadableResultWrapper<? extends Readable> readableResultWrapper, List<Class<?>> constructorArgTypes,
                                                                 List<Object> constructorArgs, Constructor<?> constructor, boolean foundValues) throws SQLException {
-        for (int i = 0; i < constructor.getParameterTypes().length; i++) {
-            Class<?> parameterType = constructor.getParameterTypes()[i];
+        Class<?>[] parameterTypes = constructor.getParameterTypes();
+        if (parameterTypes.length > readableResultWrapper.getClassNames().size()) {
+            throw new ExecutorException(MessageFormat.format(
+                    "Constructor auto-mapping of ''{0}'' failed. " +
+                            "The constructor takes ''{1}'' arguments, but there are only ''{2}'' columns in the result set.",
+                    constructor,
+                    parameterTypes.length,
+                    readableResultWrapper.getClassNames().size()
+            ));
+        }
+        for (int i = 0; i < parameterTypes.length; i++) {
+            Class<?> parameterType = parameterTypes[i];
             String columnName = readableResultWrapper.getColumnNames().get(i);
             final TypeHandler<?> typeHandler = readableResultWrapper.getTypeHandler(parameterType, columnName);
             ((TypeHandleContext) this.delegatedTypeHandler).contextWith(parameterType,typeHandler,

mybatis-r2dbc/src/main/java/pro/chenggang/project/reactive/mybatis/support/r2dbc/mapping/R2dbcVendorDatabaseIdProvider.java

@@ -17,8 +17,6 @@
 
 import io.r2dbc.spi.ConnectionFactory;
 import org.apache.ibatis.builder.BuilderException;
-import org.apache.ibatis.logging.Log;
-import org.apache.ibatis.logging.LogFactory;
 
 import java.sql.SQLException;
 import java.util.Map;
@@ -37,41 +35,37 @@
  */
 public class R2dbcVendorDatabaseIdProvider implements R2dbcDatabaseIdProvider {
 
-  private Properties properties;
+    private Properties properties;
 
-  @Override
-  public String getDatabaseId(ConnectionFactory connectionFactory) {
-    if (connectionFactory == null) {
-      throw new NullPointerException("dataSource cannot be null");
-    }
-    try {
-      return getDatabaseName(connectionFactory);
-    } catch (SQLException e) {
-      throw new BuilderException("Error occurred when getting DB product name.", e);
+    @Override
+    public String getDatabaseId(ConnectionFactory connectionFactory) {
+        if (connectionFactory == null) {
+            throw new NullPointerException("dataSource cannot be null");
+        }
+        try {
+            return getDatabaseName(connectionFactory);
+        } catch (SQLException e) {
+            throw new BuilderException("Error occurred when getting DB product name.", e);
+        }
     }
-  }
 
-  @Override
-  public void setProperties(Properties p) {
-    this.properties = p;
-  }
+    @Override
+    public void setProperties(Properties p) {
+        this.properties = p;
+    }
 
-  protected String getDatabaseName(ConnectionFactory connectionFactory) throws SQLException {
-    String productName = connectionFactory.getMetadata().getName();
-    if (this.properties != null) {
-      for (Map.Entry<Object, Object> property : properties.entrySet()) {
-        if (productName.contains((String) property.getKey())) {
-          return (String) property.getValue();
+    protected String getDatabaseName(ConnectionFactory connectionFactory) throws SQLException {
+        String productName = connectionFactory.getMetadata().getName();
+        if (properties == null || properties.isEmpty()) {
+            return productName;
+        }
+        for (Map.Entry<Object, Object> property : properties.entrySet()) {
+            if (productName.contains((String) property.getKey())) {
+                return (String) property.getValue();
+            }
         }
-      }
-      // no match, return null
-      return null;
+        // no match, return null
+        return null;
     }
-    return productName;
-  }
-
-  private static class LogHolder {
-    private static final Log log = LogFactory.getLog(R2dbcVendorDatabaseIdProvider.class);
-  }
 
 }

pom.xml

@@ -74,7 +74,7 @@
         <r2dbc-postgresql.version>1.0.7.RELEASE</r2dbc-postgresql.version>
         <r2dbc-mssql.version>1.0.2.RELEASE</r2dbc-mssql.version>
         <oracle-r2dbc.version>1.2.0</oracle-r2dbc.version>
-        <mybatis.version>3.5.16</mybatis.version>
+        <mybatis.version>3.5.19</mybatis.version>
         <mybatis-spring.version>3.0.4</mybatis-spring.version>
         <mybatis-freemarker.version>1.3.0</mybatis-freemarker.version>
         <mybatis-velocity.version>2.3.0</mybatis-velocity.version>
@@ -87,7 +87,7 @@
         <junit-jupiter.version>5.10.0</junit-jupiter.version>
         <testcontainers.version>1.20.3</testcontainers.version>
         <assertj.version>3.24.2</assertj.version>
-        <byte-buddy.version>1.15.7</byte-buddy.version>
+        <byte-buddy.version>1.15.11</byte-buddy.version>
         <caffeine.version>3.1.8</caffeine.version>
         <license-maven-plugin.version>4.3</license-maven-plugin.version>
         <slf4j.version>2.0.10</slf4j.version>