Add "then" value processing to all single and two value conditions

Author: jeffgbutler

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -17,6 +17,7 @@
 
 import java.util.function.BiPredicate;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 import org.mybatis.dynamic.sql.AbstractTwoValueCondition;
 
@@ -53,4 +54,9 @@ public static <T> Builder<T> isBetween(Supplier<T> valueSupplier1) {
     public IsBetween<T> when(BiPredicate<T, T> predicate) {
         return new IsBetween<>(valueSupplier1, valueSupplier2, predicate);
     }
+
+    public IsBetween<T> then(UnaryOperator<T> transformer1, UnaryOperator<T> transformer2) {
+        return shouldRender() ? new IsBetween<>(() -> transformer1.apply(value1()),
+                () -> transformer2.apply(value2())) : this;
+    }
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -16,6 +16,7 @@
 package org.mybatis.dynamic.sql.where.condition;
 
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 import org.mybatis.dynamic.sql.util.Predicates;
 
@@ -39,4 +40,10 @@ protected IsBetweenWhenPresent<T> build() {
     public static <T> Builder<T> isBetweenWhenPresent(Supplier<T> valueSupplier) {
         return new Builder<>(valueSupplier);
     }
+
+    @Override
+    public IsBetweenWhenPresent<T> then(UnaryOperator<T> transformer1, UnaryOperator<T> transformer2) {
+        return shouldRender() ? new IsBetweenWhenPresent<>(() -> transformer1.apply(value1()),
+                () -> transformer2.apply(value2())) : this;
+    }
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -17,6 +17,7 @@
 
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 import org.mybatis.dynamic.sql.AbstractSingleValueCondition;
 
@@ -42,4 +43,8 @@ public static <T> IsEqualTo<T> of(Supplier<T> valueSupplier) {
     public IsEqualTo<T> when(Predicate<T> predicate) {
         return new IsEqualTo<>(valueSupplier, predicate);
     }
+
+    public IsEqualTo<T> then(UnaryOperator<T> transformer) {
+        return shouldRender() ? new IsEqualTo<>(() -> transformer.apply(value())) : this;
+    }
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -17,6 +17,7 @@
 
 import java.util.Objects;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 public class IsEqualToWhenPresent<T> extends IsEqualTo<T> {
 
@@ -27,4 +28,9 @@ protected IsEqualToWhenPresent(Supplier<T> valueSupplier) {
     public static <T> IsEqualToWhenPresent<T> of(Supplier<T> valueSupplier) {
         return new IsEqualToWhenPresent<>(valueSupplier);
     }
+
+    @Override
+    public IsEqualToWhenPresent<T> then(UnaryOperator<T> transformer) {
+        return shouldRender() ? new IsEqualToWhenPresent<>(() -> transformer.apply(value())) : this;
+    }
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -17,6 +17,7 @@
 
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 import org.mybatis.dynamic.sql.AbstractSingleValueCondition;
 
@@ -42,4 +43,8 @@ public static <T> IsGreaterThan<T> of(Supplier<T> valueSupplier) {
     public IsGreaterThan<T> when(Predicate<T> predicate) {
         return new IsGreaterThan<>(valueSupplier, predicate);
     }
+
+    public IsGreaterThan<T> then(UnaryOperator<T> transformer) {
+        return shouldRender() ? new IsGreaterThan<>(() -> transformer.apply(value())) : this;
+    }
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -17,6 +17,7 @@
 
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 import org.mybatis.dynamic.sql.AbstractSingleValueCondition;
 
@@ -42,4 +43,8 @@ public static <T> IsGreaterThanOrEqualTo<T> of(Supplier<T> valueSupplier) {
     public IsGreaterThanOrEqualTo<T> when(Predicate<T> predicate) {
         return new IsGreaterThanOrEqualTo<>(valueSupplier, predicate);
     }
+
+    public IsGreaterThanOrEqualTo<T> then(UnaryOperator<T> transformer) {
+        return shouldRender() ? new IsGreaterThanOrEqualTo<>(() -> transformer.apply(value())) : this;
+    }
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -17,6 +17,7 @@
 
 import java.util.Objects;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 public class IsGreaterThanOrEqualToWhenPresent<T> extends IsGreaterThanOrEqualTo<T> {
 
@@ -27,4 +28,9 @@ protected IsGreaterThanOrEqualToWhenPresent(Supplier<T> valueSupplier) {
     public static <T> IsGreaterThanOrEqualToWhenPresent<T> of(Supplier<T> valueSupplier) {
         return new IsGreaterThanOrEqualToWhenPresent<>(valueSupplier);
     }
+
+    @Override
+    public IsGreaterThanOrEqualToWhenPresent<T> then(UnaryOperator<T> transformer) {
+        return shouldRender() ? new IsGreaterThanOrEqualToWhenPresent<>(() -> transformer.apply(value())) : this;
+    }
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -17,6 +17,7 @@
 
 import java.util.Objects;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 public class IsGreaterThanWhenPresent<T> extends IsGreaterThan<T> {
 
@@ -27,4 +28,9 @@ protected IsGreaterThanWhenPresent(Supplier<T> valueSupplier) {
     public static <T> IsGreaterThanWhenPresent<T> of(Supplier<T> valueSupplier) {
         return new IsGreaterThanWhenPresent<>(valueSupplier);
     }
+
+    @Override
+    public IsGreaterThanWhenPresent<T> then(UnaryOperator<T> transformer) {
+        return shouldRender() ? new IsGreaterThanWhenPresent<>(() -> transformer.apply(value())) : this;
+    }
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -17,6 +17,7 @@
 
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 import org.mybatis.dynamic.sql.AbstractSingleValueCondition;
 
@@ -42,4 +43,8 @@ public static <T> IsLessThan<T> of(Supplier<T> valueSupplier) {
     public IsLessThan<T> when(Predicate<T> predicate) {
         return new IsLessThan<>(valueSupplier, predicate);
     }
+
+    public IsLessThan<T> then(UnaryOperator<T> transformer) {
+        return shouldRender() ? new IsLessThan<>(() -> transformer.apply(value())) : this;
+    }
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -17,6 +17,7 @@
 
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 import org.mybatis.dynamic.sql.AbstractSingleValueCondition;
 
@@ -42,4 +43,8 @@ public static <T> IsLessThanOrEqualTo<T> of(Supplier<T> valueSupplier) {
     public IsLessThanOrEqualTo<T> when(Predicate<T> predicate) {
         return new IsLessThanOrEqualTo<>(valueSupplier, predicate);
     }
+
+    public IsLessThanOrEqualTo<T> then(UnaryOperator<T> transformer) {
+        return shouldRender() ? new IsLessThanOrEqualTo<>(() -> transformer.apply(value())) : this;
+    }
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -17,6 +17,7 @@
 
 import java.util.Objects;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 public class IsLessThanOrEqualToWhenPresent<T> extends IsLessThanOrEqualTo<T> {
 
@@ -27,4 +28,9 @@ protected IsLessThanOrEqualToWhenPresent(Supplier<T> valueSupplier) {
     public static <T> IsLessThanOrEqualToWhenPresent<T> of(Supplier<T> valueSupplier) {
         return new IsLessThanOrEqualToWhenPresent<>(valueSupplier);
     }
+
+    @Override
+    public IsLessThanOrEqualToWhenPresent<T> then(UnaryOperator<T> transformer) {
+        return shouldRender() ? new IsLessThanOrEqualToWhenPresent<>(() -> transformer.apply(value())) : this;
+    }
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -17,6 +17,7 @@
 
 import java.util.Objects;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 public class IsLessThanWhenPresent<T> extends IsLessThan<T> {
 
@@ -27,4 +28,9 @@ protected IsLessThanWhenPresent(Supplier<T> valueSupplier) {
     public static <T> IsLessThanWhenPresent<T> of(Supplier<T> valueSupplier) {
         return new IsLessThanWhenPresent<>(valueSupplier);
     }
+
+    @Override
+    public IsLessThanWhenPresent<T> then(UnaryOperator<T> transformer) {
+        return shouldRender() ? new IsLessThanWhenPresent<>(() -> transformer.apply(value())) : this;
+    }
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -17,6 +17,7 @@
 
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 import org.mybatis.dynamic.sql.AbstractSingleValueCondition;
 import org.mybatis.dynamic.sql.util.StringUtilities;
@@ -47,4 +48,8 @@ public static IsLikeCaseInsensitive of(Supplier<String> valueSupplier) {
     public IsLikeCaseInsensitive when(Predicate<String> predicate) {
         return new IsLikeCaseInsensitive(valueSupplier, predicate);
     }
+
+    public IsLikeCaseInsensitive then(UnaryOperator<String> transformer) {
+        return shouldRender() ? new IsLikeCaseInsensitive(() -> transformer.apply(value())) : this;
+    }
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -17,6 +17,7 @@
 
 import java.util.Objects;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 public class IsLikeCaseInsensitiveWhenPresent extends IsLikeCaseInsensitive {
 
@@ -27,4 +28,9 @@ protected IsLikeCaseInsensitiveWhenPresent(Supplier<String> valueSupplier) {
     public static IsLikeCaseInsensitiveWhenPresent of(Supplier<String> valueSupplier) {
         return new IsLikeCaseInsensitiveWhenPresent(valueSupplier);
     }
+
+    @Override
+    public IsLikeCaseInsensitiveWhenPresent then(UnaryOperator<String> transformer) {
+        return shouldRender() ? new IsLikeCaseInsensitiveWhenPresent(() -> transformer.apply(value())) : this;
+    }
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -17,6 +17,7 @@
 
 import java.util.Objects;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 public class IsLikeWhenPresent<T> extends IsLike<T> {
 
@@ -27,4 +28,9 @@ protected IsLikeWhenPresent(Supplier<T> valueSupplier) {
     public static <T> IsLikeWhenPresent<T> of(Supplier<T> valueSupplier) {
         return new IsLikeWhenPresent<>(valueSupplier);
     }
+
+    @Override
+    public IsLikeWhenPresent<T> then(UnaryOperator<T> transformer) {
+        return shouldRender() ? new IsLikeWhenPresent<>(() -> transformer.apply(value())) : this;
+    }
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -17,6 +17,7 @@
 
 import java.util.function.BiPredicate;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 import org.mybatis.dynamic.sql.AbstractTwoValueCondition;
 
@@ -54,4 +55,9 @@ public static <T> Builder<T> isNotBetween(Supplier<T> valueSupplier1) {
     public IsNotBetween<T> when(BiPredicate<T, T> predicate) {
         return new IsNotBetween<>(valueSupplier1, valueSupplier2, predicate);
     }
+
+    public IsNotBetween<T> then(UnaryOperator<T> transformer1, UnaryOperator<T> transformer2) {
+        return shouldRender() ? new IsNotBetween<>(() -> transformer1.apply(value1()),
+                () -> transformer2.apply(value2())) : this;
+    }
 }