feat: mediator rename package and organise the packages (#12)

* feat: mediator rename package and code cleanup

Signed-off-by: Shailesh Patil <53746241+mineme0110@users.noreply.github.com>

Signed-off-by: Shailesh Patil <shailesh.patil@iohk.io>

build.sbt

@@ -149,7 +149,7 @@ lazy val httpUtils = crossProject(JSPlatform, JVMPlatform) // project
   )
 
 lazy val mediator = project
-  .in(file("did-mediator"))
+  .in(file("mediator"))
   .settings(publish / skip := true)
   .settings((setupTestConfig): _*)
   .settings(
@@ -165,7 +165,7 @@ lazy val mediator = project
     libraryDependencies += D.mongo.value,
   )
   .settings(
-    Compile / mainClass := Some("fmgp.did.demo.MediatorStandalone"),
+    Compile / mainClass := Some("io.iohk.atala.mediator.app.MediatorStandalone"),
     Docker / maintainer := "atala-coredid@iohk.io",
     Docker / dockerUsername := Some("input-output-hk"),
     Docker / dockerRepository := Some("ghcr.io"),

http-utils/jvm/src/main/scala/fmgp/did/comm/MessageDispatcherJVM.scala → http-utils/jvm/src/main/scala/io/iohk/atala/mediator/comm/MessageDispatcherJVM.scala

@@ -1,14 +1,14 @@
-package fmgp.did.comm
+package io.iohk.atala.mediator.comm
 
-import zio._
-import zio.json._
-import zio.http._
-import zio.http.model._
-
-import fmgp.did._
-import fmgp.did.comm._
-import fmgp.crypto.error._
-import fmgp.util.MyHeaders
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import io.iohk.atala.mediator.comm.*
+import io.iohk.atala.mediator.utils.MyHeaders
+import zio.*
+import zio.http.*
+import zio.http.model.*
+import zio.json.*
 
 object MessageDispatcherJVM {
   val layer: ZLayer[Client, Throwable, MessageDispatcher] =

http-utils/jvm/src/main/scala/fmgp/util/DIDSocketManager.scala → http-utils/jvm/src/main/scala/io/iohk/atala/mediator/utils/DIDSocketManager.scala

@@ -1,14 +1,13 @@
-package fmgp.util
+package io.iohk.atala.mediator.utils
 
-import zio._
-import zio.json._
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import zio.*
+import zio.http.socket.*
 import zio.http.{Channel, ChannelEvent}
-import zio.http.socket._
-import zio.stream._
-
-import fmgp.did._
-import fmgp.did.comm._
-import fmgp.crypto.error._
+import zio.json.*
+import zio.stream.*
 
 case class DIDSocketManager(
     sockets: Map[SocketID, MyChannel] = Map.empty,

http-utils/jvm/src/main/scala/fmgp/util/HttpHelpers.scala → http-utils/jvm/src/main/scala/io/iohk/atala/mediator/utils/HttpHelpers.scala

@@ -1,7 +1,7 @@
-package fmgp.util
+package io.iohk.atala.mediator.utils
 
-import zio._
-import zio.http._
+import zio.*
+import zio.http.*
 
 extension [R, Err](app: HttpApp[R, Err])
   def annotateLogs: HttpApp[R, Err] =

http-utils/jvm/src/main/scala/fmgp/util/MyChannel.scala → http-utils/jvm/src/main/scala/io/iohk/atala/mediator/utils/MyChannel.scala

@@ -1,6 +1,6 @@
-package fmgp.util
+package io.iohk.atala.mediator.utils
 
-import zio._
+import zio.*
 
 type SocketID = String
 case class MyChannel(id: SocketID, socketOutHub: Hub[String])

http-utils/shared/src/main/scala/fmgp/did/comm/MessageDispatcher.scala → http-utils/shared/src/main/scala/io/iohk/atala/mediator/comm/MessageDispatcher.scala

@@ -1,12 +1,11 @@
-package fmgp.did.comm
+package io.iohk.atala.mediator.comm
 
-import zio._
-import zio.json._
-
-import fmgp.did._
-import fmgp.did.comm._
-import fmgp.crypto.error._
-import fmgp.util.MyHeaders
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import io.iohk.atala.mediator.utils.MyHeaders
+import zio.*
+import zio.json.*
 
 trait MessageDispatcher {
   def send(

http-utils/shared/src/main/scala/fmgp/did/comm/TapMessage.scala → http-utils/shared/src/main/scala/io/iohk/atala/mediator/comm/TapMessage.scala

@@ -1,7 +1,7 @@
-package fmgp.did.comm
-
-import zio.json._
+package io.iohk.atala.mediator.comm
 
+import zio.json.*
+import fmgp.did.comm.*
 final case class TapMessage(msg: EncryptedMessage, decrypted: PlaintextMessage)
 
 object TapMessage {

http-utils/shared/src/main/scala/fmgp/util/MyHeaders.scala → http-utils/shared/src/main/scala/io/iohk/atala/mediator/utils/MyHeaders.scala

@@ -1,4 +1,4 @@
-package fmgp.util
+package io.iohk.atala.mediator.utils
 
 object MyHeaders {
   final val xForwardedHost: CharSequence = "x-forwarded-host"

did-mediator/src/main/scala/fmgp/did/Error.scala → mediator/src/main/scala/io/iohk/atala/mediator/Error.scala

@@ -1,9 +1,9 @@
-package fmgp.did
+package io.iohk.atala.mediator
 
-import fmgp.crypto.error._
-import fmgp.did._
-import fmgp.did.comm._
-import zio.json._
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import zio.json.*
 
 trait MediatorError
 

did-mediator/src/main/scala/fmgp/did/comm/protocol/Action.scala → mediator/src/main/scala/io/iohk/atala/mediator/actions/Action.scala

@@ -1,4 +1,4 @@
-package fmgp.did.comm.protocol
+package io.iohk.atala.mediator.actions
 
 import fmgp.did.comm.PlaintextMessage
 

did-mediator/src/main/scala/fmgp/did/comm/protocol/ProtocolExecute.scala → mediator/src/main/scala/io/iohk/atala/mediator/actions/ProtocolExecute.scala

@@ -1,17 +1,17 @@
-package fmgp.did.comm.protocol
-
-import zio._
-import zio.json._
-
-import fmgp.crypto.error._
-import fmgp.did._
-import fmgp.did.comm._
-import fmgp.did.comm.Operations._
-import fmgp.did.comm.protocol._
-import fmgp.did.comm.protocol.basicmessage2._
-import fmgp.did.comm.protocol.trustping2._
-import fmgp.did.db._
-
+package io.iohk.atala.mediator.actions
+
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import fmgp.did.comm.Operations.*
+import fmgp.did.comm.protocol.*
+import fmgp.did.comm.protocol.basicmessage2.*
+import fmgp.did.comm.protocol.trustping2.*
+import io.iohk.atala.mediator.*
+import io.iohk.atala.mediator.comm.*
+import io.iohk.atala.mediator.db.*
+import zio.*
+import zio.json.*
 //TODO pick a better name // maybe "Protocol" only
 
 trait ProtocolExecuter[-R] {

did-mediator/src/main/scala/fmgp/did/comm/mediator/MediatorAgent.scala → mediator/src/main/scala/io/iohk/atala/mediator/app/MediatorAgent.scala

@@ -1,27 +1,27 @@
-package fmgp.did.comm.mediator
-
-import zio._
-import zio.json._
-import zio.http._
-import zio.http.model._
-import zio.http.socket._
-import zio.http.socket.SocketApp
+package io.iohk.atala.mediator.app
 
+import fmgp.crypto.*
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import fmgp.did.comm.protocol.*
+import io.iohk.atala.mediator.*
+import io.iohk.atala.mediator.actions.*
+import io.iohk.atala.mediator.comm.*
+import io.iohk.atala.mediator.db.*
+import io.iohk.atala.mediator.protocols.*
+import io.iohk.atala.mediator.utils.*
 import io.netty.handler.codec.http.HttpHeaderNames
+import reactivemongo.api.bson.Macros.{*, given}
+import reactivemongo.api.bson.{*, given}
+import zio.*
+import zio.http.*
+import zio.http.model.*
+import zio.http.socket.*
+import zio.json.*
 
-import fmgp.util._
-import fmgp.did._
-import fmgp.crypto._
-import fmgp.crypto.error._
-import fmgp.did.comm._
-import fmgp.did.comm.protocol._
-import fmgp.did.db._
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.util.Try
-
-import reactivemongo.api.bson.{_, given}
-import reactivemongo.api.bson.Macros.{_, given}
-
 case class MediatorAgent(
     override val id: DID,
     override val keyStore: KeyStore, // Should we make it lazy with ZIO

did-mediator/src/main/scala/fmgp/did/comm/mediator/MediatorStandalone.scala → mediator/src/main/scala/io/iohk/atala/mediator/app/MediatorStandalone.scala

@@ -1,30 +1,29 @@
-package fmgp.did.demo
+package io.iohk.atala.mediator.app
 
-import zio._
-import zio.json._
-import zio.stream._
-import zio.http._
-import zio.http.model._
-import zio.http.socket._
+import fmgp.crypto.*
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import fmgp.did.comm.protocol.*
+import fmgp.did.method.peer.*
+import io.iohk.atala.mediator.actions.*
+import io.iohk.atala.mediator.comm.*
+import io.iohk.atala.mediator.db.*
+import io.iohk.atala.mediator.protocols.*
+import io.iohk.atala.mediator.utils.*
+import zio.*
+import zio.config.*
+import zio.config.magnolia.*
+import zio.config.typesafe.*
+import zio.http.*
+import zio.http.Http.{Empty, Static}
 import zio.http.ZClient.ClientLive
-import zio.http.Http.Empty
-import zio.http.Http.Static
-import zio.config._
-import zio.config.magnolia._
-import zio.config.typesafe._
+import zio.http.model.*
+import zio.http.socket.*
+import zio.json.*
+import zio.stream.*
 
 import scala.io.Source
-
-import fmgp.crypto._
-import fmgp.crypto.error._
-import fmgp.util._
-import fmgp.did._
-import fmgp.did.comm._
-import fmgp.did.comm.mediator._
-import fmgp.did.comm.protocol._
-import fmgp.did.method.peer._
-import fmgp.did.db._
-
 case class MediatorConfig(endpoint: java.net.URI, keyAgreement: OKPPrivateKey, keyAuthentication: OKPPrivateKey) {
   val did = DIDPeer2.makeAgent(
     Seq(keyAgreement, keyAuthentication),

did-mediator/src/main/scala/fmgp/did/db/AsyncDriverResource.scala → mediator/src/main/scala/io/iohk/atala/mediator/db/AsyncDriverResource.scala

@@ -1,10 +1,10 @@
-package fmgp.did.db
+package io.iohk.atala.mediator.db
 
-import zio.{TaskLayer, ZIO, ZLayer}
-import scala.concurrent.duration.DurationInt
 import reactivemongo.api.{AsyncDriver, DB, MongoConnection}
-import zio.{Task, ZIO, ZLayer}
+import zio.{Task, TaskLayer, ZIO, ZLayer}
+
 import scala.concurrent.ExecutionContext
+import scala.concurrent.duration.DurationInt
 
 object AsyncDriverResource {
   private def acquire = ZIO.attempt(AsyncDriver())