aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/core/generators.scala
diff options
context:
space:
mode:
authorSergey Nastich <nastich@users.noreply.github.com>2018-08-24 13:41:27 -0400
committerGitHub <noreply@github.com>2018-08-24 13:41:27 -0400
commitdf1a2f7fcbdd85ac84162cf8eae8cdb6bb25cbb5 (patch)
treecdfb528e1d4569bfc973b784e6a763b02108442c /src/main/scala/xyz/driver/core/generators.scala
parent46306f0c8f7e88e55a3b18df8ab212e9ea5e01f1 (diff)
downloaddriver-core-df1a2f7fcbdd85ac84162cf8eae8cdb6bb25cbb5.tar.gz
driver-core-df1a2f7fcbdd85ac84162cf8eae8cdb6bb25cbb5.tar.bz2
driver-core-df1a2f7fcbdd85ac84162cf8eae8cdb6bb25cbb5.zip
Migration to `java.time.Instant` and `java.time.LocalDate`: Part 1 (#200)v1.13.0
* Add semi-backwards-compatible JSON formats and path matchers for java.time.Instant and java.time.LocalDate * Use `Clock` in `ApplicationContext` instead of `TimeProvider`, deprecate `TimeProvider` * Add `ChangeableClock` in time package for tests * Add generators for instants and LocalDates
Diffstat (limited to 'src/main/scala/xyz/driver/core/generators.scala')
-rw-r--r--src/main/scala/xyz/driver/core/generators.scala7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/scala/xyz/driver/core/generators.scala b/src/main/scala/xyz/driver/core/generators.scala
index d57980e..d00b6dd 100644
--- a/src/main/scala/xyz/driver/core/generators.scala
+++ b/src/main/scala/xyz/driver/core/generators.scala
@@ -2,6 +2,7 @@ package xyz.driver.core
import enumeratum._
import java.math.MathContext
+import java.time.{Instant, LocalDate, ZoneOffset}
import java.util.UUID
import xyz.driver.core.time.{Time, TimeOfDay, TimeRange}
@@ -88,7 +89,9 @@ object generators {
def nextTriad[F, S, T](first: => F, second: => S, third: => T): (F, S, T) = (first, second, third)
- def nextTime(): Time = Time(math.abs(nextLong() % System.currentTimeMillis))
+ def nextInstant(): Instant = Instant.ofEpochMilli(math.abs(nextLong() % System.currentTimeMillis))
+
+ def nextTime(): Time = nextInstant()
def nextTimeOfDay: TimeOfDay = TimeOfDay(java.time.LocalTime.MIN.plusSeconds(nextLong), java.util.TimeZone.getDefault)
@@ -103,6 +106,8 @@ object generators {
def nextDate(): Date = nextTime().toDate(java.util.TimeZone.getTimeZone("UTC"))
+ def nextLocalDate(): LocalDate = nextInstant().atZone(ZoneOffset.UTC).toLocalDate
+
def nextDayOfWeek(): DayOfWeek = oneOf(DayOfWeek.All)
def nextBigDecimal(multiplier: Double = 1000000.00, precision: Int = 2): BigDecimal =