Merge pull request #2 from mybatis/master

update...

Author: peterchenhdu

.travis.yml

@@ -2,9 +2,10 @@ language: java
 
 jdk:
   - openjdk-ea
+  - openjdk13
   - openjdk12
-  - oraclejdk11
-  - oraclejdk8
+  - openjdk11
+  - openjdk8
 
 services:
   - docker
@@ -24,3 +25,9 @@ env:
   global:
     - secure: "jWLfOryabB89R5v7nD3V/8ke6+B26UW8E5wjwKj7dDhjfmGUg+KbOShqWrq4\nEAnyE4GltwDLxKErZ5aAPWcT47C3GJYocKtmTcec2sblqMdVVUd3udylrM1d\n66Yb0XZoqri9JJ9pb8ObDp5XRV+ZQ5xP0w1gboNY6SynJg/1FKk="
     - secure: "UV14rAITDqou5jObPInlIS3IYdf45LihGal9/+C4TLyhXLaVktbT/arFAAIF\ndpv9OM+YgeA7ZeRZLJ8vbgipO+rxizPNL1DqK1rp9s5B2F2y9+ir47nTwayL\n0RN7TgdswjzZZKOukWF2CVK1hjk+n8iFkCrorU22trmXlHc0aoE="
+
+addons:
+  sonarcloud:
+    organization: "mybatis"
+    token:
+      secure: "O1r6kWWgCPGgzw0L3yvC0J21p2ge3d6g80IfnFb1HYk46vd7XMNyqFnlPMLftLPEiC3R+f5u+tLWcRuutCCmRllbFuKgh++Jt0RZzfSm/xcdcr6V92zt8LQKIKJZH2hwalwzVQdI2xebdkltO2HyE+QVbhnpm9bQDklZKR7t1IQ="

README.md

