chore: scalafmt import rewrite

.scalafmt.conf

@@ -3,3 +3,11 @@ runner.dialect = scala3
 
 maxColumn = 120
 trailingCommas = preserve
+
+rewrite.rules = [Imports]
+rewrite.imports.expand = true
+rewrite.imports.sort = original
+rewrite.imports.groups = [
+  [".*"],
+  ["java\\..*", "scala\\..*"]
+]

castor/src/main/scala/org/hyperledger/identus/castor/core/model/ProtoModelHelper.scala

@@ -2,34 +2,35 @@ package org.hyperledger.identus.castor.core.model
 
 import com.google.protobuf.ByteString
 import io.circe.Json
-import org.hyperledger.identus.castor.core.model.did.ServiceEndpoint.UriOrJsonEndpoint
-import org.hyperledger.identus.castor.core.model.did.{
-  DIDData,
-  EllipticCurve,
-  InternalKeyPurpose,
-  InternalPublicKey,
-  PrismDID,
-  PrismDIDOperation,
-  PublicKey,
-  PublicKeyData,
-  ScheduledDIDOperationDetail,
-  ScheduledDIDOperationStatus,
-  Service,
-  ServiceEndpoint,
-  ServiceType,
-  SignedPrismDIDOperation,
-  UpdateDIDAction,
-  VerificationRelationship
-}
+import io.iohk.atala.prism.protos.common_models
 import io.iohk.atala.prism.protos.common_models.OperationStatus
+import io.iohk.atala.prism.protos.node_api
+import io.iohk.atala.prism.protos.node_models
 import io.iohk.atala.prism.protos.node_models.KeyUsage
 import io.iohk.atala.prism.protos.node_models.PublicKey.KeyData
-import io.iohk.atala.prism.protos.{common_models, node_api, node_models}
+import org.hyperledger.identus.castor.core.model.did.DIDData
+import org.hyperledger.identus.castor.core.model.did.EllipticCurve
+import org.hyperledger.identus.castor.core.model.did.InternalKeyPurpose
+import org.hyperledger.identus.castor.core.model.did.InternalPublicKey
+import org.hyperledger.identus.castor.core.model.did.PrismDID
+import org.hyperledger.identus.castor.core.model.did.PrismDIDOperation
+import org.hyperledger.identus.castor.core.model.did.PublicKey
+import org.hyperledger.identus.castor.core.model.did.PublicKeyData
+import org.hyperledger.identus.castor.core.model.did.ScheduledDIDOperationDetail
+import org.hyperledger.identus.castor.core.model.did.ScheduledDIDOperationStatus
+import org.hyperledger.identus.castor.core.model.did.Service
+import org.hyperledger.identus.castor.core.model.did.ServiceEndpoint
+import org.hyperledger.identus.castor.core.model.did.ServiceEndpoint.UriOrJsonEndpoint
+import org.hyperledger.identus.castor.core.model.did.ServiceType
+import org.hyperledger.identus.castor.core.model.did.SignedPrismDIDOperation
+import org.hyperledger.identus.castor.core.model.did.UpdateDIDAction
+import org.hyperledger.identus.castor.core.model.did.VerificationRelationship
 import org.hyperledger.identus.shared.models.Base64UrlString
 import org.hyperledger.identus.shared.utils.Traverse.*
+import zio.*
+
 import java.time.Instant
 import scala.language.implicitConversions
-import zio.*
 
 object ProtoModelHelper extends ProtoModelHelper
 

castor/src/main/scala/org/hyperledger/identus/castor/core/model/did/PrismDID.scala

@@ -1,13 +1,14 @@
 package org.hyperledger.identus.castor.core.model.did
 
-import org.hyperledger.identus.castor.core.model.ProtoModelHelper
-import org.hyperledger.identus.shared.crypto.Sha256Hash
 import io.iohk.atala.prism.protos.node_models
 import io.iohk.atala.prism.protos.node_models.AtalaOperation.Operation
