Merge pull request #1 from mybatis/master

feat: pull update

Author: xdshent

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*.{java, xml, sql}]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true

.travis.yml

@@ -1,9 +1,17 @@
 language: java
 
 jdk:
+  - openjdk12
   - oraclejdk11
   - oraclejdk8
 
+services:
+  - docker
+
+cache:
+  directories:
+    - $HOME/.m2
+
 before_install:
   - echo "MAVEN_OPTS='-Dlicense.skip=true'" > ~/.mavenrc
 

ISSUE_TEMPLATE.md

@@ -3,10 +3,13 @@
 ⭕️ 请将您的问题发送到邮件列表
 請用英文寫
 https://groups.google.com/group/mybatis-user
+或
+https://stackoverflow.com/questions/ask?tags=mybatis
 
 Question?
 ======================
 Please use the mailing list. http://groups.google.com/group/mybatis-user
+Or Stack Overflow with 'mybatis' tag. https://stackoverflow.com/questions/ask?tags=mybatis
 Questions on this tracker will be closed without comment.
 
 Bug report?

README.md

@@ -4,6 +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)
 [![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.1-SNAPSHOT</version>
+  <version>3.5.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>mybatis</name>
@@ -132,7 +132,7 @@
 
   <properties>
     <clirr.comparisonVersion>3.4.6</clirr.comparisonVersion>
-    <excludedGroups>EmbeddedPostgresqlTests</excludedGroups>
+    <excludedGroups>TestcontainersTests</excludedGroups>
     <maven.compiler.testCompilerArgument>-parameters</maven.compiler.testCompilerArgument>
     <module.name>org.mybatis</module.name>
     <osgi.export>org.apache.ibatis.*;version=${project.version};-noimport:=true</osgi.export>
@@ -159,13 +159,13 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.25</version>
+      <version>1.7.26</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.25</version>
+      <version>1.7.26</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -177,7 +177,7 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
-      <version>2.11.1</version>
+      <version>2.11.2</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -197,7 +197,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.3.2</version>
+      <version>5.4.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -206,7 +206,7 @@
       <version>2.4.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
+    <dependency> <!-- 10.15+ need Java 9+ -->
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
       <version>10.14.2.0</version>
@@ -215,19 +215,19 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.23.4</version>
+      <version>2.25.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>
-      <version>2.23.4</version>
+      <version>2.25.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-dbcp2</artifactId>
-      <version>2.5.0</version>
+      <version>2.6.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -252,7 +252,7 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.11.1</version>
+      <version>3.12.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -262,9 +262,15 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>ru.yandex.qatools.embed</groupId>
-      <artifactId>postgresql-embedded</artifactId>
-      <version>2.10</version>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>1.11.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>1.11.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2016 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.
@@ -28,7 +28,33 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface DeleteProvider {
+
+  /**
+   * Specify a type that implements an SQL provider method.
+   *
+   * @return a type that implements an SQL provider method
+   */
   Class<?> type();
 
-  String method();
+  /**
+   * Specify a method for providing an SQL.
+   *
+   * <p>
+   * Since 3.5.1, this attribute can omit.
+   * If this attribute omit, the MyBatis will call a method that decide by following rules.
+   * <ul>
+   *   <li>
+   *     If class that specified the {@link #type()} attribute implements the {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver},
+   *     the MyBatis use a method that returned by it
+   *   </li>
+   *   <li>
+   *     If cannot resolve a method by {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver}(= not implement it or it was returned {@code null}),
+   *     the MyBatis will search and use a fallback method that named {@code provideSql} from specified type
+   *   </li>
+   * </ul>
+   *
+   * @return a method name of method for providing an SQL
+   */
+  String method() default "";
+
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2016 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.
@@ -28,7 +28,33 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface InsertProvider {
+
+  /**
+   * Specify a type that implements an SQL provider method.
+   *
+   * @return a type that implements an SQL provider method
+   */
   Class<?> type();
 
-  String method();
+  /**
+   * Specify a method for providing an SQL.
+   *
+   * <p>
+   * Since 3.5.1, this attribute can omit.
+   * If this attribute omit, the MyBatis will call a method that decide by following rules.
+   * <ul>
+   *   <li>
+   *     If class that specified the {@link #type()} attribute implements the {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver},
+   *     the MyBatis use a method that returned by it
+   *   </li>
+   *   <li>
+   *     If cannot resolve a method by {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver}(= not implement it or it was returned {@code null}),
+   *     the MyBatis will search and use a fallback method that named {@code provideSql} from specified type
+   *   </li>
+   * </ul>
+   *
+   * @return a method name of method for providing an SQL
+   */
+  String method() default "";
+
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2016 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.
@@ -28,7 +28,33 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface SelectProvider {
+
+  /**
+   * Specify a type that implements an SQL provider method.
+   *
+   * @return a type that implements an SQL provider method
+   */
   Class<?> type();
 
-  String method();
+  /**
+   * Specify a method for providing an SQL.
+   *
+   * <p>
+   * Since 3.5.1, this attribute can omit.
+   * If this attribute omit, the MyBatis will call a method that decide by following rules.
+   * <ul>
+   *   <li>
+   *     If class that specified the {@link #type()} attribute implements the {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver},
+   *     the MyBatis use a method that returned by it
+   *   </li>
+   *   <li>
+   *     If cannot resolve a method by {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver}(= not implement it or it was returned {@code null}),
+   *     the MyBatis will search and use a fallback method that named {@code provideSql} from specified type
+   *   </li>
+   * </ul>
+   *
+   * @return a method name of method for providing an SQL
+   */
+  String method() default "";
+
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2016 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.
@@ -28,7 +28,33 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface UpdateProvider {
+
+  /**
+   * Specify a type that implements an SQL provider method.
+   *
+   * @return a type that implements an SQL provider method
+   */
   Class<?> type();
 
-  String method();
+  /**
+   * Specify a method for providing an SQL.
+   *
+   * <p>
+   * Since 3.5.1, this attribute can omit.
+   * If this attribute omit, the MyBatis will call a method that decide by following rules.
+   * <ul>
+   *   <li>
+   *     If class that specified the {@link #type()} attribute implements the {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver},
+   *     the MyBatis use a method that returned by it
+   *   </li>
+   *   <li>
+   *     If cannot resolve a method by {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver}(= not implement it or it was returned {@code null}),
+   *     the MyBatis will search and use a fallback method that named {@code provideSql} from specified type
+   *   </li>
+   * </ul>
+   *
+   * @return a method name of method for providing an SQL
+   */
+  String method() default "";
+
 }

src/main/java/org/apache/ibatis/builder/MapperBuilderAssistant.java

@@ -457,13 +457,12 @@ public ResultMapping buildResultMapping(Class<?> resultType, String property, St
       nestedResultMap, notNullColumn, columnPrefix, typeHandler, flags, null, null, configuration.isLazyLoadingEnabled());
   }
 
+  /**
+   * @deprecated Use {@link Configuration#getLanguageDriver(Class)}
+   */
+  @Deprecated
   public LanguageDriver getLanguageDriver(Class<? extends LanguageDriver> langClass) {
-    if (langClass != null) {
-      configuration.getLanguageRegistry().register(langClass);
-    } else {
-      langClass = configuration.getLanguageRegistry().getDefaultDriverClass();
-    }
-    return configuration.getLanguageRegistry().getDriver(langClass);
+    return configuration.getLanguageDriver(langClass);
   }
 
   /** Backward compatibility signature. */