Support filtering extended properties and parameters

ical4j · Jan 14, 2023 · b05e39d · b05e39d
1 parent 42360da
commit b05e39d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/filter/ComponentFilter.java b/src/main/java/net/fortuna/ical4j/filter/ComponentFilter.java
@@ -4,10 +4,13 @@
 import net.fortuna.ical4j.filter.expression.UnaryExpression;
 import net.fortuna.ical4j.filter.predicate.*;
 import net.fortuna.ical4j.model.Component;
+import net.fortuna.ical4j.model.ParameterFactory;
 import net.fortuna.ical4j.model.Property;
+import net.fortuna.ical4j.model.PropertyFactory;
 
 import java.util.List;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 
 /**
  * ComponentFilter produces predicates for lambda-style filtering of {@link Component iCalendar components}.
@@ -23,6 +26,13 @@
  */
 public class ComponentFilter<T extends Component> extends AbstractFilter<T> {
 
+    public ComponentFilter() {
+    }
+
+    public ComponentFilter(Supplier<List<PropertyFactory<?>>> propertyFactorySupplier, Supplier<List<ParameterFactory<?>>> parameterFactorySupplier) {
+        super(propertyFactorySupplier, parameterFactorySupplier);
+    }
+
     public Predicate<T> predicate(UnaryExpression expression) {
         switch (expression.operator) {
             case not:

diff --git a/src/main/java/net/fortuna/ical4j/filter/PropertyFilter.java b/src/main/java/net/fortuna/ical4j/filter/PropertyFilter.java
@@ -35,12 +35,23 @@
 import net.fortuna.ical4j.filter.expression.UnaryExpression;
 import net.fortuna.ical4j.filter.predicate.ParameterEqualToRule;
 import net.fortuna.ical4j.filter.predicate.ParameterExistsRule;
+import net.fortuna.ical4j.model.ParameterFactory;
 import net.fortuna.ical4j.model.Property;
+import net.fortuna.ical4j.model.PropertyFactory;
 
+import java.util.List;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 
 public class PropertyFilter extends AbstractFilter<Property> {
 
+    public PropertyFilter() {
+    }
+
+    public PropertyFilter(Supplier<List<PropertyFactory<?>>> propertyFactorySupplier, Supplier<List<ParameterFactory<?>>> parameterFactorySupplier) {
+        super(propertyFactorySupplier, parameterFactorySupplier);
+    }
+
     public Predicate<Property> predicate(UnaryExpression expression) {
         switch (expression.operator) {
             case not: