kn: Implement Instant using kotlinx.datetime.Instant
#1201
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,6 +26,7 @@ kotlin { | |
| nativeMain { | ||
| dependencies { | ||
| api(libs.crt.kotlin) | ||
| implementation(libs.kotlinx.datetime) | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Contributor
There was a problem hiding this comment. Question: Because of some of the refactoring, it's a bit tricky for me to see what's functionally changed in these tests. Besides the addition of
Contributor
Author
There was a problem hiding this comment. Nothing else changed, it's just restructured |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package aws.smithy.kotlin.runtime.time | ||
|
|
||
| import kotlinx.datetime.LocalDate | ||
| import kotlinx.datetime.UtcOffset | ||
| import kotlinx.datetime.format.DateTimeComponents | ||
| import kotlinx.datetime.format.DayOfWeekNames | ||
| import kotlinx.datetime.format.MonthNames | ||
| import kotlinx.datetime.format.alternativeParsing | ||
| import kotlinx.datetime.format.char | ||
| import kotlinx.datetime.format.optional | ||
|
|
||
| /** | ||
| * [DateTimeFormat<DateTimeComponents>] for use with [kotlinx.datetime.Instant] | ||
| */ | ||
| internal object DateTimeFormats { | ||
|
|
||
| /** | ||
| * ISO8601, full precision. Corresponds to [TimestampFormat.ISO_8601_FULL]. Truncate to microseconds for [TimestampFormat.ISO_8601]. | ||
| * e.g. "2020-11-05T19:22:37+00:00" | ||
| */ | ||
| val ISO_8601 = DateTimeComponents.Format { | ||
| // Two possible date formats: YYYY-MM-DD or YYYYMMDD | ||
| alternativeParsing({ | ||
| date( | ||
| LocalDate.Format { | ||
| year() | ||
| monthNumber() | ||
| dayOfMonth() | ||
| }, | ||
| ) | ||
| }) { | ||
| date( | ||
| LocalDate.Format { | ||
| year() | ||
| char('-') | ||
| monthNumber() | ||
| char('-') | ||
| dayOfMonth() | ||
| }, | ||
| ) | ||
| } | ||
|
|
||
| char('T') | ||
|
|
||
| // Two possible time formats: HH:MM:SS or HHMMSS | ||
| alternativeParsing({ | ||
| hour() | ||
| minute() | ||
| second() | ||
| }) { | ||
| hour() | ||
| char(':') | ||
| minute() | ||
| char(':') | ||
| second() | ||
| } | ||
|
|
||
| // Fractional seconds | ||
| optional { | ||
| char('.') | ||
| secondFraction(1, 9) | ||
| } | ||
|
|
||
| // Offsets | ||
| alternativeParsing({ | ||
| offsetHours() | ||
| }) { | ||
| offset(UtcOffset.Formats.ISO) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * ISO8601 condensed. Corresponds to [TimestampFormat.ISO_8601_CONDENSED]. | ||
| */ | ||
| val ISO_8601_CONDENSED = DateTimeComponents.Format { | ||
| year() | ||
| monthNumber() | ||
| dayOfMonth() | ||
|
|
||
| char('T') | ||
| hour() | ||
| minute() | ||
| second() | ||
| char('Z') | ||
| } | ||
|
|
||
| /** | ||
| * ISO8601 condensed, date only. Corresponds to [TimestampFormat.ISO_8601_CONDENSED_DATE] | ||
| */ | ||
| val ISO_8601_CONDENSED_DATE = DateTimeComponents.Format { | ||
| year() | ||
| monthNumber() | ||
| dayOfMonth() | ||
| } | ||
|
|
||
| /** | ||
| * [RFC-5322/2822/822 IMF timestamp](https://tools.ietf.org/html/rfc5322). Corresponds to [TimestampFormat.RFC_5322]. | ||
| * e.g. "Thu, 05 Nov 2020 19:22:37 +0000" | ||
| */ | ||
| val RFC_5322 = DateTimeComponents.Format { | ||
| dayOfWeek(DayOfWeekNames.ENGLISH_ABBREVIATED) | ||
| chars(", ") | ||
|
|
||
| dayOfMonth() | ||
| char(' ') | ||
| monthName(MonthNames.ENGLISH_ABBREVIATED) | ||
| char(' ') | ||
| year() | ||
| char(' ') | ||
|
|
||
| hour() | ||
| char(':') | ||
| minute() | ||
| char(':') | ||
| second() | ||
| char(' ') | ||
|
|
||
| optional("GMT") { | ||
| offset(UtcOffset.Formats.FOUR_DIGITS) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Comment: Oh jeez, good catch. 🤦♂️