Rolling back some Refined codev0.11.2

4 files changed, 6 insertions, 13 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala
index 7f17419..f616754 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala
@@ -2,8 +2,6 @@ package xyz.driver.pdsuidomain.entities
 
 import java.time.LocalDateTime
 
-import eu.timepit.refined.api.Refined
-import eu.timepit.refined.collection.NonEmpty
 import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
 
@@ -12,7 +10,7 @@ final case class PatientIssue(id: LongId[PatientIssue],
                               patientId: UuidId[Patient],
                               lastUpdate: LocalDateTime,
                               isDraft: Boolean,
-                              text: String Refined NonEmpty,
+                              text: String,
                               archiveRequired: Boolean)
 
 object PatientIssue {
diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala
index 2780526..3c14a37 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala
@@ -182,7 +182,7 @@ object treatmentmatching {
     patientId = nextUuidId[Patient],
     lastUpdate = nextLocalDateTime,
     isDraft = generators.nextBoolean(),
-    text = generators.nextNonEmptyString(),
+    text = generators.nextString(),
     archiveRequired = generators.nextBoolean()
   )
 
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue.scala
index bf1c0fd..9345581 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue.scala
@@ -2,8 +2,6 @@ package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
-import eu.timepit.refined.api.Refined
-import eu.timepit.refined.collection.NonEmpty
 import spray.json._
 import xyz.driver.pdsuicommon.domain.{LongId, StringId, User, UuidId}
 import xyz.driver.pdsuidomain.entities._
@@ -11,13 +9,12 @@ import xyz.driver.pdsuidomain.entities._
 object patientissue {
   import DefaultJsonProtocol._
   import common._
-  import xyz.driver.core.json._
 
   def applyUpdateToPatientIssue(json: JsValue, orig: PatientIssue): PatientIssue = {
     json.asJsObject.getFields("text", "archiveRequired") match {
       case Seq(text, archiveRequired) =>
         orig.copy(
-          text = text.convertTo[String Refined NonEmpty],
+          text = text.convertTo[String],
           archiveRequired = archiveRequired.convertTo[Boolean]
         )
 
@@ -34,7 +31,7 @@ object patientissue {
           patientId = patientId,
           lastUpdate = LocalDateTime.MIN,
           isDraft = true,
-          text = text.convertTo[String Refined NonEmpty],
+          text = text.convertTo[String],
           archiveRequired = false
         )
 
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientIssueFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientIssueFormatSuite.scala
index d904150..0d56918 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientIssueFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientIssueFormatSuite.scala
@@ -2,12 +2,10 @@ package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
-import eu.timepit.refined.collection.NonEmpty
 import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
 import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
 import xyz.driver.pdsuidomain.entities.PatientIssue
-import eu.timepit.refined.refineMV
 
 class PatientIssueFormatSuite extends FlatSpec with Matchers {
   import xyz.driver.pdsuidomain.formats.json.patientissue._
@@ -19,7 +17,7 @@ class PatientIssueFormatSuite extends FlatSpec with Matchers {
       userId = StringId("userId-001"),
       lastUpdate = LocalDateTime.parse("2017-08-10T18:00:00"),
       isDraft = false,
-      text = refineMV[NonEmpty]("message text"),
+      text = "message text",
       archiveRequired = false
     )
     val writtenJson = patientIssueWriter.write(patientIssue)
@@ -37,7 +35,7 @@ class PatientIssueFormatSuite extends FlatSpec with Matchers {
     val updatePatientIssueJson =
       """{"text":"new issue text","evidence":"issue evidence","archiveRequired":true}""".parseJson
     val expectedUpdatedPatientIssue = patientIssue.copy(
-      text = refineMV[NonEmpty]("new issue text"),
+      text = "new issue text",
       archiveRequired = true
     )
     val parsedUpdatePatientIssue = applyUpdateToPatientIssue(updatePatientIssueJson, patientIssue)