Merge pull request #235 from jeffgbutler/master

Final all the things

Author: jeffgbutler

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 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,7 +19,7 @@
 
 public abstract class AbstractColumnComparisonCondition<T> implements VisitableCondition<T> {
 
-    protected BasicColumn column;
+    protected final BasicColumn column;
 
     protected AbstractColumnComparisonCondition(BasicColumn column) {
         this.column = column;

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

@@ -23,8 +23,8 @@
 import java.util.stream.Stream;
 
 public abstract class AbstractListValueCondition<T> implements VisitableCondition<T> {
-    protected Collection<T> values;
-    protected UnaryOperator<Stream<T>> valueStreamTransformer;
+    protected final Collection<T> values;
+    protected final UnaryOperator<Stream<T>> valueStreamTransformer;
     protected boolean renderWhenEmpty = false;
 
     protected AbstractListValueCondition(Collection<T> values) {

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 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.
@@ -20,7 +20,7 @@
 
 public abstract class AbstractNoValueCondition<T> implements VisitableCondition<T> {
 
-    private BooleanSupplier booleanSupplier;
+    private final BooleanSupplier booleanSupplier;
 
     protected AbstractNoValueCondition() {
         booleanSupplier = () -> true;

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 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.
@@ -20,8 +20,8 @@
 import java.util.function.Supplier;
 
 public abstract class AbstractSingleValueCondition<T> implements VisitableCondition<T> {
-    protected Supplier<T> valueSupplier;
-    private Predicate<T> predicate;
+    protected final Supplier<T> valueSupplier;
+    private final Predicate<T> predicate;
 
     protected AbstractSingleValueCondition(Supplier<T> valueSupplier) {
         this.valueSupplier = Objects.requireNonNull(valueSupplier);

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 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,7 +19,7 @@
 import org.mybatis.dynamic.sql.util.Buildable;
 
 public abstract class AbstractSubselectCondition<T> implements VisitableCondition<T> {
-    private SelectModel selectModel;
+    private final SelectModel selectModel;
 
     protected AbstractSubselectCondition(Buildable<SelectModel> selectModelBuilder) {
         this.selectModel = selectModelBuilder.build();

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 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.
@@ -20,9 +20,9 @@
 import java.util.function.Supplier;
 
 public abstract class AbstractTwoValueCondition<T> implements VisitableCondition<T> {
-    protected Supplier<T> valueSupplier1;
-    protected Supplier<T> valueSupplier2;
-    private BiPredicate<T, T> predicate;
+    protected final Supplier<T> valueSupplier1;
+    protected final Supplier<T> valueSupplier2;
+    private final BiPredicate<T, T> predicate;
 
     protected AbstractTwoValueCondition(Supplier<T> valueSupplier1, Supplier<T> valueSupplier2) {
         this.valueSupplier1 = Objects.requireNonNull(valueSupplier1);
@@ -32,7 +32,8 @@ protected AbstractTwoValueCondition(Supplier<T> valueSupplier1, Supplier<T> valu
 
     protected AbstractTwoValueCondition(Supplier<T> valueSupplier1, Supplier<T> valueSupplier2,
             BiPredicate<T, T> predicate) {
-        this(valueSupplier1, valueSupplier2);
+        this.valueSupplier1 = Objects.requireNonNull(valueSupplier1);
+        this.valueSupplier2 = Objects.requireNonNull(valueSupplier2);
         this.predicate = Objects.requireNonNull(predicate);
     }
 

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

@@ -23,7 +23,7 @@
 public class Constant<T> implements BindableColumn<T> {
 
     private String alias;
-    private String value;
+    private final String value;
 
     private Constant(String value) {
         this.value = Objects.requireNonNull(value);

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 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.
@@ -40,7 +40,7 @@ public interface SortSpecification {
     /**
      * Return true if the sort order is descending.
      * 
-     * @return true if the SortSpcification should render as descending 
+     * @return true if the SortSpecification should render as descending
      */
     boolean isDescending();
 }

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

@@ -734,7 +734,7 @@ static SortSpecification sortColumn(String name) {
 
     class InsertIntoNextStep {
 
-        private SqlTable table;
+        private final SqlTable table;
 
         private InsertIntoNextStep(SqlTable table) {
             this.table = Objects.requireNonNull(table);

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

@@ -25,9 +25,9 @@
 
 public class SqlColumn<T> implements BindableColumn<T>, SortSpecification {
 
-    protected String name;
-    protected SqlTable table;
-    protected JDBCType jdbcType;
+    protected final String name;
+    protected final SqlTable table;
+    protected final JDBCType jdbcType;
     protected boolean isDescending = false;
     protected String alias;
     protected String typeHandler;

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 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.
@@ -24,10 +24,10 @@
 
 public class SqlCriterion<T> {
 
-    private BindableColumn<T> column;
-    private VisitableCondition<T> condition;
-    private String connector;
-    private List<SqlCriterion<?>> subCriteria;
+    private final BindableColumn<T> column;
+    private final VisitableCondition<T> condition;
+    private final String connector;
+    private final List<SqlCriterion<?>> subCriteria;
 
     private SqlCriterion(Builder<T> builder) {
         connector = builder.connector;
@@ -60,7 +60,7 @@ public static class Builder<T> {
         private String connector;
         private BindableColumn<T> column;
         private VisitableCondition<T> condition;
-        private List<SqlCriterion<?>> subCriteria = new ArrayList<>();
+        private final List<SqlCriterion<?>> subCriteria = new ArrayList<>();
 
         public Builder<T> withConnector(String connector) {
             this.connector = connector;

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

@@ -23,7 +23,7 @@
 
 public class SqlTable {
 
-    private Supplier<String> nameSupplier;
+    private final Supplier<String> nameSupplier;
 
     protected SqlTable(String tableName) {
         Objects.requireNonNull(tableName);

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

@@ -23,7 +23,7 @@
 public class StringConstant implements BindableColumn<String> {
 
     private String alias;
-    private String value;
+    private final String value;
 
     private StringConstant(String value) {
         this.value = Objects.requireNonNull(value);

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

@@ -33,9 +33,9 @@
 
 public class DeleteDSL<R> implements Buildable<R> {
 
-    private Function<DeleteModel, R> adapterFunction;
-    private SqlTable table;
-    private DeleteWhereBuilder whereBuilder = new DeleteWhereBuilder();
+    private final Function<DeleteModel, R> adapterFunction;
+    private final SqlTable table;
+    private final DeleteWhereBuilder whereBuilder = new DeleteWhereBuilder();
 
     private DeleteDSL(SqlTable table, Function<DeleteModel, R> adapterFunction) {
         this.table = Objects.requireNonNull(table);

src/main/java/org/mybatis/dynamic/sql/delete/DeleteModel.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.
@@ -26,8 +26,8 @@
 import org.mybatis.dynamic.sql.where.WhereModel;
 
 public class DeleteModel {
-    private SqlTable table;
-    private WhereModel whereModel;
+    private final SqlTable table;
+    private final WhereModel whereModel;
 
     private DeleteModel(Builder builder) {
         table = Objects.requireNonNull(builder.table);

src/main/java/org/mybatis/dynamic/sql/delete/MyBatis3DeleteModelAdapter.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.
@@ -33,8 +33,8 @@
 @Deprecated
 public class MyBatis3DeleteModelAdapter<R> {
 
-    private DeleteModel deleteModel;
-    private Function<DeleteStatementProvider, R> mapperMethod;
+    private final DeleteModel deleteModel;
+    private final Function<DeleteStatementProvider, R> mapperMethod;
 
     private MyBatis3DeleteModelAdapter(DeleteModel deleteModel, Function<DeleteStatementProvider, R> mapperMethod) {
         this.deleteModel = Objects.requireNonNull(deleteModel);

src/main/java/org/mybatis/dynamic/sql/delete/render/DefaultDeleteStatementProvider.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.
@@ -20,8 +20,8 @@
 import java.util.Objects;
 
 public class DefaultDeleteStatementProvider implements DeleteStatementProvider {
-    private String deleteStatement;
-    private Map<String, Object> parameters;
+    private final String deleteStatement;
+    private final Map<String, Object> parameters;
 
     private DefaultDeleteStatementProvider(Builder builder) {
         deleteStatement = Objects.requireNonNull(builder.deleteStatement);
@@ -44,7 +44,7 @@ public static Builder withDeleteStatement(String deleteStatement) {
 
     public static class Builder {
         private String deleteStatement;
-        private Map<String, Object> parameters = new HashMap<>();
+        private final Map<String, Object> parameters = new HashMap<>();
 
         public Builder withDeleteStatement(String deleteStatement) {
             this.deleteStatement = deleteStatement;

src/main/java/org/mybatis/dynamic/sql/delete/render/DeleteRenderer.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.
@@ -29,8 +29,8 @@
 import org.mybatis.dynamic.sql.where.render.WhereRenderer;
 
 public class DeleteRenderer {
-    private DeleteModel deleteModel;
-    private RenderingStrategy renderingStrategy;
+    private final DeleteModel deleteModel;
+    private final RenderingStrategy renderingStrategy;
 
     private DeleteRenderer(Builder builder) {
         deleteModel = Objects.requireNonNull(builder.deleteModel);

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

@@ -27,9 +27,9 @@
 import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 
 public abstract class AbstractMultiRowInsertModel<T> {
-    private SqlTable table;
-    private List<T> records;
-    private List<AbstractColumnMapping> columnMappings;
+    private final SqlTable table;
+    private final List<T> records;
+    private final List<AbstractColumnMapping> columnMappings;
 
     protected AbstractMultiRowInsertModel(AbstractBuilder<T, ?> builder) {
         table = Objects.requireNonNull(builder.table);
@@ -55,8 +55,8 @@ public int recordCount() {
 
     public abstract static class AbstractBuilder<T, S extends AbstractBuilder<T, S>> {
         private SqlTable table;
-        private List<T> records = new ArrayList<>();
-        private List<AbstractColumnMapping> columnMappings = new ArrayList<>();
+        private final List<T> records = new ArrayList<>();
+        private final List<AbstractColumnMapping> columnMappings = new ArrayList<>();
 
         public S withTable(SqlTable table) {
             this.table = table;

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

@@ -32,9 +32,9 @@
 
 public class BatchInsertDSL<T> implements Buildable<BatchInsertModel<T>> {
 
-    private Collection<T> records;
-    private SqlTable table;
-    private List<AbstractColumnMapping> columnMappings = new ArrayList<>();
+    private final Collection<T> records;
+    private final SqlTable table;
+    private final List<AbstractColumnMapping> columnMappings = new ArrayList<>();
 
     private BatchInsertDSL(Collection<T> records, SqlTable table) {
         this.records = records;
@@ -64,7 +64,7 @@ public static <T> IntoGatherer<T> insert(Collection<T> records) {
     }
 
     public static class IntoGatherer<T> {
-        private Collection<T> records;
+        private final Collection<T> records;
 
         private IntoGatherer(Collection<T> records) {
             this.records = records;
@@ -76,7 +76,7 @@ public BatchInsertDSL<T> into(SqlTable table) {
     }
 
     public class ColumnMappingFinisher<F> {
-        private SqlColumn<F> column;
+        private final SqlColumn<F> column;
 
         public ColumnMappingFinisher(SqlColumn<F> column) {
             this.column = column;

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

@@ -32,8 +32,8 @@
 import org.mybatis.dynamic.sql.util.ValueWhenPresentMapping;
 
 public class GeneralInsertDSL implements Buildable<GeneralInsertModel> {
-    private List<AbstractColumnMapping> insertMappings = new ArrayList<>();
-    private SqlTable table;
+    private final List<AbstractColumnMapping> insertMappings = new ArrayList<>();
+    private final SqlTable table;
 
     private GeneralInsertDSL(SqlTable table) {
         this.table = Objects.requireNonNull(table);
@@ -58,7 +58,7 @@ public static GeneralInsertDSL insertInto(SqlTable table) {
 
     public class SetClauseFinisher<T> {
 
-        private SqlColumn<T> column;
+        private final SqlColumn<T> column;
 
         public SetClauseFinisher(SqlColumn<T> column) {
             this.column = column;

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

@@ -30,8 +30,8 @@
 
 public class GeneralInsertModel {
 
-    private SqlTable table;
-    private List<AbstractColumnMapping> insertMappings;
+    private final SqlTable table;
+    private final List<AbstractColumnMapping> insertMappings;
 
     private GeneralInsertModel(Builder builder) {
         table = Objects.requireNonNull(builder.table);
@@ -56,7 +56,7 @@ public GeneralInsertStatementProvider render(RenderingStrategy renderingStrategy
 
     public static class Builder {
         private SqlTable table;
-        private List<AbstractColumnMapping> insertMappings = new ArrayList<>();
+        private final List<AbstractColumnMapping> insertMappings = new ArrayList<>();
 
         public Builder withTable(SqlTable table) {
             this.table = table;