Refactor filter/map algorithm into base class for two value Conditions

Author: jeffgbutler

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

@@ -17,6 +17,7 @@
 
 import java.util.function.BiFunction;
 import java.util.function.BiPredicate;
+import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 
 public abstract class AbstractTwoValueCondition<T, S extends AbstractTwoValueCondition<T, S>>
@@ -42,15 +43,15 @@ public <R> R accept(ConditionVisitor<T, R> visitor) {
         return visitor.visit(this);
     }
 
-    protected S filter(BiPredicate<T, T> predicate, S self, S empty) {
+    protected S filter(BiPredicate<T, T> predicate, Supplier<S> empty, S self) {
         if (shouldRender()) {
-            return predicate.test(value1, value2) ? self : empty;
+            return predicate.test(value1, value2) ? self : empty.get();
         } else {
             return self;
         }
     }
 
-    protected S map(UnaryOperator<T> mapper1, UnaryOperator<T> mapper2, S self, BiFunction<T, T, S> constructor) {
+    protected S map(UnaryOperator<T> mapper1, UnaryOperator<T> mapper2, BiFunction<T, T, S> constructor, S self) {
         if (shouldRender()) {
             return constructor.apply(mapper1.apply(value1), mapper2.apply(value2));
         }else {

src/main/java/org/mybatis/dynamic/sql/where/condition/IsBetween.java

@@ -63,12 +63,12 @@ public IsBetween<T> then(UnaryOperator<T> mapper1, UnaryOperator<T> mapper2) {
 
     @Override
     public IsBetween<T> filter(BiPredicate<T, T> predicate) {
-        return filter(predicate, this, EmptyIsBetween.empty());
+        return filter(predicate, EmptyIsBetween::empty, this);
     }
 
     @Override
     public IsBetween<T> map(UnaryOperator<T> mapper1, UnaryOperator<T> mapper2) {
-        return map(mapper1, mapper2, this, IsBetween::new);
+        return map(mapper1, mapper2, IsBetween::new, this);
     }
 
     public static <T> Builder<T> isBetween(T value1) {

src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotBetween.java

@@ -63,12 +63,12 @@ public IsNotBetween<T> then(UnaryOperator<T> mapper1, UnaryOperator<T> mapper2)
 
     @Override
     public IsNotBetween<T> filter(BiPredicate<T, T> predicate) {
-        return filter(predicate, this, EmptyIsNotBetween.empty());
+        return filter(predicate, EmptyIsNotBetween::empty, this);
     }
 
     @Override
     public IsNotBetween<T> map(UnaryOperator<T> mapper1, UnaryOperator<T> mapper2) {
-        return map(mapper1, mapper2, this, IsNotBetween::new);
+        return map(mapper1, mapper2, IsNotBetween::new, this);
     }
 
     public static <T> Builder<T> isNotBetween(T value1) {