Define a map template method for two value

Author: jeffgbutler

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

@@ -88,6 +88,30 @@ protected <R, S extends AbstractTwoValueCondition<R>> S mapSupport(Function<? su
      */
     public abstract AbstractTwoValueCondition<T> filter(Predicate<? super T> predicate);
 
+    /**
+     * If renderable, apply the mappings to the values and return a new condition with the new values. Else return a
+     * condition that will not render (this).
+     *
+     * @param mapper1 a mapping function to apply to the first value, if renderable
+     * @param mapper2 a mapping function to apply to the second value, if renderable
+     * @param <R> type of the new condition
+     * @return a new condition with the result of applying the mappers to the values of this condition,
+     *     if renderable, otherwise a condition that will not render.
+     */
+    public abstract <R> AbstractTwoValueCondition<R> map(Function<? super T, ? extends R> mapper1,
+                                                         Function<? super T, ? extends R> mapper2);
+
+    /**
+     * If renderable, apply the mapping to both values and return a new condition with the new values. Else return a
+     *     condition that will not render (this).
+     *
+     * @param mapper a mapping function to apply to both values, if renderable
+     * @param <R> type of the new condition
+     * @return a new condition with the result of applying the mappers to the values of this condition,
+     *     if renderable, otherwise a condition that will not render.
+     */
+    public abstract <R> AbstractTwoValueCondition<R> map(Function<? super T, ? extends R> mapper);
+
     public abstract String operator1();
 
     public abstract String operator2();

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

@@ -71,29 +71,12 @@ public IsBetween<T> filter(Predicate<? super T> predicate) {
         return filterSupport(predicate, IsBetween::empty, this);
     }
 
-    /**
-     * If renderable, apply the mappings to the values and return a new condition with the new values. Else return a
-     * condition that will not render (this).
-     *
-     * @param mapper1 a mapping function to apply to the first value, if renderable
-     * @param mapper2 a mapping function to apply to the second value, if renderable
-     * @param <R> type of the new condition
-     * @return a new condition with the result of applying the mappers to the values of this condition,
-     *     if renderable, otherwise a condition that will not render.
-     */
+    @Override
     public <R> IsBetween<R> map(Function<? super T, ? extends R> mapper1, Function<? super T, ? extends R> mapper2) {
         return mapSupport(mapper1, mapper2, IsBetween::new, IsBetween::empty);
     }
 
-    /**
-     * If renderable, apply the mapping to both values and return a new condition with the new values. Else return a
-     *     condition that will not render (this).
-     *
-     * @param mapper a mapping function to apply to both values, if renderable
-     * @param <R> type of the new condition
-     * @return a new condition with the result of applying the mappers to the values of this condition,
-     *     if renderable, otherwise a condition that will not render.
-     */
+    @Override
     public <R> IsBetween<R> map(Function<? super T, ? extends R> mapper) {
         return map(mapper, mapper);
     }

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

@@ -71,30 +71,13 @@ public IsNotBetween<T> filter(Predicate<? super T> predicate) {
         return filterSupport(predicate, IsNotBetween::empty, this);
     }
 
-    /**
-     * If renderable, apply the mappings to the values and return a new condition with the new values. Else return a
-     * condition that will not render (this).
-     *
-     * @param mapper1 a mapping function to apply to the first value, if renderable
-     * @param mapper2 a mapping function to apply to the second value, if renderable
-     * @param <R> type of the new condition
-     * @return a new condition with the result of applying the mappers to the values of this condition,
-     *     if renderable, otherwise a condition that will not render.
-     */
+    @Override
     public <R> IsNotBetween<R> map(Function<? super T, ? extends R> mapper1,
             Function<? super T, ? extends R> mapper2) {
         return mapSupport(mapper1, mapper2, IsNotBetween::new, IsNotBetween::empty);
     }
 
-    /**
-     * If renderable, apply the mapping to both values and return a new condition with the new values. Else return a
-     *     condition that will not render (this).
-     *
-     * @param mapper a mapping function to apply to both values, if renderable
-     * @param <R> type of the new condition
-     * @return a new condition with the result of applying the mappers to the values of this condition,
-     *     if renderable, otherwise a condition that will not render.
-     */
+    @Override
     public <R> IsNotBetween<R> map(Function<? super T, ? extends R> mapper) {
         return map(mapper, mapper);
     }