Skip to content

Commit

Permalink
Refactored to use jsr-310 date/time API
Browse files Browse the repository at this point in the history
  • Loading branch information
@benfortuna
benfortuna committed Apr 18, 2019
1 parent 43c1048 commit 5054d7a
Show file tree
Hide file tree
Showing 18 changed files with 274 additions and 340 deletions.
36 changes: 17 additions & 19 deletions src/main/java/net/fortuna/ical4j/model/Component.java
View file
Expand Up @@ -42,6 +42,7 @@
import java.io.Serializable;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.time.temporal.Temporal;
import java.time.temporal.TemporalAmount;
import java.util.List;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -322,42 +323,40 @@ public final PeriodList calculateRecurrenceSet(final Period period) {
if (end == null && duration == null) {
rDuration = java.time.Duration.ZERO;
} else if (duration == null) {
rDuration = TemporalAmountAdapter.fromDateRange(start.getDate(), end.getDate()).getDuration();
rDuration = TemporalAmountAdapter.from(start.getDate(), end.getDate()).getDuration();
} else {
rDuration = duration.getDuration();
}

// add recurrence dates..
List<RDate> rDates = getProperties(Property.RDATE);
recurrenceSet.addAll(rDates.stream().filter(p -> p.getParameter(Parameter.VALUE) == Value.PERIOD)
.map(p -> p.getPeriods()).flatMap(PeriodList::stream).filter(rdatePeriod -> period.intersects(rdatePeriod))
.map(RDate::getPeriods).flatMap(List::stream).filter(rdatePeriod -> period.intersects(rdatePeriod))
.collect(Collectors.toList()));

recurrenceSet.addAll(rDates.stream().filter(p -> p.getParameter(Parameter.VALUE) == Value.DATE_TIME)
.map(p -> p.getDates()).flatMap(DateList::stream).filter(date -> period.includes(date))
.map(rdateTime -> new Period((DateTime) rdateTime, rDuration)).collect(Collectors.toList()));
.map(DateListProperty::getDates).flatMap(List::stream).filter(date -> period.includes(date))
.map(rdateTime -> new Period(rdateTime, rDuration)).collect(Collectors.toList()));

recurrenceSet.addAll(rDates.stream().filter(p -> p.getParameter(Parameter.VALUE) == Value.DATE)
.map(p -> p.getDates()).flatMap(DateList::stream).filter(date -> period.includes(date))
.map(rdateDate -> new Period(new DateTime(rdateDate), rDuration)).collect(Collectors.toList()));
.map(DateListProperty::getDates).flatMap(List::stream).filter(date -> period.includes(date))
.map(rdateDate -> new Period(rdateDate, rDuration)).collect(Collectors.toList()));

// allow for recurrence rules that start prior to the specified period
// but still intersect with it..
final DateTime startMinusDuration = new DateTime(period.getStart());
startMinusDuration.setTime(Date.from(period.getStart().toInstant().minus(rDuration)).getTime());
final Temporal startMinusDuration = period.getStart().minus(rDuration);

// add recurrence rules..
List<RRule> rRules = getProperties(Property.RRULE);
if (!rRules.isEmpty()) {
recurrenceSet.addAll(rRules.stream().map(r -> r.getRecur().getDates(start.getDate(),
new Period(startMinusDuration, period.getEnd()), startValue)).flatMap(DateList::stream)
.map(rruleDate -> new Period(new DateTime(rruleDate), rDuration)).collect(Collectors.toList()));
startMinusDuration, period.getEnd())).flatMap(List::stream)
.map(rruleDate -> new Period(rruleDate, rDuration)).collect(Collectors.toList()));
} else {
// add initial instance if intersection with the specified period..
Period startPeriod;
if (end != null) {
startPeriod = new Period(new DateTime(start.getDate()),
new DateTime(end.getDate()));
startPeriod = new Period(start.getDate(), end.getDate());
} else {
/*
* PeS: Anniversary type has no DTEND nor DUR, define DUR
Expand All @@ -367,8 +366,7 @@ public final PeriodList calculateRecurrenceSet(final Period period) {
duration = new Duration(rDuration);
}

startPeriod = new Period(new DateTime(start.getDate()),
duration.getDuration());
startPeriod = new Period(start.getDate(), duration.getDuration());
}
if (period.intersects(startPeriod)) {
recurrenceSet.add(startPeriod);
Expand All @@ -377,23 +375,23 @@ public final PeriodList calculateRecurrenceSet(final Period period) {

// subtract exception dates..
List<ExDate> exDateProps = getProperties(Property.EXDATE);
List<Date> exDates = exDateProps.stream().map(e -> e.getDates()).flatMap(DateList::stream)
List<Temporal> exDates = exDateProps.stream().map(DateListProperty::getDates).flatMap(List::stream)
.collect(Collectors.toList());

recurrenceSet.removeIf(recurrence -> {
// for DATE-TIME instances check for DATE-based exclusions also..
return exDates.contains(recurrence.getStart()) || exDates.contains(new Date(recurrence.getStart()));
return exDates.contains(recurrence.getStart()) || exDates.contains(recurrence.getStart());
});

// subtract exception rules..
List<ExRule> exRules = getProperties(Property.EXRULE);
List<Date> exRuleDates = exRules.stream().map(e -> e.getRecur().getDates(start.getDate(),
period, startValue)).flatMap(DateList::stream).collect(Collectors.toList());
List<Object> exRuleDates = exRules.stream().map(e -> e.getRecur().getDates(start.getDate(),
period)).flatMap(List::stream).collect(Collectors.toList());

recurrenceSet.removeIf(recurrence -> {
// for DATE-TIME instances check for DATE-based exclusions also..
return exRuleDates.contains(recurrence.getStart())
|| exRuleDates.contains(new Date(recurrence.getStart()));
|| exRuleDates.contains(recurrence.getStart());
});

return recurrenceSet;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/fortuna/ical4j/model/ComponentSequenceComparator.java
View file
Expand Up @@ -3,6 +3,7 @@
import net.fortuna.ical4j.model.property.DtStamp;
import net.fortuna.ical4j.model.property.Sequence;

import java.time.Instant;
import java.util.Comparator;
import java.util.Optional;

Expand All @@ -25,7 +26,7 @@ public int compare(Component o1, Component o2) {

retVal = sequence1.compareTo(sequence2);
if (retVal == 0) {
DtStamp defaultDtStamp = new DtStamp(new DateTime(0));
DtStamp defaultDtStamp = new DtStamp(Instant.EPOCH);
DtStamp dtStamp1 = Optional.ofNullable((DtStamp) o1.getProperty(Property.DTSTAMP)).orElse(defaultDtStamp);
DtStamp dtStamp2 = Optional.ofNullable((DtStamp) o2.getProperty(Property.DTSTAMP)).orElse(defaultDtStamp);

Expand Down
7 changes: 7 additions & 0 deletions src/main/java/net/fortuna/ical4j/model/NumberList.java
View file
Expand Up @@ -35,6 +35,7 @@

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.StringTokenizer;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -122,4 +123,10 @@ public final boolean add(final Integer aNumber) {
public final String toString() {
return stream().map(Object::toString).collect(Collectors.joining(","));
}

public static NumberList parse(String numberString) {
NumberList retVal = new NumberList();
retVal.addAll(Arrays.stream(numberString.split(",")).map(Numbers::parseInt).collect(Collectors.toList()));
return retVal;
}
}

0 comments on commit 5054d7a

Please sign in to comment.