Bug fixes

ical4j · Mar 7, 2020 · 71ed8a3 · 71ed8a3
1 parent 9739a31
commit 71ed8a3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/model/ComponentGroup.java b/src/main/java/net/fortuna/ical4j/model/ComponentGroup.java
@@ -6,9 +6,7 @@
 import net.fortuna.ical4j.model.property.Uid;
 
 import java.time.temporal.Temporal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -86,7 +84,8 @@ public C getLatestRevision() {
      * @see Component#calculateRecurrenceSet(Period)
      */
     public <T extends Temporal> List<Period<T>> calculateRecurrenceSet(final Period<T> period) {
-        List<Period<T>> periods = new ArrayList<>();
+        // Use set to exclude duplicates..
+        Set<Period<T>> periods = new HashSet<>();
         List<Component> replacements = new ArrayList<>();
 
         for (Component component : getRevisions()) {
@@ -97,7 +96,7 @@ public <T extends Temporal> List<Period<T>> calculateRecurrenceSet(final Period<
             }
         }
 
-        List<Period<T>> finalPeriods = periods;
+        List<Period<T>> finalPeriods = new ArrayList<>(periods);
         replacements.forEach(component -> {
             RecurrenceId recurrenceId = component.getProperty(Property.RECURRENCE_ID);
             List<Period> match = finalPeriods.stream().filter(p -> p.getStart().equals(recurrenceId.getDate()))
@@ -107,6 +106,8 @@ public <T extends Temporal> List<Period<T>> calculateRecurrenceSet(final Period<
             finalPeriods.addAll(component.calculateRecurrenceSet(period));
         });
 
-        return periods;
+        // Natural sort of final list..
+        Collections.sort(finalPeriods);
+        return finalPeriods;
     }
 }
diff --git a/src/test/groovy/net/fortuna/ical4j/model/ComponentGroupTest.groovy b/src/test/groovy/net/fortuna/ical4j/model/ComponentGroupTest.groovy
@@ -51,7 +51,7 @@ class ComponentGroupTest extends Specification {
             uid(uid)
             sequence('3')
             recurrenceid('20101129', parameters: parameters() { value('DATE') })
-            dtstamp(new DtStamp(new DateTime()))
+            dtstamp(new DtStamp(Instant.now()))
             dtstart('20101130', parameters: parameters() { value('DATE') })
             dtend('20101201', parameters: parameters() { value('DATE') })
         }
@@ -84,22 +84,22 @@ class ComponentGroupTest extends Specification {
         def components = new ComponentList<VEvent>([event, rev1])
 
         when: 'recurrence instances are calculated'
-        Period period = Period.parse('20101113T120000/P3W')
+        Period period = Period.parse('20101113/P3W')
         def recurrences = new ComponentGroup(components, uid).calculateRecurrenceSet(period)
 
         then: 'the expected number of recurrences are returned'
-        recurrences == event.calculateRecurrenceSet(period).normalise()
+        recurrences == event.calculateRecurrenceSet(period)
     }
 
     def "CalculateRecurrenceSetWithException"() {
         given: 'an event with 2 revisions'
         def components = new ComponentList<VEvent>([event, rev1, rev2, rev3])
 
         when: 'recurrence instances are calculated'
-        Period period = ['20101113T120000/P3W']
+        Period period = Period.parse '20101113/P3W'
         def recurrences = new ComponentGroup(components, uid).calculateRecurrenceSet(period)
 
         then: 'the expected number of recurrences are returned'
-        recurrences.size() == event.calculateRecurrenceSet(period).normalise().size()
+        recurrences.size() == event.calculateRecurrenceSet(period).size()
     }
 }