- * When a format is present, it'll try parsing using that format alone, & return null if it fails. + * When a format is present, tries parsing using that format alone, & return null if it fails. * - * @param this String representation of either LocalDate, or LocalDateTime. - * @param format String representing format that should solely be used when parsing the date. - * @return LocalDateTime? Null means couldn't parse, else parsed LocalDateTime. + * @param this String representation of either LocalDate, or LocalDateTime. + * @param format String representing format that should solely be used when parsing the date. + * @return LocalDateTime? Null means couldn't parse, else parsed LocalDateTime. */ -fun String.parseLocalDateTime(format: String? = null): LocalDateTime? { +fun String.toLocalDateTime(format: String? = null): LocalDateTime? { val localDateTime = parseLocalDateTimeHelper(this, format) if (localDateTime != null) { return localDateTime } - val localDate = this.parseLocalDate(format) + val localDate = this.toLocalDate(format) if (localDate != null) { return LocalDateTime.of(localDate, LocalTime.MIN) } diff --git a/src/main/kotlin/javatimefun/localtime/extensions/LocalTimeParsingExtensions.kt b/src/main/kotlin/javatimefun/localtime/extensions/LocalTimeParsingExtensions.kt index 6f731f8..2770772 100644 --- a/src/main/kotlin/javatimefun/localtime/extensions/LocalTimeParsingExtensions.kt +++ b/src/main/kotlin/javatimefun/localtime/extensions/LocalTimeParsingExtensions.kt @@ -4,7 +4,7 @@ import java.time.LocalTime import java.time.format.DateTimeFormatter import java.time.format.DateTimeParseException -fun String.parseLocalTime(format: String? = null): LocalTime? = +fun String.toLocalTime(format: String? = null): LocalTime? = if (format.isNullOrEmpty()) { try { LocalTime.parse(this) diff --git a/src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeParsingExtensions.kt b/src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeParsingExtensions.kt index d7a08d8..e49bdc7 100644 --- a/src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeParsingExtensions.kt +++ b/src/main/kotlin/javatimefun/zoneddatetime/extensions/ZonedDateTimeParsingExtensions.kt @@ -1,6 +1,6 @@ package javatimefun.zoneddatetime.extensions -import javatimefun.localdatetime.extensions.parseLocalDateTime +import javatimefun.localdatetime.extensions.toLocalDateTime import javatimefun.zoneddatetime.ZonedDateTimeUtil import java.time.ZoneId import java.time.ZonedDateTime @@ -12,18 +12,18 @@ import java.time.format.DateTimeParseException * no format is present: *
- * When a format is present, it'll try parsing using that format alone, & return null if it fails. + * When a format is present however, it'll try parsing using that format alone, & return null if it fails. * * @param this String representation of either MsftDate, LocalDate, LocalDateTime, or ZonedDateTime. * @param format String representing format that should solely be used when parsing the date. * @param useSystemTimeZone If true, converts parsed date to system default timezone, else keeps original time zone. - * @return ZonedDateTime? Null means couldn't parse, else parsed ZonedDateTime. + * @return ZonedDateTime? Null means couldn't parse, else parsed ZonedDateTime. */ -fun String.parseZonedDateTime( +fun String.toZonedDateTime( format: String? = null, useSystemTimeZone: Boolean = true ): ZonedDateTime? { @@ -34,7 +34,7 @@ fun String.parseZonedDateTime( } return zonedDateTime } - val localDateTime = this.parseLocalDateTime(format) + val localDateTime = this.toLocalDateTime(format) if (localDateTime != null) { return ZonedDateTime.of(localDateTime, ZoneId.systemDefault()) } diff --git a/src/test/kotlin/zoneddatetime/ZonedDateTimeMutatingExtensionsTest.kt b/src/test/kotlin/zoneddatetime/ZonedDateTimeMutatingExtensionsTest.kt index b6203fa..694fe1b 100644 --- a/src/test/kotlin/zoneddatetime/ZonedDateTimeMutatingExtensionsTest.kt +++ b/src/test/kotlin/zoneddatetime/ZonedDateTimeMutatingExtensionsTest.kt @@ -1,6 +1,6 @@ package zoneddatetime -import javatimefun.localtime.extensions.parseLocalTime +import javatimefun.localtime.extensions.toLocalTime import javatimefun.localtime.extensions.print import javatimefun.zoneddatetime.ZonedDateTimeUtil import org.junit.jupiter.api.Assertions @@ -74,7 +74,7 @@ class ZonedDateTimeMutatingExtensionsTest { // given var dateA = ZonedDateTimeUtil.new(2020, 3, 20) val timeText = "07:35:11 AM" - val time: LocalTime = timeText.parseLocalTime(HH_MM_SS_AM) ?: throw RuntimeException("Failed to parse") + val time: LocalTime = timeText.toLocalTime(HH_MM_SS_AM) ?: throw RuntimeException("Failed to parse") // when dateA = dateA.withLocalTime(time) diff --git a/src/test/kotlin/zoneddatetime/ZonedDateTimeParsingExtensionsTest.kt b/src/test/kotlin/zoneddatetime/ZonedDateTimeParsingExtensionsTest.kt index 3382f90..f07ea52 100644 --- a/src/test/kotlin/zoneddatetime/ZonedDateTimeParsingExtensionsTest.kt +++ b/src/test/kotlin/zoneddatetime/ZonedDateTimeParsingExtensionsTest.kt @@ -2,7 +2,7 @@ package zoneddatetime import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test -import javatimefun.zoneddatetime.extensions.parseZonedDateTime +import javatimefun.zoneddatetime.extensions.toZonedDateTime import javatimefun.zoneddatetime.extensions.print import java.lang.RuntimeException import java.time.ZonedDateTime @@ -20,7 +20,7 @@ class ZonedDateTimeParsingExtensionsTest { val dateInText = "2021-06-07" // when - val dateParsed: ZonedDateTime = dateInText.parseZonedDateTime() ?: throw RuntimeException("Failed to parse") + val dateParsed: ZonedDateTime = dateInText.toZonedDateTime() ?: throw RuntimeException("Failed to parse") // then assertEquals(dateInText, dateParsed.print(YYYY_MM_DD_DASH)) @@ -32,7 +32,7 @@ class ZonedDateTimeParsingExtensionsTest { val dateInText = "2021-06-07" // when - val dateParsed: ZonedDateTime = dateInText.parseZonedDateTime(format = YYYY_MM_DD_DASH) + val dateParsed: ZonedDateTime = dateInText.toZonedDateTime(format = YYYY_MM_DD_DASH) ?: throw RuntimeException("Failed to parse") // then @@ -45,7 +45,7 @@ class ZonedDateTimeParsingExtensionsTest { val dateInText = "06/07/2021" // when - val dateParsed: ZonedDateTime = dateInText.parseZonedDateTime(format = MM_DD_YYYY_SLASH) ?: throw RuntimeException("Failed to parse") + val dateParsed: ZonedDateTime = dateInText.toZonedDateTime(format = MM_DD_YYYY_SLASH) ?: throw RuntimeException("Failed to parse") // then assertEquals(dateInText, dateParsed.print(MM_DD_YYYY_SLASH))