@@ -4,7 +4,7 @@ MyBatis SQL Mapper Framework for Java
 [![Build Status](https://travis-ci.org/mybatis/mybatis-3.svg?branch=master)](https://travis-ci.org/mybatis/mybatis-3)
 [![Coverage Status](https://coveralls.io/repos/mybatis/mybatis-3/badge.svg?branch=master&service=github)](https://coveralls.io/github/mybatis/mybatis-3?branch=master)
 [![Maven central](https://maven-badges.herokuapp.com/maven-central/org.mybatis/mybatis/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.mybatis/mybatis)
-[![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/https/oss.sonatype.org/org.mybatis/mybatis.svg)](https://oss.sonatype.org/content/repositories/snapshots/org/mybatis/mybatis)
+[![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/https/oss.sonatype.org/org.mybatis/mybatis.svg)](https://oss.sonatype.org/content/repositories/snapshots/org/mybatis/mybatis/)
 [![License](http://img.shields.io/:license-apache-brightgreen.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
 [![Stack Overflow](http://img.shields.io/:stack%20overflow-mybatis-brightgreen.svg)](http://stackoverflow.com/questions/tagged/mybatis)
 [![Project Stats](https://www.openhub.net/p/mybatis/widgets/project_thin_badge.gif)](https://www.openhub.net/p/mybatis)

pom.xml

@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>mybatis</artifactId>
-  <version>3.5.2-SNAPSHOT</version>
+  <version>3.5.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>mybatis</name>
@@ -140,35 +140,35 @@
     <osgi.dynamicImport>*</osgi.dynamicImport>
     <spotbugs.onlyAnalyze>org.apache.ibatis.*</spotbugs.onlyAnalyze>
 
-    <!-- Remove after parent 32 (support for jdk 13) -->
-    <jacoco.version>0.8.4</jacoco.version>
+    <!-- Remove after parent 32 (support for jdk 13 and 14) -->
+    <jacoco.version>0.8.5</jacoco.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>ognl</groupId>
       <artifactId>ognl</artifactId>
-      <version>3.2.10</version>
+      <version>3.2.12</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.javassist</groupId>
       <artifactId>javassist</artifactId>
-      <version>3.24.1-GA</version>
+      <version>3.26.0-GA</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.26</version>
+      <version>1.7.30</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.26</version>
+      <version>1.7.30</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -180,7 +180,7 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
-      <version>2.11.2</version>
+      <version>2.13.0</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -192,21 +192,21 @@
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib</artifactId>
-      <version>3.2.10</version>
+      <version>3.3.0</version>
       <optional>true</optional>
     </dependency>
 
     <!-- Test dependencies -->
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.4.1</version>
+      <version>5.5.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>2.4.1</version>
+      <version>2.5.0</version>
       <scope>test</scope>
     </dependency>
     <dependency> <!-- 10.15+ need Java 9+ -->
@@ -218,62 +218,62 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.25.1</version>
+      <version>3.2.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>
-      <version>2.25.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
-      <version>2.6.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.transaction</groupId>
-      <artifactId>javax.transaction-api</artifactId>
-      <version>1.3</version>
+      <version>3.2.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity-engine-core</artifactId>
-      <version>2.0</version>
+      <version>2.1</version>
       <scope>test</scope>
     </dependency>
     <!-- postgresql driver is required to run the refcursor tests -->
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.2.5</version>
+      <version>42.2.9</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>8.0.18</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.12.2</version>
+      <version>3.14.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>eu.codearte.catch-exception</groupId>
       <artifactId>catch-exception</artifactId>
-      <version>1.4.6</version>
+      <version>2.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>1.11.2</version>
+      <version>1.12.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>postgresql</artifactId>
-      <version>1.11.2</version>
+      <version>1.12.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>mysql</artifactId>
+      <version>1.12.4</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

src/main/java/org/apache/ibatis/annotations/Arg.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2018 the original author or authors.
+ *    Copyright 2009-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.
@@ -16,6 +16,8 @@
 package org.apache.ibatis.annotations;
 
 import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -25,29 +27,78 @@
 import org.apache.ibatis.type.UnknownTypeHandler;
 
 /**
+ * The annotation that specify a mapping definition for the constructor argument.
+ *
+ * @see ConstructorArgs
  * @author Clinton Begin
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target({})
+@Target(ElementType.METHOD)
+@Repeatable(ConstructorArgs.class)
 public @interface Arg {
+
+  /**
+   * Returns whether id column or not.
+   *
+   * @return {@code true} if id column; {@code false} if otherwise
+   */
   boolean id() default false;
 
+  /**
+   * Return the column name(or column label) to map to this argument.
+   *
+   * @return the column name(or column label)
+   */
   String column() default "";
 
+  /**
+   * Return the java type for this argument.
+   *
+   * @return the java type
+   */
   Class<?> javaType() default void.class;
 
+  /**
+   * Return the jdbc type for column that map to this argument.
+   *
+   * @return the jdbc type
+   */
   JdbcType jdbcType() default JdbcType.UNDEFINED;
 
+  /**
+   * Returns the {@link TypeHandler} type for retrieving a column value from result set.
+   *
+   * @return the {@link TypeHandler} type
+   */
   Class<? extends TypeHandler> typeHandler() default UnknownTypeHandler.class;
 
+  /**
+   * Return the statement id for retrieving a object that map to this argument.
+   *
+   * @return the statement id
+   */
   String select() default "";
 
+  /**
+   * Returns the result map id for mapping to a object that map to this argument.
+   *
+   * @return the result map id
+   */
   String resultMap() default "";
 
+  /**
+   * Returns the parameter name for applying this mapping.
+   *
+   * @return the parameter name
+   * @since 3.4.3
+   */
   String name() default "";
 
   /**
+   * Returns the column prefix that use when applying {@link #resultMap()}.
+   *
+   * @return the column prefix
    * @since 3.5.0
    */
   String columnPrefix() default "";

src/main/java/org/apache/ibatis/annotations/AutomapConstructor.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2017 the original author or authors.
+ *    Copyright 2009-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,26 @@
 /**
  * The marker annotation that indicate a constructor for automatic mapping.
  *
+ * <p><br>
+ * <b>How to use:</b>
+ * <pre>
+ * public class User {
+ *
+ *   private int id;
+ *   private String name;
+ *
+ *   public User(int id) {
+ *     this.id = id;
+ *   }
+ *
+ *   &#064;AutomapConstructor
+ *   public User(int id, String name) {
+ *     this.id = id;
+ *     this.name = name;
+ *   }
+ *   // ...
+ * }
+ * </pre>
  * @author Tim Chen
  * @since 3.4.3
  */