Checkstyle and Sonar Updates

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java

@@ -81,9 +81,8 @@ protected DeleteWhereBuilder getThis() {
             return this;
         }
 
-        @Override
         protected WhereModel buildWhereModel() {
-            return super.buildWhereModel();
+            return internalBuild();
         }
     }
 }

src/main/java/org/mybatis/dynamic/sql/select/AbstractQueryExpressionDSL.java

@@ -34,7 +34,11 @@
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL;
 import org.mybatis.dynamic.sql.where.AbstractWhereSupportingDSL;
 
-public abstract class AbstractQueryExpressionDSL<W extends AbstractWhereDSL<?>, T extends AbstractQueryExpressionDSL<W, T, R>, R>
+public abstract class AbstractQueryExpressionDSL<
+            W extends AbstractWhereDSL<?>,
+            T extends AbstractQueryExpressionDSL<W, T, R>,
+            R
+        >
         extends AbstractWhereSupportingDSL<W>
         implements Buildable<R> {
 

src/main/java/org/mybatis/dynamic/sql/select/CountDSL.java

@@ -35,7 +35,8 @@
  *
  * @author Jeff Butler
  */
-public class CountDSL<R> extends AbstractQueryExpressionDSL<CountDSL<R>.CountWhereBuilder, CountDSL<R>, R> implements Buildable<R> {
+public class CountDSL<R> extends AbstractQueryExpressionDSL<CountDSL<R>.CountWhereBuilder, CountDSL<R>, R>
+        implements Buildable<R> {
 
     private final Function<SelectModel, R> adapterFunction;
     private final CountWhereBuilder whereBuilder = new CountWhereBuilder();
@@ -130,9 +131,8 @@ protected CountWhereBuilder getThis() {
             return this;
         }
 
-        @Override
         protected WhereModel buildWhereModel() {
-            return super.buildWhereModel();
+            return internalBuild();
         }
     }
 }

src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java

@@ -23,22 +23,20 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.BindableColumn;
 import org.mybatis.dynamic.sql.SortSpecification;
-import org.mybatis.dynamic.sql.SqlCriterion;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.TableExpression;
-import org.mybatis.dynamic.sql.VisitableCondition;
 import org.mybatis.dynamic.sql.select.join.JoinCondition;
 import org.mybatis.dynamic.sql.select.join.JoinCriterion;
 import org.mybatis.dynamic.sql.select.join.JoinSpecification;
 import org.mybatis.dynamic.sql.select.join.JoinType;
 import org.mybatis.dynamic.sql.util.Buildable;
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL;
-import org.mybatis.dynamic.sql.where.WhereApplier;
+import org.mybatis.dynamic.sql.where.AbstractWhereSupportingDSL;
 import org.mybatis.dynamic.sql.where.WhereModel;
 
-public class QueryExpressionDSL<R> extends AbstractQueryExpressionDSL<QueryExpressionDSL<R>.QueryExpressionWhereBuilder, QueryExpressionDSL<R>, R>
+public class QueryExpressionDSL<R>
+        extends AbstractQueryExpressionDSL<QueryExpressionDSL<R>.QueryExpressionWhereBuilder, QueryExpressionDSL<R>, R>
         implements Buildable<R> {
 
     private final String connector;
@@ -284,9 +282,8 @@ protected QueryExpressionWhereBuilder getThis() {
             return this;
         }
 
-        @Override
         protected WhereModel buildWhereModel() {
-            return super.buildWhereModel();
+            return internalBuild();
         }
     }
 
@@ -309,7 +306,8 @@ public JoinSpecificationFinisher on(BasicColumn joinColumn, JoinCondition onJoin
         }
     }
 
