Skip to content

Commit

Permalink
Add 'javatimefun' as root package name (#23)
Browse files Browse the repository at this point in the history
  • Loading branch information
seljabali committed Feb 8, 2024
1 parent 9146823 commit c6137a1
Show file tree
Hide file tree
Showing 37 changed files with 105 additions and 92 deletions.
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package localdate
package javatimefun.localdate

import java.time.LocalDate
import java.time.Month
Expand Down Expand Up @@ -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())
}
39 changes: 39 additions & 0 deletions src/main/kotlin/javatimefun/localdate/LocalDates.kt
Original file line number Diff line number Diff line change
@@ -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
)
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package localdate.extensions
package javatimefun.localdate.extensions

import java.time.LocalDate
import java.time.Year
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package localdate.extensions
package javatimefun.localdate.extensions

import java.time.Duration
import java.time.LocalDate
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package localdate.extensions
package javatimefun.localdate.extensions

import java.time.DayOfWeek
import java.time.LocalDate
Expand Down Expand Up @@ -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)
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package localdate.extensions
package javatimefun.localdate.extensions

import java.time.LocalDate
import java.time.format.DateTimeFormatter
Expand All @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package localdate.extensions
package javatimefun.localdate.extensions

import java.time.LocalDate
import java.time.format.DateTimeFormatterBuilder
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package localdatetime
package javatimefun.localdatetime

import java.time.LocalDateTime
import java.time.Month
Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package localdatetime.extensions
package javatimefun.localdatetime.extensions

import java.time.LocalDateTime
import java.time.Year
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package localdatetime.extensions
package javatimefun.localdatetime.extensions

import java.time.Duration
import java.time.LocalDateTime
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package localdatetime.extensions
package javatimefun.localdatetime.extensions

import java.time.DayOfWeek
import java.time.LocalDateTime
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package localdatetime.extensions
package javatimefun.localdatetime.extensions

import java.time.LocalDateTime
import java.time.format.DateTimeFormatterBuilder
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package localtime
package javatimefun.localtime

import java.time.LocalTime

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package localtime.extensions
package javatimefun.localtime.extensions

import java.time.LocalTime

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package localtime.extensions
package javatimefun.localtime.extensions

import java.time.Duration
import java.time.LocalTime
Expand Down
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package localtime.extensions
package javatimefun.localtime.extensions

import java.time.LocalTime
import java.time.format.DateTimeFormatterBuilder
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package zoneddatetime
package javatimefun.zoneddatetime

import java.time.Instant
import java.time.LocalDateTime
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package zoneddatetime.extensions
package javatimefun.zoneddatetime.extensions

import java.time.Year
import java.time.ZonedDateTime
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package zoneddatetime.extensions
package javatimefun.zoneddatetime.extensions

import java.time.Duration
import java.time.ZonedDateTime
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package zoneddatetime.extensions
package javatimefun.zoneddatetime.extensions

import java.time.DayOfWeek
import java.time.LocalTime
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package zoneddatetime.extensions
package javatimefun.zoneddatetime.extensions

import java.time.ZonedDateTime
import java.time.format.DateTimeFormatterBuilder
Expand Down
31 changes: 0 additions & 31 deletions src/main/kotlin/localdate/LocalDates.kt

This file was deleted.

8 changes: 4 additions & 4 deletions src/test/kotlin/localdate/LocalDateUtilTest.kt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion src/test/kotlin/localdatetime/LocalDateTimeUtilTest.kt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions src/test/kotlin/localtime/LocalTimeUtilTest.kt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Loading

0 comments on commit c6137a1

Please sign in to comment.