Better name for the base where support class

Author: jeffgbutler

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

@@ -22,10 +22,10 @@
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.util.Buildable;
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL;
-import org.mybatis.dynamic.sql.where.AbstractWhereSupportingDSL;
+import org.mybatis.dynamic.sql.where.AbstractWhereSupport;
 import org.mybatis.dynamic.sql.where.WhereModel;
 
-public class DeleteDSL<R> extends AbstractWhereSupportingDSL<DeleteDSL<R>.DeleteWhereBuilder> implements Buildable<R> {
+public class DeleteDSL<R> extends AbstractWhereSupport<DeleteDSL<R>.DeleteWhereBuilder> implements Buildable<R> {
 
     private final Function<DeleteModel, R> adapterFunction;
     private final SqlTable table;

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

@@ -32,14 +32,11 @@
 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.AbstractWhereSupportingDSL;
-
-public abstract class AbstractQueryExpressionDSL<
-            W extends AbstractWhereDSL<?>,
-            T extends AbstractQueryExpressionDSL<W, T, R>,
-            R
-        >
-        extends AbstractWhereSupportingDSL<W>
+import org.mybatis.dynamic.sql.where.AbstractWhereSupport;
+
+public abstract class AbstractQueryExpressionDSL<W extends AbstractWhereDSL<?>,
+            T extends AbstractQueryExpressionDSL<W, T, R>, R>
+        extends AbstractWhereSupport<W>
         implements Buildable<R> {
 
     private final List<JoinSpecification.Builder> joinSpecificationBuilders = new ArrayList<>();

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

@@ -32,7 +32,7 @@
 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.AbstractWhereSupportingDSL;
+import org.mybatis.dynamic.sql.where.AbstractWhereSupport;
 import org.mybatis.dynamic.sql.where.WhereModel;
 
 public class QueryExpressionDSL<R>
@@ -306,7 +306,7 @@ public JoinSpecificationFinisher on(BasicColumn joinColumn, JoinCondition onJoin
         }
     }
 
-    public class JoinSpecificationFinisher extends AbstractWhereSupportingDSL<QueryExpressionWhereBuilder>
+    public class JoinSpecificationFinisher extends AbstractWhereSupport<QueryExpressionWhereBuilder>
             implements Buildable<R> {
         private final JoinSpecification.Builder joinSpecificationBuilder;
 

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

@@ -36,10 +36,10 @@
 import org.mybatis.dynamic.sql.util.ValueMapping;
 import org.mybatis.dynamic.sql.util.ValueWhenPresentMapping;
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL;
-import org.mybatis.dynamic.sql.where.AbstractWhereSupportingDSL;
+import org.mybatis.dynamic.sql.where.AbstractWhereSupport;
 import org.mybatis.dynamic.sql.where.WhereModel;
 
-public class UpdateDSL<R> extends AbstractWhereSupportingDSL<UpdateDSL<R>.UpdateWhereBuilder> implements Buildable<R> {
+public class UpdateDSL<R> extends AbstractWhereSupport<UpdateDSL<R>.UpdateWhereBuilder> implements Buildable<R> {
 
     private final Function<UpdateModel, R> adapterFunction;
     private final List<AbstractColumnMapping> columnMappings = new ArrayList<>();

src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereSupportingDSL.java renamed to src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereSupport.java

@@ -24,11 +24,14 @@
 import org.mybatis.dynamic.sql.VisitableCondition;
 
 /**
- * Base class for DSLs that support where clauses.
+ * Base class for DSLs that support where clauses - which is every DSL except Insert.
+ * The purpose of the class is to provide an implementation of the {@link AbstractWhereDSL}
+ * that is customized for a particular DSL, and to add the initiating common "where"
+ * methods.
  *
- * @param <W> the implementation of the Where DSL.
+ * @param <W> the implementation of the Where DSL customized for a particular SQL statement.
  */
-public abstract class AbstractWhereSupportingDSL<W extends AbstractWhereDSL<?>> {
+public abstract class AbstractWhereSupport<W extends AbstractWhereDSL<?>> {
 
     public abstract W where();
 

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

@@ -21,7 +21,7 @@ import org.mybatis.dynamic.sql.SqlTable
 import org.mybatis.dynamic.sql.VisitableCondition
 import org.mybatis.dynamic.sql.select.AbstractQueryExpressionDSL
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL
-import org.mybatis.dynamic.sql.where.AbstractWhereSupportingDSL
+import org.mybatis.dynamic.sql.where.AbstractWhereSupport
 
 @Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE)
 @DslMarker
@@ -31,7 +31,7 @@ typealias WhereApplier = AbstractWhereDSL<*>.() -> Unit
 
 @MyBatisDslMarker
 @Suppress("TooManyFunctions")
-abstract class KotlinBaseBuilder<D: AbstractWhereSupportingDSL<*>, B: KotlinBaseBuilder<D, B>> {
+abstract class KotlinBaseBuilder<D: AbstractWhereSupport<*>, B: KotlinBaseBuilder<D, B>> {
     fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>) =
         applyToWhere {
             where(column, condition)