Required renames after infrastructure package rename

CBSR-Biobank · Apr 10, 2018 · 282a32e · 282a32e
1 parent 2b345b8
commit 282a32e
Show file tree

Hide file tree

Showing 80 changed files with 208 additions and 208 deletions.
diff --git a/app/org/biobank/controllers/CommandController.scala b/app/org/biobank/controllers/CommandController.scala
@@ -1,6 +1,6 @@
 package org.biobank.controllers
 
-import org.biobank.infrastructure.command.Commands._
+import org.biobank.infrastructure.commands.Commands._
 import org.biobank.services.ServiceValidation
 import org.slf4j.{Logger, LoggerFactory}
 import play.api.libs.json._

diff --git a/app/org/biobank/controllers/access/AccessController.scala b/app/org/biobank/controllers/access/AccessController.scala
@@ -33,8 +33,8 @@ class AccessController @Inject() (controllerComponents: ControllerComponents,
                               (implicit val ec: ExecutionContext)
     extends CommandController(controllerComponents) {
 
-  import org.biobank.infrastructure.command.AccessCommands._
-  import org.biobank.infrastructure.command.MembershipCommands._
+  import org.biobank.infrastructure.commands.AccessCommands._
+  import org.biobank.infrastructure.commands.MembershipCommands._
 
   val log: Logger = Logger(this.getClass)
 

diff --git a/app/org/biobank/controllers/centres/CentresController.scala b/app/org/biobank/controllers/centres/CentresController.scala
@@ -4,7 +4,7 @@ import javax.inject.{Inject, Singleton}
 import org.biobank.controllers._
 import org.biobank.domain.centres.CentreId
 import org.biobank.dto._
-import org.biobank.infrastructure.command.CentreCommands._
+import org.biobank.infrastructure.commands.CentreCommands._
 import org.biobank.services._
 import org.biobank.services.centres.CentresService
 import org.biobank.services.studies.StudiesService

diff --git a/app/org/biobank/controllers/centres/ShipmentsController.scala b/app/org/biobank/controllers/centres/ShipmentsController.scala
@@ -32,8 +32,8 @@ class ShipmentsController @Inject() (controllerComponents: ControllerComponents,
                                  (implicit val ec: ExecutionContext)
     extends CommandController(controllerComponents) {
 
-  import org.biobank.infrastructure.command.ShipmentCommands._
-  import org.biobank.infrastructure.command.ShipmentSpecimenCommands._
+  import org.biobank.infrastructure.commands.ShipmentCommands._
+  import org.biobank.infrastructure.commands.ShipmentSpecimenCommands._
 
   type ServiceListFunc = (CentreId, FilterString, SortString) => ServiceValidation[List[ShipmentDto]]
 

diff --git a/app/org/biobank/controllers/participants/CollectionEventsController.scala b/app/org/biobank/controllers/participants/CollectionEventsController.scala
@@ -3,7 +3,7 @@ package org.biobank.controllers.participants
 import javax.inject.{Inject, Singleton}
 import org.biobank.controllers._
 import org.biobank.domain.participants.{ParticipantId, CollectionEventId}
-import org.biobank.infrastructure.command.CollectionEventCommands._
+import org.biobank.infrastructure.commands.CollectionEventCommands._
 import org.biobank.services.PagedResults
 import org.biobank.services.participants.CollectionEventsService
 import play.api.libs.json._

diff --git a/app/org/biobank/controllers/participants/ParticipantsController.scala b/app/org/biobank/controllers/participants/ParticipantsController.scala
@@ -4,7 +4,7 @@ import javax.inject.{Inject, Singleton}
 import org.biobank.controllers._
 import org.biobank.domain.studies.StudyId
 import org.biobank.domain.participants.ParticipantId
-import org.biobank.infrastructure.command.ParticipantCommands._
+import org.biobank.infrastructure.commands.ParticipantCommands._
 import org.biobank.services.participants._
 import play.api.{ Environment, Logger }
 import play.api.libs.json._

diff --git a/app/org/biobank/controllers/participants/SpecimensController.scala b/app/org/biobank/controllers/participants/SpecimensController.scala
@@ -20,7 +20,7 @@ class SpecimensController @Inject() (controllerComponents: ControllerComponents,
                                      val service:      SpecimensService)
                                  (implicit val ec: ExecutionContext)
     extends CommandController(controllerComponents) {
-  import org.biobank.infrastructure.command.SpecimenCommands._
+  import org.biobank.infrastructure.commands.SpecimenCommands._
 
   val log: Logger = Logger(this.getClass)
 

diff --git a/app/org/biobank/controllers/studies/CeventTypesController.scala b/app/org/biobank/controllers/studies/CeventTypesController.scala
@@ -4,7 +4,7 @@ import javax.inject.{Inject, Singleton}
 import org.biobank.controllers._
 import org.biobank.domain.studies.{StudyId, CollectionEventTypeId}
 import org.biobank.dto.EntityInfoDto
-import org.biobank.infrastructure.command.CollectionEventTypeCommands._
+import org.biobank.infrastructure.commands.CollectionEventTypeCommands._
 import org.biobank.services.PagedResults
 import org.biobank.services.studies.CollectionEventTypeService
 import play.api.libs.json._

diff --git a/app/org/biobank/controllers/studies/ProcessingTypesController.scala b/app/org/biobank/controllers/studies/ProcessingTypesController.scala
@@ -3,7 +3,7 @@ package org.biobank.controllers.studies
 import javax.inject.{Inject, Singleton}
 import org.biobank.controllers._
 import org.biobank.domain.studies.{StudyId, ProcessingTypeId}
-import org.biobank.infrastructure.command.StudyCommands._
+import org.biobank.infrastructure.commands.StudyCommands._
 import org.biobank.services.studies.StudiesService
 import play.api.libs.json._
 import play.api.Environment

diff --git a/app/org/biobank/controllers/studies/SpecimenLinkTypesController.scala b/app/org/biobank/controllers/studies/SpecimenLinkTypesController.scala
@@ -3,7 +3,7 @@ package org.biobank.controllers.studies
 import javax.inject.{Inject, Singleton}
 import org.biobank.controllers._
 import org.biobank.domain.studies.{ProcessingTypeId, SpecimenLinkTypeId}
-import org.biobank.infrastructure.command.StudyCommands._
+import org.biobank.infrastructure.commands.StudyCommands._
 import org.biobank.services.studies.StudiesService
 import play.api.Logger
 import play.api.libs.json._

diff --git a/app/org/biobank/controllers/studies/StudiesController.scala b/app/org/biobank/controllers/studies/StudiesController.scala
@@ -6,7 +6,7 @@ import org.biobank.domain._
 import org.biobank.domain.annotations._
 import org.biobank.domain.studies._
 import org.biobank.dto.NameAndStateDto
-import org.biobank.infrastructure.command.StudyCommands._
+import org.biobank.infrastructure.commands.StudyCommands._
 import org.biobank.services._
 import org.biobank.services.studies.StudiesService
 import play.api.Logger

diff --git a/app/org/biobank/controllers/users/UsersController.scala b/app/org/biobank/controllers/users/UsersController.scala
@@ -1,12 +1,12 @@
 package org.biobank.controllers.users
 
-import org.biobank.infrastructure.command.Commands._
+import org.biobank.infrastructure.commands.Commands._
 import javax.inject.{Inject, Singleton}
 import org.biobank.dto._
 import org.biobank.domain.access.{AccessItemId, MembershipId}
 import org.biobank.domain.users._
 import org.biobank.controllers._
-import org.biobank.infrastructure.command.UserCommands._
+import org.biobank.infrastructure.commands.UserCommands._
 import org.biobank.services.users.UsersService
 import org.biobank.services.{AuthToken, PagedResults}
 import play.api.Logger

diff --git a/app/org/biobank/infrastructure/commands/AccessCommands.scala b/app/org/biobank/infrastructure/commands/AccessCommands.scala
@@ -1,4 +1,4 @@
-package org.biobank.infrastructure.command
+package org.biobank.infrastructure.commands
 
 import Commands._
 

diff --git a/app/org/biobank/infrastructure/commands/CentreCommands.scala b/app/org/biobank/infrastructure/commands/CentreCommands.scala
@@ -1,6 +1,6 @@
-package org.biobank.infrastructure.command
+package org.biobank.infrastructure.commands
 
-import org.biobank.infrastructure.command.Commands._
+import org.biobank.infrastructure.commands.Commands._
 
 import play.api.libs.json._
 import play.api.libs.json.Reads._

diff --git a/app/org/biobank/infrastructure/commands/CollectionEventCommands.scala b/app/org/biobank/infrastructure/commands/CollectionEventCommands.scala
@@ -1,4 +1,4 @@
-package org.biobank.infrastructure.command
+package org.biobank.infrastructure.commands
 
 import Commands._
 import java.time.OffsetDateTime

diff --git a/app/org/biobank/infrastructure/commands/CollectionEventTypeCommands.scala b/app/org/biobank/infrastructure/commands/CollectionEventTypeCommands.scala
@@ -1,4 +1,4 @@
-package org.biobank.infrastructure.command
+package org.biobank.infrastructure.commands
 
 import org.biobank.domain.AnatomicalSourceType._
 import org.biobank.domain.annotations.AnnotationValueType._
@@ -9,7 +9,7 @@ import play.api.libs.json.Reads._
 import play.api.libs.json._
 
 object CollectionEventTypeCommands {
-  import org.biobank.infrastructure.command.Commands._
+  import org.biobank.infrastructure.commands.Commands._
 
   trait CollectionEventTypeCommand extends Command with HasStudyIdentity with HasSessionUserId
 

diff --git a/app/org/biobank/infrastructure/commands/Commands.scala b/app/org/biobank/infrastructure/commands/Commands.scala
@@ -1,4 +1,4 @@
-package org.biobank.infrastructure.command
+package org.biobank.infrastructure.commands
 
 object Commands {
 

diff --git a/app/org/biobank/infrastructure/commands/MembershipCommands.scala b/app/org/biobank/infrastructure/commands/MembershipCommands.scala
@@ -1,4 +1,4 @@
-package org.biobank.infrastructure.command
+package org.biobank.infrastructure.commands
 
 import Commands._
 

diff --git a/app/org/biobank/infrastructure/commands/ParticipantCommands.scala b/app/org/biobank/infrastructure/commands/ParticipantCommands.scala
@@ -1,7 +1,7 @@
-package org.biobank.infrastructure.command
+package org.biobank.infrastructure.commands
 
 import org.biobank.domain.annotations.Annotation
-import org.biobank.infrastructure.command.Commands._
+import org.biobank.infrastructure.commands.Commands._
 import play.api.libs.json._
 
 object ParticipantCommands {

diff --git a/app/org/biobank/infrastructure/commands/ShipmentCommands.scala b/app/org/biobank/infrastructure/commands/ShipmentCommands.scala
@@ -1,7 +1,7 @@
-package org.biobank.infrastructure.command
+package org.biobank.infrastructure.commands
 
 import java.time.OffsetDateTime
-import org.biobank.infrastructure.command.Commands._
+import org.biobank.infrastructure.commands.Commands._
 import play.api.libs.json._
 
 object ShipmentCommands {

diff --git a/app/org/biobank/infrastructure/commands/ShipmentSpecimenCommands.scala b/app/org/biobank/infrastructure/commands/ShipmentSpecimenCommands.scala
@@ -1,7 +1,7 @@
-package org.biobank.infrastructure.command
+package org.biobank.infrastructure.commands
 
-import org.biobank.infrastructure.command.Commands._
-import org.biobank.infrastructure.command.ShipmentCommands._
+import org.biobank.infrastructure.commands.Commands._
+import org.biobank.infrastructure.commands.ShipmentCommands._
 import play.api.libs.json._
 import play.api.libs.json.Reads._
 

diff --git a/app/org/biobank/infrastructure/commands/SpecimenCommands.scala b/app/org/biobank/infrastructure/commands/SpecimenCommands.scala
@@ -1,4 +1,4 @@
-package org.biobank.infrastructure.command
+package org.biobank.infrastructure.commands
 
 import Commands._
 import java.time.OffsetDateTime

diff --git a/app/org/biobank/infrastructure/commands/StudyCommands.scala b/app/org/biobank/infrastructure/commands/StudyCommands.scala
@@ -1,12 +1,12 @@
-package org.biobank.infrastructure.command
+package org.biobank.infrastructure.commands
 
 import org.biobank.domain.annotations.AnnotationValueType._
 import org.biobank.infrastructure._
 import play.api.libs.json.Reads._
 import play.api.libs.json._
 
 object StudyCommands {
-  import org.biobank.infrastructure.command.Commands._
+  import org.biobank.infrastructure.commands.Commands._
 
   // study commands
   trait StudyCommand extends Command with HasOptionalSessionUserId

diff --git a/app/org/biobank/infrastructure/commands/UserCommands.scala b/app/org/biobank/infrastructure/commands/UserCommands.scala
@@ -1,6 +1,6 @@
-package org.biobank.infrastructure.command
+package org.biobank.infrastructure.commands
 
-import org.biobank.infrastructure.command.Commands._
+import org.biobank.infrastructure.commands.Commands._
 
 import play.api.libs.json._
 import play.api.libs.json.Reads._

diff --git a/app/org/biobank/infrastructure/events/EventUtils.scala b/app/org/biobank/infrastructure/events/EventUtils.scala
@@ -1,16 +1,16 @@
-package org.biobank.infrastructure.event
+package org.biobank.infrastructure.events
 
 import java.time.format.DateTimeFormatter
-import org.biobank.infrastructure.command.SpecimenCommands.SpecimenInfo
-import org.biobank.infrastructure.event.CommonEvents.{AnnotationType => EventAnnotationType}
-import org.biobank.infrastructure.event.CollectionEventTypeEvents._
-import org.biobank.infrastructure.event.SpecimenEvents._
+import org.biobank.infrastructure.commands.SpecimenCommands.SpecimenInfo
+import org.biobank.infrastructure.events.CommonEvents.{AnnotationType => EventAnnotationType}
+import org.biobank.infrastructure.events.CollectionEventTypeEvents._
+import org.biobank.infrastructure.events.SpecimenEvents._
 import org.biobank.domain._
 import org.biobank.domain.annotations._
 import org.biobank.domain.studies.{CollectionSpecimenDescription, SpecimenDescriptionId}
 import org.biobank.domain.participants.SpecimenId
 import org.biobank.domain.centres.ShipmentSpecimen
-import org.biobank.infrastructure.event.ShipmentSpecimenEvents._
+import org.biobank.infrastructure.events.ShipmentSpecimenEvents._
 
 object EventUtils {
 
@@ -40,16 +40,16 @@ object EventUtils {
   }
 
   def annotationToEvent(annotation: org.biobank.domain.annotations.Annotation)
-      : org.biobank.infrastructure.event.CommonEvents.Annotation = {
-    org.biobank.infrastructure.event.CommonEvents.Annotation().update(
+      : org.biobank.infrastructure.events.CommonEvents.Annotation = {
+    org.biobank.infrastructure.events.CommonEvents.Annotation().update(
       _.annotationTypeId    := annotation.annotationTypeId.id,
       _.optionalStringValue := annotation.stringValue,
       _.optionalNumberValue := annotation.numberValue,
       _.selectedValues      := annotation.selectedValues.toSeq
     )
   }
 
-  def annotationFromEvent(event: org.biobank.infrastructure.event.CommonEvents.Annotation)
+  def annotationFromEvent(event: org.biobank.infrastructure.events.CommonEvents.Annotation)
       : org.biobank.domain.annotations.Annotation = {
     org.biobank.domain.annotations.Annotation(
       annotationTypeId = AnnotationTypeId(event.getAnnotationTypeId),

diff --git a/app/org/biobank/infrastructure/events/StudyEventsUtils.scala b/app/org/biobank/infrastructure/events/StudyEventsUtils.scala
@@ -1,9 +1,9 @@
-package org.biobank.infrastructure.event
+package org.biobank.infrastructure.events
 
 import java.time.OffsetDateTime
 import java.time.format.DateTimeFormatter
-import org.biobank.infrastructure.command.StudyCommands.StudyCommand
-import org.biobank.infrastructure.event.StudyEvents._
+import org.biobank.infrastructure.commands.StudyCommands.StudyCommand
+import org.biobank.infrastructure.events.StudyEvents._
 import org.biobank.domain.studies._
 
 object StudyEventsUtil {

diff --git a/app/org/biobank/services/access/AccessProcessor.scala b/app/org/biobank/services/access/AccessProcessor.scala
@@ -9,8 +9,8 @@ import java.time.format.DateTimeFormatter
 import javax.inject.Inject
 import org.biobank.domain.access._
 import org.biobank.domain.users.UserId
-import org.biobank.infrastructure.command.AccessCommands._
-import org.biobank.infrastructure.event.AccessEvents._
+import org.biobank.infrastructure.commands.AccessCommands._
+import org.biobank.infrastructure.events.AccessEvents._
 import org.biobank.services.{Processor, ServiceValidation, SnapshotWriter}
 import play.api.libs.json._
 import scalaz.Scalaz._

diff --git a/app/org/biobank/services/access/AccessService.scala b/app/org/biobank/services/access/AccessService.scala
@@ -14,10 +14,10 @@ import org.biobank.domain.centres.{CentreId, CentreRepository}
 import org.biobank.dto._
 import org.biobank.dto.access._
 import org.biobank.infrastructure.AscendingOrder
-import org.biobank.infrastructure.command.AccessCommands._
-import org.biobank.infrastructure.command.MembershipCommands._
-import org.biobank.infrastructure.event.AccessEvents._
-import org.biobank.infrastructure.event.MembershipEvents._
+import org.biobank.infrastructure.commands.AccessCommands._
+import org.biobank.infrastructure.commands.MembershipCommands._
+import org.biobank.infrastructure.events.AccessEvents._
+import org.biobank.infrastructure.events.MembershipEvents._
 import org.biobank.services._
 import org.slf4j.{Logger, LoggerFactory}
 import play.api.Environment

diff --git a/app/org/biobank/services/access/MembershipProcessor.scala b/app/org/biobank/services/access/MembershipProcessor.scala
@@ -10,8 +10,8 @@ import org.biobank.domain.access._
 import org.biobank.domain.centres.CentreId
 import org.biobank.domain.studies.StudyId
 import org.biobank.domain.users.UserId
-import org.biobank.infrastructure.command.MembershipCommands._
-import org.biobank.infrastructure.event.MembershipEvents._
+import org.biobank.infrastructure.commands.MembershipCommands._
+import org.biobank.infrastructure.events.MembershipEvents._
 import org.biobank.services.{Processor, ServiceError, ServiceValidation, SnapshotWriter}
 import play.api.libs.json._
 import scalaz.Scalaz._

diff --git a/app/org/biobank/services/centres/CentresProcessor.scala b/app/org/biobank/services/centres/CentresProcessor.scala
@@ -10,8 +10,8 @@ import org.biobank.domain.{LocationId, Slug}
 import org.biobank.domain.centres._
 import org.biobank.domain.studies.{StudyId, StudyRepository}
 import org.biobank.domain.Location
-import org.biobank.infrastructure.command.CentreCommands._
-import org.biobank.infrastructure.event.CentreEvents._
+import org.biobank.infrastructure.commands.CentreCommands._
+import org.biobank.infrastructure.events.CentreEvents._
 import org.biobank.services.{Processor, ServiceError, ServiceValidation, SnapshotWriter}
 import play.api.libs.json._
 import scalaz.Scalaz._

diff --git a/app/org/biobank/services/centres/CentresService.scala b/app/org/biobank/services/centres/CentresService.scala
@@ -12,8 +12,8 @@ import org.biobank.domain.centres._
 import org.biobank.domain.users.UserId
 import org.biobank.dto._
 import org.biobank.infrastructure._
-import org.biobank.infrastructure.command.CentreCommands._
-import org.biobank.infrastructure.event.CentreEvents._
+import org.biobank.infrastructure.commands.CentreCommands._
+import org.biobank.infrastructure.events.CentreEvents._
 import org.biobank.services._
 import org.biobank.services.access.AccessService
 import org.biobank.services.studies.StudiesService

diff --git a/app/org/biobank/services/centres/ShipmentsProcessor.scala b/app/org/biobank/services/centres/ShipmentsProcessor.scala
@@ -11,11 +11,11 @@ import org.biobank.TestData
 import org.biobank.domain.LocationId
 import org.biobank.domain.centres._
 import org.biobank.domain.participants.{SpecimenId, SpecimenRepository}
-import org.biobank.infrastructure.command.ShipmentCommands._
-import org.biobank.infrastructure.command.ShipmentSpecimenCommands._
-import org.biobank.infrastructure.event.EventUtils
-import org.biobank.infrastructure.event.ShipmentEvents._
-import org.biobank.infrastructure.event.ShipmentSpecimenEvents._
+import org.biobank.infrastructure.commands.ShipmentCommands._
+import org.biobank.infrastructure.commands.ShipmentSpecimenCommands._
+import org.biobank.infrastructure.events.EventUtils
+import org.biobank.infrastructure.events.ShipmentEvents._
+import org.biobank.infrastructure.events.ShipmentSpecimenEvents._
 import org.biobank.services.{Processor, ServiceError, ServiceValidation, SnapshotWriter}
 import play.api.libs.json._
 import scalaz.Scalaz._

diff --git a/app/org/biobank/services/centres/ShipmentsService.scala b/app/org/biobank/services/centres/ShipmentsService.scala
@@ -10,10 +10,10 @@ import org.biobank.domain.access.PermissionId
 import org.biobank.domain.participants._
 import org.biobank.domain.studies.CollectionEventTypeRepository
 import org.biobank.domain.users.UserId
-import org.biobank.infrastructure.command.ShipmentCommands._
-import org.biobank.infrastructure.command.ShipmentSpecimenCommands._
-import org.biobank.infrastructure.event.ShipmentEvents._
-import org.biobank.infrastructure.event.ShipmentSpecimenEvents._
+import org.biobank.infrastructure.commands.ShipmentCommands._
+import org.biobank.infrastructure.commands.ShipmentSpecimenCommands._
+import org.biobank.infrastructure.events.ShipmentEvents._
+import org.biobank.infrastructure.events.ShipmentSpecimenEvents._
 import org.biobank.services.participants.SpecimensService
 import org.biobank.services._
 import org.biobank.services.access.AccessService

diff --git a/app/org/biobank/services/participants/CollectionEventsProcessor.scala b/app/org/biobank/services/participants/CollectionEventsProcessor.scala
@@ -10,9 +10,9 @@ import org.biobank.domain.annotations.AnnotationTypeId
 import org.biobank.domain.participants._
 import org.biobank.domain.studies._
 import org.biobank.domain.annotations.Annotation
-import org.biobank.infrastructure.command.CollectionEventCommands._
-import org.biobank.infrastructure.event.CollectionEventEvents._
-import org.biobank.infrastructure.event.CommonEvents._
+import org.biobank.infrastructure.commands.CollectionEventCommands._
+import org.biobank.infrastructure.events.CollectionEventEvents._
+import org.biobank.infrastructure.events.CommonEvents._
 import org.biobank.services.{Processor, ServiceValidation, SnapshotWriter}
 import play.api.libs.json._
 import scalaz.Scalaz._
@@ -42,7 +42,7 @@ class CollectionEventsProcessor @Inject() (
   import CollectionEventsProcessor._
   import org.biobank.CommonValidations._
   import CollectionEventEvent.EventType
-  import org.biobank.infrastructure.event.EventUtils._
+  import org.biobank.infrastructure.events.EventUtils._
 
   override def persistenceId: String = "collection-events-processor-id"