Merge master into arg-name-based-constructor-automapping

Author: harawata

.github/workflows/ci.yaml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        java: [8, 11, 17, 18-ea, 19-ea]
+        java: [8, 11, 17, 18, 19-ea]
         distribution: ['zulu']
       fail-fast: false
       max-parallel: 4

pom.xml

@@ -166,7 +166,7 @@
     <dependency>
       <groupId>ch.qos.reload4j</groupId>
       <artifactId>reload4j</artifactId>
-      <version>1.2.19</version>
+      <version>1.2.20</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -210,7 +210,7 @@
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>2.1.210</version>
+      <version>2.1.212</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -259,19 +259,19 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>1.16.3</version>
+      <version>1.17.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>postgresql</artifactId>
-      <version>1.16.3</version>
+      <version>1.17.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>mysql</artifactId>
-      <version>1.16.3</version>
+      <version>1.17.0</version>
       <scope>test</scope>
     </dependency>
     <!-- For javadoc link -->
@@ -374,6 +374,16 @@
           </excludes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>animal-sniffer-maven-plugin</artifactId>
+        <configuration>
+          <ignores>
+            <!-- https://github.com/mojohaus/animal-sniffer/issues/67 -->
+            <ignore>java.lang.invoke.MethodHandle</ignore>
+          </ignores>
+        </configuration>
+      </plugin>
     </plugins>
 
     <resources>
@@ -415,6 +425,38 @@
         <excludedGroups />
       </properties>
     </profile>
+    <profile>
+      <id>pre16</id>
+      <activation>
+        <jdk>(,16)</jdk>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-compiler-plugin</artifactId>
+              <configuration>
+                <testExcludes>
+                  <testExclude>**/record_type/*.java</testExclude>
+                </testExcludes>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
+    <profile>
+      <id>16</id>
+      <activation>
+        <jdk>[16,)</jdk>
+      </activation>
+      <properties>
+        <maven.compiler.testTarget>16</maven.compiler.testTarget>
+        <maven.compiler.testSource>16</maven.compiler.testSource>
+        <excludedGroups>TestcontainersTests,RequireIllegalAccess</excludedGroups>
+      </properties>
+    </profile>
   </profiles>
 
 </project>

src/main/java/org/apache/ibatis/cache/decorators/BlockingCache.java

@@ -76,7 +76,7 @@ public Object getObject(Object key) {
 
   @Override
   public Object removeObject(Object key) {
-    // despite of its name, this method is called only to release locks
+    // despite its name, this method is called only to release locks
     releaseLock(key);
     return null;
   }

src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java

@@ -479,6 +479,8 @@ private PooledConnection popConnection(String username, String password) throws
                 state.wait(poolTimeToWait);
                 state.accumulatedWaitTime += System.currentTimeMillis() - wt;
               } catch (InterruptedException e) {
+                // set interrupt flag
+                Thread.currentThread().interrupt();
                 break;
               }
             }

src/main/java/org/apache/ibatis/executor/loader/cglib/CglibProxyFactory.java

@@ -41,7 +41,9 @@
 
 /**
  * @author Clinton Begin
+ * @deprecated Since 3.5.10, use Javassist instead.
  */
