Merge branch 'master' into r2dbc-support

Author: jeffgbutler

.github/workflows/ci.yaml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java }} ${{ matrix.distribution }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: ${{ matrix.distribution }}

.github/workflows/coveralls.yaml

@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: zulu

.github/workflows/site.yaml

@@ -0,0 +1,34 @@
+name: Site
+
+on:
+  push:
+    branches:
+      - site
+
+jobs:
+  build:
+    if: github.repository_owner == 'mybatis' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]')
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: zulu
+      - uses: webfactory/ssh-agent@master
+        with:
+          ssh-private-key: ${{ secrets.DEPLOY_KEY }}
+      - name: Build site
+        run: ./mvnw site site:stage -DskipTests -B -V --no-transfer-progress -Dlicense.skip=true
+        env:
+          CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Deploy Site to gh-pages
+        uses: JamesIves/[email protected]
+        with:
+          ssh-key: true
+          branch: gh-pages
+          folder: target/staging
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sonar.yaml

@@ -15,7 +15,7 @@ jobs:
           # Disabling shallow clone is recommended for improving relevancy of reporting
           fetch-depth: 0
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: zulu

.github/workflows/sonatype.yaml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: zulu

.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.mybatis</groupId>
     <artifactId>mybatis-parent</artifactId>
-    <version>40</version>
+    <version>41</version>
   </parent>
   <groupId>org.mybatis.dynamic-sql</groupId>
   <artifactId>mybatis-dynamic-sql</artifactId>
@@ -56,22 +56,22 @@
     <java.version>17</java.version>
     <java.release.version>8</java.release.version>
     <junit.jupiter.version>5.10.1</junit.jupiter.version>
-    <spring.batch.version>5.0.3</spring.batch.version>
+    <spring.batch.version>5.1.0</spring.batch.version>
 
     <checkstyle.config>checkstyle-override.xml</checkstyle.config>
 
     <clirr.comparisonVersion>1.5.0</clirr.comparisonVersion>
 
     <module.name>org.mybatis.dynamic.sql</module.name>
 
-    <kotlin.version>1.9.20</kotlin.version>
+    <kotlin.version>1.9.22</kotlin.version>
     <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
 
     <sonar.sources>pom.xml,src/main/java,src/main/kotlin</sonar.sources>
     <sonar.tests>src/test/java,src/test/kotlin</sonar.tests>
 
     <kotlin.code.style>official</kotlin.code.style>
-    <test.containers.version>1.19.2</test.containers.version>
+    <test.containers.version>1.19.3</test.containers.version>
     <osgi.export>org.mybatis.dynamic.sql.*;version=${project.version};-noimport:=true</osgi.export>
 
     <!-- Reproducible Builds -->
@@ -89,14 +89,14 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>6.0.14</version>
+      <version>6.1.3</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.mybatis</groupId>
       <artifactId>mybatis</artifactId>
-      <version>3.5.14</version>
+      <version>3.5.15</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
@@ -122,13 +122,13 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.24.2</version>
+      <version>3.25.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mybatis</groupId>
       <artifactId>mybatis-spring</artifactId>
-      <version>3.0.2</version>
+      <version>3.0.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -158,7 +158,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.4.11</version>
+      <version>1.4.14</version>
       <scope>test</scope>
     </dependency>
     <!-- Hamcrest is only here to make Infinitest happy. Not really used in the project. -->
@@ -184,7 +184,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.6.0</version>
+      <version>42.7.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -196,7 +196,7 @@
     <dependency>
       <groupId>org.mariadb.jdbc</groupId>
       <artifactId>mariadb-java-client</artifactId>
-      <version>3.3.0</version>
+      <version>3.3.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -327,7 +327,7 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>io.jsonwebtoken.coveralls</groupId>
+        <groupId>com.github.hazendaz.maven</groupId>
         <artifactId>coveralls-maven-plugin</artifactId>
         <configuration>
           <sourceDirectories>src/main/java,src/main/kotlin</sourceDirectories>
