From 35d628f642eadd65b40c5feb72b33c567225319d Mon Sep 17 00:00:00 2001
From: Jeff Butler <jeffgbutler@gmail.com>
Date: Tue, 16 Aug 2022 16:55:20 -0400
Subject: [PATCH] Checkstyle Updates

---
 .../org/mybatis/dynamic/sql/BasicColumn.java  |  4 +-
 .../org/mybatis/dynamic/sql/SqlBuilder.java   | 50 +++++++++----------
 .../dynamic/sql/insert/BatchInsertDSL.java    |  2 +-
 .../dynamic/sql/insert/InsertSelectDSL.java   |  4 +-
 .../dynamic/sql/insert/MultiRowInsertDSL.java |  2 +-
 .../select/AbstractQueryExpressionDSL.java    | 18 +++----
 .../sql/select/QueryExpressionDSL.java        | 24 ++++-----
 .../mybatis/dynamic/sql/select/SelectDSL.java | 10 ++--
 .../sql/select/SelectDSLCompleter.java        |  4 +-
 .../util/springbatch/SpringBatchUtility.java  |  8 +--
 .../dynamic/sql/where/AbstractWhereDSL.java   | 18 +++----
 .../sql/where/AbstractWhereSupport.java       |  6 +--
 .../java/examples/joins/JoinMapperTest.java   |  3 +-
 13 files changed, 77 insertions(+), 76 deletions(-)