+@Deprecated
 public class CglibProxyFactory implements ProxyFactory {
 
   private static final String FINALIZE_METHOD = "finalize";
@@ -65,6 +67,7 @@ public Object createDeserializationProxy(Object target, Map<String, ResultLoader
   }
 
   static Object crateProxy(Class<?> type, Callback callback, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+    LogHolder.log.warn("CglibProxyFactory is deprecated. Use another proxy factory implementation.");
     Enhancer enhancer = new Enhancer();
     enhancer.setCallback(callback);
     enhancer.setSuperclass(type);

src/main/java/org/apache/ibatis/executor/loader/cglib/CglibSerialStateHolder.java

@@ -24,7 +24,9 @@
 
 /**
  * @author Eduardo Macarron
+ * @deprecated Since 3.5.10, use Javassist instead.
  */
+@Deprecated
 class CglibSerialStateHolder extends AbstractSerialStateHolder {
 
   private static final long serialVersionUID = 8940388717901644661L;

src/main/java/org/apache/ibatis/jdbc/SqlBuilder.java

@@ -20,6 +20,7 @@
  *
  * @author Jeff Butler
  */
+@Deprecated
 public class SqlBuilder {
 
   private static final ThreadLocal<SQL> localSQL = new ThreadLocal<>();

src/main/java/org/apache/ibatis/reflection/Reflector.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2021 the original author or authors.
+ *    Copyright 2009-2022 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.
@@ -15,6 +15,9 @@
  */
 package org.apache.ibatis.reflection;
 
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -50,6 +53,7 @@
  */
 public class Reflector {
 
+  private static final MethodHandle isRecordMethodHandle = getIsRecordMethodHandle();
   private final Class<?> type;
   private final String[] readablePropertyNames;
   private final String[] writablePropertyNames;
@@ -65,9 +69,13 @@ public Reflector(Class<?> clazz) {
     type = clazz;
     addDefaultConstructor(clazz);
     Method[] classMethods = getClassMethods(clazz);
-    addGetMethods(classMethods);
-    addSetMethods(classMethods);
-    addFields(clazz);
+    if (isRecord(type)) {
+      addRecordGetMethods(classMethods);
+    } else {
+      addGetMethods(classMethods);
+      addSetMethods(classMethods);
+      addFields(clazz);
+    }
     readablePropertyNames = getMethods.keySet().toArray(new String[0]);
     writablePropertyNames = setMethods.keySet().toArray(new String[0]);
     for (String propName : readablePropertyNames) {
@@ -78,6 +86,11 @@ public Reflector(Class<?> clazz) {
     }
   }
 
+  private void addRecordGetMethods(Method[] methods) {
+    Arrays.stream(methods).filter(m -> m.getParameterTypes().length == 0)
+      .forEach(m -> addGetMethod(m.getName(), m, false));
+  }
+
   private void addDefaultConstructor(Class<?> clazz) {
     Constructor<?>[] constructors = clazz.getDeclaredConstructors();
     Arrays.stream(constructors).filter(constructor -> constructor.getParameterTypes().length == 0)
@@ -445,4 +458,25 @@ public boolean hasGetter(String propertyName) {
   public String findPropertyName(String name) {
     return caseInsensitivePropertyMap.get(name.toUpperCase(Locale.ENGLISH));
   }
+
+  /**
+   * Class.isRecord() alternative for Java 15 and older.
+   */
+  private static boolean isRecord(Class<?> clazz) {
+    try {
+      return isRecordMethodHandle != null && (boolean)isRecordMethodHandle.invokeExact(clazz);
+    } catch (Throwable e) {
+      throw new ReflectionException("Failed to invoke 'Class.isRecord()'.", e);
+    }
+  }
+
+  private static MethodHandle getIsRecordMethodHandle() {
+    MethodHandles.Lookup lookup = MethodHandles.lookup();
+    MethodType mt = MethodType.methodType(boolean.class);
+    try {
+      return lookup.findVirtual(Class.class, "isRecord", mt);
+    } catch (NoSuchMethodException | IllegalAccessException e) {
+      return null;
+    }
+  }
 }

src/site/es/xdoc/configuration.xml

@@ -496,7 +496,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 Permite especificar qué herramienta de generación de proxys se usará para crear los objetos con capacidad de carga lazy.
               </td>
               <td>
-                CGLIB | JAVASSIST
+                CGLIB (deprecated since 3.5.10) | JAVASSIST
               </td>
               <td>
                 JAVASSIST (MyBatis 3.3 or above)

src/site/es/xdoc/dynamic-sql.xml

@@ -136,7 +136,7 @@ AND title like ‘someTitle’]]></source>
   where id=#{id}
 </update>]]></source>
   <p>En este caso, el elemento set  prefijará dinámicamente el valor SET y además eliminará todas las comas sobrantes que pudieran quedar tras las asignaciones de valor después de que se hayan aplicado las condiciones.</p>
-  <p>Si tienes curiosidad de qué aspecto tendría el elemento trim equivalente, aquí lo tienes:</p>
+  <p>Alternativamente, puede utilizar el elemento <em>trim</em> para obtener el mismo efecto:</p>
   <source><![CDATA[<trim prefix="SET" suffixOverrides=",">
   ...
 </trim>]]></source>