diff options
author | Vlad Uspensky <v.uspenskiy@icloud.com> | 2017-05-24 18:17:26 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-24 18:17:26 -0700 |
commit | 4918ea8daa68fbd5e0c7d63129a7f1f41cf2d25a (patch) | |
tree | 86af7f43a179a79384b308adb18ca25431291cf0 /src/main/scala/xyz | |
parent | 98fcc358e25186b34aef82c94893b6d320c28311 (diff) | |
parent | cc5144977ee247e0de5a119b4c86b3a16e1dd6e6 (diff) | |
download | driver-core-4918ea8daa68fbd5e0c7d63129a7f1f41cf2d25a.tar.gz driver-core-4918ea8daa68fbd5e0c7d63129a7f1f41cf2d25a.tar.bz2 driver-core-4918ea8daa68fbd5e0c7d63129a7f1f41cf2d25a.zip |
Merge pull request #37 from drivergroup/normalize-uuid-at-construction
PDW-276 normalize uuid string case received from client
Diffstat (limited to 'src/main/scala/xyz')
-rw-r--r-- | src/main/scala/xyz/driver/core/json.scala | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/main/scala/xyz/driver/core/json.scala b/src/main/scala/xyz/driver/core/json.scala index 21bcad5..b9d0745 100644 --- a/src/main/scala/xyz/driver/core/json.scala +++ b/src/main/scala/xyz/driver/core/json.scala @@ -1,21 +1,26 @@ package xyz.driver.core +import java.util.UUID + +import scala.reflect.runtime.universe._ +import scala.util.Try + import akka.http.scaladsl.model.Uri.Path +import akka.http.scaladsl.server._ import akka.http.scaladsl.server.PathMatcher.{Matched, Unmatched} -import akka.http.scaladsl.server.{PathMatcher, _} import akka.http.scaladsl.unmarshalling.Unmarshaller -import spray.json.{DeserializationException, JsNumber, _} +import spray.json._ import xyz.driver.core.auth.AuthCredentials -import xyz.driver.core.time.Time import xyz.driver.core.date.{Date, Month} import xyz.driver.core.domain.{Email, PhoneNumber} - -import scala.reflect.runtime.universe._ +import xyz.driver.core.time.Time object json { import DefaultJsonProtocol._ - def IdInPath[T]: PathMatcher1[Id[T]] = new PathMatcher1[Id[T]] { + private def UuidInPath[T]: PathMatcher1[Id[T]] = PathMatchers.JavaUUID.map((id: UUID) => Id[T](id.toString.toLowerCase)) + + def IdInPath[T]: PathMatcher1[Id[T]] = UuidInPath[T] | new PathMatcher1[Id[T]] { def apply(path: Path) = path match { case Path.Segment(segment, tail) => Matched(tail, Tuple1(Id[T](segment))) case _ => Unmatched @@ -26,8 +31,9 @@ object json { def write(id: Id[T]) = JsString(id.value) def read(value: JsValue) = value match { - case JsString(id) => Id[T](id) - case _ => throw DeserializationException("Id expects string") + case JsString(id) if Try(UUID.fromString(id)).isSuccess => Id[T](id.toLowerCase) + case JsString(id) => Id[T](id) + case _ => throw DeserializationException("Id expects string") } } |