diff --git a/build.gradle.kts b/build.gradle.kts index 7c7bcd0..a535200 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,6 @@ repositories { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion") testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitVersion") diff --git a/src/main/kotlin/localdate/LocalDateUtil.kt b/src/main/kotlin/javatimefun/localdate/LocalDateUtil.kt similarity index 79% rename from src/main/kotlin/localdate/LocalDateUtil.kt rename to src/main/kotlin/javatimefun/localdate/LocalDateUtil.kt index 796806e..9358909 100644 --- a/src/main/kotlin/localdate/LocalDateUtil.kt +++ b/src/main/kotlin/javatimefun/localdate/LocalDateUtil.kt @@ -1,4 +1,4 @@ -package localdate +package javatimefun.localdate import java.time.LocalDate import java.time.Month @@ -29,11 +29,13 @@ object LocalDateUtil { * @param date A wrapper of Epoch time in UTC. * @return LocalDate. */ - fun new(date: Date): LocalDate = new(date.toInstant().toEpochMilli()) + fun new(date: Date): LocalDate = + javatimefun.localdate.LocalDateUtil.new(date.toInstant().toEpochMilli()) /** * @param calendar Calendar, a date time variable that supports time zones. * @return LocalDate. */ - fun new(calendar: Calendar): LocalDate = new(calendar.toInstant().toEpochMilli()) + fun new(calendar: Calendar): LocalDate = + javatimefun.localdate.LocalDateUtil.new(calendar.toInstant().toEpochMilli()) } \ No newline at end of file diff --git a/src/main/kotlin/javatimefun/localdate/LocalDates.kt b/src/main/kotlin/javatimefun/localdate/LocalDates.kt new file mode 100644 index 0000000..7f2d11c --- /dev/null +++ b/src/main/kotlin/javatimefun/localdate/LocalDates.kt @@ -0,0 +1,39 @@ +package javatimefun.localdate + +import javatimefun.localdate.extensions.getLast +import javatimefun.localdate.extensions.getNext +import java.time.DayOfWeek +import java.time.LocalDate + +object LocalDates { + val today: LocalDate get() = LocalDate.now() + val yesterday: LocalDate get() = javatimefun.localdate.LocalDates.today.minusDays(1) + val tomorrow: LocalDate get() = javatimefun.localdate.LocalDates.today.plusDays(1) + + val lastMonday: LocalDate get() = javatimefun.localdate.LocalDates.today.getLast(DayOfWeek.MONDAY) + val lastTuesday: LocalDate get() = javatimefun.localdate.LocalDates.today.getLast(DayOfWeek.TUESDAY) + val lastWednesday: LocalDate get() = javatimefun.localdate.LocalDates.today.getLast(DayOfWeek.WEDNESDAY) + val lastThursday: LocalDate get() = javatimefun.localdate.LocalDates.today.getLast(DayOfWeek.THURSDAY) + val lastFriday: LocalDate get() = javatimefun.localdate.LocalDates.today.getLast(DayOfWeek.FRIDAY) + val lastSaturday: LocalDate get() = javatimefun.localdate.LocalDates.today.getLast(DayOfWeek.SATURDAY) + val lastSunday: LocalDate get() = javatimefun.localdate.LocalDates.today.getLast(DayOfWeek.SUNDAY) + + val nextMonday: LocalDate get() = javatimefun.localdate.LocalDates.today.getNext(DayOfWeek.MONDAY) + val nextTuesday: LocalDate get() = javatimefun.localdate.LocalDates.today.getNext(DayOfWeek.TUESDAY) + val nextWednesday: LocalDate get() = javatimefun.localdate.LocalDates.today.getNext(DayOfWeek.WEDNESDAY) + val nextThursday: LocalDate get() = javatimefun.localdate.LocalDates.today.getNext(DayOfWeek.THURSDAY) + val nextFriday: LocalDate get() = javatimefun.localdate.LocalDates.today.getNext(DayOfWeek.FRIDAY) + val nextSaturday: LocalDate get() = javatimefun.localdate.LocalDates.today.getNext(DayOfWeek.SATURDAY) + val nextSunday: LocalDate get() = javatimefun.localdate.LocalDates.today.getNext(DayOfWeek.SUNDAY) + + val firstDayOfThisYear: LocalDate get() = javatimefun.localdate.LocalDateUtil.new( + javatimefun.localdate.LocalDates.today.year, + 1, + 1 + ) + val lastDayOfThisYear: LocalDate get() = javatimefun.localdate.LocalDateUtil.new( + javatimefun.localdate.LocalDates.today.year, + 12, + 31 + ) +} \ No newline at end of file diff --git a/src/main/kotlin/localdate/extensions/LocalDateAttributeExtensions.kt b/src/main/kotlin/javatimefun/localdate/extensions/LocalDateAttributeExtensions.kt similarity index 85% rename from src/main/kotlin/localdate/extensions/LocalDateAttributeExtensions.kt rename to src/main/kotlin/javatimefun/localdate/extensions/LocalDateAttributeExtensions.kt index ad95e65..c849bab 100644 --- a/src/main/kotlin/localdate/extensions/LocalDateAttributeExtensions.kt +++ b/src/main/kotlin/javatimefun/localdate/extensions/LocalDateAttributeExtensions.kt @@ -1,4 +1,4 @@ -package localdate.extensions +package javatimefun.localdate.extensions import java.time.LocalDate import java.time.Year diff --git a/src/main/kotlin/localdate/extensions/LocalDateComparisonExtensions.kt b/src/main/kotlin/javatimefun/localdate/extensions/LocalDateComparisonExtensions.kt similarity index 98% rename from src/main/kotlin/localdate/extensions/LocalDateComparisonExtensions.kt rename to src/main/kotlin/javatimefun/localdate/extensions/LocalDateComparisonExtensions.kt index 0e63b97..7f1e544 100644 --- a/src/main/kotlin/localdate/extensions/LocalDateComparisonExtensions.kt +++ b/src/main/kotlin/javatimefun/localdate/extensions/LocalDateComparisonExtensions.kt @@ -1,4 +1,4 @@ -package localdate.extensions +package javatimefun.localdate.extensions import java.time.Duration import java.time.LocalDate diff --git a/src/main/kotlin/localdate/extensions/LocalDateMutatingExtensions.kt b/src/main/kotlin/javatimefun/localdate/extensions/LocalDateMutatingExtensions.kt similarity index 90% rename from src/main/kotlin/localdate/extensions/LocalDateMutatingExtensions.kt rename to src/main/kotlin/javatimefun/localdate/extensions/LocalDateMutatingExtensions.kt index 01e67d2..9577b51 100644 --- a/src/main/kotlin/localdate/extensions/LocalDateMutatingExtensions.kt +++ b/src/main/kotlin/javatimefun/localdate/extensions/LocalDateMutatingExtensions.kt @@ -1,4 +1,4 @@ -package localdate.extensions +package javatimefun.localdate.extensions import java.time.DayOfWeek import java.time.LocalDate @@ -33,6 +33,4 @@ fun LocalDate.getNext(dayOfWeek: DayOfWeek, countingInThisDay: Boolean = false): return nextLocalDate } -fun LocalDate.startOfDay(): LocalDateTime = LocalDateTime.of(this, LocalTime.MIN) - fun LocalDate.atEndOfDay(): LocalDateTime = LocalDateTime.of(this, LocalTime.MAX) diff --git a/src/main/kotlin/localdate/extensions/LocalDateParsingExtensions.kt b/src/main/kotlin/javatimefun/localdate/extensions/LocalDateParsingExtensions.kt similarity index 93% rename from src/main/kotlin/localdate/extensions/LocalDateParsingExtensions.kt rename to src/main/kotlin/javatimefun/localdate/extensions/LocalDateParsingExtensions.kt index dbc678e..64a86ef 100644 --- a/src/main/kotlin/localdate/extensions/LocalDateParsingExtensions.kt +++ b/src/main/kotlin/javatimefun/localdate/extensions/LocalDateParsingExtensions.kt @@ -1,4 +1,4 @@ -package localdate.extensions +package javatimefun.localdate.extensions import java.time.LocalDate import java.time.format.DateTimeFormatter @@ -13,7 +13,7 @@ import java.time.format.DateTimeParseException * @return LocalDate? Null means couldn't parse, else parsed LocalDate. */ fun String.parseLocalDate(format: String? = null): LocalDate? = - if (format == null || format.isEmpty()) { + if (format.isNullOrEmpty()) { try { LocalDate.parse(this) } catch (e: DateTimeParseException) { diff --git a/src/main/kotlin/localdate/extensions/LocalDatePrintExtensions.kt b/src/main/kotlin/javatimefun/localdate/extensions/LocalDatePrintExtensions.kt similarity index 86% rename from src/main/kotlin/localdate/extensions/LocalDatePrintExtensions.kt rename to src/main/kotlin/javatimefun/localdate/extensions/LocalDatePrintExtensions.kt index cd75a09..c06f40c 100644 --- a/src/main/kotlin/localdate/extensions/LocalDatePrintExtensions.kt +++ b/src/main/kotlin/javatimefun/localdate/extensions/LocalDatePrintExtensions.kt @@ -1,4 +1,4 @@ -package localdate.extensions +package javatimefun.localdate.extensions import java.time.LocalDate import java.time.format.DateTimeFormatterBuilder diff --git a/src/main/kotlin/localdatetime/LocalDateTimeUtil.kt b/src/main/kotlin/javatimefun/localdatetime/LocalDateTimeUtil.kt similarity index 98% rename from src/main/kotlin/localdatetime/LocalDateTimeUtil.kt rename to src/main/kotlin/javatimefun/localdatetime/LocalDateTimeUtil.kt index 5e37ac4..d8d982a 100644 --- a/src/main/kotlin/localdatetime/LocalDateTimeUtil.kt +++ b/src/main/kotlin/javatimefun/localdatetime/LocalDateTimeUtil.kt @@ -1,4 +1,4 @@ -package localdatetime +package javatimefun.localdatetime import java.time.LocalDateTime import java.time.Month diff --git a/src/main/kotlin/localdatetime/LocalDateTimes.kt b/src/main/kotlin/javatimefun/localdatetime/LocalDateTimes.kt similarity index 88% rename from src/main/kotlin/localdatetime/LocalDateTimes.kt rename to src/main/kotlin/javatimefun/localdatetime/LocalDateTimes.kt index 40e76da..e20718f 100644 --- a/src/main/kotlin/localdatetime/LocalDateTimes.kt +++ b/src/main/kotlin/javatimefun/localdatetime/LocalDateTimes.kt @@ -1,8 +1,8 @@ -package localdatetime +package javatimefun.localdatetime -import localdatetime.extensions.atStartOfDay -import localdatetime.extensions.getLast -import localdatetime.extensions.getNext +import javatimefun.localdatetime.extensions.atStartOfDay +import javatimefun.localdatetime.extensions.getLast +import javatimefun.localdatetime.extensions.getNext import java.time.DayOfWeek import java.time.LocalDateTime diff --git a/src/main/kotlin/localdatetime/extensions/LocalDateTimeAttributeExtensions.kt b/src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimeAttributeExtensions.kt similarity index 90% rename from src/main/kotlin/localdatetime/extensions/LocalDateTimeAttributeExtensions.kt rename to src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimeAttributeExtensions.kt index 2516527..459342c 100644 --- a/src/main/kotlin/localdatetime/extensions/LocalDateTimeAttributeExtensions.kt +++ b/src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimeAttributeExtensions.kt @@ -1,4 +1,4 @@ -package localdatetime.extensions +package javatimefun.localdatetime.extensions import java.time.LocalDateTime import java.time.Year diff --git a/src/main/kotlin/localdatetime/extensions/LocalDateTimeComparisonExtensions.kt b/src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimeComparisonExtensions.kt similarity index 98% rename from src/main/kotlin/localdatetime/extensions/LocalDateTimeComparisonExtensions.kt rename to src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimeComparisonExtensions.kt index 9798bb1..777dcdc 100644 --- a/src/main/kotlin/localdatetime/extensions/LocalDateTimeComparisonExtensions.kt +++ b/src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimeComparisonExtensions.kt @@ -1,4 +1,4 @@ -package localdatetime.extensions +package javatimefun.localdatetime.extensions import java.time.Duration import java.time.LocalDateTime diff --git a/src/main/kotlin/localdatetime/extensions/LocalDateTimeMutatingExtensions.kt b/src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimeMutatingExtensions.kt similarity index 97% rename from src/main/kotlin/localdatetime/extensions/LocalDateTimeMutatingExtensions.kt rename to src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimeMutatingExtensions.kt index 1dd6e43..62efe60 100644 --- a/src/main/kotlin/localdatetime/extensions/LocalDateTimeMutatingExtensions.kt +++ b/src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimeMutatingExtensions.kt @@ -1,4 +1,4 @@ -package localdatetime.extensions +package javatimefun.localdatetime.extensions import java.time.DayOfWeek import java.time.LocalDateTime diff --git a/src/main/kotlin/localdatetime/extensions/LocalDateTimeParsingExtensions.kt b/src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimeParsingExtensions.kt similarity index 92% rename from src/main/kotlin/localdatetime/extensions/LocalDateTimeParsingExtensions.kt rename to src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimeParsingExtensions.kt index 2b8e84c..75d9337 100644 --- a/src/main/kotlin/localdatetime/extensions/LocalDateTimeParsingExtensions.kt +++ b/src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimeParsingExtensions.kt @@ -1,6 +1,6 @@ -package localdatetime.extensions +package javatimefun.localdatetime.extensions -import localdate.extensions.parseLocalDate +import javatimefun.localdate.extensions.parseLocalDate import java.time.LocalDateTime import java.time.LocalTime import java.time.format.DateTimeFormatter @@ -32,7 +32,7 @@ fun String.parseLocalDateTime(format: String? = null): LocalDateTime? { } private fun parseLocalDateTimeHelper(dateText: String, format: String?): LocalDateTime? = - if (format == null || format.isEmpty()) + if (format.isNullOrEmpty()) try { LocalDateTime.parse(dateText) } catch (e: DateTimeParseException) { diff --git a/src/main/kotlin/localdatetime/extensions/LocalDateTimePrintExtensions.kt b/src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimePrintExtensions.kt similarity index 85% rename from src/main/kotlin/localdatetime/extensions/LocalDateTimePrintExtensions.kt rename to src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimePrintExtensions.kt index 738f7e1..7ec81b8 100644 --- a/src/main/kotlin/localdatetime/extensions/LocalDateTimePrintExtensions.kt +++ b/src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimePrintExtensions.kt @@ -1,4 +1,4 @@ -package localdatetime.extensions +package javatimefun.localdatetime.extensions import java.time.LocalDateTime import java.time.format.DateTimeFormatterBuilder diff --git a/src/main/kotlin/localtime/LocalTimeUtil.kt b/src/main/kotlin/javatimefun/localtime/LocalTimeUtil.kt similarity index 96% rename from src/main/kotlin/localtime/LocalTimeUtil.kt rename to src/main/kotlin/javatimefun/localtime/LocalTimeUtil.kt index 1c8e513..d3b3455 100644 --- a/src/main/kotlin/localtime/LocalTimeUtil.kt +++ b/src/main/kotlin/javatimefun/localtime/LocalTimeUtil.kt @@ -1,6 +1,6 @@ -package localtime +package javatimefun.localtime -import localdatetime.LocalDateTimeUtil +import javatimefun.localdatetime.LocalDateTimeUtil import java.time.LocalTime import java.util.Date import java.util.Calendar diff --git a/src/main/kotlin/localtime/LocalTimes.kt b/src/main/kotlin/javatimefun/localtime/LocalTimes.kt similarity index 85% rename from src/main/kotlin/localtime/LocalTimes.kt rename to src/main/kotlin/javatimefun/localtime/LocalTimes.kt index 4694ea4..1dd8307 100644 --- a/src/main/kotlin/localtime/LocalTimes.kt +++ b/src/main/kotlin/javatimefun/localtime/LocalTimes.kt @@ -1,4 +1,4 @@ -package localtime +package javatimefun.localtime import java.time.LocalTime diff --git a/src/main/kotlin/localtime/extensions/LocalTimeAttributeExtensions.kt b/src/main/kotlin/javatimefun/localtime/extensions/LocalTimeAttributeExtensions.kt similarity index 87% rename from src/main/kotlin/localtime/extensions/LocalTimeAttributeExtensions.kt rename to src/main/kotlin/javatimefun/localtime/extensions/LocalTimeAttributeExtensions.kt index d04223f..1c17736 100644 --- a/src/main/kotlin/localtime/extensions/LocalTimeAttributeExtensions.kt +++ b/src/main/kotlin/javatimefun/localtime/extensions/LocalTimeAttributeExtensions.kt @@ -1,4 +1,4 @@ -package localtime.extensions +package javatimefun.localtime.extensions import java.time.LocalTime diff --git a/src/main/kotlin/localtime/extensions/LocalTimeComparisonExtensions.kt b/src/main/kotlin/javatimefun/localtime/extensions/LocalTimeComparisonExtensions.kt similarity index 95% rename from src/main/kotlin/localtime/extensions/LocalTimeComparisonExtensions.kt rename to src/main/kotlin/javatimefun/localtime/extensions/LocalTimeComparisonExtensions.kt index 2d7efe2..bb182ad 100644 --- a/src/main/kotlin/localtime/extensions/LocalTimeComparisonExtensions.kt +++ b/src/main/kotlin/javatimefun/localtime/extensions/LocalTimeComparisonExtensions.kt @@ -1,4 +1,4 @@ -package localtime.extensions +package javatimefun.localtime.extensions import java.time.Duration import java.time.LocalTime diff --git a/src/main/kotlin/localtime/extensions/LocalTimeParsingExtensions.kt b/src/main/kotlin/javatimefun/localtime/extensions/LocalTimeParsingExtensions.kt similarity index 89% rename from src/main/kotlin/localtime/extensions/LocalTimeParsingExtensions.kt rename to src/main/kotlin/javatimefun/localtime/extensions/LocalTimeParsingExtensions.kt index 4a95bea..6f731f8 100644 --- a/src/main/kotlin/localtime/extensions/LocalTimeParsingExtensions.kt +++ b/src/main/kotlin/javatimefun/localtime/extensions/LocalTimeParsingExtensions.kt @@ -1,11 +1,11 @@ -package localtime.extensions +package javatimefun.localtime.extensions import java.time.LocalTime import java.time.format.DateTimeFormatter import java.time.format.DateTimeParseException fun String.parseLocalTime(format: String? = null): LocalTime? = - if (format == null || format.isEmpty()) { + if (format.isNullOrEmpty()) { try { LocalTime.parse(this) } catch (e: DateTimeParseException) { diff --git a/src/main/kotlin/localtime/extensions/LocalTimePrintExtensions.kt b/src/main/kotlin/javatimefun/localtime/extensions/LocalTimePrintExtensions.kt similarity index 86% rename from src/main/kotlin/localtime/extensions/LocalTimePrintExtensions.kt rename to src/main/kotlin/javatimefun/localtime/extensions/LocalTimePrintExtensions.kt index ce71de9..9b7c8f0 100644 --- a/src/main/kotlin/localtime/extensions/LocalTimePrintExtensions.kt +++ b/src/main/kotlin/javatimefun/localtime/extensions/LocalTimePrintExtensions.kt @@ -1,4 +1,4 @@ -package localtime.extensions +package javatimefun.localtime.extensions import java.time.LocalTime import java.time.format.DateTimeFormatterBuilder diff --git a/src/main/kotlin/zoneddatetime/ZonedDateTimeUtil.kt b/src/main/kotlin/javatimefun/zoneddatetime/ZonedDateTimeUtil.kt similarity index 99% rename from src/main/kotlin/zoneddatetime/ZonedDateTimeUtil.kt rename to src/main/kotlin/javatimefun/zoneddatetime/ZonedDateTimeUtil.kt index f200649..8a1775c 100644 --- a/src/main/kotlin/zoneddatetime/ZonedDateTimeUtil.kt +++ b/src/main/kotlin/javatimefun/zoneddatetime/ZonedDateTimeUtil.kt @@ -1,4 +1,4 @@ -package zoneddatetime +package javatimefun.zoneddatetime import java.time.Instant import java.time.LocalDateTime diff --git a/src/main/kotlin/zoneddatetime/ZonedDateTimes.kt b/src/main/kotlin/javatimefun/zoneddatetime/ZonedDateTimes.kt similarity index 89% rename from src/main/kotlin/zoneddatetime/ZonedDateTimes.kt rename to src/main/kotlin/javatimefun/zoneddatetime/ZonedDateTimes.kt index c8ec584..722d5f5 100644 --- a/src/main/kotlin/zoneddatetime/ZonedDateTimes.kt +++ b/src/main/kotlin/javatimefun/zoneddatetime/ZonedDateTimes.kt @@ -1,8 +1,8 @@ -package zoneddatetime +package javatimefun.zoneddatetime -import zoneddatetime.extensions.atStartOfDay -import zoneddatetime.extensions.getLast -import zoneddatetime.extensions.getNext +import javatimefun.zoneddatetime.extensions.atStartOfDay +import javatimefun.zoneddatetime.extensions.getLast +import javatimefun.zoneddatetime.extensions.getNext import java.time.DayOfWeek.FRIDAY import java.time.DayOfWeek.MONDAY import java.time.DayOfWeek.SATURDAY diff --git a/src/main/kotlin/zoneddatetime/extensions/ZonedDateTimeAttributeExtensions.kt b/src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeAttributeExtensions.kt similarity index 95% rename from src/main/kotlin/zoneddatetime/extensions/ZonedDateTimeAttributeExtensions.kt rename to src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeAttributeExtensions.kt index 4be6a61..273b57a 100644 --- a/src/main/kotlin/zoneddatetime/extensions/ZonedDateTimeAttributeExtensions.kt +++ b/src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeAttributeExtensions.kt @@ -1,4 +1,4 @@ -package zoneddatetime.extensions +package javatimefun.zoneddatetime.extensions import java.time.Year import java.time.ZonedDateTime diff --git a/src/main/kotlin/zoneddatetime/extensions/ZonedDateTimeComparisonExtensions.kt b/src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeComparisonExtensions.kt similarity index 99% rename from src/main/kotlin/zoneddatetime/extensions/ZonedDateTimeComparisonExtensions.kt rename to src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeComparisonExtensions.kt index 593d1b5..c6d46aa 100644 --- a/src/main/kotlin/zoneddatetime/extensions/ZonedDateTimeComparisonExtensions.kt +++ b/src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeComparisonExtensions.kt @@ -1,4 +1,4 @@ -package zoneddatetime.extensions +package javatimefun.zoneddatetime.extensions import java.time.Duration import java.time.ZonedDateTime diff --git a/src/main/kotlin/zoneddatetime/extensions/ZonedDateTimeMutatingExtensions.kt b/src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeMutatingExtensions.kt similarity index 98% rename from src/main/kotlin/zoneddatetime/extensions/ZonedDateTimeMutatingExtensions.kt rename to src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeMutatingExtensions.kt index ef8c9c5..68bc870 100644 --- a/src/main/kotlin/zoneddatetime/extensions/ZonedDateTimeMutatingExtensions.kt +++ b/src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeMutatingExtensions.kt @@ -1,4 +1,4 @@ -package zoneddatetime.extensions +package javatimefun.zoneddatetime.extensions import java.time.DayOfWeek import java.time.LocalTime diff --git a/src/main/kotlin/zoneddatetime/extensions/ZonedDateTimeParsingExtensions.kt b/src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeParsingExtensions.kt similarity index 93% rename from src/main/kotlin/zoneddatetime/extensions/ZonedDateTimeParsingExtensions.kt rename to src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeParsingExtensions.kt index 310edb9..d7a08d8 100644 --- a/src/main/kotlin/zoneddatetime/extensions/ZonedDateTimeParsingExtensions.kt +++ b/src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeParsingExtensions.kt @@ -1,7 +1,7 @@ -package zoneddatetime.extensions +package javatimefun.zoneddatetime.extensions -import localdatetime.extensions.parseLocalDateTime -import zoneddatetime.ZonedDateTimeUtil +import javatimefun.localdatetime.extensions.parseLocalDateTime +import javatimefun.zoneddatetime.ZonedDateTimeUtil import java.time.ZoneId import java.time.ZonedDateTime import java.time.format.DateTimeFormatter @@ -42,7 +42,7 @@ fun String.parseZonedDateTime( } private fun parseZonedDateTimeHelper(dateText: String, format: String?): ZonedDateTime? = - if (format == null || format.isEmpty()) { + if (format.isNullOrEmpty()) { try { if (dateText.isMsftDate()) { dateText.parseMsftDate() diff --git a/src/main/kotlin/zoneddatetime/extensions/ZonedDateTimePrintExtensions.kt b/src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimePrintExtensions.kt similarity index 85% rename from src/main/kotlin/zoneddatetime/extensions/ZonedDateTimePrintExtensions.kt rename to src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimePrintExtensions.kt index 5d2967a..15c04da 100644 --- a/src/main/kotlin/zoneddatetime/extensions/ZonedDateTimePrintExtensions.kt +++ b/src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimePrintExtensions.kt @@ -1,4 +1,4 @@ -package zoneddatetime.extensions +package javatimefun.zoneddatetime.extensions import java.time.ZonedDateTime import java.time.format.DateTimeFormatterBuilder diff --git a/src/main/kotlin/localdate/LocalDates.kt b/src/main/kotlin/localdate/LocalDates.kt deleted file mode 100644 index 3970668..0000000 --- a/src/main/kotlin/localdate/LocalDates.kt +++ /dev/null @@ -1,31 +0,0 @@ -package localdate - -import localdate.extensions.getLast -import localdate.extensions.getNext -import java.time.DayOfWeek -import java.time.LocalDate - -object LocalDates { - val today: LocalDate get() = LocalDate.now() - val yesterday: LocalDate get() = today.minusDays(1) - val tomorrow: LocalDate get() = today.plusDays(1) - - val lastMonday: LocalDate get() = today.getLast(DayOfWeek.MONDAY) - val lastTuesday: LocalDate get() = today.getLast(DayOfWeek.TUESDAY) - val lastWednesday: LocalDate get() = today.getLast(DayOfWeek.WEDNESDAY) - val lastThursday: LocalDate get() = today.getLast(DayOfWeek.THURSDAY) - val lastFriday: LocalDate get() = today.getLast(DayOfWeek.FRIDAY) - val lastSaturday: LocalDate get() = today.getLast(DayOfWeek.SATURDAY) - val lastSunday: LocalDate get() = today.getLast(DayOfWeek.SUNDAY) - - val nextMonday: LocalDate get() = today.getNext(DayOfWeek.MONDAY) - val nextTuesday: LocalDate get() = today.getNext(DayOfWeek.TUESDAY) - val nextWednesday: LocalDate get() = today.getNext(DayOfWeek.WEDNESDAY) - val nextThursday: LocalDate get() = today.getNext(DayOfWeek.THURSDAY) - val nextFriday: LocalDate get() = today.getNext(DayOfWeek.FRIDAY) - val nextSaturday: LocalDate get() = today.getNext(DayOfWeek.SATURDAY) - val nextSunday: LocalDate get() = today.getNext(DayOfWeek.SUNDAY) - - val firstDayOfThisYear: LocalDate get() = LocalDateUtil.new(today.year, 1, 1) - val lastDayOfThisYear: LocalDate get() = LocalDateUtil.new(today.year, 12, 31) -} \ No newline at end of file diff --git a/src/test/kotlin/localdate/LocalDateUtilTest.kt b/src/test/kotlin/localdate/LocalDateUtilTest.kt index eba4ec6..3750ff1 100644 --- a/src/test/kotlin/localdate/LocalDateUtilTest.kt +++ b/src/test/kotlin/localdate/LocalDateUtilTest.kt @@ -1,6 +1,6 @@ package localdate -import localdate.extensions.getMonthBaseZero +import javatimefun.localdate.extensions.getMonthBaseZero import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import java.util.Date @@ -16,7 +16,7 @@ class LocalDateUtilTest { val epoch = 1325134800000 // when - val localDate = LocalDateUtil.new(epoch) + val localDate = javatimefun.localdate.LocalDateUtil.new(epoch) // then assertEquals(2011, localDate.year) @@ -31,7 +31,7 @@ class LocalDateUtilTest { // when val date = Date(epoch) - val localDate = LocalDateUtil.new(date) + val localDate = javatimefun.localdate.LocalDateUtil.new(date) // then assertEquals(2011, localDate.year) @@ -50,7 +50,7 @@ class LocalDateUtilTest { timeZone = TimeZone.getTimeZone("UTC") time = date } - val localDate = LocalDateUtil.new(calendar) + val localDate = javatimefun.localdate.LocalDateUtil.new(calendar) // then assertEquals(calendar[Calendar.YEAR], localDate.year) diff --git a/src/test/kotlin/localdatetime/LocalDateTimeUtilTest.kt b/src/test/kotlin/localdatetime/LocalDateTimeUtilTest.kt index cc57301..4a4afed 100644 --- a/src/test/kotlin/localdatetime/LocalDateTimeUtilTest.kt +++ b/src/test/kotlin/localdatetime/LocalDateTimeUtilTest.kt @@ -1,6 +1,7 @@ package localdatetime -import localdatetime.extensions.getMonthBaseZero +import javatimefun.localdatetime.LocalDateTimeUtil +import javatimefun.localdatetime.extensions.getMonthBaseZero import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import java.util.Calendar diff --git a/src/test/kotlin/localtime/LocalTimeUtilTest.kt b/src/test/kotlin/localtime/LocalTimeUtilTest.kt index 84bfbe2..3ba92ca 100644 --- a/src/test/kotlin/localtime/LocalTimeUtilTest.kt +++ b/src/test/kotlin/localtime/LocalTimeUtilTest.kt @@ -1,5 +1,6 @@ package localtime +import javatimefun.localtime.LocalTimeUtil import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import java.util.Date diff --git a/src/test/kotlin/zoneddatetime/ZonedDateTimeAttributeExtensionsTest.kt b/src/test/kotlin/zoneddatetime/ZonedDateTimeAttributeExtensionsTest.kt index 52b1471..29f2d96 100644 --- a/src/test/kotlin/zoneddatetime/ZonedDateTimeAttributeExtensionsTest.kt +++ b/src/test/kotlin/zoneddatetime/ZonedDateTimeAttributeExtensionsTest.kt @@ -1,10 +1,11 @@ package zoneddatetime +import javatimefun.zoneddatetime.ZonedDateTimeUtil import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test -import zoneddatetime.extensions.* +import javatimefun.zoneddatetime.extensions.* class ZonedDateTimeAttributeExtensionsTest { diff --git a/src/test/kotlin/zoneddatetime/ZonedDateTimeComparisonExtensionsTest.kt b/src/test/kotlin/zoneddatetime/ZonedDateTimeComparisonExtensionsTest.kt index df7fe80..d73d112 100644 --- a/src/test/kotlin/zoneddatetime/ZonedDateTimeComparisonExtensionsTest.kt +++ b/src/test/kotlin/zoneddatetime/ZonedDateTimeComparisonExtensionsTest.kt @@ -1,10 +1,11 @@ package zoneddatetime +import javatimefun.zoneddatetime.ZonedDateTimeUtil import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Test -import zoneddatetime.extensions.* +import javatimefun.zoneddatetime.extensions.* class ZonedDateTimeComparisonExtensionsTest { diff --git a/src/test/kotlin/zoneddatetime/ZonedDateTimeMutatingExtensionsTest.kt b/src/test/kotlin/zoneddatetime/ZonedDateTimeMutatingExtensionsTest.kt index 7c77a46..b6203fa 100644 --- a/src/test/kotlin/zoneddatetime/ZonedDateTimeMutatingExtensionsTest.kt +++ b/src/test/kotlin/zoneddatetime/ZonedDateTimeMutatingExtensionsTest.kt @@ -1,14 +1,15 @@ package zoneddatetime -import localtime.extensions.parseLocalTime -import localtime.extensions.print +import javatimefun.localtime.extensions.parseLocalTime +import javatimefun.localtime.extensions.print +import javatimefun.zoneddatetime.ZonedDateTimeUtil import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test -import zoneddatetime.extensions.getLast -import zoneddatetime.extensions.getNext -import zoneddatetime.extensions.isEqualDay -import zoneddatetime.extensions.withLocalTime +import javatimefun.zoneddatetime.extensions.getLast +import javatimefun.zoneddatetime.extensions.getNext +import javatimefun.zoneddatetime.extensions.isEqualDay +import javatimefun.zoneddatetime.extensions.withLocalTime import java.time.DayOfWeek import java.time.LocalTime diff --git a/src/test/kotlin/zoneddatetime/ZonedDateTimeParsingExtensionsTest.kt b/src/test/kotlin/zoneddatetime/ZonedDateTimeParsingExtensionsTest.kt index f14a605..3382f90 100644 --- a/src/test/kotlin/zoneddatetime/ZonedDateTimeParsingExtensionsTest.kt +++ b/src/test/kotlin/zoneddatetime/ZonedDateTimeParsingExtensionsTest.kt @@ -2,8 +2,8 @@ package zoneddatetime import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test -import zoneddatetime.extensions.parseZonedDateTime -import zoneddatetime.extensions.print +import javatimefun.zoneddatetime.extensions.parseZonedDateTime +import javatimefun.zoneddatetime.extensions.print import java.lang.RuntimeException import java.time.ZonedDateTime diff --git a/src/test/kotlin/zoneddatetime/ZonedDateTimeUtilTest.kt b/src/test/kotlin/zoneddatetime/ZonedDateTimeUtilTest.kt index ff7cb00..fde2e36 100644 --- a/src/test/kotlin/zoneddatetime/ZonedDateTimeUtilTest.kt +++ b/src/test/kotlin/zoneddatetime/ZonedDateTimeUtilTest.kt @@ -1,8 +1,9 @@ package zoneddatetime +import javatimefun.zoneddatetime.ZonedDateTimeUtil import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test -import zoneddatetime.extensions.getMonthBaseZero +import javatimefun.zoneddatetime.extensions.getMonthBaseZero import java.time.ZonedDateTime import java.util.Calendar import java.util.Calendar.HOUR