diff --git a/src/main/java/org/mybatis/dynamic/sql/BasicColumn.java b/src/main/java/org/mybatis/dynamic/sql/BasicColumn.java
index 0764c1904..c3aff7b6d 100644
--- a/src/main/java/org/mybatis/dynamic/sql/BasicColumn.java
+++ b/src/main/java/org/mybatis/dynamic/sql/BasicColumn.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2020 the original author or authors.
+ *    Copyright 2016-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.
@@ -74,7 +74,7 @@ default String renderWithTableAndColumnAlias(TableAliasCalculator tableAliasCalc
      * @param columns list of BasicColumn
      * @return an array of BasicColumn
      */
-    static BasicColumn[] columnList(BasicColumn...columns) {
+    static BasicColumn[] columnList(BasicColumn... columns) {
         return columns;
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java b/src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java
index 42aa8eaee..09bc4368a 100644
--- a/src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java
+++ b/src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java
@@ -144,7 +144,7 @@ static <T> InsertDSL.IntoGatherer<T> insert(T row) {
      * @return the next step in the DSL
      */
     @SafeVarargs
-    static <T> BatchInsertDSL.IntoGatherer<T> insertBatch(T...records) {
+    static <T> BatchInsertDSL.IntoGatherer<T> insertBatch(T... records) {
         return BatchInsertDSL.insert(records);
     }
 
@@ -171,7 +171,7 @@ static <T> BatchInsertDSL.IntoGatherer<T> insertBatch(Collection<T> records) {
      * @return the next step in the DSL
      */
     @SafeVarargs
-    static <T> MultiRowInsertDSL.IntoGatherer<T> insertMultiple(T...records) {
+    static <T> MultiRowInsertDSL.IntoGatherer<T> insertMultiple(T... records) {
         return MultiRowInsertDSL.insert(records);
     }
 
@@ -194,7 +194,7 @@ static InsertIntoNextStep insertInto(SqlTable table) {
         return new InsertIntoNextStep(table);
     }
 
-    static FromGatherer<SelectModel> select(BasicColumn...selectList) {
+    static FromGatherer<SelectModel> select(BasicColumn... selectList) {
         return SelectDSL.select(selectList);
     }
 
@@ -202,7 +202,7 @@ static FromGatherer<SelectModel> select(Collection<BasicColumn> selectList) {
         return SelectDSL.select(selectList);
     }
 
-    static FromGatherer<SelectModel> selectDistinct(BasicColumn...selectList) {
+    static FromGatherer<SelectModel> selectDistinct(BasicColumn... selectList) {
         return SelectDSL.selectDistinct(selectList);
     }
 
@@ -237,7 +237,7 @@ static WhereDSL where(ExistsPredicate existsPredicate, AndOrCriteriaGroup... sub
 
     // where condition connectors
     static <T> CriteriaGroup group(BindableColumn<T> column, VisitableCondition<T> condition,
-                                   AndOrCriteriaGroup...subCriteria) {
+                                   AndOrCriteriaGroup... subCriteria) {
         return group(column, condition, Arrays.asList(subCriteria));
     }
 
@@ -250,7 +250,7 @@ static <T> CriteriaGroup group(BindableColumn<T> column, VisitableCondition<T> c
                 .build();
     }
 
-    static CriteriaGroup group(ExistsPredicate existsPredicate, AndOrCriteriaGroup...subCriteria) {
+    static CriteriaGroup group(ExistsPredicate existsPredicate, AndOrCriteriaGroup... subCriteria) {
         return group(existsPredicate, Arrays.asList(subCriteria));
     }
 
@@ -262,7 +262,7 @@ static CriteriaGroup group(ExistsPredicate existsPredicate, List<AndOrCriteriaGr
                 .build();
     }
 
-    static CriteriaGroup group(SqlCriterion initialCriterion, AndOrCriteriaGroup...subCriteria) {
+    static CriteriaGroup group(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
         return group(initialCriterion, Arrays.asList(subCriteria));
     }
 
@@ -280,7 +280,7 @@ static CriteriaGroup group(List<AndOrCriteriaGroup> subCriteria) {
     }
 
     static <T> NotCriterion not(BindableColumn<T> column, VisitableCondition<T> condition,
-                                AndOrCriteriaGroup...subCriteria) {
+                                AndOrCriteriaGroup... subCriteria) {
         return not(column, condition, Arrays.asList(subCriteria));
     }
 
@@ -293,7 +293,7 @@ static <T> NotCriterion not(BindableColumn<T> column, VisitableCondition<T> cond
                 .build();
     }
 
-    static NotCriterion not(ExistsPredicate existsPredicate, AndOrCriteriaGroup...subCriteria) {
+    static NotCriterion not(ExistsPredicate existsPredicate, AndOrCriteriaGroup... subCriteria) {
         return not(existsPredicate, Arrays.asList(subCriteria));
     }
 
@@ -305,7 +305,7 @@ static NotCriterion not(ExistsPredicate existsPredicate, List<AndOrCriteriaGroup
                 .build();
     }
 
-    static NotCriterion not(SqlCriterion initialCriterion, AndOrCriteriaGroup...subCriteria) {
+    static NotCriterion not(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
         return not(initialCriterion, Arrays.asList(subCriteria));
     }
 
@@ -323,7 +323,7 @@ static NotCriterion not(List<AndOrCriteriaGroup> subCriteria) {
     }
 
     static <T> AndOrCriteriaGroup or(BindableColumn<T> column, VisitableCondition<T> condition,
-                                     AndOrCriteriaGroup...subCriteria) {
+                                     AndOrCriteriaGroup... subCriteria) {
         return new AndOrCriteriaGroup.Builder()
                 .withInitialCriterion(ColumnAndConditionCriterion.withColumn(column)
                         .withCondition(condition)
@@ -333,7 +333,7 @@ static <T> AndOrCriteriaGroup or(BindableColumn<T> column, VisitableCondition<T>
                 .build();
     }
 
-    static AndOrCriteriaGroup or(ExistsPredicate existsPredicate, AndOrCriteriaGroup...subCriteria) {
+    static AndOrCriteriaGroup or(ExistsPredicate existsPredicate, AndOrCriteriaGroup... subCriteria) {
         return new AndOrCriteriaGroup.Builder()
                 .withInitialCriterion(new ExistsCriterion.Builder()
                         .withExistsPredicate(existsPredicate).build())
@@ -342,7 +342,7 @@ static AndOrCriteriaGroup or(ExistsPredicate existsPredicate, AndOrCriteriaGroup
                 .build();
     }
 
-    static AndOrCriteriaGroup or(SqlCriterion initialCriterion, AndOrCriteriaGroup...subCriteria) {
+    static AndOrCriteriaGroup or(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
         return new AndOrCriteriaGroup.Builder()
                 .withConnector("or") //$NON-NLS-1$
                 .withInitialCriterion(initialCriterion)
@@ -358,7 +358,7 @@ static AndOrCriteriaGroup or(List<AndOrCriteriaGroup> subCriteria) {
     }
 
     static <T> AndOrCriteriaGroup and(BindableColumn<T> column, VisitableCondition<T> condition,
-                                      AndOrCriteriaGroup...subCriteria) {
+                                      AndOrCriteriaGroup... subCriteria) {
         return new AndOrCriteriaGroup.Builder()
                 .withInitialCriterion(ColumnAndConditionCriterion.withColumn(column)
                         .withCondition(condition)
@@ -368,7 +368,7 @@ static <T> AndOrCriteriaGroup and(BindableColumn<T> column, VisitableCondition<T
                 .build();
     }
 
-    static AndOrCriteriaGroup and(ExistsPredicate existsPredicate, AndOrCriteriaGroup...subCriteria) {
+    static AndOrCriteriaGroup and(ExistsPredicate existsPredicate, AndOrCriteriaGroup... subCriteria) {
         return new AndOrCriteriaGroup.Builder()
                 .withInitialCriterion(new ExistsCriterion.Builder()
                         .withExistsPredicate(existsPredicate).build())
@@ -377,7 +377,7 @@ static AndOrCriteriaGroup and(ExistsPredicate existsPredicate, AndOrCriteriaGrou
                 .build();
     }
 
-    static AndOrCriteriaGroup and(SqlCriterion initialCriterion, AndOrCriteriaGroup...subCriteria) {
+    static AndOrCriteriaGroup and(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
         return new AndOrCriteriaGroup.Builder()
                 .withConnector("and") //$NON-NLS-1$
                 .withInitialCriterion(initialCriterion)
@@ -657,7 +657,7 @@ static <T> IsLessThanOrEqualTo<T> isLessThanOrEqualToWhenPresent(Supplier<T> val
     }
 
     @SafeVarargs
-    static <T> IsIn<T> isIn(T...values) {
+    static <T> IsIn<T> isIn(T... values) {
         return IsIn.of(values);
     }
 
@@ -670,7 +670,7 @@ static <T> IsInWithSubselect<T> isIn(Buildable<SelectModel> selectModelBuilder)
     }
 
     @SafeVarargs
-    static <T> IsIn<T> isInWhenPresent(T...values) {
+    static <T> IsIn<T> isInWhenPresent(T... values) {
         return IsIn.of(values).filter(Objects::nonNull);
     }
 
@@ -679,7 +679,7 @@ static <T> IsIn<T> isInWhenPresent(Collection<T> values) {
     }
 
     @SafeVarargs
-    static <T> IsNotIn<T> isNotIn(T...values) {
+    static <T> IsNotIn<T> isNotIn(T... values) {
         return IsNotIn.of(values);
     }
 
@@ -692,7 +692,7 @@ static <T> IsNotInWithSubselect<T> isNotIn(Buildable<SelectModel> selectModelBui
     }
 
     @SafeVarargs
-    static <T> IsNotIn<T> isNotInWhenPresent(T...values) {
+    static <T> IsNotIn<T> isNotInWhenPresent(T... values) {
         return IsNotIn.of(values).filter(Objects::nonNull);
     }
 
@@ -807,7 +807,7 @@ static IsNotLikeCaseInsensitive isNotLikeCaseInsensitiveWhenPresent(Supplier<Str
         return isNotLikeCaseInsensitiveWhenPresent(valueSupplier.get());
     }
 
-    static IsInCaseInsensitive isInCaseInsensitive(String...values) {
+    static IsInCaseInsensitive isInCaseInsensitive(String... values) {
         return IsInCaseInsensitive.of(values);
     }
 
@@ -815,7 +815,7 @@ static IsInCaseInsensitive isInCaseInsensitive(Collection<String> values) {
         return IsInCaseInsensitive.of(values);
     }
 
-    static IsInCaseInsensitive isInCaseInsensitiveWhenPresent(String...values) {
+    static IsInCaseInsensitive isInCaseInsensitiveWhenPresent(String... values) {
         return IsInCaseInsensitive.of(values).filter(Objects::nonNull);
     }
 
@@ -823,7 +823,7 @@ static IsInCaseInsensitive isInCaseInsensitiveWhenPresent(Collection<String> val
         return values == null ? IsInCaseInsensitive.empty() : IsInCaseInsensitive.of(values).filter(Objects::nonNull);
     }
 
-    static IsNotInCaseInsensitive isNotInCaseInsensitive(String...values) {
+    static IsNotInCaseInsensitive isNotInCaseInsensitive(String... values) {
         return IsNotInCaseInsensitive.of(values);
     }
 
@@ -831,7 +831,7 @@ static IsNotInCaseInsensitive isNotInCaseInsensitive(Collection<String> values)
         return IsNotInCaseInsensitive.of(values);
     }
 
-    static IsNotInCaseInsensitive isNotInCaseInsensitiveWhenPresent(String...values) {
+    static IsNotInCaseInsensitive isNotInCaseInsensitiveWhenPresent(String... values) {
         return IsNotInCaseInsensitive.of(values).filter(Objects::nonNull);
     }
 
@@ -885,7 +885,7 @@ public InsertSelectDSL withSelectStatement(Buildable<SelectModel> selectModelBui
                     .withSelectStatement(selectModelBuilder);
         }
 
-        public InsertSelectDSL.SelectGatherer withColumnList(SqlColumn<?>...columns) {
+        public InsertSelectDSL.SelectGatherer withColumnList(SqlColumn<?>... columns) {
             return InsertSelectDSL.insertInto(table)
                     .withColumnList(columns);
         }
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/BatchInsertDSL.java b/src/main/java/org/mybatis/dynamic/sql/insert/BatchInsertDSL.java
index 2baa0ca30..076989e0e 100644
--- a/src/main/java/org/mybatis/dynamic/sql/insert/BatchInsertDSL.java
+++ b/src/main/java/org/mybatis/dynamic/sql/insert/BatchInsertDSL.java
@@ -57,7 +57,7 @@ public BatchInsertModel<T> build() {
     }
 
     @SafeVarargs
-    public static <T> IntoGatherer<T> insert(T...records) {
+    public static <T> IntoGatherer<T> insert(T... records) {
         return BatchInsertDSL.insert(Arrays.asList(records));
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/InsertSelectDSL.java b/src/main/java/org/mybatis/dynamic/sql/insert/InsertSelectDSL.java
index 55821162a..0262ed550 100644
--- a/src/main/java/org/mybatis/dynamic/sql/insert/InsertSelectDSL.java
+++ b/src/main/java/org/mybatis/dynamic/sql/insert/InsertSelectDSL.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2020 the original author or authors.
+ *    Copyright 2016-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.
@@ -63,7 +63,7 @@ private InsertColumnGatherer(SqlTable table) {
             this.table = table;
         }
 
-        public SelectGatherer withColumnList(SqlColumn<?>...columns) {
+        public SelectGatherer withColumnList(SqlColumn<?>... columns) {
             return withColumnList(Arrays.asList(columns));
         }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/MultiRowInsertDSL.java b/src/main/java/org/mybatis/dynamic/sql/insert/MultiRowInsertDSL.java
index 0ccb426ac..1dac3dcb7 100644
--- a/src/main/java/org/mybatis/dynamic/sql/insert/MultiRowInsertDSL.java
+++ b/src/main/java/org/mybatis/dynamic/sql/insert/MultiRowInsertDSL.java
@@ -56,7 +56,7 @@ public MultiRowInsertModel<T> build() {
     }
 
     @SafeVarargs
-    public static <T> IntoGatherer<T> insert(T...records) {
+    public static <T> IntoGatherer<T> insert(T... records) {
         return MultiRowInsertDSL.insert(Arrays.asList(records));
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/AbstractQueryExpressionDSL.java b/src/main/java/org/mybatis/dynamic/sql/select/AbstractQueryExpressionDSL.java
index 5a4d311a4..1cabb6300 100644
--- a/src/main/java/org/mybatis/dynamic/sql/select/AbstractQueryExpressionDSL.java
+++ b/src/main/java/org/mybatis/dynamic/sql/select/AbstractQueryExpressionDSL.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2021 the original author or authors.
+ *    Copyright 2016-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.
@@ -53,13 +53,13 @@ public TableExpression table() {
     }
 
     public T join(SqlTable joinTable, JoinCriterion onJoinCriterion,
-            JoinCriterion...andJoinCriteria) {
+            JoinCriterion... andJoinCriteria) {
         addJoinSpecificationBuilder(joinTable, onJoinCriterion, JoinType.INNER, Arrays.asList(andJoinCriteria));
         return getThis();
     }
 
     public T join(SqlTable joinTable, String tableAlias, JoinCriterion onJoinCriterion,
-            JoinCriterion...andJoinCriteria) {
+            JoinCriterion... andJoinCriteria) {
         addTableAlias(joinTable, tableAlias);
         return join(joinTable, onJoinCriterion, andJoinCriteria);
     }
@@ -84,13 +84,13 @@ public T join(Buildable<SelectModel> subQuery, String tableAlias, JoinCriterion
     }
 
     public T leftJoin(SqlTable joinTable, JoinCriterion onJoinCriterion,
-            JoinCriterion...andJoinCriteria) {
+            JoinCriterion... andJoinCriteria) {
         addJoinSpecificationBuilder(joinTable, onJoinCriterion, JoinType.LEFT, Arrays.asList(andJoinCriteria));
         return getThis();
     }
 
     public T leftJoin(SqlTable joinTable, String tableAlias, JoinCriterion onJoinCriterion,
-            JoinCriterion...andJoinCriteria) {
+            JoinCriterion... andJoinCriteria) {
         addTableAlias(joinTable, tableAlias);
         return leftJoin(joinTable, onJoinCriterion, andJoinCriteria);
     }
@@ -115,13 +115,13 @@ public T leftJoin(Buildable<SelectModel> subQuery, String tableAlias, JoinCriter
     }
 
     public T rightJoin(SqlTable joinTable, JoinCriterion onJoinCriterion,
-            JoinCriterion...andJoinCriteria) {
+            JoinCriterion... andJoinCriteria) {
         addJoinSpecificationBuilder(joinTable, onJoinCriterion, JoinType.RIGHT, Arrays.asList(andJoinCriteria));
         return getThis();
     }
 
     public T rightJoin(SqlTable joinTable, String tableAlias, JoinCriterion onJoinCriterion,
-            JoinCriterion...andJoinCriteria) {
+            JoinCriterion... andJoinCriteria) {
         addTableAlias(joinTable, tableAlias);
         return rightJoin(joinTable, onJoinCriterion, andJoinCriteria);
     }
@@ -146,13 +146,13 @@ public T rightJoin(Buildable<SelectModel> subQuery, String tableAlias, JoinCrite
     }
 
     public T fullJoin(SqlTable joinTable, JoinCriterion onJoinCriterion,
-            JoinCriterion...andJoinCriteria) {
+            JoinCriterion... andJoinCriteria) {
         addJoinSpecificationBuilder(joinTable, onJoinCriterion, JoinType.FULL, Arrays.asList(andJoinCriteria));
         return getThis();
     }
 
     public T fullJoin(SqlTable joinTable, String tableAlias, JoinCriterion onJoinCriterion,
-            JoinCriterion...andJoinCriteria) {
+            JoinCriterion... andJoinCriteria) {
         addTableAlias(joinTable, tableAlias);
         return fullJoin(joinTable, onJoinCriterion, andJoinCriteria);
     }
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java b/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java
index 6061babe6..4d44c46e6 100644
--- a/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java
+++ b/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2021 the original author or authors.
+ *    Copyright 2016-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.
@@ -122,7 +122,7 @@ public JoinSpecificationStarter fullJoin(Buildable<SelectModel> joinTable, Strin
         return new JoinSpecificationStarter(buildSubQuery(joinTable, tableAlias), JoinType.FULL);
     }
 
-    public GroupByFinisher groupBy(BasicColumn...columns) {
+    public GroupByFinisher groupBy(BasicColumn... columns) {
         return groupBy(Arrays.asList(columns));
     }
 
@@ -131,7 +131,7 @@ public GroupByFinisher groupBy(Collection<BasicColumn> columns) {
         return new GroupByFinisher();
     }
 
-    public SelectDSL<R> orderBy(SortSpecification...columns) {
+    public SelectDSL<R> orderBy(SortSpecification... columns) {
         return orderBy(Arrays.asList(columns));
     }
 
@@ -250,7 +250,7 @@ public UnionBuilder unionAll() {
             return QueryExpressionDSL.this.unionAll();
         }
 
-        public SelectDSL<R> orderBy(SortSpecification...columns) {
+        public SelectDSL<R> orderBy(SortSpecification... columns) {
             return orderBy(Arrays.asList(columns));
         }
 
@@ -258,7 +258,7 @@ public SelectDSL<R> orderBy(Collection<SortSpecification> columns) {
             return QueryExpressionDSL.this.orderBy(columns);
         }
 
-        public GroupByFinisher groupBy(BasicColumn...columns) {
+        public GroupByFinisher groupBy(BasicColumn... columns) {
             return groupBy(Arrays.asList(columns));
         }
 
@@ -308,7 +308,7 @@ public JoinSpecificationFinisher on(BasicColumn joinColumn, JoinCondition joinCo
         }
 
         public JoinSpecificationFinisher on(BasicColumn joinColumn, JoinCondition onJoinCondition,
-                JoinCriterion...andJoinCriteria) {
+                JoinCriterion... andJoinCriteria) {
             return new JoinSpecificationFinisher(joinTable, joinColumn, onJoinCondition, joinType, andJoinCriteria);
         }
     }
@@ -333,7 +333,7 @@ public JoinSpecificationFinisher(TableExpression table, BasicColumn joinColumn,
         }
 
         public JoinSpecificationFinisher(TableExpression table, BasicColumn joinColumn,
-                JoinCondition joinCondition, JoinType joinType, JoinCriterion...andJoinCriteria) {
+                JoinCondition joinCondition, JoinType joinType, JoinCriterion... andJoinCriteria) {
             JoinCriterion onJoinCriterion = new JoinCriterion.Builder()
                     .withConnector("on") //$NON-NLS-1$
                     .withJoinColumn(joinColumn)
@@ -417,7 +417,7 @@ public JoinSpecificationStarter fullJoin(Buildable<SelectModel> joinTable, Strin
             return QueryExpressionDSL.this.fullJoin(joinTable, tableAlias);
         }
 
-        public GroupByFinisher groupBy(BasicColumn...columns) {
+        public GroupByFinisher groupBy(BasicColumn... columns) {
             return groupBy(Arrays.asList(columns));
         }
 
@@ -433,7 +433,7 @@ public UnionBuilder unionAll() {
             return QueryExpressionDSL.this.unionAll();
         }
 
-        public SelectDSL<R> orderBy(SortSpecification...columns) {
+        public SelectDSL<R> orderBy(SortSpecification... columns) {
             return orderBy(Arrays.asList(columns));
         }
 
@@ -455,7 +455,7 @@ public SelectDSL<R>.FetchFirstFinisher fetchFirst(long fetchFirstRows) {
     }
 
     public class GroupByFinisher implements Buildable<R> {
-        public SelectDSL<R> orderBy(SortSpecification...columns) {
+        public SelectDSL<R> orderBy(SortSpecification... columns) {
             return orderBy(Arrays.asList(columns));
         }
 
@@ -497,7 +497,7 @@ public UnionBuilder(String connector) {
             this.connector = connector;
         }
 
-        public FromGatherer<R> select(BasicColumn...selectList) {
+        public FromGatherer<R> select(BasicColumn... selectList) {
             return select(Arrays.asList(selectList));
         }
 
@@ -509,7 +509,7 @@ public FromGatherer<R> select(List<BasicColumn> selectList) {
                     .build();
         }
 
-        public FromGatherer<R> selectDistinct(BasicColumn...selectList) {
+        public FromGatherer<R> selectDistinct(BasicColumn... selectList) {
             return selectDistinct(Arrays.asList(selectList));
         }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/SelectDSL.java b/src/main/java/org/mybatis/dynamic/sql/select/SelectDSL.java
index 5627734d0..339487116 100644
--- a/src/main/java/org/mybatis/dynamic/sql/select/SelectDSL.java
+++ b/src/main/java/org/mybatis/dynamic/sql/select/SelectDSL.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2020 the original author or authors.
+ *    Copyright 2016-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.
@@ -51,7 +51,7 @@ private SelectDSL(Function<SelectModel, R> adapterFunction) {
         this.adapterFunction = Objects.requireNonNull(adapterFunction);
     }
 
-    public static QueryExpressionDSL.FromGatherer<SelectModel> select(BasicColumn...selectList) {
+    public static QueryExpressionDSL.FromGatherer<SelectModel> select(BasicColumn... selectList) {
         return select(Arrays.asList(selectList));
     }
 
@@ -60,7 +60,7 @@ public static QueryExpressionDSL.FromGatherer<SelectModel> select(Collection<Bas
     }
 
     public static <R> QueryExpressionDSL.FromGatherer<R> select(Function<SelectModel, R> adapterFunction,
-            BasicColumn...selectList) {
+            BasicColumn... selectList) {
         return select(adapterFunction, Arrays.asList(selectList));
     }
 
@@ -72,7 +72,7 @@ public static <R> QueryExpressionDSL.FromGatherer<R> select(Function<SelectModel
                 .build();
     }
 
-    public static QueryExpressionDSL.FromGatherer<SelectModel> selectDistinct(BasicColumn...selectList) {
+    public static QueryExpressionDSL.FromGatherer<SelectModel> selectDistinct(BasicColumn... selectList) {
         return selectDistinct(Function.identity(), selectList);
     }
 
@@ -81,7 +81,7 @@ public static QueryExpressionDSL.FromGatherer<SelectModel> selectDistinct(Collec
     }
 
     public static <R> QueryExpressionDSL.FromGatherer<R> selectDistinct(Function<SelectModel, R> adapterFunction,
-            BasicColumn...selectList) {
+            BasicColumn... selectList) {
         return selectDistinct(adapterFunction, Arrays.asList(selectList));
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/SelectDSLCompleter.java b/src/main/java/org/mybatis/dynamic/sql/select/SelectDSLCompleter.java
index beccf5659..a720e8cce 100644
--- a/src/main/java/org/mybatis/dynamic/sql/select/SelectDSLCompleter.java
+++ b/src/main/java/org/mybatis/dynamic/sql/select/SelectDSLCompleter.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2020 the original author or authors.
+ *    Copyright 2016-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.
@@ -89,7 +89,7 @@ static SelectDSLCompleter allRows() {
      * @param columns list of sort specifications for an order by clause
      * @return the completer that will select every row in a table with specified order
      */
-    static SelectDSLCompleter allRowsOrderedBy(SortSpecification...columns) {
+    static SelectDSLCompleter allRowsOrderedBy(SortSpecification... columns) {
         return c -> c.orderBy(columns);
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/util/springbatch/SpringBatchUtility.java b/src/main/java/org/mybatis/dynamic/sql/util/springbatch/SpringBatchUtility.java
index f1ab9b504..b796c982e 100644
--- a/src/main/java/org/mybatis/dynamic/sql/util/springbatch/SpringBatchUtility.java
+++ b/src/main/java/org/mybatis/dynamic/sql/util/springbatch/SpringBatchUtility.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2020 the original author or authors.
+ *    Copyright 2016-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.
@@ -41,14 +41,14 @@ public static Map<String, Object> toParameterValues(SelectStatementProvider sele
     /**
      * Select builder that renders in a manner appropriate for the MyBatisPagingItemReader.
      *
-     * <b>Important</b> rendered SQL will contain LIMIT and OFFSET clauses in the SELECT statement. If your database
+     * <p><b>Important</b> rendered SQL will contain LIMIT and OFFSET clauses in the SELECT statement. If your database
      * (Oracle) does not support LIMIT and OFFSET, the queries will fail.
      *
      * @param selectList a column list for the SELECT statement
      * @return FromGatherer used to continue a SELECT statement
      */
     public static QueryExpressionDSL.FromGatherer<SpringBatchPagingReaderSelectModel> selectForPaging(
-            BasicColumn...selectList) {
+            BasicColumn... selectList) {
         return SelectDSL.select(SpringBatchPagingReaderSelectModel::new, selectList);
     }
 
@@ -59,7 +59,7 @@ public static QueryExpressionDSL.FromGatherer<SpringBatchPagingReaderSelectModel
      * @return FromGatherer used to continue a SELECT statement
      */
     public static QueryExpressionDSL.FromGatherer<SpringBatchCursorReaderSelectModel> selectForCursor(
-            BasicColumn...selectList) {
+            BasicColumn... selectList) {
         return SelectDSL.select(SpringBatchCursorReaderSelectModel::new, selectList);
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereDSL.java b/src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereDSL.java
index de46fd15c..24f394971 100644
--- a/src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereDSL.java
+++ b/src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereDSL.java
@@ -35,7 +35,7 @@ public abstract class AbstractWhereDSL<T extends AbstractWhereDSL<T>> {
 
     @NotNull
     public <S> T where(BindableColumn<S> column, VisitableCondition<S> condition,
-                       AndOrCriteriaGroup...subCriteria) {
+                       AndOrCriteriaGroup... subCriteria) {
         return where(column, condition, Arrays.asList(subCriteria));
     }
 
@@ -50,7 +50,7 @@ public <S> T where(BindableColumn<S> column, VisitableCondition<S> condition,
     }
 
     @NotNull
-    public T where(ExistsPredicate existsPredicate, AndOrCriteriaGroup...subCriteria) {
+    public T where(ExistsPredicate existsPredicate, AndOrCriteriaGroup... subCriteria) {
         return where(existsPredicate, Arrays.asList(subCriteria));
     }
 
@@ -62,7 +62,7 @@ public T where(ExistsPredicate existsPredicate, List<AndOrCriteriaGroup> subCrit
     }
 
     @NotNull
-    public T where(SqlCriterion initialCriterion, AndOrCriteriaGroup...subCriteria) {
+    public T where(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
         return where(initialCriterion, Arrays.asList(subCriteria));
     }
 
@@ -91,7 +91,7 @@ public T applyWhere(WhereApplier whereApplier) {
 
     @NotNull
     public <S> T and(BindableColumn<S> column, VisitableCondition<S> condition,
-                     AndOrCriteriaGroup...subCriteria) {
+                     AndOrCriteriaGroup... subCriteria) {
         return and(column, condition, Arrays.asList(subCriteria));
     }
 
@@ -103,7 +103,7 @@ public <S> T and(BindableColumn<S> column, VisitableCondition<S> condition,
     }
 
     @NotNull
-    public T and(ExistsPredicate existsPredicate, AndOrCriteriaGroup...subCriteria) {
+    public T and(ExistsPredicate existsPredicate, AndOrCriteriaGroup... subCriteria) {
         return and(existsPredicate, Arrays.asList(subCriteria));
     }
 
@@ -114,7 +114,7 @@ public T and(ExistsPredicate existsPredicate, List<AndOrCriteriaGroup> subCriter
     }
 
     @NotNull
-    public T and(SqlCriterion initialCriterion, AndOrCriteriaGroup...subCriteria) {
+    public T and(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
         return and(initialCriterion, Arrays.asList(subCriteria));
     }
 
@@ -132,7 +132,7 @@ public T and(List<AndOrCriteriaGroup> criteria) {
 
     @NotNull
     public <S> T or(BindableColumn<S> column, VisitableCondition<S> condition,
-                    AndOrCriteriaGroup...subCriteria) {
+                    AndOrCriteriaGroup... subCriteria) {
         return or(column, condition, Arrays.asList(subCriteria));
     }
 
@@ -144,7 +144,7 @@ public <S> T or(BindableColumn<S> column, VisitableCondition<S> condition,
     }
 
     @NotNull
-    public T or(ExistsPredicate existsPredicate, AndOrCriteriaGroup...subCriteria) {
+    public T or(ExistsPredicate existsPredicate, AndOrCriteriaGroup... subCriteria) {
         return or(existsPredicate, Arrays.asList(subCriteria));
     }
 
@@ -155,7 +155,7 @@ public T or(ExistsPredicate existsPredicate, List<AndOrCriteriaGroup> subCriteri
     }
 
     @NotNull
-    public T or(SqlCriterion initialCriterion, AndOrCriteriaGroup...subCriteria) {
+    public T or(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
         return or(initialCriterion, Arrays.asList(subCriteria));
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereSupport.java b/src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereSupport.java
index 3a4d46523..29384e153 100644
--- a/src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereSupport.java
+++ b/src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereSupport.java
@@ -37,7 +37,7 @@ public abstract class AbstractWhereSupport<W extends AbstractWhereDSL<?>> {
 
     public abstract W where();
 
-    public <T> W where(BindableColumn<T> column, VisitableCondition<T> condition, AndOrCriteriaGroup...subCriteria) {
+    public <T> W where(BindableColumn<T> column, VisitableCondition<T> condition, AndOrCriteriaGroup... subCriteria) {
         return where(column, condition, Arrays.asList(subCriteria));
     }
 
@@ -46,7 +46,7 @@ public <T> W where(BindableColumn<T> column, VisitableCondition<T> condition,
         return apply(w -> w.where(column, condition, subCriteria));
     }
 
-    public W where(ExistsPredicate existsPredicate, AndOrCriteriaGroup...subCriteria) {
+    public W where(ExistsPredicate existsPredicate, AndOrCriteriaGroup... subCriteria) {
         return where(existsPredicate, Arrays.asList(subCriteria));
     }
 
@@ -54,7 +54,7 @@ public W where(ExistsPredicate existsPredicate, List<AndOrCriteriaGroup> subCrit
         return apply(w -> w.where(existsPredicate, subCriteria));
     }
 
-    public W where(SqlCriterion initialCriterion, AndOrCriteriaGroup...subCriteria) {
+    public W where(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
         return where(initialCriterion, Arrays.asList(subCriteria));
     }
 
diff --git a/src/test/java/examples/joins/JoinMapperTest.java b/src/test/java/examples/joins/JoinMapperTest.java
index d22203b1e..a8e599350 100644
--- a/src/test/java/examples/joins/JoinMapperTest.java
+++ b/src/test/java/examples/joins/JoinMapperTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2021 the original author or authors.
+ *    Copyright 2016-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.
@@ -60,6 +60,7 @@ class JoinMapperTest {
     void setup() throws Exception {
         Class.forName(JDBC_DRIVER);
         InputStream is = getClass().getResourceAsStream("/examples/joins/CreateJoinDB.sql");
+        assert is != null;
         try (Connection connection = DriverManager.getConnection(JDBC_URL, "sa", "")) {
             ScriptRunner sr = new ScriptRunner(connection);
             sr.setLogWriter(null);