Fixed merge issues

ical4j · Jul 29, 2021 · f68c3ad · f68c3ad
1 parent 42999c9
commit f68c3ad
Show file tree

Hide file tree

Showing 19 changed files with 187 additions and 304 deletions.
diff --git a/src/main/groovy/net/fortuna/ical4j/model/component/ParticipantFactory.groovy b/src/main/groovy/net/fortuna/ical4j/model/component/ParticipantFactory.groovy
diff --git a/src/main/java/net/fortuna/ical4j/filter/ParameterEqualToRule.java b/src/main/java/net/fortuna/ical4j/filter/ParameterEqualToRule.java
@@ -31,8 +31,6 @@
  */
 package net.fortuna.ical4j.filter;
 
-import net.fortuna.ical4j.model.Parameter;
-import net.fortuna.ical4j.model.ParameterList;
 import net.fortuna.ical4j.model.Property;
 
 import java.util.function.Predicate;
@@ -59,12 +57,6 @@ public ParameterEqualToRule(String parameterName, Object 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;
+        return property.getParameters().get(parameterName).stream().anyMatch(p -> value.equals(p.getValue()));
     }
 }
diff --git a/src/main/java/net/fortuna/ical4j/filter/PropertyContainsRule.java b/src/main/java/net/fortuna/ical4j/filter/PropertyContainsRule.java
@@ -1,8 +1,6 @@
 package net.fortuna.ical4j.filter;
 
 import net.fortuna.ical4j.model.Component;
-import net.fortuna.ical4j.model.Property;
-import net.fortuna.ical4j.model.PropertyList;
 
 import java.util.function.Predicate;
 
@@ -24,12 +22,6 @@ public PropertyContainsRule(String propertyName, Object value) {
 
     @Override
     public boolean test(T t) {
-        final PropertyList<Property> properties = t.getProperties(propertyName);
-        for (final Property p : properties) {
-            if (p.getValue().contains(value.toString())) {
-                return true;
-            }
-        }
-        return false;
+        return t.getProperties().get(propertyName).stream().anyMatch(p -> p.getValue().contains(value.toString()));
     }
 }
diff --git a/src/main/java/net/fortuna/ical4j/filter/PropertyEqualToRule.java b/src/main/java/net/fortuna/ical4j/filter/PropertyEqualToRule.java
@@ -34,7 +34,6 @@
 import net.fortuna.ical4j.model.Component;
 import net.fortuna.ical4j.model.Property;
 
-import java.util.List;
 import java.util.function.Predicate;
 
 /**
@@ -71,12 +70,6 @@ public PropertyEqualToRule(String propertyName, Object value) {
      */
     @Override
     public final boolean test(final T component) {
-        final List<Property> properties = component.getProperties().get(property.getName());
-        for (final Property p : properties) {
-            if (value.equals(p.getValue())) {
-                return true;
-            }
-        }
-        return false;
+        return component.getProperties().get(propertyName).stream().anyMatch(p -> value.equals(p.getValue()));
     }
 }
diff --git a/src/main/java/net/fortuna/ical4j/filter/PropertyGreaterThanRule.java b/src/main/java/net/fortuna/ical4j/filter/PropertyGreaterThanRule.java
@@ -3,6 +3,7 @@
 import net.fortuna.ical4j.model.Component;
 import net.fortuna.ical4j.model.property.Sequence;
 
+import java.util.Optional;
 import java.util.function.Predicate;
 
 /**
@@ -31,10 +32,10 @@ public PropertyGreaterThanRule(String propertyName, Object value, boolean inclus
     @Override
     public boolean test(T t) {
         if ("sequence".equalsIgnoreCase(propertyName)) {
-            Sequence sequence = t.getProperty(propertyName);
-            if (sequence != null) {
-                return inclusive ? sequence.getSequenceNo() >= Integer.parseInt(value.toString())
-                        : sequence.getSequenceNo() > Integer.parseInt(value.toString());
+            Optional<Sequence> sequence = t.getProperty(propertyName);
+            if (sequence.isPresent()) {
+                return inclusive ? sequence.get().getSequenceNo() >= Integer.parseInt(value.toString())
+                        : sequence.get().getSequenceNo() > Integer.parseInt(value.toString());
             }
         }
         return false;

diff --git a/src/main/java/net/fortuna/ical4j/filter/PropertyLessThanRule.java b/src/main/java/net/fortuna/ical4j/filter/PropertyLessThanRule.java
@@ -1,13 +1,13 @@
 package net.fortuna.ical4j.filter;
 
 import net.fortuna.ical4j.model.Component;
+import net.fortuna.ical4j.model.TemporalComparator;
 import net.fortuna.ical4j.model.property.DateProperty;
 import net.fortuna.ical4j.model.property.Sequence;
 
-import java.time.Instant;
 import java.time.temporal.Temporal;
 import java.util.Arrays;
-import java.util.Date;
+import java.util.Optional;
 import java.util.function.Predicate;
 
 /**
@@ -36,15 +36,17 @@ public PropertyLessThanRule(String propertyName, Object value, boolean inclusive
     @Override
     public boolean test(T t) {
         if ("sequence".equalsIgnoreCase(propertyName)) {
-            Sequence sequence = t.getProperty(propertyName);
-            if (sequence != null) {
-                return inclusive ? sequence.getSequenceNo() <= Integer.parseInt(value.toString())
-                        : sequence.getSequenceNo() < Integer.parseInt(value.toString());
+            Optional<Sequence> sequence = t.getProperty(propertyName);
+            if (sequence.isPresent()) {
+                return inclusive ? sequence.get().getSequenceNo() <= Integer.parseInt(value.toString())
+                        : sequence.get().getSequenceNo() < Integer.parseInt(value.toString());
             }
         } else if (Arrays.asList("due").contains(propertyName)) {
-            DateProperty dateProperty = t.getProperty(propertyName);
-            return inclusive ? dateProperty.getDate().compareTo(Date.from(Instant.from((Temporal) value))) < 0
-                    : dateProperty.getDate().compareTo(Date.from(Instant.from((Temporal) value))) <= 0;
+            Optional<DateProperty> dateProperty = t.getProperty(propertyName);
+            if (dateProperty.isPresent()) {
+                return inclusive ? new TemporalComparator().compare(dateProperty.get().getDate(), (Temporal) value) < 0
+                        : new TemporalComparator().compare(dateProperty.get().getDate(), (Temporal) value) <= 0;
+            }
         }
         return false;
     }