chore: clean duplicate imports

hyperledger · Apr 29, 2024 · 3aa31ef · 3aa31ef
1 parent 93f11bf
commit 3aa31ef
Show file tree

Hide file tree

Showing 18 changed files with 10 additions and 122 deletions.
diff --git a/castor/src/test/scala/org/hyperledger/identus/castor/core/model/ProtoModelHelperSpec.scala b/castor/src/test/scala/org/hyperledger/identus/castor/core/model/ProtoModelHelperSpec.scala
@@ -3,19 +3,19 @@ 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 org.hyperledger.identus.castor.core.model.ProtoModelHelper
+
+import java.time.Instant
+import scala.language.implicitConversions
 
 object ProtoModelHelperSpec extends ZIOSpecDefault {
 

diff --git a/castor/src/test/scala/org/hyperledger/identus/castor/core/model/did/DIDSpec.scala b/castor/src/test/scala/org/hyperledger/identus/castor/core/model/did/DIDSpec.scala
@@ -1,10 +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
-import org.hyperledger.identus.castor.core.model.did.{DID, PrismDID}
 
 object DIDSpec extends ZIOSpecDefault {
 

diff --git a/castor/src/test/scala/org/hyperledger/identus/castor/core/model/did/PrismDIDSpec.scala b/castor/src/test/scala/org/hyperledger/identus/castor/core/model/did/PrismDIDSpec.scala
@@ -7,7 +7,6 @@ import org.hyperledger.identus.shared.models.Base64UrlString
 import zio.*
 import zio.test.*
 import zio.test.Assertion.*
-import org.hyperledger.identus.castor.core.model.did.PrismDID
 
 object PrismDIDSpec extends ZIOSpecDefault {
 

diff --git a/...or/src/test/scala/org/hyperledger/identus/castor/core/model/did/ServiceEndpointSpec.scala b/...or/src/test/scala/org/hyperledger/identus/castor/core/model/did/ServiceEndpointSpec.scala
@@ -3,7 +3,6 @@ package org.hyperledger.identus.castor.core.model.did
 import zio.*
 import zio.test.*
 import zio.test.Assertion.*
-import org.hyperledger.identus.castor.core.model.did.ServiceEndpoint
 
 object ServiceEndpointSpec extends ZIOSpecDefault {
 

diff --git a/castor/src/test/scala/org/hyperledger/identus/castor/core/model/did/ServiceTypeSpec.scala b/castor/src/test/scala/org/hyperledger/identus/castor/core/model/did/ServiceTypeSpec.scala
@@ -3,7 +3,6 @@ package org.hyperledger.identus.castor.core.model.did
 import zio.*
 import zio.test.*
 import zio.test.Assertion.*
-import org.hyperledger.identus.castor.core.model.did.ServiceType
 
 object ServiceTypeSpec extends ZIOSpecDefault {
 

diff --git a/...src/test/scala/org/hyperledger/identus/castor/core/model/did/w3c/W3CModelHelperSpec.scala b/...src/test/scala/org/hyperledger/identus/castor/core/model/did/w3c/W3CModelHelperSpec.scala
@@ -12,7 +12,6 @@ import org.hyperledger.identus.castor.core.util.GenUtils
 import zio.*
 import zio.test.*
 import zio.test.Assertion.*
-import org.hyperledger.identus.castor.core.model.did.w3c.W3CModelHelper
 
 object W3CModelHelperSpec extends ZIOSpecDefault {
 

diff --git a/castor/src/test/scala/org/hyperledger/identus/castor/core/service/DIDServiceSpec.scala b/castor/src/test/scala/org/hyperledger/identus/castor/core/service/DIDServiceSpec.scala
@@ -32,7 +32,6 @@ import zio.test.*
 import zio.test.Assertion.*
 
 import scala.concurrent.Future
-import org.hyperledger.identus.castor.core.service.{DIDService, DIDServiceImpl}
 
 object DIDServiceSpec extends ZIOSpecDefault {
 

diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/MainApp.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/MainApp.scala
@@ -1,6 +1,7 @@
 package org.hyperledger.identus.agent.server
 
 import com.nimbusds.jose.crypto.bc.BouncyCastleProviderSingleton
+import io.micrometer.prometheus.{PrometheusConfig, PrometheusMeterRegistry}
 import org.hyperledger.identus.agent.server.config.AppConfig
 import org.hyperledger.identus.agent.server.http.ZioHttpClient
 import org.hyperledger.identus.agent.server.sql.Migrations as AgentMigrations
@@ -33,36 +34,12 @@ import org.hyperledger.identus.iam.entity.http.controller.{EntityController, Ent
 import org.hyperledger.identus.iam.wallet.http.controller.WalletManagementControllerImpl
 import org.hyperledger.identus.issue.controller.IssueControllerImpl
 import org.hyperledger.identus.mercury.*
-import org.hyperledger.identus.pollux.core.service.*
-import org.hyperledger.identus.pollux.core.service.verification.VcVerificationServiceImpl
-import org.hyperledger.identus.pollux.credentialdefinition.controller.CredentialDefinitionControllerImpl
-import org.hyperledger.identus.agent.walletapi.sql.{
-  JdbcDIDNonSecretStorage,
-  JdbcEntityRepository,
-  JdbcWalletNonSecretStorage
-}
-import org.hyperledger.identus.agent.walletapi.storage.GenericSecretStorage
-import org.hyperledger.identus.castor.controller.{DIDControllerImpl, DIDRegistrarControllerImpl}
-import org.hyperledger.identus.castor.core.service.DIDServiceImpl
-import org.hyperledger.identus.castor.core.util.DIDOperationValidator
-import org.hyperledger.identus.connect.controller.ConnectionControllerImpl
-import org.hyperledger.identus.connect.core.service.{ConnectionServiceImpl, ConnectionServiceNotifier}
-import org.hyperledger.identus.connect.sql.repository.{JdbcConnectionRepository, Migrations as ConnectMigrations}
-import org.hyperledger.identus.event.controller.EventControllerImpl
-import org.hyperledger.identus.event.notification.EventNotificationServiceImpl
-import org.hyperledger.identus.iam.authentication.DefaultAuthenticator
-import org.hyperledger.identus.iam.authentication.apikey.JdbcAuthenticationRepository
-import org.hyperledger.identus.iam.authorization.DefaultPermissionManagementService
-import org.hyperledger.identus.iam.authorization.core.EntityPermissionManagementService
-import org.hyperledger.identus.iam.entity.http.controller.{EntityController, EntityControllerImpl}
-import org.hyperledger.identus.iam.wallet.http.controller.WalletManagementControllerImpl
-import org.hyperledger.identus.issue.controller.IssueControllerImpl
-import org.hyperledger.identus.mercury.*
 import org.hyperledger.identus.oidc4vc.controller.CredentialIssuerControllerImpl
 import org.hyperledger.identus.oidc4vc.service.OIDCCredentialIssuerServiceImpl
 import org.hyperledger.identus.oidc4vc.storage.InMemoryIssuanceSessionService
 import org.hyperledger.identus.pollux.core.repository.InMemoryOIDC4VCIssuerMetadataRepository
 import org.hyperledger.identus.pollux.core.service.*
+import org.hyperledger.identus.pollux.core.service.verification.VcVerificationServiceImpl
 import org.hyperledger.identus.pollux.credentialdefinition.controller.CredentialDefinitionControllerImpl
 import org.hyperledger.identus.pollux.credentialschema.controller.{
   CredentialSchemaController,
@@ -82,7 +59,6 @@ import org.hyperledger.identus.presentproof.controller.PresentProofControllerImp
 import org.hyperledger.identus.resolvers.DIDResolver
 import org.hyperledger.identus.system.controller.SystemControllerImpl
 import org.hyperledger.identus.verification.controller.VcVerificationControllerImpl
-import io.micrometer.prometheus.{PrometheusConfig, PrometheusMeterRegistry}
 import zio.*
 import zio.logging.*
 import zio.logging.LogFormat.*

diff --git a/...nt/service/server/src/main/scala/org/hyperledger/identus/agent/server/PrismAgentApp.scala b/...nt/service/server/src/main/scala/org/hyperledger/identus/agent/server/PrismAgentApp.scala
@@ -19,33 +19,6 @@ import org.hyperledger.identus.iam.entity.http.EntityServerEndpoints
 import org.hyperledger.identus.iam.wallet.http.WalletManagementServerEndpoints
 import org.hyperledger.identus.issue.controller.IssueServerEndpoints
 import org.hyperledger.identus.mercury.{DidOps, HttpClient}
-import org.hyperledger.identus.pollux.core.service.{CredentialService, PresentationService}
-import org.hyperledger.identus.pollux.credentialdefinition.CredentialDefinitionRegistryServerEndpoints
-import org.hyperledger.identus.pollux.credentialschema.{
-  SchemaRegistryServerEndpoints,
-  VerificationPolicyServerEndpoints
-}
-import org.hyperledger.identus.pollux.vc.jwt.DidResolver as JwtDidResolver
-import org.hyperledger.identus.presentproof.controller.PresentProofServerEndpoints
-import org.hyperledger.identus.shared.models.{HexString, WalletAccessContext, WalletAdministrationContext, WalletId}
-import org.hyperledger.identus.resolvers.DIDResolver
-import org.hyperledger.identus.shared.utils.DurationOps.toMetricsSeconds
-import org.hyperledger.identus.system.controller.SystemServerEndpoints
-import org.hyperledger.identus.verification.controller.VcVerificationServerEndpoints
-import org.hyperledger.identus.agent.walletapi.model.{Entity, Wallet, WalletSeed}
-import org.hyperledger.identus.agent.walletapi.service.{EntityService, ManagedDIDService, WalletManagementService}
-import org.hyperledger.identus.agent.walletapi.storage.DIDNonSecretStorage
-import org.hyperledger.identus.castor.controller.{DIDRegistrarServerEndpoints, DIDServerEndpoints}
-import org.hyperledger.identus.castor.core.service.DIDService
-import org.hyperledger.identus.connect.controller.ConnectionServerEndpoints
-import org.hyperledger.identus.connect.core.service.ConnectionService
-import org.hyperledger.identus.event.controller.EventServerEndpoints
-import org.hyperledger.identus.event.notification.EventNotificationConfig
-import org.hyperledger.identus.iam.authentication.apikey.ApiKeyAuthenticator
-import org.hyperledger.identus.iam.entity.http.EntityServerEndpoints
-import org.hyperledger.identus.iam.wallet.http.WalletManagementServerEndpoints
-import org.hyperledger.identus.issue.controller.IssueServerEndpoints
-import org.hyperledger.identus.mercury.{DidOps, HttpClient}
 import org.hyperledger.identus.oidc4vc.CredentialIssuerServerEndpoints
 import org.hyperledger.identus.pollux.core.service.{CredentialService, PresentationService}
 import org.hyperledger.identus.pollux.credentialdefinition.CredentialDefinitionRegistryServerEndpoints
@@ -60,6 +33,7 @@ import org.hyperledger.identus.shared.models.WalletAdministrationContext
 import org.hyperledger.identus.shared.models.{HexString, WalletAccessContext, WalletId}
 import org.hyperledger.identus.shared.utils.DurationOps.toMetricsSeconds
 import org.hyperledger.identus.system.controller.SystemServerEndpoints
+import org.hyperledger.identus.verification.controller.VcVerificationServerEndpoints
 import zio.*
 import zio.metrics.*
 

diff --git a/...gent/service/server/src/test/scala/org/hyperledger/identus/api/util/Tapir2StaticOAS.scala b/...gent/service/server/src/test/scala/org/hyperledger/identus/api/util/Tapir2StaticOAS.scala
@@ -10,31 +10,15 @@ import org.hyperledger.identus.iam.authentication.DefaultAuthenticator
 import org.hyperledger.identus.iam.entity.http.controller.EntityController
 import org.hyperledger.identus.iam.wallet.http.controller.WalletManagementController
 import org.hyperledger.identus.issue.controller.IssueController
-import org.hyperledger.identus.pollux.credentialdefinition.controller.CredentialDefinitionController
-import org.hyperledger.identus.pollux.credentialschema.controller.{
-  CredentialSchemaController,
-  VerificationPolicyController
-}
-import org.hyperledger.identus.presentproof.controller.PresentProofController
-import org.hyperledger.identus.system.controller.SystemController
-import org.hyperledger.identus.verification.controller.VcVerificationController
-import org.hyperledger.identus.agent.server.AgentHttpServer
-import org.hyperledger.identus.agent.server.http.DocModels
-import org.hyperledger.identus.castor.controller.{DIDController, DIDRegistrarController}
-import org.hyperledger.identus.connect.controller.ConnectionController
-import org.hyperledger.identus.event.controller.EventController
-import org.hyperledger.identus.iam.authentication.DefaultAuthenticator
-import org.hyperledger.identus.iam.entity.http.controller.EntityController
 import org.hyperledger.identus.oidc4vc.controller.CredentialIssuerController
-import org.hyperledger.identus.iam.wallet.http.controller.WalletManagementController
-import org.hyperledger.identus.issue.controller.IssueController
 import org.hyperledger.identus.pollux.credentialdefinition.controller.CredentialDefinitionController
 import org.hyperledger.identus.pollux.credentialschema.controller.{
   CredentialSchemaController,
   VerificationPolicyController
 }
 import org.hyperledger.identus.presentproof.controller.PresentProofController
 import org.hyperledger.identus.system.controller.SystemController
+import org.hyperledger.identus.verification.controller.VcVerificationController
 import org.scalatestplus.mockito.MockitoSugar.*
 import sttp.tapir.docs.openapi.OpenAPIDocsInterpreter
 import zio.{Scope, ZIO, ZIOAppArgs, ZIOAppDefault, ZLayer}

diff --git a/.../src/main/scala/org/hyperledger/identus/agent/walletapi/storage/DIDNonSecretStorage.scala b/.../src/main/scala/org/hyperledger/identus/agent/walletapi/storage/DIDNonSecretStorage.scala
@@ -1,9 +1,5 @@
 package org.hyperledger.identus.agent.walletapi.storage
 
-import org.hyperledger.identus.agent.walletapi.model.*
-import org.hyperledger.identus.castor.core.model.did.{PrismDID, ScheduledDIDOperationStatus}
-import org.hyperledger.identus.mercury.model.DidId
-import org.hyperledger.identus.shared.models.WalletAccessContext
 import org.hyperledger.identus.agent.walletapi.model.*
 import org.hyperledger.identus.castor.core.model.did.{PrismDID, ScheduledDIDOperationStatus}
 import org.hyperledger.identus.mercury.model.DidId

diff --git a/...c/test/scala/org/hyperledger/identus/mercury/protocol/presentproof/PresentationSpec.scala b/...c/test/scala/org/hyperledger/identus/mercury/protocol/presentproof/PresentationSpec.scala
@@ -7,7 +7,6 @@ import org.hyperledger.identus.mercury.model.AttachmentDescriptor
 import org.hyperledger.identus.mercury.model.AttachmentDescriptor.attachmentDescriptorEncoderV2
 import munit.*
 import org.hyperledger.identus.mercury.model.{LinkData, DidId}
-import org.hyperledger.identus.mercury.protocol.presentproof.Presentation
 
 class PresentationSpec extends ZSuite {
 

diff --git a/pollux/anoncredsTest/src/test/scala/org/hyperledger/identus/pollux/anoncreds/PoCNewLib.scala b/pollux/anoncredsTest/src/test/scala/org/hyperledger/identus/pollux/anoncreds/PoCNewLib.scala
@@ -3,13 +3,6 @@ package org.hyperledger.identus.pollux.anoncreds
 import org.scalatest.flatspec.AnyFlatSpec
 
 import scala.jdk.CollectionConverters.*
-import org.hyperledger.identus.pollux.anoncreds.{
-  AnoncredLinkSecretWithId,
-  AnoncredLinkSecret,
-  AnoncredPresentationRequest,
-  AnoncredLib,
-  AnoncredCredentialRequests
-}
 
 /** polluxAnoncredsTest/Test/testOnly org.hyperledger.identus.pollux.anoncreds.PoCNewLib
   */

diff --git a/...x/core/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialService.scala b/...x/core/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialService.scala
@@ -2,18 +2,6 @@ package org.hyperledger.identus.pollux.core.service
 
 import io.circe.syntax.*
 import io.circe.{Json, JsonObject}
-import org.hyperledger.identus.castor.core.model.did.CanonicalPrismDID
-import org.hyperledger.identus.mercury.model.DidId
-import org.hyperledger.identus.mercury.protocol.issuecredential.{
-  Attribute,
-  IssueCredential,
-  OfferCredential,
-  RequestCredential
-}
-import org.hyperledger.identus.pollux.core.model.*
-import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError
-import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError.*
-import org.hyperledger.identus.shared.models.WalletAccessContext
 import org.hyperledger.identus.castor.core.model.did.{CanonicalPrismDID, PrismDID, VerificationRelationship}
 import org.hyperledger.identus.mercury.model.DidId
 import org.hyperledger.identus.mercury.protocol.issuecredential.{

diff --git a/...rc/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceNotifier.scala b/...rc/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceNotifier.scala
@@ -1,14 +1,6 @@
 package org.hyperledger.identus.pollux.core.service
 
 import io.circe.Json
-import org.hyperledger.identus.castor.core.model.did.CanonicalPrismDID
-import org.hyperledger.identus.event.notification.*
-import org.hyperledger.identus.mercury.model.DidId
-import org.hyperledger.identus.mercury.protocol.issuecredential.{IssueCredential, OfferCredential, RequestCredential}
-import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError
-import org.hyperledger.identus.pollux.core.model.{DidCommID, IssueCredentialRecord}
-import org.hyperledger.identus.shared.models.WalletAccessContext
-import zio.{URLayer, ZIO, ZLayer, IO}
 import org.hyperledger.identus.castor.core.model.did.{CanonicalPrismDID, PrismDID, VerificationRelationship}
 import org.hyperledger.identus.event.notification.*
 import org.hyperledger.identus.mercury.model.DidId

diff --git a/...re/src/main/scala/org/hyperledger/identus/pollux/core/service/MockCredentialService.scala b/...re/src/main/scala/org/hyperledger/identus/pollux/core/service/MockCredentialService.scala
@@ -1,12 +1,6 @@
 package org.hyperledger.identus.pollux.core.service
 
 import io.circe.Json
-import org.hyperledger.identus.castor.core.model.did.CanonicalPrismDID
-import org.hyperledger.identus.mercury.model.DidId
-import org.hyperledger.identus.mercury.protocol.issuecredential.{IssueCredential, OfferCredential, RequestCredential}
-import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError
-import org.hyperledger.identus.pollux.core.model.{DidCommID, IssueCredentialRecord}
-import org.hyperledger.identus.shared.models.WalletAccessContext
 import org.hyperledger.identus.castor.core.model.did.{CanonicalPrismDID, PrismDID, VerificationRelationship}
 import org.hyperledger.identus.mercury.model.DidId
 import org.hyperledger.identus.mercury.protocol.issuecredential.{IssueCredential, OfferCredential, RequestCredential}

diff --git a/...main/scala/org/hyperledger/identus/pollux/core/service/OIDC4VCIssuerMetadataService.scala b/...main/scala/org/hyperledger/identus/pollux/core/service/OIDC4VCIssuerMetadataService.scala
@@ -5,7 +5,6 @@ import org.hyperledger.identus.pollux.core.model.error.CredentialSchemaError.URI
 import org.hyperledger.identus.pollux.core.model.oidc4vc.CredentialConfiguration
 import org.hyperledger.identus.pollux.core.model.oidc4vc.CredentialIssuer
 import org.hyperledger.identus.pollux.core.model.schema.CredentialSchema
-import org.hyperledger.identus.pollux.core.service.URIDereferencer
 import org.hyperledger.identus.pollux.core.repository.OIDC4VCIssuerMetadataRepository
 import org.hyperledger.identus.pollux.core.service.OIDC4VCIssuerMetadataServiceError.InvalidSchemaId
 import org.hyperledger.identus.pollux.core.service.OIDC4VCIssuerMetadataServiceError.IssuerIdNotFound

diff --git a/shared/crypto/src/test/scala/org/hyperledger/identus/shared/crypto/ApolloSpecHelper.scala b/shared/crypto/src/test/scala/org/hyperledger/identus/shared/crypto/ApolloSpecHelper.scala
@@ -1,7 +1,6 @@
 package org.hyperledger.identus.shared.crypto
 
 import zio.*
-import org.hyperledger.identus.shared.crypto.Apollo
 
 trait ApolloSpecHelper {
   protected val apollo: Apollo = Apollo.default