+import org.hyperledger.identus.castor.core.model.ProtoModelHelper
+import org.hyperledger.identus.shared.crypto.Sha256Hash
 import org.hyperledger.identus.shared.models.Base64UrlString
 import org.hyperledger.identus.shared.models.HexString
-import scala.util.Try
+
 import scala.util.matching.Regex
+import scala.util.Try
 
 /** Represents a [Did] used in PRISM with prism-specific method and keys as [PrismDid]
   */

castor/src/main/scala/org/hyperledger/identus/castor/core/model/did/PrismDIDOperation.scala

@@ -1,10 +1,10 @@
 package org.hyperledger.identus.castor.core.model.did
 
+import io.iohk.atala.prism.protos.node_models
 import org.hyperledger.identus.castor.core.model.ProtoModelHelper
 import org.hyperledger.identus.shared.crypto.Sha256Hash
 
 import scala.collection.compat.immutable.ArraySeq
-import io.iohk.atala.prism.protos.node_models
 
 sealed trait PrismDIDOperation {
   def did: CanonicalPrismDID

castor/src/main/scala/org/hyperledger/identus/castor/core/model/did/w3c/W3CModelHelper.scala

@@ -7,9 +7,9 @@ import org.hyperledger.identus.shared.crypto.Apollo
 import org.hyperledger.identus.shared.models.Base64UrlString
 import org.hyperledger.identus.shared.models.HexString
 
+import java.time.format.DateTimeFormatter
 import java.time.Instant
 import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
 
 object W3CModelHelper extends W3CModelHelper
 

castor/src/main/scala/org/hyperledger/identus/castor/core/service/DIDService.scala

@@ -1,28 +1,29 @@
 package org.hyperledger.identus.castor.core.service
 
-import org.hyperledger.identus.castor.core.model.ProtoModelHelper
-import org.hyperledger.identus.castor.core.model.did.{
-  CanonicalPrismDID,
-  DIDData,
-  DIDMetadata,
-  InternalPublicKey,
-  LongFormPrismDID,
-  PrismDID,
-  PublicKey,
-  ScheduleDIDOperationOutcome,
-  ScheduledDIDOperationDetail,
-  SignedPrismDIDOperation
-}
-import org.hyperledger.identus.castor.core.model.error.OperationValidationError
-import org.hyperledger.identus.castor.core.model.error.{DIDOperationError, DIDResolutionError}
-import org.hyperledger.identus.castor.core.util.DIDOperationValidator
+import io.iohk.atala.prism.protos.node_api
 import io.iohk.atala.prism.protos.node_api.NodeServiceGrpc.NodeService
+import io.iohk.atala.prism.protos.node_models
 import io.iohk.atala.prism.protos.node_models.OperationOutput.OperationMaybe
-import io.iohk.atala.prism.protos.{node_api, node_models}
+import org.hyperledger.identus.castor.core.model.did.CanonicalPrismDID
+import org.hyperledger.identus.castor.core.model.did.DIDData
+import org.hyperledger.identus.castor.core.model.did.DIDMetadata
+import org.hyperledger.identus.castor.core.model.did.InternalPublicKey
+import org.hyperledger.identus.castor.core.model.did.LongFormPrismDID
+import org.hyperledger.identus.castor.core.model.did.PrismDID
+import org.hyperledger.identus.castor.core.model.did.PublicKey
+import org.hyperledger.identus.castor.core.model.did.ScheduleDIDOperationOutcome
+import org.hyperledger.identus.castor.core.model.did.ScheduledDIDOperationDetail
+import org.hyperledger.identus.castor.core.model.did.SignedPrismDIDOperation
+import org.hyperledger.identus.castor.core.model.error.DIDOperationError
+import org.hyperledger.identus.castor.core.model.error.DIDResolutionError
+import org.hyperledger.identus.castor.core.model.error.OperationValidationError
+import org.hyperledger.identus.castor.core.model.ProtoModelHelper
+import org.hyperledger.identus.castor.core.util.DIDOperationValidator
 import org.hyperledger.identus.shared.models.HexString
+import zio.*
+
 import java.time.Instant
 import scala.collection.immutable.ArraySeq
-import zio.*
 
 trait DIDService {
   def scheduleOperation(operation: SignedPrismDIDOperation): IO[DIDOperationError, ScheduleDIDOperationOutcome]

castor/src/main/scala/org/hyperledger/identus/castor/core/service/MockDIDService.scala

@@ -5,9 +5,15 @@ import org.hyperledger.identus.castor.core.model.error
 import org.hyperledger.identus.shared.crypto.Apollo
 import org.hyperledger.identus.shared.crypto.Secp256k1KeyPair
 import org.hyperledger.identus.shared.models.Base64UrlString
-import zio.mock.{Expectation, Mock, Proxy}
+import zio.mock
+import zio.mock.Expectation
+import zio.mock.Mock
+import zio.mock.Proxy
 import zio.test.Assertion
-import zio.{IO, URLayer, ZIO, ZLayer, mock}
+import zio.IO
+import zio.URLayer
+import zio.ZIO
+import zio.ZLayer
 
 import scala.collection.immutable.ArraySeq
 

castor/src/main/scala/org/hyperledger/identus/castor/core/util/UriUtils.scala

@@ -1,9 +1,12 @@
 package org.hyperledger.identus.castor.core.util
 
-import io.lemonlabs.uri.{Uri, Url, Urn, QueryString}
 import io.lemonlabs.uri.config.UriConfig
-import io.lemonlabs.uri.encoding.PercentEncoder
 import io.lemonlabs.uri.decoding.UriDecodeException
+import io.lemonlabs.uri.encoding.PercentEncoder
+import io.lemonlabs.uri.QueryString
+import io.lemonlabs.uri.Uri
+import io.lemonlabs.uri.Url
+import io.lemonlabs.uri.Urn
 
 // TODO: unify with the logic used in Node
 // https://github.com/input-output-hk/atala-prism/blob/ba7b3e3ef307f6bd06734af2bf8fed9b119ee98e/prism-backend/common/src/main/scala/io/iohk/atala/prism/utils/UriUtils.scala

castor/src/test/scala/org/hyperledger/identus/castor/core/model/ProtoModelHelperSpec.scala

@@ -3,19 +3,20 @@ package org.hyperledger.identus.castor.core.model
 import com.google.protobuf.timestamp.Timestamp
 import io.circe.Json
 import io.circe.JsonObject
+import io.iohk.atala.prism.protos.common_models.Ledger
+import io.iohk.atala.prism.protos.node_models
 import org.hyperledger.identus.castor.core.model.did.ServiceEndpoint
 import org.hyperledger.identus.castor.core.model.did.ServiceEndpoint.UriOrJsonEndpoint
 import org.hyperledger.identus.castor.core.model.did.ServiceEndpoint.UriValue
 import org.hyperledger.identus.castor.core.model.did.ServiceType
 import org.hyperledger.identus.castor.core.util.GenUtils
-import io.iohk.atala.prism.protos.common_models.Ledger
-import io.iohk.atala.prism.protos.node_models
-import java.time.Instant
-import scala.language.implicitConversions
 import zio.*
 import zio.test.*
 import zio.test.Assertion.*
 
+import java.time.Instant
+import scala.language.implicitConversions
+
 object ProtoModelHelperSpec extends ZIOSpecDefault {
 
   import ProtoModelHelper.*

castor/src/test/scala/org/hyperledger/identus/castor/core/model/did/DIDSpec.scala

@@ -1,9 +1,9 @@
 package org.hyperledger.identus.castor.core.model.did
 
+import org.hyperledger.identus.castor.core.util.GenUtils
 import zio.*
 import zio.test.*
 import zio.test.Assertion.*
-import org.hyperledger.identus.castor.core.util.GenUtils
 
 object DIDSpec extends ZIOSpecDefault {
 

castor/src/test/scala/org/hyperledger/identus/castor/core/model/did/PrismDIDSpec.scala

@@ -1,8 +1,8 @@
 package org.hyperledger.identus.castor.core.model.did
 
 import com.google.protobuf.ByteString
-import org.hyperledger.identus.shared.crypto.Sha256Hash
 import io.iohk.atala.prism.protos.node_models
+import org.hyperledger.identus.shared.crypto.Sha256Hash
 import org.hyperledger.identus.shared.models.Base64UrlString
 import zio.*
 import zio.test.*

castor/src/test/scala/org/hyperledger/identus/castor/core/model/did/w3c/W3CModelHelperSpec.scala

@@ -1,13 +1,11 @@
 package org.hyperledger.identus.castor.core.model.did.w3c
 
-import org.hyperledger.identus.castor.core.model.did.{
-  CanonicalPrismDID,
-  DIDData,
-  InternalKeyPurpose,
-  PrismDID,
-  PrismDIDOperation,
-  VerificationRelationship
-}
+import org.hyperledger.identus.castor.core.model.did.CanonicalPrismDID
+import org.hyperledger.identus.castor.core.model.did.DIDData
+import org.hyperledger.identus.castor.core.model.did.InternalKeyPurpose
+import org.hyperledger.identus.castor.core.model.did.PrismDID
+import org.hyperledger.identus.castor.core.model.did.PrismDIDOperation
+import org.hyperledger.identus.castor.core.model.did.VerificationRelationship
 import org.hyperledger.identus.castor.core.util.GenUtils
 import zio.*
 import zio.test.*

castor/src/test/scala/org/hyperledger/identus/castor/core/service/DIDServiceSpec.scala

@@ -1,32 +1,33 @@
 package org.hyperledger.identus.castor.core.service
 
 import com.google.protobuf.ByteString
-import org.hyperledger.identus.castor.core.model.did.{DIDData, PrismDID, PrismDIDOperation}
-import org.hyperledger.identus.castor.core.model.error.DIDResolutionError
-import org.hyperledger.identus.castor.core.util.{GenUtils}
-import org.hyperledger.identus.castor.core.util.DIDOperationValidator
-import io.iohk.atala.prism.protos.common_models.{HealthCheckRequest, HealthCheckResponse}
+import io.iohk.atala.prism.protos.common_models.HealthCheckRequest
+import io.iohk.atala.prism.protos.common_models.HealthCheckResponse
 import io.iohk.atala.prism.protos.node_api
+import io.iohk.atala.prism.protos.node_api.GetBatchStateRequest
+import io.iohk.atala.prism.protos.node_api.GetBatchStateResponse
+import io.iohk.atala.prism.protos.node_api.GetCredentialRevocationTimeRequest
+import io.iohk.atala.prism.protos.node_api.GetCredentialRevocationTimeResponse
+import io.iohk.atala.prism.protos.node_api.GetDidDocumentRequest
+import io.iohk.atala.prism.protos.node_api.GetDidDocumentResponse
+import io.iohk.atala.prism.protos.node_api.GetLastSyncedBlockTimestampRequest
+import io.iohk.atala.prism.protos.node_api.GetLastSyncedBlockTimestampResponse
+import io.iohk.atala.prism.protos.node_api.GetNodeBuildInfoRequest
+import io.iohk.atala.prism.protos.node_api.GetNodeBuildInfoResponse
+import io.iohk.atala.prism.protos.node_api.GetNodeNetworkProtocolInfoRequest
+import io.iohk.atala.prism.protos.node_api.GetNodeNetworkProtocolInfoResponse
+import io.iohk.atala.prism.protos.node_api.GetOperationInfoRequest
+import io.iohk.atala.prism.protos.node_api.GetOperationInfoResponse
+import io.iohk.atala.prism.protos.node_api.NodeServiceGrpc
+import io.iohk.atala.prism.protos.node_api.ScheduleOperationsRequest
+import io.iohk.atala.prism.protos.node_api.ScheduleOperationsResponse
 import io.iohk.atala.prism.protos.node_models
-import io.iohk.atala.prism.protos.node_api.{
-  GetBatchStateRequest,
-  GetBatchStateResponse,
-  GetCredentialRevocationTimeRequest,
-  GetCredentialRevocationTimeResponse,
-  GetDidDocumentRequest,
-  GetDidDocumentResponse,
-  GetLastSyncedBlockTimestampRequest,
-  GetLastSyncedBlockTimestampResponse,
-  GetNodeBuildInfoRequest,
-  GetNodeBuildInfoResponse,
-  GetNodeNetworkProtocolInfoRequest,
-  GetNodeNetworkProtocolInfoResponse,
-  GetOperationInfoRequest,
-  GetOperationInfoResponse,
-  NodeServiceGrpc,
-  ScheduleOperationsRequest,
-  ScheduleOperationsResponse
-}
+import org.hyperledger.identus.castor.core.model.did.DIDData
+import org.hyperledger.identus.castor.core.model.did.PrismDID
+import org.hyperledger.identus.castor.core.model.did.PrismDIDOperation
+import org.hyperledger.identus.castor.core.model.error.DIDResolutionError
+import org.hyperledger.identus.castor.core.util.DIDOperationValidator
+import org.hyperledger.identus.castor.core.util.GenUtils
 import zio.*
 import zio.test.*
 import zio.test.Assertion.*

cloud-agent/service/server/src/main/scala/org/hyperledger/identus/LogUtils.scala

@@ -1,8 +1,8 @@
 package org.hyperledger.identus
 
-import zio.*
 import org.hyperledger.identus.api.http.RequestContext
 import sttp.model.Header
+import zio.*
 
 object LogUtils {
   inline val headerName = "X-Request-ID"

cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/notification/JsonEventEncoders.scala

@@ -7,10 +7,8 @@ import org.hyperledger.identus.connect.controller.http.Connection
 import org.hyperledger.identus.connect.core.model.ConnectionRecord
 import org.hyperledger.identus.event.notification.Event
 import org.hyperledger.identus.issue.controller.http.IssueCredentialRecord
-import org.hyperledger.identus.pollux.core.model.{
-  IssueCredentialRecord as PolluxIssueCredentialRecord,
-  PresentationRecord as PolluxPresentationRecord
-}
+import org.hyperledger.identus.pollux.core.model.IssueCredentialRecord as PolluxIssueCredentialRecord
+import org.hyperledger.identus.pollux.core.model.PresentationRecord as PolluxPresentationRecord
 import org.hyperledger.identus.presentproof.controller.http.PresentationStatus
 import org.hyperledger.identus.shared.models.WalletId
 import zio.*

cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/notification/WebhookPublisher.scala

@@ -6,9 +6,12 @@ import org.hyperledger.identus.agent.server.config.AppConfig
 import org.hyperledger.identus.agent.walletapi.model.ManagedDIDDetail
 import org.hyperledger.identus.agent.walletapi.service.WalletManagementService
 import org.hyperledger.identus.connect.core.model.ConnectionRecord
+import org.hyperledger.identus.event.notification.Event
+import org.hyperledger.identus.event.notification.EventConsumer
 import org.hyperledger.identus.event.notification.EventNotificationConfig
-import org.hyperledger.identus.event.notification.{Event, EventConsumer, EventNotificationService}
-import org.hyperledger.identus.pollux.core.model.{IssueCredentialRecord, PresentationRecord}
+import org.hyperledger.identus.event.notification.EventNotificationService
+import org.hyperledger.identus.pollux.core.model.IssueCredentialRecord
+import org.hyperledger.identus.pollux.core.model.PresentationRecord
 import org.hyperledger.identus.shared.models.WalletAccessContext
 import org.hyperledger.identus.shared.models.WalletId
 import zio.*