Checkstyle

Author: jeffgbutler

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

@@ -75,14 +75,6 @@ protected S filter(Predicate<T> predicate, BiFunction<Collection<T>, Callback, S
         }
     }
 
-    protected S map(UnaryOperator<T> mapper, BiFunction<Collection<T>, Callback, S> constructor, S self) {
-        if (shouldRender()) {
-            return constructor.apply(applyMapper(mapper), emptyCallback);
-        } else {
-            return self;
-        }
-    }
-
     /**
      * If renderable, apply the predicate to each value in the list and return a new condition with the filtered values.
      *     Else returns a condition that will not render (this). If all values are filtered out of the value
@@ -94,6 +86,14 @@ protected S map(UnaryOperator<T> mapper, BiFunction<Collection<T>, Callback, S>
      */
     public abstract S filter(Predicate<T> predicate);
 
+    protected S map(UnaryOperator<T> mapper, BiFunction<Collection<T>, Callback, S> constructor, S self) {
+        if (shouldRender()) {
+            return constructor.apply(applyMapper(mapper), emptyCallback);
+        } else {
+            return self;
+        }
+    }
+
     /**
      * If renderable, apply the mapping to each value in the list return a new condition with the mapped values.
      *     Else return a condition that will not render (this).

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

@@ -45,14 +45,6 @@ protected S filter(Predicate<T> predicate, Supplier<S> empty, S self) {
         }
     }
 
-    protected S map(UnaryOperator<T> mapper, Function<T, S> constructor, S self) {
-        if (shouldRender()) {
-           return constructor.apply(mapper.apply(value));
-        }else {
-            return self;
-        }
-    }
-
     /**
      * If renderable and the value matches the predicate, returns this condition. Else returns a condition
      *     that will not render.
@@ -63,6 +55,14 @@ protected S map(UnaryOperator<T> mapper, Function<T, S> constructor, S self) {
      */
     public abstract S filter(Predicate<T> predicate);
 
+    protected S map(UnaryOperator<T> mapper, Function<T, S> constructor, S self) {
+        if (shouldRender()) {
+            return constructor.apply(mapper.apply(value));
+        } else {
+            return self;
+        }
+    }
+
     /**
      * If renderable, apply the mapping to the value and return a new condition with the new value. Else return a
      *     condition that will not render (this).

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

@@ -51,14 +51,6 @@ protected S filter(BiPredicate<T, T> predicate, Supplier<S> empty, S self) {
         }
     }
 
-    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 {
-            return self;
-        }
-    }
-
     /**
      * If renderable and the values match the predicate, returns this condition. Else returns a condition
      *     that will not render.
@@ -69,6 +61,14 @@ protected S map(UnaryOperator<T> mapper1, UnaryOperator<T> mapper2, BiFunction<T
      */
     public abstract S filter(BiPredicate<T, T> predicate);
 
+    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 {
+            return self;
+        }
+    }
+
     /**
      * 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).