Merge pull request #234 from jeffgbutler/master

Refactor the Criterion Renderer

Author: jeffgbutler

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

@@ -25,7 +25,7 @@
 public abstract class AbstractListValueCondition<T> implements VisitableCondition<T> {
     protected Collection<T> values;
     protected UnaryOperator<Stream<T>> valueStreamTransformer;
-    protected boolean skipRenderingWhenEmpty = true;
+    protected boolean renderWhenEmpty = false;
 
     protected AbstractListValueCondition(Collection<T> values) {
         this(values, UnaryOperator.identity());
@@ -40,15 +40,16 @@ public final <R> Stream<R> mapValues(Function<T, R> mapper) {
         return valueStreamTransformer.apply(values.stream()).map(mapper);
     }
 
-    public boolean skipRenderingWhenEmpty() {
-        return skipRenderingWhenEmpty;
+    @Override
+    public boolean shouldRender() {
+        return !values.isEmpty() || renderWhenEmpty;
     }
-    
+
     /**
      * Use with caution - this could cause the library to render invalid SQL like "where column in ()".
      */
     protected void forceRenderingWhenEmpty() {
-        skipRenderingWhenEmpty = false;
+        renderWhenEmpty = true;
     }
 
     @Override

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2019 the original author or authors.
+ *    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.
@@ -19,6 +19,7 @@
 import java.util.function.Function;
 import java.util.function.ToIntFunction;
 
+import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.BindableColumn;
 import org.mybatis.dynamic.sql.SqlCriterion;
 import org.mybatis.dynamic.sql.SqlTable;
@@ -61,6 +62,7 @@ public DeleteWhereBuilder applyWhere(WhereApplier whereApplier) {
      * 
      * @return the model class
      */
+    @NotNull
     @Override
     public R build() {
         DeleteModel deleteModel = DeleteModel.withTable(table)
@@ -99,6 +101,7 @@ private DeleteWhereBuilder() {
             super();
         }
 
+        @NotNull
         @Override
         public R build() {
             return DeleteDSL.this.build();

src/main/java/org/mybatis/dynamic/sql/insert/BatchInsertDSL.java

@@ -20,6 +20,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
@@ -44,6 +45,7 @@ public <F> ColumnMappingFinisher<F> map(SqlColumn<F> column) {
         return new ColumnMappingFinisher<>(column);
     }
 
+    @NotNull
     @Override
     public BatchInsertModel<T> build() {
         return BatchInsertModel.withRecords(records)

src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertDSL.java

@@ -20,6 +20,7 @@
 import java.util.Objects;
 import java.util.function.Supplier;
 
+import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
@@ -42,6 +43,7 @@ public <T> SetClauseFinisher<T> set(SqlColumn<T> column) {
         return new SetClauseFinisher<>(column);
     }
 
+    @NotNull
     @Override
     public GeneralInsertModel build() {
         return new GeneralInsertModel.Builder()

src/main/java/org/mybatis/dynamic/sql/insert/InsertDSL.java

@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.function.Supplier;
 
+import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
@@ -44,6 +45,7 @@ public <F> ColumnMappingFinisher<F> map(SqlColumn<F> column) {
         return new ColumnMappingFinisher<>(column);
     }
 
+    @NotNull
     @Override
     public InsertModel<T> build() {
         return InsertModel.withRecord(record)

src/main/java/org/mybatis/dynamic/sql/insert/MultiRowInsertDSL.java

@@ -20,6 +20,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
@@ -44,6 +45,7 @@ public <F> ColumnMappingFinisher<F> map(SqlColumn<F> column) {
         return new ColumnMappingFinisher<>(column);
     }
 
+    @NotNull
     @Override
     public MultiRowInsertModel<T> build() {
         return MultiRowInsertModel.withRecords(records)

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

@@ -18,6 +18,7 @@
 import java.util.Objects;
 import java.util.function.Function;
 
+import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.BindableColumn;
 import org.mybatis.dynamic.sql.SqlBuilder;
@@ -64,6 +65,7 @@ public CountWhereBuilder applyWhere(WhereApplier whereApplier) {
         return whereBuilder.applyWhere(whereApplier);
     }
 
+    @NotNull
     @Override
     public R build() {
         return adapterFunction.apply(buildModel());
@@ -130,6 +132,7 @@ public class CountWhereBuilder extends AbstractWhereDSL<CountWhereBuilder>
             implements Buildable<R> {
         private <T> CountWhereBuilder() {}
 
+        @NotNull
         @Override
         public R build() {
             return CountDSL.this.build();

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

@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Objects;
 
+import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.BindableColumn;
 import org.mybatis.dynamic.sql.SortSpecification;
@@ -73,6 +74,7 @@ public QueryExpressionWhereBuilder applyWhere(WhereApplier whereApplier) {
         return whereBuilder.applyWhere(whereApplier);
     }
 
+    @NotNull
     @Override
     public R build() {
         return selectDSL.build();
@@ -258,6 +260,7 @@ public SelectDSL<R>.FetchFirstFinisher fetchFirst(long fetchFirstRows) {
             return QueryExpressionDSL.this.fetchFirst(fetchFirstRows);
         }
 
+        @NotNull
         @Override
         public R build() {
             return QueryExpressionDSL.this.build();
@@ -327,6 +330,7 @@ public JoinSpecificationFinisher(SqlTable table, BasicColumn joinColumn,
             addJoinSpecificationBuilder(joinSpecificationBuilder);
         }
 
+        @NotNull
         @Override
         public R build() {
             return QueryExpressionDSL.this.build();
@@ -421,6 +425,7 @@ public SelectDSL<R> orderBy(SortSpecification...columns) {
             return QueryExpressionDSL.this.orderBy(columns);
         }
 
+        @NotNull
         @Override
         public R build() {
             return QueryExpressionDSL.this.build();

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

@@ -23,6 +23,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.SortSpecification;
 import org.mybatis.dynamic.sql.select.QueryExpressionDSL.FromGatherer;
@@ -157,6 +158,7 @@ public FetchFirstFinisher fetchFirst(long fetchFirstRows) {
         return new FetchFirstFinisher();
     }
 
+    @NotNull
     @Override
     public R build() {
         SelectModel selectModel = SelectModel.withQueryExpressions(buildModels())
@@ -186,13 +188,15 @@ public OffsetFinisher offset(long offset) {
             return new OffsetFinisher();
         }
 
+        @NotNull
         @Override
         public R build() {
             return SelectDSL.this.build();
         }
     }
 
     public class OffsetFinisher implements Buildable<R> {
+        @NotNull
         @Override
         public R build() {
             return SelectDSL.this.build();
@@ -205,6 +209,7 @@ public FetchFirstFinisher fetchFirst(long fetchFirstRows) {
             return new FetchFirstFinisher();
         }
 
+        @NotNull
         @Override
         public R build() {
             return SelectDSL.this.build();
@@ -218,6 +223,7 @@ public RowsOnlyFinisher rowsOnly() {
     }
 
     public class RowsOnlyFinisher implements Buildable<R> {
+        @NotNull
         @Override
         public R build() {
             return SelectDSL.this.build();

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

@@ -22,6 +22,7 @@
 import java.util.function.Supplier;
 import java.util.function.ToIntFunction;
 
+import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.BindableColumn;
 import org.mybatis.dynamic.sql.SqlColumn;
@@ -80,6 +81,7 @@ public UpdateWhereBuilder applyWhere(WhereApplier whereApplier) {
      * 
      * @return the update model
      */
+    @NotNull
     @Override
     public R build() {
         UpdateModel updateModel = UpdateModel.withTable(table)
@@ -171,6 +173,7 @@ public UpdateWhereBuilder() {
             super();
         }
 
+        @NotNull
         @Override
         public R build() {
             return UpdateDSL.this.build();