Make filtering optional on no value conditions

Author: jeffgbutler

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

@@ -34,22 +34,23 @@ protected <S extends AbstractNoValueCondition<?>> S filterSupport(BooleanSupplie
 
     public abstract String operator();
 
-    /**
-     * If renderable and the supplier returns true, returns this condition. Else returns a condition that will not
-     * render.
-     *
-     * @param booleanSupplier
-     *            function that specifies whether the condition should render
-     * @param <S>
-     *            condition type - not used except for compilation compliance
-     *
-     * @return this condition if renderable and the supplier returns true, otherwise a condition that will not render.
-     */
-    public abstract <S> AbstractNoValueCondition<S> filter(BooleanSupplier booleanSupplier);
-
-
-        @Override
+    @Override
     public FragmentAndParameters renderCondition(RenderingContext renderingContext, BindableColumn<T> leftColumn) {
         return FragmentAndParameters.fromFragment(operator());
     }
+
+    public interface Filterable {
+        /**
+         * If renderable and the supplier returns true, returns this condition. Else returns a condition that will not
+         * render.
+         *
+         * @param booleanSupplier
+         *            function that specifies whether the condition should render
+         * @param <S>
+         *            condition type - not used except for compilation compliance
+         *
+         * @return this condition if renderable and the supplier returns true, otherwise a condition that will not render.
+         */
+        <S> AbstractNoValueCondition<S> filter(BooleanSupplier booleanSupplier);
+    }
 }

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

@@ -19,7 +19,7 @@
 
 import org.mybatis.dynamic.sql.AbstractNoValueCondition;
 
-public class IsNotNull<T> extends AbstractNoValueCondition<T> {
+public class IsNotNull<T> extends AbstractNoValueCondition<T> implements AbstractNoValueCondition.Filterable {
     private static final IsNotNull<?> EMPTY = new IsNotNull<>() {
         @Override
         public boolean isEmpty() {

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

@@ -19,7 +19,7 @@
 
 import org.mybatis.dynamic.sql.AbstractNoValueCondition;
 
-public class IsNull<T> extends AbstractNoValueCondition<T> {
+public class IsNull<T> extends AbstractNoValueCondition<T> implements AbstractNoValueCondition.Filterable {
     private static final IsNull<?> EMPTY = new IsNull<>() {
         @Override
         public boolean isEmpty() {

src/test/java/examples/mysql/MemberOfCondition.java

@@ -16,26 +16,12 @@
 package examples.mysql;
 
 import java.util.Objects;
-import java.util.function.BooleanSupplier;
 
 import org.jspecify.annotations.NullMarked;
 import org.mybatis.dynamic.sql.AbstractNoValueCondition;
 
 @NullMarked
 public class MemberOfCondition<T> extends AbstractNoValueCondition<T> {
-    private static final MemberOfCondition<?> EMPTY = new MemberOfCondition<>("") {
-        @Override
-        public boolean isEmpty() {
-            return true;
-        }
-    };
-
-    public static <T> MemberOfCondition<T> empty() {
-        @SuppressWarnings("unchecked")
-        MemberOfCondition<T> t = (MemberOfCondition<T>) EMPTY;
-        return t;
-    }
-
     private final String jsonArray;
 
     protected MemberOfCondition(String jsonArray) {
@@ -47,13 +33,6 @@ public String operator() {
         return "member of(" + jsonArray + ")";
     }
 
-    @Override
-    public <S> MemberOfCondition<S> filter(BooleanSupplier booleanSupplier) {
-        @SuppressWarnings("unchecked")
-        MemberOfCondition<S> self = (MemberOfCondition<S>) this;
-        return filterSupport(booleanSupplier, MemberOfCondition::empty, self);
-    }
-
     public static <T> MemberOfCondition<T> memberOf(String jsonArray) {
         return new MemberOfCondition<>(jsonArray);
     }