@@ -337,7 +337,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.4.0</version>
+        <version>3.5.0</version>
         <executions>
           <execution>
             <goals>

src/main/java/org/mybatis/dynamic/sql/SqlColumn.java

@@ -46,7 +46,7 @@ private SqlColumn(Builder<T> builder) {
         alias = builder.alias;
         typeHandler = builder.typeHandler;
         renderingStrategy = builder.renderingStrategy;
-        parameterTypeConverter = builder.parameterTypeConverter;
+        parameterTypeConverter = Objects.requireNonNull(builder.parameterTypeConverter);
         tableQualifier = builder.tableQualifier;
         javaType = builder.javaType;
     }
@@ -81,7 +81,7 @@ public Optional<Class<T>> javaType() {
 
     @Override
     public Object convertParameterType(T value) {
-        return parameterTypeConverter == null ? value : parameterTypeConverter.convert(value);
+        return parameterTypeConverter.convert(value);
     }
 
     @Override
@@ -110,7 +110,7 @@ public SqlColumn<T> qualifiedWith(String tableQualifier) {
     }
 
     /**
-     * Set an alias with a camel cased string based on the column name. The can be useful for queries using
+     * Set an alias with a camel cased string based on the column name. This can be useful for queries using
      * the {@link org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper} where the columns are placed into
      * a map based on the column name returned from the database.
      *
@@ -218,7 +218,7 @@ public static class Builder<T> {
         protected String alias;
         protected String typeHandler;
         protected RenderingStrategy renderingStrategy;
-        protected ParameterTypeConverter<T, ?> parameterTypeConverter;
+        protected ParameterTypeConverter<T, ?> parameterTypeConverter = v -> v;
         protected String tableQualifier;
         protected Class<T> javaType;
 

src/main/java/org/mybatis/dynamic/sql/common/AbstractBooleanExpressionDSL.java

@@ -28,8 +28,7 @@
 import org.mybatis.dynamic.sql.ExistsPredicate;
 import org.mybatis.dynamic.sql.SqlCriterion;
 import org.mybatis.dynamic.sql.VisitableCondition;
-import org.mybatis.dynamic.sql.exception.InvalidSqlException;
-import org.mybatis.dynamic.sql.util.Messages;
+import org.mybatis.dynamic.sql.util.Validator;
 
 public abstract class AbstractBooleanExpressionDSL<T extends AbstractBooleanExpressionDSL<T>> {
     private SqlCriterion initialCriterion; // WARNING - may be null!
@@ -146,10 +145,7 @@ private void addSubCriteria(String connector, List<AndOrCriteriaGroup> criteria)
     }
 
     protected void setInitialCriterion(SqlCriterion initialCriterion, StatementType statementType) {
-        if (this.initialCriterion != null) {
-            throw new InvalidSqlException(Messages.getString(statementType.messageNumber())); //$NON-NLS-1$
-        }
-
+        Validator.assertTrue(this.initialCriterion == null, statementType.messageNumber());
         this.initialCriterion = initialCriterion;
     }
 

src/main/java/org/mybatis/dynamic/sql/common/OrderByModel.java

@@ -23,17 +23,14 @@
 import java.util.stream.Stream;
 
 import org.mybatis.dynamic.sql.SortSpecification;
-import org.mybatis.dynamic.sql.exception.InvalidSqlException;
-import org.mybatis.dynamic.sql.util.Messages;
+import org.mybatis.dynamic.sql.util.Validator;
 
 public class OrderByModel {
     private final List<SortSpecification> columns = new ArrayList<>();
 
     private OrderByModel(Collection<? extends SortSpecification> columns) {
         Objects.requireNonNull(columns);
-        if (columns.isEmpty()) {
-            throw new InvalidSqlException(Messages.getString("ERROR.12")); //$NON-NLS-1$
-        }
+        Validator.assertNotEmpty(columns, "ERROR.12"); //$NON-NLS-1$
         this.columns.addAll(columns);
     }