PDSUI-2336 Deleted api classes of play format, userhistory and message services

27 files changed, 60 insertions, 60 deletions

diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ArmFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/ArmFormatSuite.scala
index 35b0fad..3cab4a1 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ArmFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/ArmFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
@@ -6,7 +6,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, StringId}
 import xyz.driver.pdsuidomain.entities.Arm
 
 class ArmFormatSuite extends FlatSpec with Matchers {
-  import arm._
+  import xyz.driver.pdsuidomain.formats.json.arm._
 
   "Json format for Arm" should "read and write correct JSON" in {
     val arm = Arm(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/BridgeUploadQueueFormat.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/BridgeUploadQueueFormatSuite.scala
index 854f51f..9aaecae 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/BridgeUploadQueueFormat.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/BridgeUploadQueueFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
@@ -6,8 +6,8 @@ import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
 import xyz.driver.pdsuicommon.concurrent.BridgeUploadQueue
 
-class BridgeUploadQueueFormat extends FlatSpec with Matchers {
-  import bridgeuploadqueue._
+class BridgeUploadQueueFormatSuite extends FlatSpec with Matchers {
+  import xyz.driver.pdsuidomain.formats.json.bridgeuploadqueue._
 
   "Json format for BridgeUploadQueue.Item" should "read and write correct JSON" in {
     val item = BridgeUploadQueue.Item(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/CriterionFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/CriterionFormatSuite.scala
index 51665d2..a227afa 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/CriterionFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/CriterionFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
@@ -7,7 +7,7 @@ import xyz.driver.pdsuidomain.entities.{EligibilityArm, Criterion, CriterionLabe
 import xyz.driver.pdsuidomain.services.CriterionService.RichCriterion
 
 class CriterionFormatSuite extends FlatSpec with Matchers {
-  import criterion._
+  import xyz.driver.pdsuidomain.formats.json.criterion._
 
   "Json format for Criterion" should "read and write correct JSON" in {
     val criterion = Criterion(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/DocumentFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentFormatSuite.scala
index 111da6e..5e33805 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/DocumentFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.{LocalDate, LocalDateTime}
 
@@ -8,7 +8,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, TextJson}
 import xyz.driver.pdsuidomain.entities.Document
 
 class DocumentFormatSuite extends FlatSpec with Matchers {
-  import document._
+  import xyz.driver.pdsuidomain.formats.json.document._
 
   "Json format for Document" should "read and write correct JSON" in {
     val orig = Document(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/DocumentHistoryFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentHistoryFormatSuite.scala
index 5975919..e4a0733 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/DocumentHistoryFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentHistoryFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
@@ -8,7 +8,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, StringId}
 import xyz.driver.pdsuidomain.entities.DocumentHistory
 
 class DocumentHistoryFormatSuite extends FlatSpec with Matchers {
-  import documenthistory._
+  import xyz.driver.pdsuidomain.formats.json.documenthistory._
 
   "Json format for DocumentHistory" should "read and write correct JSON" in {
     val documentHistory = DocumentHistory(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/DocumentIssueFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentIssueFormatSuite.scala
index 54cfe90..7f34725 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/DocumentIssueFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentIssueFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
@@ -8,7 +8,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, StringId}
 import xyz.driver.pdsuidomain.entities.DocumentIssue
 
 class DocumentIssueFormatSuite extends FlatSpec with Matchers {
-  import documentissue._
+  import xyz.driver.pdsuidomain.formats.json.documentissue._
 
   "Json format for DocumentIssue" should "read and write correct JSON" in {
     val documentIssue = DocumentIssue(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/EligibilityArmWithDiseasesFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/EligibilityArmWithDiseasesFormatSuite.scala
index 22adc98..054f2f6 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/EligibilityArmWithDiseasesFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/EligibilityArmWithDiseasesFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
@@ -7,7 +7,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, StringId}
 import xyz.driver.pdsuidomain.entities.{EligibilityArm, EligibilityArmDisease, EligibilityArmWithDiseases}
 
 class EligibilityArmWithDiseasesFormatSuite extends FlatSpec with Matchers {
-  import eligibilityarm._
+  import xyz.driver.pdsuidomain.formats.json.eligibilityarm._
 
   "Json format for EligibilityArmWithDiseases" should "read and write correct JSON" in {
     val name = "arm name"
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ExportFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/ExportFormatSuite.scala
index d78e754..1f024c3 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ExportFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/ExportFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.{LocalDate, LocalDateTime}
 import java.util.UUID
@@ -10,7 +10,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
 import xyz.driver.pdsuidomain.entities.{DocumentType, ProviderType, RecordRequestId}
 
 class ExportFormatSuite extends FlatSpec with Matchers {
-  import export._
+  import xyz.driver.pdsuidomain.formats.json.export._
 
   "Json format for ExportPatientWithLabels" should "read and write correct JSON" in {
     import xyz.driver.pdsuidomain.entities.export.patient._
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ExtractedDataFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/ExtractedDataFormatSuite.scala
index 1feca6a..bc20280 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ExtractedDataFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/ExtractedDataFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
@@ -9,7 +9,7 @@ import xyz.driver.pdsuidomain.entities.{ExtractedData, ExtractedDataLabel}
 import xyz.driver.pdsuidomain.services.ExtractedDataService.RichExtractedData
 
 class ExtractedDataFormatSuite extends FlatSpec with Matchers {
-  import extracteddata._
+  import xyz.driver.pdsuidomain.formats.json.extracteddata._
 
   "Json format for ExtractedData" should "read and write correct JSON" in {
     val extractedData = ExtractedData(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/HypothesisFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/HypothesisFormatSuite.scala
index 76d90f5..6d51873 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/HypothesisFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/HypothesisFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
@@ -6,7 +6,7 @@ import xyz.driver.pdsuicommon.domain.UuidId
 import xyz.driver.pdsuidomain.entities.Hypothesis
 
 class HypothesisFormatSuite extends FlatSpec with Matchers {
-  import hypothesis._
+  import xyz.driver.pdsuidomain.formats.json.hypothesis._
 
   "Json format for Hypothesis" should "read and write correct JSON" in {
     val hypothesis = Hypothesis(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/InterventionFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/InterventionFormatSuite.scala
index 4532da4..ac01c34 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/InterventionFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/InterventionFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
@@ -6,7 +6,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, StringId}
 import xyz.driver.pdsuidomain.entities.{Intervention, InterventionArm, InterventionType, InterventionWithArms}
 
 class InterventionFormatSuite extends FlatSpec with Matchers {
-  import intervention._
+  import xyz.driver.pdsuidomain.formats.json.intervention._
 
   "Json format for Intervention" should "read and write correct JSON" in {
     val intervention = Intervention(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponseFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/ListResponseFormatSuite.scala
index d6752d6..c561412 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponseFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/ListResponseFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 import java.util.UUID
@@ -9,8 +9,8 @@ import xyz.driver.pdsuicommon.domain.{LongId, UuidId}
 import xyz.driver.pdsuidomain.ListResponse
 import xyz.driver.pdsuidomain.entities.MedicalRecord.Status
 import xyz.driver.pdsuidomain.entities._
-import xyz.driver.pdsuidomain.formats.json.sprayformats.record.recordFormat
-import xyz.driver.pdsuidomain.formats.json.sprayformats.listresponse._
+import xyz.driver.pdsuidomain.formats.json.record.recordFormat
+import xyz.driver.pdsuidomain.formats.json.listresponse._
 
 
 class ListResponseFormatSuite extends FlatSpec with Matchers {
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/MedicalRecordFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordFormatSuite.scala
index 9616e70..e811a29 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/MedicalRecordFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 import java.util.UUID
@@ -9,7 +9,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, TextJson, UuidId}
 import xyz.driver.pdsuidomain.entities.{MedicalRecord, RecordRequestId}
 
 class MedicalRecordFormatSuite extends FlatSpec with Matchers {
-  import record._
+  import xyz.driver.pdsuidomain.formats.json.record._
   import MedicalRecord._
 
   "Json format for MedicalRecord" should "read and write correct JSON" in {
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/MedicalRecordHistoryFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordHistoryFormatSuite.scala
index a8634d9..ca4058e 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/MedicalRecordHistoryFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordHistoryFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
@@ -8,7 +8,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, StringId}
 import xyz.driver.pdsuidomain.entities.MedicalRecordHistory
 
 class MedicalRecordHistoryFormatSuite extends FlatSpec with Matchers {
-  import recordhistory._
+  import xyz.driver.pdsuidomain.formats.json.recordhistory._
 
   "Json format for MedicalRecordHistory" should "read and write correct JSON" in {
     val recordHistory = MedicalRecordHistory(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/MedicalRecordIssueFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordIssueFormatSuite.scala
index 5fa740b..c7c82a4 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/MedicalRecordIssueFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordIssueFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
@@ -8,7 +8,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, StringId}
 import xyz.driver.pdsuidomain.entities.MedicalRecordIssue
 
 class MedicalRecordIssueFormatSuite extends FlatSpec with Matchers {
-  import recordissue._
+  import xyz.driver.pdsuidomain.formats.json.recordissue._
 
   "Json format for MedicalRecordIssue" should "read and write correct JSON" in {
     val recordIssue = MedicalRecordIssue(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientCriterionFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientCriterionFormatSuite.scala
index b254013..2e193c7 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientCriterionFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientCriterionFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
@@ -10,7 +10,7 @@ import xyz.driver.pdsuidomain.entities.{PatientCriterion, PatientCriterionArm}
 import xyz.driver.pdsuidomain.services.PatientCriterionService.{DraftPatientCriterion, RichPatientCriterion}
 
 class PatientCriterionFormatSuite extends FlatSpec with Matchers {
-  import patientcriterion._
+  import xyz.driver.pdsuidomain.formats.json.patientcriterion._
 
   "Json format for PatientCriterion" should "read and write correct JSON" in {
     val orig = PatientCriterion(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientEligibleTrialFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientEligibleTrialFormatSuite.scala
index b8f6f8e..b5fbf3f 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientEligibleTrialFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientEligibleTrialFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
@@ -10,7 +10,7 @@ import xyz.driver.pdsuidomain.entities.{PatientCriterionArm, PatientTrialArmGrou
 import xyz.driver.pdsuidomain.services.PatientEligibleTrialService.RichPatientEligibleTrial
 
 class PatientEligibleTrialFormatSuite extends FlatSpec with Matchers {
-  import patienteligibletrial._
+  import xyz.driver.pdsuidomain.formats.json.patienteligibletrial._
 
   "Json format for PatientEligibleTrial" should "read and write correct JSON" in {
     val trial = Trial(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientFormatSuite.scala
index 128cad1..c296f84 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.{LocalDate, LocalDateTime}
 
@@ -10,7 +10,7 @@ import xyz.driver.pdsuicommon.domain.UuidId
 import xyz.driver.pdsuidomain.entities.{Patient, PatientOrderId}
 
 class PatientFormatSuite extends FlatSpec with Matchers {
-  import patient._
+  import xyz.driver.pdsuidomain.formats.json.patient._
 
   "Json format for Patient" should "read and write correct JSON" in {
     val orig = Patient(
@@ -27,7 +27,7 @@ class PatientFormatSuite extends FlatSpec with Matchers {
       orderId = PatientOrderId("7b54a75d-4197-4b27-9045-b9b6cb131be9"),
       lastUpdate = LocalDateTime.parse("2017-08-10T18:00:00")
     )
-    val writtenJson = patientWriter.write(orig)
+    val writtenJson = patientFormat.write(orig)
 
     writtenJson should be(
       """{"id":"748b5884-3528-4cb9-904b-7a8151d6e343","dob":"1980-06-30",
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientHistoryFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientHistoryFormatSuite.scala
index c6a5a9f..e46cf50 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientHistoryFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientHistoryFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
@@ -8,7 +8,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
 import xyz.driver.pdsuidomain.entities.PatientHistory
 
 class PatientHistoryFormatSuite extends FlatSpec with Matchers {
-  import patienthistory._
+  import xyz.driver.pdsuidomain.formats.json.patienthistory._
 
   "Json format for PatientHistory" should "read and write correct JSON" in {
     val patientHistory = PatientHistory(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientHypothesisFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientHypothesisFormatSuite.scala
index 71cbbad..270a04d 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientHypothesisFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientHypothesisFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
@@ -7,7 +7,7 @@ import xyz.driver.pdsuidomain.entities.PatientHypothesis
 import xyz.driver.pdsuidomain.services.PatientHypothesisService.RichPatientHypothesis
 
 class PatientHypothesisFormatSuite extends FlatSpec with Matchers {
-  import patienthypothesis._
+  import xyz.driver.pdsuidomain.formats.json.patienthypothesis._
 
   "Json format for RichPatientHypothesis" should "read and write correct JSON" in {
     val orig = PatientHypothesis(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientIssueFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientIssueFormatSuite.scala
index 2776dcc..0d56918 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientIssueFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientIssueFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
@@ -8,7 +8,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
 import xyz.driver.pdsuidomain.entities.PatientIssue
 
 class PatientIssueFormatSuite extends FlatSpec with Matchers {
-  import patientissue._
+  import xyz.driver.pdsuidomain.formats.json.patientissue._
 
   "Json format for PatientIssue" should "read and write correct JSON" in {
     val patientIssue = PatientIssue(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientLabelFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientLabelFormatSuite.scala
index 2122777..95dfa68 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientLabelFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientLabelFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDate
 
@@ -12,7 +12,7 @@ import xyz.driver.pdsuidomain.services.PatientLabelService.RichPatientLabel
 class PatientLabelFormatSuite extends FlatSpec with Matchers {
 
   "Json format for RichPatientLabel" should "read and write correct JSON" in {
-    import patientlabel._
+    import xyz.driver.pdsuidomain.formats.json.patientlabel._
     val orig = PatientLabel(
       id = LongId(1),
       patientId = UuidId("748b5884-3528-4cb9-904b-7a8151d6e343"),
@@ -36,7 +36,7 @@ class PatientLabelFormatSuite extends FlatSpec with Matchers {
   }
 
   "Json format for PatientLabelEvidence" should "read and write correct JSON" in {
-    import patientlabel._
+    import xyz.driver.pdsuidomain.formats.json.patientlabel._
     val orig = PatientLabelEvidenceView(
       id = LongId(1),
       value = LabelValue.Maybe,
@@ -60,7 +60,7 @@ class PatientLabelFormatSuite extends FlatSpec with Matchers {
   }
 
   "Json format for PatientLabelDefiningCriteria" should "read and write correct JSON" in {
-    import patientdefiningcriteria._
+    import xyz.driver.pdsuidomain.formats.json.patientdefiningcriteria._
     val orig = PatientLabel(
       id = LongId(1),
       patientId = UuidId("748b5884-3528-4cb9-904b-7a8151d6e343"),
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/SlotArmFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/SlotArmFormatSuite.scala
index 7dd085c..95853f6 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/SlotArmFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/SlotArmFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
@@ -6,7 +6,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, StringId}
 import xyz.driver.pdsuidomain.entities.SlotArm
 
 class SlotArmFormatSuite extends FlatSpec with Matchers {
-  import slotarm._
+  import xyz.driver.pdsuidomain.formats.json.slotarm._
 
   "Json format for SlotArm" should "read and write correct JSON" in {
     val arm = SlotArm(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/StudyDesignFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/StudyDesignFormatSuite.scala
index e847445..f3a4c83 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/StudyDesignFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/StudyDesignFormatSuite.scala
@@ -1,11 +1,11 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
 import xyz.driver.pdsuidomain.entities.StudyDesign
 
 class StudyDesignFormatSuite extends FlatSpec with Matchers {
-  import studydesign._
+  import xyz.driver.pdsuidomain.formats.json.studydesign._
 
   "Json format for StudyDesign" should "read and write correct JSON" in {
     val studyDesign = StudyDesign.Randomized
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialFormatSuite.scala
index c9dc85f..b832733 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
@@ -8,7 +8,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
 import xyz.driver.pdsuidomain.entities.Trial
 
 class TrialFormatSuite extends FlatSpec with Matchers {
-  import trial._
+  import xyz.driver.pdsuidomain.formats.json.trial._
 
   "Json format for Trial" should "read and write correct JSON" in {
     val orig = Trial(
@@ -31,7 +31,7 @@ class TrialFormatSuite extends FlatSpec with Matchers {
       title = "trial title",
       originalTitle = "orig trial title"
     )
-    val writtenJson = trialWriter.write(orig)
+    val writtenJson = trialFormat.write(orig)
 
     writtenJson should be(
       """{"isPartner":false,"assignee":null,"lastUpdate":"2017-08-10T18:16:19Z","previousStatus":null,
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialHistoryFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialHistoryFormatSuite.scala
index d5ad2ec..aa0b404 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialHistoryFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialHistoryFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
@@ -8,7 +8,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, StringId}
 import xyz.driver.pdsuidomain.entities.TrialHistory
 
 class TrialHistoryFormatSuite extends FlatSpec with Matchers {
-  import trialhistory._
+  import xyz.driver.pdsuidomain.formats.json.trialhistory._
 
   "Json format for TrialHistory" should "read and write correct JSON" in {
     val trialHistory = TrialHistory(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialIssueFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialIssueFormatSuite.scala
index 4a9ea4f..5c6aa8d 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialIssueFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialIssueFormatSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.pdsuidomain.formats.json.sprayformats
+package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
@@ -8,7 +8,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, StringId}
 import xyz.driver.pdsuidomain.entities.TrialIssue
 
 class TrialIssueFormatSuite extends FlatSpec with Matchers {
-  import trialissue._
+  import xyz.driver.pdsuidomain.formats.json.trialissue._
 
   "Json format for TrialIssue" should "read and write correct JSON" in {
     val trialIssue = TrialIssue(