Remove matching recurrence instances where a recurrence-id (override)…

… is applied
ical4j · Dec 15, 2020 · d0e113d · d0e113d
1 parent d4e2159
commit d0e113d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/model/ComponentGroup.java b/src/main/java/net/fortuna/ical4j/model/ComponentGroup.java
@@ -9,7 +9,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 /**
  * Support for operations applicable to a group of components. Typically this class is used to manage
@@ -99,11 +98,10 @@ public PeriodList calculateRecurrenceSet(final Period period) {
         PeriodList finalPeriods = periods;
         replacements.forEach(component -> {
             RecurrenceId recurrenceId = component.getProperty(Property.RECURRENCE_ID);
-            List<Period> match = finalPeriods.stream().filter(p -> p.getStart().equals(recurrenceId.getDate()))
-                    .collect(Collectors.toList());
-            finalPeriods.removeAll(match);
-
-            finalPeriods.addAll(component.calculateRecurrenceSet(period));
+            finalPeriods.removeIf(p -> p.getStart().equals(recurrenceId.getDate()));
+            component.calculateRecurrenceSet(period).stream()
+                    .filter(p -> p.getStart().equals(recurrenceId.getDate()))
+                    .forEach(finalPeriods::add);
         });
 
         return periods;

diff --git a/src/test/groovy/net/fortuna/ical4j/model/ComponentGroupTest.groovy b/src/test/groovy/net/fortuna/ical4j/model/ComponentGroupTest.groovy
@@ -78,7 +78,7 @@ class ComponentGroupTest extends Specification {
     }
 
     def "CalculateRecurrenceSet"() {
-        given: 'an event with 2 revisions'
+        given: 'an event with a revision'
         def components = new ComponentList<VEvent>([event, rev1])
 
         when: 'recurrence instances are calculated'
@@ -90,14 +90,14 @@ class ComponentGroupTest extends Specification {
     }
 
     def "CalculateRecurrenceSetWithException"() {
-        given: 'an event with 2 revisions'
+        given: 'an event with 2 revisions and instance override'
         def components = new ComponentList<VEvent>([event, rev1, rev2, rev3])
 
         when: 'recurrence instances are calculated'
         Period period = ['20101113T120000/P3W']
         def recurrences = new ComponentGroup(components, uid).calculateRecurrenceSet(period)
 
-        then: 'the expected number of recurrences are returned'
-        recurrences.size() == event.calculateRecurrenceSet(period).normalise().size()
+        then: 'the instance override is removed from the recurrence set'
+        recurrences.size() == event.calculateRecurrenceSet(period).normalise().size() - 1
     }
 }