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;