Skip to content

Commit 97c953b

Browse files
author
Matt Morgan
committed
Replace JodaTime with standard lib
1 parent 2fe109c commit 97c953b

3 files changed

Lines changed: 194 additions & 196 deletions

File tree

exercises/meetup/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ repositories {
77
}
88

99
dependencies {
10-
compile "joda-time:joda-time:2.3+"
1110
testCompile "junit:junit:4.10"
1211
testCompile "org.assertj:assertj-core:3.2.0"
1312
}

exercises/meetup/src/example/java/Meetup.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
import org.joda.time.DateTime;
1+
import java.time.LocalDate;
2+
import java.time.DayOfWeek;
3+
24

35
public class Meetup {
4-
private final DateTime startOfMonth;
6+
private final LocalDate startOfMonth;
57

68
public Meetup(int monthOfYear, int year) {
7-
startOfMonth = new DateTime(year, monthOfYear, 1, 0, 0);
9+
startOfMonth = LocalDate.of(year, monthOfYear, 1);
810
}
911

10-
DateTime day(int dayOfWeek, MeetupSchedule schedule) {
11-
DateTime current = cycleToNext(dayOfWeek, startOfMonth);
12+
LocalDate day(DayOfWeek dayOfWeek, MeetupSchedule schedule) {
13+
LocalDate current = cycleToNext(dayOfWeek, startOfMonth);
1214
switch (schedule) {
1315
case FIRST:
1416
break;
@@ -35,14 +37,14 @@ DateTime day(int dayOfWeek, MeetupSchedule schedule) {
3537
return current;
3638
}
3739

38-
private DateTime cycleToPrev(int dayOfWeek, DateTime current) {
40+
private LocalDate cycleToPrev(DayOfWeek dayOfWeek, LocalDate current) {
3941
while (current.getDayOfWeek() != dayOfWeek) {
4042
current = current.minusDays(1);
4143
}
4244
return current;
4345
}
4446

45-
private DateTime cycleToNext(int dayOfWeek, DateTime current) {
47+
private LocalDate cycleToNext(DayOfWeek dayOfWeek, LocalDate current) {
4648
while (current.getDayOfWeek() != dayOfWeek) {
4749
current = current.plusDays(1);
4850
}

0 commit comments

Comments
 (0)