aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/pdsuidomain/entities/ExtractedData.scala
diff options
context:
space:
mode:
authorMarvin Bertin <marvin.bertin@gmail.com>2017-10-10 17:17:18 -0700
committerMarvin Bertin <marvin.bertin@gmail.com>2017-10-10 17:17:18 -0700
commitb124608a4faa9cb94474f27c1d4605e5cb0ab63d (patch)
treec3439f756f023facbbae4deea1972ad2f511dda3 /src/main/scala/xyz/driver/pdsuidomain/entities/ExtractedData.scala
parentf55212361d6126a05075a1f00f3915484b4f334e (diff)
parent385a9a99e5a95c3d623cddd927c37564e32dbd2d (diff)
downloadrest-query-b124608a4faa9cb94474f27c1d4605e5cb0ab63d.tar.gz
rest-query-b124608a4faa9cb94474f27c1d4605e5cb0ab63d.tar.bz2
rest-query-b124608a4faa9cb94474f27c1d4605e5cb0ab63d.zip
fix merge conflictsv0.7.5
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/ExtractedData.scala')
-rw-r--r--src/main/scala/xyz/driver/pdsuidomain/entities/ExtractedData.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/ExtractedData.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/ExtractedData.scala
index fbd468f..352cf55 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/ExtractedData.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/ExtractedData.scala
@@ -1,7 +1,7 @@
package xyz.driver.pdsuidomain.entities
-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.pdsuicommon.logging._
import xyz.driver.pdsuidomain.entities.ExtractedData.Meta
@@ -37,7 +37,7 @@ object ExtractedDataLabel {
implicit def toPhiString(x: ExtractedDataLabel): PhiString = {
import x._
- phi"ExtractedDataLabel(id=$id, dataId=$dataId, labelId=$labelId, categoryId=$categoryId, value=$value)"
+ phi"ExtractedDataLabel(id=$id, dataId=$dataId, labelId=$labelId, categoryId=$categoryId, value=${Unsafe(value)})"
}
}
@@ -45,4 +45,4 @@ final case class ExtractedDataLabel(id: LongId[ExtractedDataLabel],
dataId: LongId[ExtractedData],
labelId: Option[LongId[Label]],
categoryId: Option[LongId[LabelCategory]],
- value: Option[FuzzyValue])
+ value: Option[LabelValue])