Checkstyle

Author: jeffgbutler

CHANGELOG.md

@@ -26,14 +26,16 @@ However, there are some changes in behavior and one breaking change.
    methods that accept Suppliers will call the `Supplier.get()` method when the condition is constructed. This should
    have no impact unless you were somehow relying on the delay in obtaining a value until the condition was rendered.
 1. The existing "then" and "when" methods have been deprecated and replaced with "map" and "filter" respectively.
-   The new method names are more familiar and more representative of what these methods actually do. In effect,
+   The new method names are more familiar and more representative of what these methods actually do. In effect
    these methods mimic the function of the "map" and "filter" methods on "java.util.Optional" and they are used
    for a similar purpose.
-1. The new "filter" method works a bit differently than the "when" method it replaces. The "when" method could not
+1. The new "filter" method works a bit differently than the "when" method it replaces. The old "when" method could not
    be chained - if it was called multiple times, only the last call would take effect. The new "filter" methods works
    as it should and every call will take effect.
+1. The new "map" method will allow you to change the datatype of a condition as is normal for a "map" method. You
+   can use this method to apply a type conversion directly within condition.
 1. All the "WhenPresent" conditions have been removed as separate classes. The methods that produced these conditions
-   in the SqlBuilder remain, and they will now produce a condition with a "NotNull" filter applied. So at the API level,
+   in the SqlBuilder remain, and they will now produce a condition with a "NotNull" filter applied. So at the API level
    things will function exactly as before, but the intermediate classes will be different.
 1. One breaking change is that the builder for List value conditions has been removed without replacement. If you
    were using this builder to supply a "value stream transformer", then the replacement is to build a new List value

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

@@ -17,7 +17,10 @@
 
 import java.util.Collection;
 import java.util.Objects;
-import java.util.function.*;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 

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

@@ -15,7 +15,10 @@
  */
 package org.mybatis.dynamic.sql;
 
-import java.util.function.*;
+import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
 public abstract class AbstractTwoValueCondition<T>
         implements VisitableCondition<T> {

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

@@ -92,8 +92,8 @@ public IsIn<T> filter(Predicate<? super T> predicate) {
      *     that will not render.
      */
     public <R> IsIn<R> map(Function<? super T, ? extends R> mapper) {
-        // the cast is a work around for a parse error in IntelliJ
-        return mapSupport(mapper, (BiFunction<Collection<R>, Callback, IsIn<R>>) IsIn::new, IsIn::empty);
+        BiFunction<Collection<R>, Callback, IsIn<R>> constructor = IsIn::new;
+        return mapSupport(mapper, constructor, IsIn::empty);
     }
 
     @SafeVarargs

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

@@ -94,8 +94,8 @@ public IsNotIn<T> filter(Predicate<? super T> predicate) {
      *     that will not render.
      */
     public <R> IsNotIn<R> map(Function<? super T, ? extends R> mapper) {
-        // the cast is a work around for a parse error in IntelliJ
-        return mapSupport(mapper, (BiFunction<Collection<R>, Callback, IsNotIn<R>>) IsNotIn::new, IsNotIn::empty);
+        BiFunction<Collection<R>, Callback, IsNotIn<R>> constructor = IsNotIn::new;
+        return mapSupport(mapper, constructor, IsNotIn::empty);
     }
 
     @SafeVarargs

src/test/java/org/mybatis/dynamic/sql/where/condition/FilterAndMapTest.java

@@ -36,8 +36,9 @@ void testTypeConversion() {
 
     @Test
     void testTypeConversionWithNullThrowsException() {
+        IsEqualTo<String> cond = SqlBuilder.isEqualTo((String) null);
         assertThatExceptionOfType(NumberFormatException.class).isThrownBy(() ->
-            SqlBuilder.isEqualTo((String) null).map(Integer::parseInt)
+            cond.map(Integer::parseInt)
         );
     }