-    public class JoinSpecificationFinisher implements Buildable<R> {
+    public class JoinSpecificationFinisher extends AbstractWhereSupportingDSL<QueryExpressionWhereBuilder>
+            implements Buildable<R> {
         private final JoinSpecification.Builder joinSpecificationBuilder;
 
         public JoinSpecificationFinisher(TableExpression table, BasicColumn joinColumn,
@@ -349,19 +347,11 @@ public R build() {
             return QueryExpressionDSL.this.build();
         }
 
+        @Override
         public QueryExpressionWhereBuilder where() {
             return QueryExpressionDSL.this.where();
         }
 
-        public <T> QueryExpressionWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition,
-                SqlCriterion<?>...subCriteria) {
-            return QueryExpressionDSL.this.where(column, condition, subCriteria);
-        }
-
-        public QueryExpressionWhereBuilder applyWhere(WhereApplier whereApplier) {
-            return QueryExpressionDSL.this.applyWhere(whereApplier);
-        }
-
         public JoinSpecificationFinisher and(BasicColumn joinColumn, JoinCondition joinCondition) {
             JoinCriterion joinCriterion = new JoinCriterion.Builder()
                     .withConnector("and") //$NON-NLS-1$

src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java

@@ -153,9 +153,8 @@ protected UpdateWhereBuilder getThis() {
             return this;
         }
 
-        @Override
         protected WhereModel buildWhereModel() {
-            return super.buildWhereModel();
+            return internalBuild();
         }
     }
 }

src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereDSL.java

@@ -125,7 +125,7 @@ private <S> void addCriterion(String connector, BindableColumn<S> column, Visita
         criteria.add(criterion);
     }
 
-    protected WhereModel buildWhereModel() {
+    protected WhereModel internalBuild() {
         return WhereModel.of(criteria);
     }
 

src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereSupportingDSL.java

@@ -1,20 +1,37 @@
+/*
+ *    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.
+ */
 package org.mybatis.dynamic.sql.where;
 
-import org.mybatis.dynamic.sql.BindableColumn;
-import org.mybatis.dynamic.sql.SqlCriterion;
-import org.mybatis.dynamic.sql.VisitableCondition;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Consumer;
 
+import org.mybatis.dynamic.sql.BindableColumn;
+import org.mybatis.dynamic.sql.SqlCriterion;
+import org.mybatis.dynamic.sql.VisitableCondition;
+
 /**
  * Base class for DSLs that support where clauses.
  *
  * @param <W> the implementation of the Where DSL.
  */
 public abstract class AbstractWhereSupportingDSL<W extends AbstractWhereDSL<?>> {
 
+    public abstract W where();
+
     public <T> W where(BindableColumn<T> column, VisitableCondition<T> condition, SqlCriterion<?>...subCriteria) {
         return where(column, condition, Arrays.asList(subCriteria));
     }
@@ -32,6 +49,4 @@ private W apply(Consumer<W> block) {
         block.accept(dsl);
         return dsl;
     }
-
-    public abstract W where();
 }

src/main/java/org/mybatis/dynamic/sql/where/WhereDSL.java

@@ -31,6 +31,6 @@ public static WhereDSL where() {
     }
 
     public WhereModel build() {
-        return buildWhereModel();
+        return internalBuild();
     }
 }

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinBaseBuilders.kt

@@ -38,8 +38,8 @@ abstract class KotlinBaseBuilder<D: AbstractWhereSupportingDSL<*>, B: KotlinBase
         }
 
     fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver) =
-        applyToWhere(subCriteria) { sq ->
-            where(column, condition, sq)
+        applyToWhere(subCriteria) { sc ->
+            where(column, condition, sc)
         }
 
     fun applyWhere(whereApplier: WhereApplier) =
@@ -53,8 +53,8 @@ abstract class KotlinBaseBuilder<D: AbstractWhereSupportingDSL<*>, B: KotlinBase
         }
 
     fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver) =
-        applyToWhere(subCriteria) { sq ->
-            and(column, condition, sq)
+        applyToWhere(subCriteria) { sc ->
+            and(column, condition, sc)
         }
 
     fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>) =
@@ -63,24 +63,24 @@ abstract class KotlinBaseBuilder<D: AbstractWhereSupportingDSL<*>, B: KotlinBase
         }
 
     fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver) =
-        applyToWhere(subCriteria) { sq ->
-            or(column, condition, sq)
+        applyToWhere(subCriteria) { sc ->
+            or(column, condition, sc)
         }
 
     fun allRows() = self()
 
-    private fun applyToWhere(block: AbstractWhereDSL<*>.() -> Unit): B {
-        getDsl().where().apply(block)
-        return self()
-    }
+    private fun applyToWhere(block: AbstractWhereDSL<*>.() -> Unit) =
+        self().also{
+            getDsl().where().apply(block)
+        }
 
     private fun applyToWhere(
         subCriteria: CriteriaReceiver,
         block: AbstractWhereDSL<*>.(List<SqlCriterion<*>>) -> Unit
-    ): B {
-        getDsl().where().block(CriteriaCollector().apply(subCriteria).criteria)
-        return self()
-    }
+    ) =
+        self().also {
+            getDsl().where().block(CriteriaCollector().apply(subCriteria).criteria)
+        }
 
     protected abstract fun self(): B
 
@@ -163,17 +163,17 @@ abstract class KotlinBaseJoiningBuilder<D: AbstractQueryExpressionDSL<*, *, *>,
             rightJoin(sq, sq.correlationName, jc.onJoinCriterion, jc.andJoinCriteria)
         }
 
-    private fun applyToDsl(joinCriteria: JoinReceiver, applyJoin: D.(JoinCollector) -> Unit): B {
-        getDsl().applyJoin(JoinCollector().apply(joinCriteria))
-        return self()
-    }
+    private fun applyToDsl(joinCriteria: JoinReceiver, applyJoin: D.(JoinCollector) -> Unit) =
+        self().also {
+            getDsl().applyJoin(JoinCollector().apply(joinCriteria))
+        }
 
     private fun applyToDsl(
         subQuery: KotlinQualifiedSubQueryBuilder.() -> Unit,
         joinCriteria: JoinReceiver,
         applyJoin: D.(KotlinQualifiedSubQueryBuilder, JoinCollector) -> Unit
-    ): B {
-        getDsl().applyJoin(KotlinQualifiedSubQueryBuilder().apply(subQuery), JoinCollector().apply(joinCriteria))
-        return self()
-    }
+    ) =
+        self().also {
+            getDsl().applyJoin(KotlinQualifiedSubQueryBuilder().apply(subQuery), JoinCollector().apply(joinCriteria))
+        }
 }