From c13a90f7dc6565e0beddcc6a61609d4e131f55ba Mon Sep 17 00:00:00 2001 From: vlad Date: Thu, 19 Oct 2017 14:42:50 -0700 Subject: [RFC] Using "Refined" library (https://github.com/fthomas/refined) to allow defining entities with more precise types --- src/main/scala/xyz/driver/core/generators.scala | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/main/scala/xyz/driver/core/generators.scala') diff --git a/src/main/scala/xyz/driver/core/generators.scala b/src/main/scala/xyz/driver/core/generators.scala index 9242fd9..f3913e5 100644 --- a/src/main/scala/xyz/driver/core/generators.scala +++ b/src/main/scala/xyz/driver/core/generators.scala @@ -1,12 +1,16 @@ package xyz.driver.core import java.math.MathContext +import java.util.UUID import xyz.driver.core.time.{Time, TimeRange} import xyz.driver.core.date.Date import scala.reflect.ClassTag import scala.util.Random +import eu.timepit.refined.refineV +import eu.timepit.refined.api.Refined +import eu.timepit.refined.collection._ object generators { @@ -35,13 +39,19 @@ object generators { def nextName[T](maxLength: Int = DefaultMaxLength): Name[T] = Name[T](nextString(maxLength)) - def nextUuid() = java.util.UUID.randomUUID + def nextUuid(): UUID = java.util.UUID.randomUUID - def nextRevision[T]() = Revision[T](nextUuid().toString) + def nextRevision[T](): Revision[T] = Revision[T](nextUuid().toString) def nextString(maxLength: Int = DefaultMaxLength): String = (oneOf[Char](StringLetters) +: arrayOf(oneOf[Char](StringLetters), maxLength - 1)).mkString + def nextNonEmptyString(maxLength: Int = DefaultMaxLength): String Refined NonEmpty = { + refineV[NonEmpty]( + (oneOf[Char](StringLetters) +: arrayOf(oneOf[Char](StringLetters), maxLength - 1)).mkString + ).right.get + } + def nextOption[T](value: => T): Option[T] = if (nextBoolean()) Option(value) else None def nextPair[L, R](left: => L, right: => R): (L, R) = (left, right) -- cgit v1.2.3