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/extracteddata.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/extracteddata.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/extracteddata.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/extracteddata.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/extracteddata.scala index d6eadbd..5d5585a 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/extracteddata.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/extracteddata.scala @@ -1,10 +1,11 @@ package xyz.driver.pdsuidomain.formats.json.sprayformats import spray.json._ -import xyz.driver.entities.labels.{Label, LabelCategory} -import xyz.driver.pdsuicommon.domain.{FuzzyValue, LongId, TextJson} +import xyz.driver.entities.labels.{Label, LabelCategory, LabelValue} +import xyz.driver.pdsuicommon.domain.{LongId, TextJson} import xyz.driver.pdsuidomain.entities._ import xyz.driver.pdsuidomain.services.ExtractedDataService.RichExtractedData +import xyz.driver.formats.json.labels._ object extracteddata { import DefaultJsonProtocol._ @@ -44,7 +45,7 @@ object extracteddata { val value = fields .get("value") - .map(_.convertTo[FuzzyValue]) + .map(_.convertTo[LabelValue]) ExtractedDataLabel( id = LongId(0), |