Refactoring filter predicates

src/main/java/net/fortuna/ical4j/filter/predicate/DateInRangeRule.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2012-2021. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+ * Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
+ * Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
+ * Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
+ * Vestibulum commodo. Ut rhoncus gravida arcu.
+ */
+package net.fortuna.ical4j.filter.predicate;
+
+import net.fortuna.ical4j.model.DateRange;
+
+import java.util.Date;
+import java.util.function.Predicate;
+
+/**
+ * @author fortuna
+ *
+ */
+public class DateInRangeRule implements Predicate<Date> {
+
+    private final DateRange range;
+
+    private final int inclusiveMask;
+
+    /**
+     * @param range the range to check
+     * @param inclusiveMask indicates inclusiveness of start and end of the range
+     */
+    public DateInRangeRule(DateRange range, int inclusiveMask) {
+        this.range = range;
+        this.inclusiveMask = inclusiveMask;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean test(Date date) {
+        return range.includes(date, inclusiveMask);
+    }
+
+}

src/main/java/net/fortuna/ical4j/filter/predicate/ParameterEqualToRule.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2012-2021. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+ * Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
+ * Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
+ * Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
+ * Vestibulum commodo. Ut rhoncus gravida arcu.
+ */
+package net.fortuna.ical4j.filter.predicate;
+
+import net.fortuna.ical4j.model.Parameter;
+import net.fortuna.ical4j.model.ParameterList;
+import net.fortuna.ical4j.model.Property;
+
+import java.util.function.Predicate;
+
+/**
+ * $Id$
+ *
+ * Created on 5/02/2006
+ *
+ * A rule that matches any component containing the specified property. Note that this rule ignores any parameters
+ * matching only on the value of the property.
+ * @author Ben Fortuna
+ */
+public class ParameterEqualToRule<T extends Property> implements Predicate<T> {
+
+    private final String parameterName;
+
+    private final Object value;
+
+    public ParameterEqualToRule(String parameterName, Object value) {
+        this.parameterName = parameterName;
+        this.value = value;
+    }
+
+    @Override
+    public final boolean test(final Property property) {
+        final ParameterList parameters = property.getParameters(parameterName);
+        for (final Parameter p : parameters) {
+            if (value.equals(p.getValue())) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

src/main/java/net/fortuna/ical4j/filter/predicate/ParameterExistsRule.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2021. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+ * Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
+ * Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
+ * Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
+ * Vestibulum commodo. Ut rhoncus gravida arcu.
+ */
+
+package net.fortuna.ical4j.filter.predicate;
+
+import net.fortuna.ical4j.model.Property;
+
+import java.util.function.Predicate;
+
+/**
+ * Test for a parameter matching the provided name.
+ */
+public class ParameterExistsRule implements Predicate<Property> {
+
+    private final String parameterName;
+
+    public ParameterExistsRule(String parameterName) {
+        this.parameterName = parameterName;
+    }
+
+    @Override
+    public boolean test(Property t) {
+        String[] param = parameterName.split(":");
+        if (param.length > 1) {
+            return new ParameterEqualToRule<>(param[0], param[1]).test(t);
+        }
+        return !t.getParameters(parameterName).isEmpty();
+    }
+}