Merge branch 'master' into pr/2121

Author: harawata

.github/workflows/ci.yaml

@@ -16,7 +16,7 @@
 
 name: Java CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   test:

.github/workflows/coveralls.yaml

@@ -0,0 +1,41 @@
+#
+#    Copyright 2016-2020 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.
+#    You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+name: Coveralls
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    if: github.repository_owner == 'mybatis'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - name: Report Coverage to Coveralls for Pull Requests
+        if: github.event_name == 'pull_request'
+        run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_NUMBER: ${{ github.event.number }}
+      - name: Report Coverage to Coveralls for General Push
+        if: github.event_name == 'push'
+        run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sonar.yaml

@@ -35,7 +35,7 @@ jobs:
         with:
           java-version: 11
       - name: Analyze with SonarCloud
-        run: ./mvnw verify sonar:sonar -B -Dsonar.projectKey=mybatis_mybatis-3 -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true
+        run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_mybatis-3 -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.travis.yml

@@ -145,7 +145,7 @@
     <dependency>
       <groupId>ognl</groupId>
       <artifactId>ognl</artifactId>
-      <version>3.2.16</version>
+      <version>3.2.18</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
@@ -264,19 +264,19 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>1.14.3</version>
+      <version>1.15.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>postgresql</artifactId>
-      <version>1.14.3</version>
+      <version>1.15.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>mysql</artifactId>
-      <version>1.14.3</version>
+      <version>1.15.1</version>
       <scope>test</scope>
     </dependency>
     <!-- For javadoc link -->

pom.xml

@@ -15,7 +15,6 @@
  */
 package org.apache.ibatis.cache.decorators;
 
-import java.text.MessageFormat;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;

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

@@ -127,7 +127,7 @@ private void unlockMissedEntries() {
       try {
         delegate.removeObject(entry);
       } catch (Exception e) {
-        log.warn("Unexpected exception while notifiying a rollback to the cache adapter. "
+        log.warn("Unexpected exception while notifying a rollback to the cache adapter. "
             + "Consider upgrading your cache adapter to the latest version. Cause: " + e);
       }
     }

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

@@ -627,9 +627,9 @@ public LanguageDriver getLanguageDriver(Class<? extends LanguageDriver> langClas
   }
 
   /**
-   * Gets the default scripting lanuage instance.
+   * Gets the default scripting language instance.
    *
-   * @return the default scripting lanuage instance
+   * @return the default scripting language instance
    * @deprecated Use {@link #getDefaultScriptingLanguageInstance()}
    */
   @Deprecated

src/main/java/org/apache/ibatis/session/Configuration.java

@@ -203,7 +203,7 @@ public interface BlogMapper {
       </p>
       <hr/>
       <h4>SqlSessionFactoryBuilder</h4>
-        <p>이 클래스는 인스턴스회되어 사용되고 던져질 수 있다.
+        <p>이 클래스는 인스턴스화되어 사용되고 던져질 수 있다.
 		SqlSessionFactory 를 생성한 후 유지할 필요는 없다.
 		그러므로 SqlSessionFactoryBuilder 인스턴스의 가장 좋은 스코프는 메소드 스코프(예를들면 메소드 지역변수)이다.
 		여러개의 SqlSessionFactory 인스턴스를 빌드하기 위해 SqlSessionFactoryBuilder를 재사용할 수도 있지만 유지하지 않는 것이 가장 좋다.</p>

src/site/ko/xdoc/getting-started.xml

@@ -104,14 +104,6 @@ void shouldGetAndSetListItem() {
     assertEquals("foo", meta.getValue("richList[0]"));
   }
 
-  @Test
-  void shouldSetAndGetSelfListItem() {
-    RichType rich = new RichType();
-    MetaObject meta = SystemMetaObject.forObject(rich);
-    meta.setValue("richList[0]", "foo");
-    assertEquals("foo", meta.getValue("richList[0]"));
-  }
-
   @Test
   void shouldGetAndSetNestedListItem() {
     RichType rich = new RichType();