Skip to content

Commit c6137a1

Browse files
seljabaliseljabali
authored
Add 'javatimefun' as root package name (#23)
1 parent 9146823 commit c6137a1

37 files changed

+105
-92
lines changed

Diff for: ‎build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ repositories {
1818
}
1919

2020
dependencies {
21-
2221
implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
2322
testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")
2423
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitVersion")

Diff for: ‎src/main/kotlin/localdate/LocalDateUtil.kt renamed to ‎src/main/kotlin/javatimefun/localdate/LocalDateUtil.kt

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package localdate
1+
package javatimefun.localdate
22

33
import java.time.LocalDate
44
import java.time.Month
@@ -29,11 +29,13 @@ object LocalDateUtil {
2929
* @param date A wrapper of Epoch time in UTC.
3030
* @return LocalDate.
3131
*/
32-
fun new(date: Date): LocalDate = new(date.toInstant().toEpochMilli())
32+
fun new(date: Date): LocalDate =
33+
javatimefun.localdate.LocalDateUtil.new(date.toInstant().toEpochMilli())
3334

3435
/**
3536
* @param calendar Calendar, a date time variable that supports time zones.
3637
* @return LocalDate.
3738
*/
38-
fun new(calendar: Calendar): LocalDate = new(calendar.toInstant().toEpochMilli())
39+
fun new(calendar: Calendar): LocalDate =
40+
javatimefun.localdate.LocalDateUtil.new(calendar.toInstant().toEpochMilli())
3941
}

Diff for: ‎src/main/kotlin/javatimefun/localdate/LocalDates.kt

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package javatimefun.localdate
2+
3+
import javatimefun.localdate.extensions.getLast
4+
import javatimefun.localdate.extensions.getNext
5+
import java.time.DayOfWeek
6+
import java.time.LocalDate
7+
8+
object LocalDates {
9+
val today: LocalDate get() = LocalDate.now()
10+
val yesterday: LocalDate get() = javatimefun.localdate.LocalDates.today.minusDays(1)
11+
val tomorrow: LocalDate get() = javatimefun.localdate.LocalDates.today.plusDays(1)
12+
13+
val lastMonday: LocalDate get() = javatimefun.localdate.LocalDates.today.getLast(DayOfWeek.MONDAY)
14+
val lastTuesday: LocalDate get() = javatimefun.localdate.LocalDates.today.getLast(DayOfWeek.TUESDAY)
15+
val lastWednesday: LocalDate get() = javatimefun.localdate.LocalDates.today.getLast(DayOfWeek.WEDNESDAY)
16+
val lastThursday: LocalDate get() = javatimefun.localdate.LocalDates.today.getLast(DayOfWeek.THURSDAY)
17+
val lastFriday: LocalDate get() = javatimefun.localdate.LocalDates.today.getLast(DayOfWeek.FRIDAY)
18+
val lastSaturday: LocalDate get() = javatimefun.localdate.LocalDates.today.getLast(DayOfWeek.SATURDAY)
19+
val lastSunday: LocalDate get() = javatimefun.localdate.LocalDates.today.getLast(DayOfWeek.SUNDAY)
20+
21+
val nextMonday: LocalDate get() = javatimefun.localdate.LocalDates.today.getNext(DayOfWeek.MONDAY)
22+
val nextTuesday: LocalDate get() = javatimefun.localdate.LocalDates.today.getNext(DayOfWeek.TUESDAY)
23+
val nextWednesday: LocalDate get() = javatimefun.localdate.LocalDates.today.getNext(DayOfWeek.WEDNESDAY)
24+
val nextThursday: LocalDate get() = javatimefun.localdate.LocalDates.today.getNext(DayOfWeek.THURSDAY)
25+
val nextFriday: LocalDate get() = javatimefun.localdate.LocalDates.today.getNext(DayOfWeek.FRIDAY)
26+
val nextSaturday: LocalDate get() = javatimefun.localdate.LocalDates.today.getNext(DayOfWeek.SATURDAY)
27+
val nextSunday: LocalDate get() = javatimefun.localdate.LocalDates.today.getNext(DayOfWeek.SUNDAY)
28+
29+
val firstDayOfThisYear: LocalDate get() = javatimefun.localdate.LocalDateUtil.new(
30+
javatimefun.localdate.LocalDates.today.year,
31+
1,
32+
1
33+
)
34+
val lastDayOfThisYear: LocalDate get() = javatimefun.localdate.LocalDateUtil.new(
35+
javatimefun.localdate.LocalDates.today.year,
36+
12,
37+
31
38+
)
39+
}

Diff for: ‎src/main/kotlin/localdate/extensions/LocalDateAttributeExtensions.kt renamed to ‎src/main/kotlin/javatimefun/localdate/extensions/LocalDateAttributeExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package localdate.extensions
1+
package javatimefun.localdate.extensions
22

33
import java.time.LocalDate
44
import java.time.Year

Diff for: ‎src/main/kotlin/localdate/extensions/LocalDateComparisonExtensions.kt renamed to ‎src/main/kotlin/javatimefun/localdate/extensions/LocalDateComparisonExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package localdate.extensions
1+
package javatimefun.localdate.extensions
22

33
import java.time.Duration
44
import java.time.LocalDate

Diff for: ‎src/main/kotlin/localdate/extensions/LocalDateMutatingExtensions.kt renamed to ‎src/main/kotlin/javatimefun/localdate/extensions/LocalDateMutatingExtensions.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package localdate.extensions
1+
package javatimefun.localdate.extensions
22

33
import java.time.DayOfWeek
44
import java.time.LocalDate
@@ -33,6 +33,4 @@ fun LocalDate.getNext(dayOfWeek: DayOfWeek, countingInThisDay: Boolean = false):
3333
return nextLocalDate
3434
}
3535

36-
fun LocalDate.startOfDay(): LocalDateTime = LocalDateTime.of(this, LocalTime.MIN)
37-
3836
fun LocalDate.atEndOfDay(): LocalDateTime = LocalDateTime.of(this, LocalTime.MAX)

Diff for: ‎src/main/kotlin/localdate/extensions/LocalDateParsingExtensions.kt renamed to ‎src/main/kotlin/javatimefun/localdate/extensions/LocalDateParsingExtensions.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package localdate.extensions
1+
package javatimefun.localdate.extensions
22

33
import java.time.LocalDate
44
import java.time.format.DateTimeFormatter
@@ -13,7 +13,7 @@ import java.time.format.DateTimeParseException
1313
* @return LocalDate? Null means couldn't parse, else parsed LocalDate.
1414
*/
1515
fun String.parseLocalDate(format: String? = null): LocalDate? =
16-
if (format == null || format.isEmpty()) {
16+
if (format.isNullOrEmpty()) {
1717
try {
1818
LocalDate.parse(this)
1919
} catch (e: DateTimeParseException) {

Diff for: ‎src/main/kotlin/localdate/extensions/LocalDatePrintExtensions.kt renamed to ‎src/main/kotlin/javatimefun/localdate/extensions/LocalDatePrintExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package localdate.extensions
1+
package javatimefun.localdate.extensions
22

33
import java.time.LocalDate
44
import java.time.format.DateTimeFormatterBuilder

Diff for: ‎src/main/kotlin/localdatetime/LocalDateTimeUtil.kt renamed to ‎src/main/kotlin/javatimefun/localdatetime/LocalDateTimeUtil.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package localdatetime
1+
package javatimefun.localdatetime
22

33
import java.time.LocalDateTime
44
import java.time.Month

Diff for: ‎src/main/kotlin/localdatetime/LocalDateTimes.kt renamed to ‎src/main/kotlin/javatimefun/localdatetime/LocalDateTimes.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package localdatetime
1+
package javatimefun.localdatetime
22

3-
import localdatetime.extensions.atStartOfDay
4-
import localdatetime.extensions.getLast
5-
import localdatetime.extensions.getNext
3+
import javatimefun.localdatetime.extensions.atStartOfDay
4+
import javatimefun.localdatetime.extensions.getLast
5+
import javatimefun.localdatetime.extensions.getNext
66
import java.time.DayOfWeek
77
import java.time.LocalDateTime
88

Diff for: ‎src/main/kotlin/localdatetime/extensions/LocalDateTimeAttributeExtensions.kt renamed to ‎src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimeAttributeExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package localdatetime.extensions
1+
package javatimefun.localdatetime.extensions
22

33
import java.time.LocalDateTime
44
import java.time.Year

Diff for: ‎src/main/kotlin/localdatetime/extensions/LocalDateTimeComparisonExtensions.kt renamed to ‎src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimeComparisonExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package localdatetime.extensions
1+
package javatimefun.localdatetime.extensions
22

33
import java.time.Duration
44
import java.time.LocalDateTime

Diff for: ‎src/main/kotlin/localdatetime/extensions/LocalDateTimeMutatingExtensions.kt renamed to ‎src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimeMutatingExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package localdatetime.extensions
1+
package javatimefun.localdatetime.extensions
22

33
import java.time.DayOfWeek
44
import java.time.LocalDateTime

Diff for: ‎src/main/kotlin/localdatetime/extensions/LocalDateTimeParsingExtensions.kt renamed to ‎src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimeParsingExtensions.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package localdatetime.extensions
1+
package javatimefun.localdatetime.extensions
22

3-
import localdate.extensions.parseLocalDate
3+
import javatimefun.localdate.extensions.parseLocalDate
44
import java.time.LocalDateTime
55
import java.time.LocalTime
66
import java.time.format.DateTimeFormatter
@@ -32,7 +32,7 @@ fun String.parseLocalDateTime(format: String? = null): LocalDateTime? {
3232
}
3333

3434
private fun parseLocalDateTimeHelper(dateText: String, format: String?): LocalDateTime? =
35-
if (format == null || format.isEmpty())
35+
if (format.isNullOrEmpty())
3636
try {
3737
LocalDateTime.parse(dateText)
3838
} catch (e: DateTimeParseException) {

Diff for: ‎src/main/kotlin/localdatetime/extensions/LocalDateTimePrintExtensions.kt renamed to ‎src/main/kotlin/javatimefun/localdatetime/extensions/LocalDateTimePrintExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package localdatetime.extensions
1+
package javatimefun.localdatetime.extensions
22

33
import java.time.LocalDateTime
44
import java.time.format.DateTimeFormatterBuilder

Diff for: ‎src/main/kotlin/localtime/LocalTimeUtil.kt renamed to ‎src/main/kotlin/javatimefun/localtime/LocalTimeUtil.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package localtime
1+
package javatimefun.localtime
22

3-
import localdatetime.LocalDateTimeUtil
3+
import javatimefun.localdatetime.LocalDateTimeUtil
44
import java.time.LocalTime
55
import java.util.Date
66
import java.util.Calendar

Diff for: ‎src/main/kotlin/localtime/LocalTimes.kt renamed to ‎src/main/kotlin/javatimefun/localtime/LocalTimes.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package localtime
1+
package javatimefun.localtime
22

33
import java.time.LocalTime
44

Diff for: ‎src/main/kotlin/localtime/extensions/LocalTimeAttributeExtensions.kt renamed to ‎src/main/kotlin/javatimefun/localtime/extensions/LocalTimeAttributeExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package localtime.extensions
1+
package javatimefun.localtime.extensions
22

33
import java.time.LocalTime
44

Diff for: ‎src/main/kotlin/localtime/extensions/LocalTimeComparisonExtensions.kt renamed to ‎src/main/kotlin/javatimefun/localtime/extensions/LocalTimeComparisonExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package localtime.extensions
1+
package javatimefun.localtime.extensions
22

33
import java.time.Duration
44
import java.time.LocalTime

Diff for: ‎src/main/kotlin/localtime/extensions/LocalTimeParsingExtensions.kt renamed to ‎src/main/kotlin/javatimefun/localtime/extensions/LocalTimeParsingExtensions.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package localtime.extensions
1+
package javatimefun.localtime.extensions
22

33
import java.time.LocalTime
44
import java.time.format.DateTimeFormatter
55
import java.time.format.DateTimeParseException
66

77
fun String.parseLocalTime(format: String? = null): LocalTime? =
8-
if (format == null || format.isEmpty()) {
8+
if (format.isNullOrEmpty()) {
99
try {
1010
LocalTime.parse(this)
1111
} catch (e: DateTimeParseException) {

Diff for: ‎src/main/kotlin/localtime/extensions/LocalTimePrintExtensions.kt renamed to ‎src/main/kotlin/javatimefun/localtime/extensions/LocalTimePrintExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package localtime.extensions
1+
package javatimefun.localtime.extensions
22

33
import java.time.LocalTime
44
import java.time.format.DateTimeFormatterBuilder

Diff for: ‎src/main/kotlin/zoneddatetime/ZonedDateTimeUtil.kt renamed to ‎src/main/kotlin/javatimefun/zoneddatetime/ZonedDateTimeUtil.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package zoneddatetime
1+
package javatimefun.zoneddatetime
22

33
import java.time.Instant
44
import java.time.LocalDateTime

Diff for: ‎src/main/kotlin/zoneddatetime/ZonedDateTimes.kt renamed to ‎src/main/kotlin/javatimefun/zoneddatetime/ZonedDateTimes.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package zoneddatetime
1+
package javatimefun.zoneddatetime
22

3-
import zoneddatetime.extensions.atStartOfDay
4-
import zoneddatetime.extensions.getLast
5-
import zoneddatetime.extensions.getNext
3+
import javatimefun.zoneddatetime.extensions.atStartOfDay
4+
import javatimefun.zoneddatetime.extensions.getLast
5+
import javatimefun.zoneddatetime.extensions.getNext
66
import java.time.DayOfWeek.FRIDAY
77
import java.time.DayOfWeek.MONDAY
88
import java.time.DayOfWeek.SATURDAY

Diff for: ‎src/main/kotlin/zoneddatetime/extensions/ZonedDateTimeAttributeExtensions.kt renamed to ‎src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeAttributeExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package zoneddatetime.extensions
1+
package javatimefun.zoneddatetime.extensions
22

33
import java.time.Year
44
import java.time.ZonedDateTime

Diff for: ‎src/main/kotlin/zoneddatetime/extensions/ZonedDateTimeComparisonExtensions.kt renamed to ‎src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeComparisonExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package zoneddatetime.extensions
1+
package javatimefun.zoneddatetime.extensions
22

33
import java.time.Duration
44
import java.time.ZonedDateTime

Diff for: ‎src/main/kotlin/zoneddatetime/extensions/ZonedDateTimeMutatingExtensions.kt renamed to ‎src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeMutatingExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package zoneddatetime.extensions
1+
package javatimefun.zoneddatetime.extensions
22

33
import java.time.DayOfWeek
44
import java.time.LocalTime

Diff for: ‎src/main/kotlin/zoneddatetime/extensions/ZonedDateTimeParsingExtensions.kt renamed to ‎src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeParsingExtensions.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package zoneddatetime.extensions
1+
package javatimefun.zoneddatetime.extensions
22

3-
import localdatetime.extensions.parseLocalDateTime
4-
import zoneddatetime.ZonedDateTimeUtil
3+
import javatimefun.localdatetime.extensions.parseLocalDateTime
4+
import javatimefun.zoneddatetime.ZonedDateTimeUtil
55
import java.time.ZoneId
66
import java.time.ZonedDateTime
77
import java.time.format.DateTimeFormatter
@@ -42,7 +42,7 @@ fun String.parseZonedDateTime(
4242
}
4343

4444
private fun parseZonedDateTimeHelper(dateText: String, format: String?): ZonedDateTime? =
45-
if (format == null || format.isEmpty()) {
45+
if (format.isNullOrEmpty()) {
4646
try {
4747
if (dateText.isMsftDate()) {
4848
dateText.parseMsftDate()

Diff for: ‎src/main/kotlin/zoneddatetime/extensions/ZonedDateTimePrintExtensions.kt renamed to ‎src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimePrintExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package zoneddatetime.extensions
1+
package javatimefun.zoneddatetime.extensions
22

33
import java.time.ZonedDateTime
44
import java.time.format.DateTimeFormatterBuilder

Diff for: ‎src/main/kotlin/localdate/LocalDates.kt

-31
This file was deleted.

Diff for: ‎src/test/kotlin/localdate/LocalDateUtilTest.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package localdate
22

3-
import localdate.extensions.getMonthBaseZero
3+
import javatimefun.localdate.extensions.getMonthBaseZero
44
import org.junit.jupiter.api.Assertions.assertEquals
55
import org.junit.jupiter.api.Test
66
import java.util.Date
@@ -16,7 +16,7 @@ class LocalDateUtilTest {
1616
val epoch = 1325134800000
1717

1818
// when
19-
val localDate = LocalDateUtil.new(epoch)
19+
val localDate = javatimefun.localdate.LocalDateUtil.new(epoch)
2020

2121
// then
2222
assertEquals(2011, localDate.year)
@@ -31,7 +31,7 @@ class LocalDateUtilTest {
3131

3232
// when
3333
val date = Date(epoch)
34-
val localDate = LocalDateUtil.new(date)
34+
val localDate = javatimefun.localdate.LocalDateUtil.new(date)
3535

3636
// then
3737
assertEquals(2011, localDate.year)
@@ -50,7 +50,7 @@ class LocalDateUtilTest {
5050
timeZone = TimeZone.getTimeZone("UTC")
5151
time = date
5252
}
53-
val localDate = LocalDateUtil.new(calendar)
53+
val localDate = javatimefun.localdate.LocalDateUtil.new(calendar)
5454

5555
// then
5656
assertEquals(calendar[Calendar.YEAR], localDate.year)

Diff for: ‎src/test/kotlin/localdatetime/LocalDateTimeUtilTest.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package localdatetime
22

3-
import localdatetime.extensions.getMonthBaseZero
3+
import javatimefun.localdatetime.LocalDateTimeUtil
4+
import javatimefun.localdatetime.extensions.getMonthBaseZero
45
import org.junit.jupiter.api.Assertions.assertEquals
56
import org.junit.jupiter.api.Test
67
import java.util.Calendar

Diff for: ‎src/test/kotlin/localtime/LocalTimeUtilTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package localtime
22

3+
import javatimefun.localtime.LocalTimeUtil
34
import org.junit.jupiter.api.Assertions.assertEquals
45
import org.junit.jupiter.api.Test
56
import java.util.Date

Diff for: ‎src/test/kotlin/zoneddatetime/ZonedDateTimeAttributeExtensionsTest.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package zoneddatetime
22

3+
import javatimefun.zoneddatetime.ZonedDateTimeUtil
34
import org.junit.jupiter.api.Assertions
45
import org.junit.jupiter.api.Assertions.assertEquals
56
import org.junit.jupiter.api.Assertions.assertTrue
67
import org.junit.jupiter.api.Test
7-
import zoneddatetime.extensions.*
8+
import javatimefun.zoneddatetime.extensions.*
89

910
class ZonedDateTimeAttributeExtensionsTest {
1011

Diff for: ‎src/test/kotlin/zoneddatetime/ZonedDateTimeComparisonExtensionsTest.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package zoneddatetime
22

3+
import javatimefun.zoneddatetime.ZonedDateTimeUtil
34
import org.junit.jupiter.api.Assertions.assertEquals
45
import org.junit.jupiter.api.Assertions.assertTrue
56
import org.junit.jupiter.api.Assertions.assertFalse
67
import org.junit.jupiter.api.Test
7-
import zoneddatetime.extensions.*
8+
import javatimefun.zoneddatetime.extensions.*
89

910
class ZonedDateTimeComparisonExtensionsTest {
1011

0 commit comments

Comments
 (0)