diff options
author | Aleksandr <ognelisar@gmail.com> | 2017-10-10 16:41:33 +0700 |
---|---|---|
committer | Aleksandr <ognelisar@gmail.com> | 2017-10-10 16:41:33 +0700 |
commit | 4c22afe6a34641f5b35ff4953a5821a2bc940255 (patch) | |
tree | 4f77275d4460a184cf64085e9d7597841a50fbc9 /src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/common.scala | |
parent | c32f965212481e4d26c2ae1ae5616f2d4b3e22ae (diff) | |
parent | 4f83461cba1f78e607ca2a4edb6fa26f6e16e732 (diff) | |
download | rest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.tar.gz rest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.tar.bz2 rest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.zip |
All merge conflicts are resolved
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/common.scala')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/common.scala | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/common.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/common.scala index dbd0a43..61e0e7f 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/common.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/common.scala @@ -3,7 +3,7 @@ package xyz.driver.pdsuidomain.formats.json.sprayformats import java.time.{LocalDate, LocalDateTime, ZoneId, ZonedDateTime} import spray.json._ -import xyz.driver.pdsuicommon.domain.{FuzzyValue, LongId, StringId, UuidId} +import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId} object common { @@ -55,14 +55,6 @@ object common { } } - implicit def fuzzyValueFormat: RootJsonFormat[FuzzyValue] = new RootJsonFormat[FuzzyValue] { - override def write(value: FuzzyValue): JsString = JsString(FuzzyValue.valueToString(value)) - override def read(json: JsValue): FuzzyValue = json match { - case JsString(value) => FuzzyValue.fromString(value) - case _ => deserializationError(s"Expected value as FuzzyValue, but got $json") - } - } - implicit val integerFormat: RootJsonFormat[Integer] = new RootJsonFormat[Integer] { override def write(obj: Integer): JsNumber = JsNumber(obj.intValue()) override def read(json: JsValue): Integer = json match { |