Skip to content

Proper implementation of OffsetDateTime.toJava, LocalTime.fromJava, and LocalTime#toJava methods #1928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
plokhotnyuk wants to merge 1 commit into
base: series/0.19
Choose a base branch
from
Open

Proper implementation of OffsetDateTime.toJava, LocalTime.fromJava, and LocalTime#toJava methods #1928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/core/src-jvm/smithy4s/time/LocalTimeCompanionPlatform.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ private[time] trait LocalTimeCompanionPlatform {

/** JVM platform only method */
def fromJava(x: JLocalTime): LocalTime =
LocalTime(x.getSecond(), x.getNano())
LocalTime.apply(x.getHour, x.getMinute, x.getSecond, x.getNano)

def now(): LocalTime = fromJava(JLocalTime.now())
}
9 changes: 7 additions & 2 deletions modules/core/src-jvm/smithy4s/time/LocalTimePlatform.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ import java.time.{LocalTime => JLocalTime}
private[time] trait LocalTimePlatform { self: LocalTime =>

/** JVM platform only method */
def toJava: JLocalTime =
JLocalTime.ofSecondOfDay(seconds.toLong).plusNanos(nano.toLong)
def toJava: JLocalTime = {
val minutesOfDay = seconds / 60
val hour = minutesOfDay / 60
val minute = minutesOfDay - hour * 60
val second = seconds - minutesOfDay * 60
JLocalTime.of(hour, minute, second, nano)
}

}
14 changes: 10 additions & 4 deletions modules/core/src-jvm/smithy4s/time/OffsetDateTimeCompanionPlatform.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,16 @@ private[time] trait OffsetDateTimeCompanionPlatform {

/** JVM platform only method */
def toJava(x: OffsetDateTime): JOffsetDateTime = {
val instant = java.time.Instant
.ofEpochSecond(x.timestamp.epochSecond, x.timestamp.nano.toLong)
val offset = java.time.ZoneOffset.ofTotalSeconds(x.offset.seconds)
java.time.OffsetDateTime.ofInstant(instant, offset)
val offsetSeconds = x.offset.seconds
val timestamp = x.timestamp
val instant = java.time.Instant.ofEpochSecond(
timestamp.epochSecond - offsetSeconds,
timestamp.nano.toLong
)
JOffsetDateTime.ofInstant(
instant,
java.time.ZoneOffset.ofTotalSeconds(offsetSeconds)
)
}

def now(): OffsetDateTime = fromJava(JOffsetDateTime.now())
Expand Down
Loading