From e2e57c1b26d86291c4228acaab51ea61f48b8142 Mon Sep 17 00:00:00 2001 From: DaSCH Bot <50987250+daschbot@users.noreply.github.com> Date: Mon, 18 Mar 2024 12:45:38 +0100 Subject: [PATCH] chore: Major dependency updates (#3121) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Christian Kleinbölting --- .scalafix.conf | 2 +- .../org/knora/webapi/it/v2/StandoffRouteV2ITSpec.scala | 2 +- .../permissionsmessages/PermissionsMessagesADMSpec.scala | 2 +- .../webapi/messages/util/rdf/RdfFormatUtilSpec.scala | 2 +- .../org/knora/webapi/messages/util/rdf/RdfModelSpec.scala | 2 +- .../knora/webapi/models/filemodels/FileModelsSpec.scala | 2 +- .../webapi/models/standoffmodels/StandoffModels.scala | 2 +- .../responders/admin/PermissionsResponderADMSpec.scala | 2 +- .../responders/admin/ProjectsResponderADMSpec.scala | 2 +- .../webapi/responders/admin/UsersRestServiceSpec.scala | 2 +- .../webapi/responders/v2/OntologyResponderV2Spec.scala | 2 +- .../webapi/responders/v2/SearchResponderV2Spec.scala | 2 +- .../webapi/responders/v2/ValuesResponderV2Spec.scala | 2 +- .../v2/ontology/AddCardinalitiesToClassSpec.scala | 2 +- .../upgrade/plugins/UpgradePluginPR1307Spec.scala | 2 +- .../upgrade/plugins/UpgradePluginPR1322Spec.scala | 2 +- .../upgrade/plugins/UpgradePluginPR1372Spec.scala | 2 +- .../upgrade/plugins/UpgradePluginPR1615Spec.scala | 2 +- .../upgrade/plugins/UpgradePluginPR2018Spec.scala | 2 +- .../org/knora/webapi/testservices/TestClientService.scala | 2 +- project/plugins.sbt | 2 +- webapi/src/main/scala/dsp/valueobjects/Schema.scala | 2 +- .../admin/responder/usersmessages/UsersMessagesADM.scala | 2 +- .../store/triplestoremessages/TriplestoreMessages.scala | 2 +- .../webapi/messages/util/ConstructResponseUtilV2.scala | 2 +- .../gravsearch/transformers/OntologyInferencer.scala | 2 +- .../webapi/messages/util/standoff/StandoffTagUtilV2.scala | 2 +- .../responder/resourcemessages/ResourceMessagesV2.scala | 2 +- .../v2/responder/valuemessages/ValueMessagesV2.scala | 2 +- .../webapi/responders/admin/GroupsResponderADM.scala | 2 +- .../knora/webapi/responders/admin/ListsResponder.scala | 2 +- .../webapi/responders/admin/PermissionsResponderADM.scala | 2 +- .../webapi/responders/admin/ProjectsResponderADM.scala | 4 ++-- .../knora/webapi/responders/v2/OntologyResponderV2.scala | 4 ++-- .../org/knora/webapi/responders/v2/ResourceUtilV2.scala | 2 +- .../knora/webapi/responders/v2/ResourcesResponderV2.scala | 6 +++--- .../knora/webapi/responders/v2/StandoffResponderV2.scala | 2 +- .../knora/webapi/responders/v2/ValuesResponderV2.scala | 4 ++-- .../webapi/responders/v2/ontology/OntologyHelpers.scala | 2 +- .../v2/resources/CheckObjectClassConstraints.scala | 2 +- .../responders/v2/resources/CreateResourceV2Handler.scala | 8 ++++---- .../scala/org/knora/webapi/routing/Authenticator.scala | 2 +- .../scala/org/knora/webapi/routing/RouteUtilADM.scala | 2 +- .../org/knora/webapi/routing/v2/ResourcesRouteV2.scala | 2 +- .../knora/webapi/slice/admin/api/AdminPathVariables.scala | 2 +- .../scala/org/knora/webapi/slice/admin/api/Codecs.scala | 2 +- .../org/knora/webapi/slice/admin/api/FilesEndpoints.scala | 2 +- .../knora/webapi/slice/admin/api/GroupsEndpoints.scala | 2 +- .../webapi/slice/admin/api/ProjectsEndpointsHandler.scala | 2 +- .../slice/admin/api/service/ProjectsADMRestService.scala | 2 +- .../slice/admin/repo/service/KnoraGroupRepoLive.scala | 6 +++--- .../slice/admin/repo/service/KnoraUserRepoLive.scala | 2 +- .../slice/infrastructure/api/ManagementEndpoints.scala | 2 +- .../slice/ontology/repo/service/OntologyCache.scala | 2 +- .../knora/webapi/slice/search/api/SearchEndpoints.scala | 2 +- .../store/triplestore/impl/TriplestoreServiceLive.scala | 2 +- .../store/triplestore/upgrade/RepositoryUpdatePlan.scala | 2 +- .../triplestore/upgrade/plugins/UpgradePluginPR3110.scala | 2 +- .../triplestore/upgrade/plugins/UpgradePluginPR3111.scala | 2 +- webapi/src/main/scala/org/knora/webapi/util/Logger.scala | 4 ++-- .../test/scala/dsp/valueobjects/SchemaCommandsSpec.scala | 2 +- .../src/test/scala/org/knora/webapi/TestDataFactory.scala | 2 +- .../test/scala/org/knora/webapi/ValuesValidatorSpec.scala | 2 +- .../scala/org/knora/webapi/core/MessageRelaySpec.scala | 2 +- .../scala/org/knora/webapi/routing/RouteUtilZSpec.scala | 2 +- .../admin/api/service/AuthorizationRestServiceSpec.scala | 2 +- .../slice/common/repo/InMemoryCrudRepositorySpec.scala | 2 +- .../knora/webapi/slice/common/repo/rdf/RdfModelSpec.scala | 2 +- .../common/repo/service/InMemoryCrudRepositorySpec.scala | 2 +- .../api/service/RestCardinalityServiceLiveSpec.scala | 2 +- .../ontology/domain/CardinalityServiceLiveSpec.scala | 2 +- .../domain/service/PredicateRepositoryLiveSpec.scala | 2 +- .../slice/ontology/repo/OntologyCacheFakeSpec.scala | 2 +- .../ontology/repo/service/OntologyRepoLiveSpec.scala | 2 +- .../triplestore/api/TriplestoreServiceInMemorySpec.scala | 2 +- 75 files changed, 86 insertions(+), 86 deletions(-) diff --git a/.scalafix.conf b/.scalafix.conf index 83281ce087..0ead976b00 100644 --- a/.scalafix.conf +++ b/.scalafix.conf @@ -7,7 +7,6 @@ OrganizeImports { blankLines = Auto coalesceToWildcardImportThreshold = null expandRelative = false - groupExplicitlyImportedImplicitsSeparately = false groupedImports = Explode groups = [ "*" @@ -18,6 +17,7 @@ OrganizeImports { importsOrder = Ascii preset = DEFAULT removeUnused = true + targetDialect = Scala3 } RemoveUnused { diff --git a/integration/src/test/scala/org/knora/webapi/it/v2/StandoffRouteV2ITSpec.scala b/integration/src/test/scala/org/knora/webapi/it/v2/StandoffRouteV2ITSpec.scala index 2923ce0326..30ae8f26c7 100644 --- a/integration/src/test/scala/org/knora/webapi/it/v2/StandoffRouteV2ITSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/it/v2/StandoffRouteV2ITSpec.scala @@ -21,8 +21,8 @@ import dsp.valueobjects.Iri import org.knora.webapi.* import org.knora.webapi.e2e.v2.ResponseCheckerV2.compareJSONLDForMappingCreationResponse import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.store.sipimessages.SipiUploadResponseJsonProtocol.* import org.knora.webapi.messages.store.sipimessages.* +import org.knora.webapi.messages.store.sipimessages.SipiUploadResponseJsonProtocol.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.util.rdf.JsonLDDocument import org.knora.webapi.messages.util.rdf.JsonLDKeywords diff --git a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala index ffe42411db..529d6dc3c1 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala @@ -16,9 +16,9 @@ import org.knora.webapi.messages.OntologyConstants.KnoraBase.EntityPermissionAbb import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsMessagesUtilADM.PermissionTypeAndCodes import org.knora.webapi.responders.admin.PermissionsResponderADM import org.knora.webapi.routing.UnsafeZioRun +import org.knora.webapi.sharedtestdata.* import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM.* import org.knora.webapi.sharedtestdata.SharedTestDataADM2.* -import org.knora.webapi.sharedtestdata.* import org.knora.webapi.slice.admin.api.service.PermissionsRestService import org.knora.webapi.util.ZioScalaTestUtil.assertFailsWithA diff --git a/integration/src/test/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtilSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtilSpec.scala index 0f59c47847..fcc8f662cc 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtilSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtilSpec.scala @@ -20,10 +20,10 @@ import dsp.errors.BadRequestException import org.knora.webapi.CoreSpec import org.knora.webapi.IRI import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.util.rdf.JenaModel import org.knora.webapi.messages.util.rdf.JenaModelFactory import org.knora.webapi.messages.util.rdf.JenaNodeFactory -import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.util.FileUtil /** diff --git a/integration/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala index 58eb31681e..062fece56d 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala @@ -13,8 +13,8 @@ import java.io.FileInputStream import dsp.errors.AssertionException import org.knora.webapi.CoreSpec import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf.JenaRepository import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf.JenaRepository /** * Tests implementations of [[RdfModel]]. diff --git a/integration/src/test/scala/org/knora/webapi/models/filemodels/FileModelsSpec.scala b/integration/src/test/scala/org/knora/webapi/models/filemodels/FileModelsSpec.scala index b76d574f79..a3424eeda3 100644 --- a/integration/src/test/scala/org/knora/webapi/models/filemodels/FileModelsSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/models/filemodels/FileModelsSpec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.models.filemodels -import spray.json.DefaultJsonProtocol.* import spray.json.* +import spray.json.DefaultJsonProtocol.* import java.time.Instant import java.util.UUID diff --git a/integration/src/test/scala/org/knora/webapi/models/standoffmodels/StandoffModels.scala b/integration/src/test/scala/org/knora/webapi/models/standoffmodels/StandoffModels.scala index 0eeb1de6b7..cf61f73b1b 100644 --- a/integration/src/test/scala/org/knora/webapi/models/standoffmodels/StandoffModels.scala +++ b/integration/src/test/scala/org/knora/webapi/models/standoffmodels/StandoffModels.scala @@ -5,8 +5,8 @@ package org.knora.webapi.models.standoffmodels -import spray.json.DefaultJsonProtocol.* import spray.json.* +import spray.json.DefaultJsonProtocol.* import java.util.UUID diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala index e5a2c4e0cb..ef962c91f8 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala @@ -19,8 +19,8 @@ import dsp.errors.NotFoundException import org.knora.webapi.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.OntologyConstants.KnoraBase.EntityPermissionAbbreviations -import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsMessagesUtilADM.PermissionTypeAndCodes import org.knora.webapi.messages.admin.responder.permissionsmessages.* +import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsMessagesUtilADM.PermissionTypeAndCodes import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.messages.util.PermissionUtilADM diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala index ade0620b94..80dfb89e65 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala @@ -22,8 +22,8 @@ import dsp.valueobjects.V2 import org.knora.webapi.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.admin.responder.permissionsmessages.* -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* import org.knora.webapi.messages.admin.responder.projectsmessages.* +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.ProjectCreateRequest diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/UsersRestServiceSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/UsersRestServiceSpec.scala index 449d59b6be..61ca3b7adb 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/UsersRestServiceSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/UsersRestServiceSpec.scala @@ -29,10 +29,10 @@ import org.knora.webapi.slice.admin.api.UsersEndpoints.Requests.StatusChangeRequ import org.knora.webapi.slice.admin.api.UsersEndpoints.Requests.SystemAdminChangeRequest import org.knora.webapi.slice.admin.api.UsersEndpoints.Requests.UserCreateRequest import org.knora.webapi.slice.admin.api.service.UsersRestService +import org.knora.webapi.slice.admin.domain.model.* import org.knora.webapi.slice.admin.domain.model.Group import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.Username -import org.knora.webapi.slice.admin.domain.model.* import org.knora.webapi.slice.admin.domain.service.UserService import org.knora.webapi.util.ZioScalaTestUtil.assertFailsWithA diff --git a/integration/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala b/integration/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala index 6eda6361d4..4c500340cb 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala @@ -29,8 +29,8 @@ import org.knora.webapi.messages.store.triplestoremessages.* import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.messages.v2.responder.CanDoResponseV2 import org.knora.webapi.messages.v2.responder.SuccessResponseV2 -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.KnoraCardinalityInfo import org.knora.webapi.messages.v2.responder.ontologymessages.* +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.KnoraCardinalityInfo import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceRequestV2 import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceV2 import org.knora.webapi.messages.v2.responder.resourcemessages.CreateValueInNewResourceV2 diff --git a/integration/src/test/scala/org/knora/webapi/responders/v2/SearchResponderV2Spec.scala b/integration/src/test/scala/org/knora/webapi/responders/v2/SearchResponderV2Spec.scala index fde87e2e87..79501326e6 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/v2/SearchResponderV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/v2/SearchResponderV2Spec.scala @@ -6,8 +6,8 @@ package org.knora.webapi.responders.v2 import dsp.errors.BadRequestException -import org.knora.webapi.SchemaRendering.apiV2SchemaWithOption import org.knora.webapi.* +import org.knora.webapi.SchemaRendering.apiV2SchemaWithOption import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject diff --git a/integration/src/test/scala/org/knora/webapi/responders/v2/ValuesResponderV2Spec.scala b/integration/src/test/scala/org/knora/webapi/responders/v2/ValuesResponderV2Spec.scala index bce73f5c32..950d809d44 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/v2/ValuesResponderV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/v2/ValuesResponderV2Spec.scala @@ -26,8 +26,8 @@ import org.knora.webapi.messages.util.DatePrecisionYear import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.messages.util.PermissionUtilADM import org.knora.webapi.messages.util.search.gravsearch.GravsearchParser -import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceRequestV2.AssetIngestState import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceRequestV2.AssetIngestState import org.knora.webapi.messages.v2.responder.standoffmessages.* import org.knora.webapi.messages.v2.responder.valuemessages.* import org.knora.webapi.models.filemodels.FileModelUtil diff --git a/integration/src/test/scala/org/knora/webapi/responders/v2/ontology/AddCardinalitiesToClassSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/v2/ontology/AddCardinalitiesToClassSpec.scala index 7c97b24905..cce56ce736 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/v2/ontology/AddCardinalitiesToClassSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/v2/ontology/AddCardinalitiesToClassSpec.scala @@ -15,8 +15,8 @@ import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.store.triplestoremessages.SmartIriLiteralV2 -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* import org.knora.webapi.messages.v2.responder.ontologymessages.* +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.slice.ontology.domain.model.Cardinality.ZeroOrOne diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307Spec.scala index 8c88d7c4bd..55fec8224c 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307Spec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.store.triplestore.upgrade.plugins -import org.knora.webapi.messages.util.rdf.JenaRepository import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf.JenaRepository class UpgradePluginPR1307Spec extends UpgradePluginSpec { "Upgrade plugin PR1307" should { diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322Spec.scala index e93e8dc1c4..05d59b6001 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322Spec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.store.triplestore.upgrade.plugins -import org.knora.webapi.messages.util.rdf.JenaRepository import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf.JenaRepository class UpgradePluginPR1322Spec extends UpgradePluginSpec { "Upgrade plugin PR1322" should { diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372Spec.scala index 20995c970b..590e1e0464 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372Spec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.store.triplestore.upgrade.plugins -import org.knora.webapi.messages.util.rdf.JenaRepository import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf.JenaRepository class UpgradePluginPR1372Spec extends UpgradePluginSpec { "Upgrade plugin PR1372" should { diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615Spec.scala index e05b877235..9aee164867 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615Spec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.store.triplestore.upgrade.plugins -import org.knora.webapi.messages.util.rdf.JenaRepository import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf.JenaRepository class UpgradePluginPR1615Spec extends UpgradePluginSpec { "Upgrade plugin PR1615" should { diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018Spec.scala index 7427738b19..0664c5079c 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018Spec.scala @@ -7,8 +7,8 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import com.typesafe.scalalogging.LazyLogging -import org.knora.webapi.messages.util.rdf.JenaRepository import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf.JenaRepository class UpgradePluginPR2018Spec extends UpgradePluginSpec with LazyLogging { "Upgrade plugin PR2018" should { diff --git a/integration/src/test/scala/org/knora/webapi/testservices/TestClientService.scala b/integration/src/test/scala/org/knora/webapi/testservices/TestClientService.scala index e899a27c4a..4a47185180 100644 --- a/integration/src/test/scala/org/knora/webapi/testservices/TestClientService.scala +++ b/integration/src/test/scala/org/knora/webapi/testservices/TestClientService.scala @@ -20,8 +20,8 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager import org.apache.http.util.EntityUtils import org.apache.pekko import org.apache.pekko.actor.ActorSystem -import spray.json.JsObject import spray.json.* +import spray.json.JsObject import zio.* import java.nio.file.Path diff --git a/project/plugins.sbt b/project/plugins.sbt index 686e43ee70..2ffa540f9d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -14,7 +14,7 @@ addSbtPlugin("com.github.sbt" % "sbt-javaagent" % "0.1.8") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") // ad-hoc plugins - uncomment on demenad and keep it commented out in main branch diff --git a/webapi/src/main/scala/dsp/valueobjects/Schema.scala b/webapi/src/main/scala/dsp/valueobjects/Schema.scala index 33995599c3..1b8f21787b 100644 --- a/webapi/src/main/scala/dsp/valueobjects/Schema.scala +++ b/webapi/src/main/scala/dsp/valueobjects/Schema.scala @@ -6,9 +6,9 @@ package dsp.valueobjects import com.google.gwt.safehtml.shared.UriUtils.encodeAllowEscapes +import zio.prelude.* import zio.prelude.ZValidation.Failure import zio.prelude.ZValidation.Success -import zio.prelude.* import dsp.constants.SalsahGui import dsp.errors.ValidationException diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala index d5c71bdc31..a585a5e50a 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala @@ -15,8 +15,8 @@ import org.knora.webapi.messages.admin.responder.groupsmessages.GroupsADMJsonPro import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsADMJsonProtocol import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectsADMJsonProtocol -import org.knora.webapi.slice.admin.domain.model.Group import org.knora.webapi.slice.admin.domain.model.* +import org.knora.webapi.slice.admin.domain.model.Group ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Messages diff --git a/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessages.scala b/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessages.scala index ce9a218cdf..72ccf37d37 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessages.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessages.scala @@ -17,8 +17,8 @@ import scala.collection.mutable import dsp.errors.* import dsp.valueobjects.V2 import org.knora.webapi.* -import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.util.ErrorHandlingMap import org.knora.webapi.messages.util.rdf.* diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2.scala index 6dbe748f6e..60959d91d7 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2.scala @@ -25,8 +25,8 @@ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetRequestADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetResponse import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* -import org.knora.webapi.messages.store.triplestoremessages.SparqlExtendedConstructResponse.ConstructPredicateObjects import org.knora.webapi.messages.store.triplestoremessages.* +import org.knora.webapi.messages.store.triplestoremessages.SparqlExtendedConstructResponse.ConstructPredicateObjects import org.knora.webapi.messages.util.ConstructResponseUtilV2.FlatPredicateObjects import org.knora.webapi.messages.util.ConstructResponseUtilV2.FlatStatements import org.knora.webapi.messages.util.ConstructResponseUtilV2.MainResourcesAndValueRdfData diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/OntologyInferencer.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/OntologyInferencer.scala index 2b111a5c08..b481adb3f5 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/OntologyInferencer.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/OntologyInferencer.scala @@ -5,8 +5,8 @@ package org.knora.webapi.messages.util.search.gravsearch.transformers -import zio.ZLayer import zio.* +import zio.ZLayer import dsp.errors.GravsearchException import org.knora.webapi.messages.IriConversions.* diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2.scala index 31e940451f..4065b5ba81 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2.scala @@ -28,8 +28,8 @@ import org.knora.webapi.messages.util import org.knora.webapi.messages.util.DateUtil import org.knora.webapi.messages.util.KnoraCalendarPrecision import org.knora.webapi.messages.util.KnoraCalendarType -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* import org.knora.webapi.messages.v2.responder.ontologymessages.* +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* import org.knora.webapi.messages.v2.responder.standoffmessages.* import org.knora.webapi.slice.admin.domain.model.User import org.knora.webapi.slice.ontology.domain.model.Cardinality.AtLeastOne diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/resourcemessages/ResourceMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/resourcemessages/ResourceMessagesV2.scala index 0222a36970..086acdf902 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/resourcemessages/ResourceMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/resourcemessages/ResourceMessagesV2.scala @@ -27,8 +27,8 @@ import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetRequestADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetResponse import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* -import org.knora.webapi.messages.util.PermissionUtilADM.EntityPermission import org.knora.webapi.messages.util.* +import org.knora.webapi.messages.util.PermissionUtilADM.EntityPermission import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 import org.knora.webapi.messages.util.standoff.XMLUtil diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala index 07cd11b72d..95ca9aa122 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala @@ -30,8 +30,8 @@ import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.ValuesValidator import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM -import org.knora.webapi.messages.util.PermissionUtilADM.EntityPermission import org.knora.webapi.messages.util.* +import org.knora.webapi.messages.util.PermissionUtilADM.EntityPermission import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.util.standoff.StandoffStringUtil import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala index c131b6686e..db759008e2 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala @@ -26,8 +26,8 @@ import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* import org.knora.webapi.messages.admin.responder.usersmessages.* -import org.knora.webapi.messages.store.triplestoremessages.SparqlExtendedConstructResponse.ConstructPredicateObjects import org.knora.webapi.messages.store.triplestoremessages.* +import org.knora.webapi.messages.store.triplestoremessages.SparqlExtendedConstructResponse.ConstructPredicateObjects import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.responders.IriLocker diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/ListsResponder.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/ListsResponder.scala index 3449c1df64..99d281fb38 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/ListsResponder.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/ListsResponder.scala @@ -21,8 +21,8 @@ import org.knora.webapi.messages.OntologyConstants.Rdfs import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.listsmessages.* -import org.knora.webapi.messages.store.triplestoremessages.SparqlExtendedConstructResponse.ConstructPredicateObjects import org.knora.webapi.messages.store.triplestoremessages.* +import org.knora.webapi.messages.store.triplestoremessages.SparqlExtendedConstructResponse.ConstructPredicateObjects import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.responders.IriLocker import org.knora.webapi.responders.IriService diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponderADM.scala index c90a0f5c3c..e31182dbde 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponderADM.scala @@ -26,8 +26,8 @@ import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.groupsmessages.GroupGetADM import org.knora.webapi.messages.admin.responder.permissionsmessages -import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsMessagesUtilADM.PermissionTypeAndCodes import org.knora.webapi.messages.admin.responder.permissionsmessages.* +import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsMessagesUtilADM.PermissionTypeAndCodes import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala index 8c34ea8ecd..e868dbc2d7 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala @@ -16,11 +16,11 @@ import dsp.valueobjects.V2 import org.knora.webapi.* import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.admin.responder.permissionsmessages.* -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* import org.knora.webapi.messages.admin.responder.projectsmessages.* +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* import org.knora.webapi.messages.store.triplestoremessages.* import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.responders.IriLocker diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala index 558939ac41..73efb3f94f 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala @@ -19,8 +19,8 @@ import org.knora.webapi.* import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* import org.knora.webapi.messages.store.triplestoremessages.SmartIriLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 @@ -28,8 +28,8 @@ import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.messages.util.ErrorHandlingMap import org.knora.webapi.messages.v2.responder.CanDoResponseV2 import org.knora.webapi.messages.v2.responder.SuccessResponseV2 -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.KnoraCardinalityInfo import org.knora.webapi.messages.v2.responder.ontologymessages.* +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.KnoraCardinalityInfo import org.knora.webapi.responders.IriLocker import org.knora.webapi.responders.IriService import org.knora.webapi.responders.Responder diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourceUtilV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourceUtilV2.scala index db7516bc00..560412a131 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourceUtilV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourceUtilV2.scala @@ -6,8 +6,8 @@ package org.knora.webapi.responders.v2 import com.typesafe.scalalogging.LazyLogging -import zio.Task import zio.* +import zio.Task import dsp.errors.ForbiddenException import org.knora.webapi.IRI diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala index caadc3536a..c2360f3111 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala @@ -15,21 +15,21 @@ import scala.concurrent.Future import dsp.errors.* import dsp.valueobjects.Iri import dsp.valueobjects.UuidUtil -import org.knora.webapi.SchemaRendering.apiV2SchemaWithOption import org.knora.webapi.* +import org.knora.webapi.SchemaRendering.apiV2SchemaWithOption import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileRequest import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileResponse import org.knora.webapi.messages.twirl.queries.sparql +import org.knora.webapi.messages.util.* import org.knora.webapi.messages.util.ConstructResponseUtilV2.MappingAndXSLTransformation import org.knora.webapi.messages.util.PermissionUtilADM.DeletePermission import org.knora.webapi.messages.util.PermissionUtilADM.ModifyPermission -import org.knora.webapi.messages.util.* import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.util.search.gravsearch.GravsearchParser import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/StandoffResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/StandoffResponderV2.scala index b45a7a4cd0..45068cb5aa 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/StandoffResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/StandoffResponderV2.scala @@ -24,8 +24,8 @@ import org.knora.webapi.* import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ValuesResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ValuesResponderV2.scala index ba31a2884c..967d978b8b 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ValuesResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ValuesResponderV2.scala @@ -14,13 +14,13 @@ import java.util.UUID import dsp.errors.* import dsp.valueobjects.UuidUtil -import org.knora.webapi.SchemaRendering.apiV2SchemaWithOption import org.knora.webapi.* +import org.knora.webapi.SchemaRendering.apiV2SchemaWithOption import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionADM import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionType import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpers.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpers.scala index 0654284832..eac457e369 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpers.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpers.scala @@ -27,8 +27,8 @@ import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.messages.util.ErrorHandlingMap import org.knora.webapi.messages.util.rdf.SparqlSelectResult import org.knora.webapi.messages.util.rdf.VariableResultsRow -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* import org.knora.webapi.messages.v2.responder.ontologymessages.* +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* import org.knora.webapi.messages.v2.responder.standoffmessages.StandoffDataTypeClasses import org.knora.webapi.responders.IriService import org.knora.webapi.slice.admin.domain.model.User diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/resources/CheckObjectClassConstraints.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/resources/CheckObjectClassConstraints.scala index 751edf08b1..6c20218acf 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/resources/CheckObjectClassConstraints.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/resources/CheckObjectClassConstraints.scala @@ -9,8 +9,8 @@ import zio.* import dsp.errors.* import org.knora.webapi.* -import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.v2.responder.ontologymessages.* import org.knora.webapi.messages.v2.responder.resourcemessages.* import org.knora.webapi.messages.v2.responder.valuemessages.* diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/resources/CreateResourceV2Handler.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/resources/CreateResourceV2Handler.scala index 4b95ba77ca..ad01fd9183 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/resources/CreateResourceV2Handler.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/resources/CreateResourceV2Handler.scala @@ -15,22 +15,22 @@ import dsp.valueobjects.Iri import org.knora.webapi.* import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.admin.responder.permissionsmessages.DefaultObjectAccessPermissionsStringForResourceClassGetADM import org.knora.webapi.messages.admin.responder.permissionsmessages.DefaultObjectAccessPermissionsStringResponseADM import org.knora.webapi.messages.admin.responder.permissionsmessages.ResourceCreateOperation import org.knora.webapi.messages.admin.responder.projectsmessages.* import org.knora.webapi.messages.twirl.SparqlTemplateResourceToCreate import org.knora.webapi.messages.twirl.queries.sparql +import org.knora.webapi.messages.util.* import org.knora.webapi.messages.util.PermissionUtilADM.AGreaterThanB import org.knora.webapi.messages.util.PermissionUtilADM.PermissionComparisonResult -import org.knora.webapi.messages.util.* import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* import org.knora.webapi.messages.v2.responder.ontologymessages.* -import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceRequestV2.AssetIngestState +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceRequestV2.AssetIngestState import org.knora.webapi.messages.v2.responder.valuemessages.* import org.knora.webapi.responders.IriLocker import org.knora.webapi.responders.IriService diff --git a/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala b/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala index 97b489af1f..0f4ada8139 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala @@ -24,10 +24,10 @@ import org.knora.webapi.config.AppConfig import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.usersmessages.* import org.knora.webapi.messages.util.KnoraSystemInstances +import org.knora.webapi.messages.v2.routing.authenticationmessages.* import org.knora.webapi.messages.v2.routing.authenticationmessages.KnoraCredentialsV2.KnoraJWTTokenCredentialsV2 import org.knora.webapi.messages.v2.routing.authenticationmessages.KnoraCredentialsV2.KnoraPasswordCredentialsV2 import org.knora.webapi.messages.v2.routing.authenticationmessages.KnoraCredentialsV2.KnoraSessionCredentialsV2 -import org.knora.webapi.messages.v2.routing.authenticationmessages.* import org.knora.webapi.routing.Authenticator.AUTHENTICATION_INVALIDATION_CACHE_NAME import org.knora.webapi.routing.Authenticator.BAD_CRED_NONE_SUPPLIED import org.knora.webapi.routing.Authenticator.BAD_CRED_NOT_VALID diff --git a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilADM.scala b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilADM.scala index d36fdbdeec..7ef91acf71 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilADM.scala @@ -5,9 +5,9 @@ package org.knora.webapi.routing +import org.apache.pekko.http.scaladsl.model.* import org.apache.pekko.http.scaladsl.model.ContentTypes.`application/json` import org.apache.pekko.http.scaladsl.model.StatusCodes.OK -import org.apache.pekko.http.scaladsl.model.* import org.apache.pekko.http.scaladsl.server.RequestContext import org.apache.pekko.http.scaladsl.server.RouteResult import org.apache.pekko.util.ByteString diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/ResourcesRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/ResourcesRouteV2.scala index a3c53a749f..238bfce598 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/ResourcesRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/ResourcesRouteV2.scala @@ -26,9 +26,9 @@ import org.knora.webapi.messages.ValuesValidator import org.knora.webapi.messages.ValuesValidator.arkTimestampToInstant import org.knora.webapi.messages.ValuesValidator.xsdDateTimeStampToInstant import org.knora.webapi.messages.util.rdf.JsonLDUtil +import org.knora.webapi.messages.v2.responder.resourcemessages.* import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceRequestV2.AssetIngestState.AssetInTemp import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceRequestV2.AssetIngestState.AssetIngested -import org.knora.webapi.messages.v2.responder.resourcemessages.* import org.knora.webapi.messages.v2.responder.valuemessages.* import org.knora.webapi.responders.v2.SearchResponderV2 import org.knora.webapi.routing.Authenticator diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminPathVariables.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminPathVariables.scala index e485a53c97..06517b7dad 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminPathVariables.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminPathVariables.scala @@ -5,8 +5,8 @@ package org.knora.webapi.slice.admin.api -import sttp.tapir.CodecFormat.TextPlain import sttp.tapir.* +import sttp.tapir.CodecFormat.TextPlain import dsp.errors.BadRequestException import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.IriIdentifier diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/Codecs.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/Codecs.scala index ee1c2d0efa..2017159fc2 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/Codecs.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/Codecs.scala @@ -11,6 +11,7 @@ import zio.json.JsonCodec import dsp.valueobjects.V2 import org.knora.webapi.slice.admin.api.model.MaintenanceRequests.AssetId +import org.knora.webapi.slice.admin.domain.model.* import org.knora.webapi.slice.admin.domain.model.KnoraProject.* import org.knora.webapi.slice.admin.domain.model.ListProperties.Comments import org.knora.webapi.slice.admin.domain.model.ListProperties.Labels @@ -23,7 +24,6 @@ import org.knora.webapi.slice.admin.domain.model.SystemAdmin import org.knora.webapi.slice.admin.domain.model.UserIri import org.knora.webapi.slice.admin.domain.model.UserStatus import org.knora.webapi.slice.admin.domain.model.Username -import org.knora.webapi.slice.admin.domain.model.* import org.knora.webapi.slice.common.Value.BooleanValue import org.knora.webapi.slice.common.Value.IntValue import org.knora.webapi.slice.common.Value.StringValue diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/FilesEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/FilesEndpoints.scala index 816f42d639..6b86a9be11 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/FilesEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/FilesEndpoints.scala @@ -5,8 +5,8 @@ package org.knora.webapi.slice.admin.api -import sttp.tapir.EndpointInput.PathCapture import sttp.tapir.* +import sttp.tapir.EndpointInput.PathCapture import sttp.tapir.generic.auto.schemaForCaseClass import sttp.tapir.json.zio.jsonBody import zio.ZLayer diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/GroupsEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/GroupsEndpoints.scala index 4c71fd92cd..f36a096da6 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/GroupsEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/GroupsEndpoints.scala @@ -20,8 +20,8 @@ import org.knora.webapi.slice.admin.api.AdminPathVariables.groupIriPathVar import org.knora.webapi.slice.admin.api.GroupsRequests.GroupCreateRequest import org.knora.webapi.slice.admin.api.GroupsRequests.GroupStatusUpdateRequest import org.knora.webapi.slice.admin.api.GroupsRequests.GroupUpdateRequest -import org.knora.webapi.slice.admin.domain.model.KnoraProject.* import org.knora.webapi.slice.admin.domain.model.* +import org.knora.webapi.slice.admin.domain.model.KnoraProject.* import org.knora.webapi.slice.common.api.BaseEndpoints final case class GroupsEndpoints(baseEndpoints: BaseEndpoints) { diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpointsHandler.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpointsHandler.scala index 700d7b5206..651bd706b7 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpointsHandler.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpointsHandler.scala @@ -11,10 +11,10 @@ import zio.ZLayer import java.nio.file.Files import scala.concurrent.ExecutionContext +import org.knora.webapi.messages.admin.responder.projectsmessages.* import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.IriIdentifier import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.ShortcodeIdentifier import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.ShortnameIdentifier -import org.knora.webapi.messages.admin.responder.projectsmessages.* import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.ProjectCreateRequest import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.ProjectUpdateRequest import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.RestrictedViewResponse diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/ProjectsADMRestService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/ProjectsADMRestService.scala index 872d563b39..0410784da5 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/ProjectsADMRestService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/ProjectsADMRestService.scala @@ -10,8 +10,8 @@ import zio.macros.accessible import dsp.errors.BadRequestException import dsp.errors.NotFoundException -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* import org.knora.webapi.messages.admin.responder.projectsmessages.* +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* import org.knora.webapi.responders.admin.ProjectsResponderADM import org.knora.webapi.slice.admin.api.model.ProjectDataGetResponseADM import org.knora.webapi.slice.admin.api.model.ProjectExportInfoResponse diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLive.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLive.scala index bc35d7bfb8..1bd3102189 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLive.scala @@ -5,10 +5,10 @@ package org.knora.webapi.slice.admin.repo.service -import org.eclipse.rdf4j.model.vocabulary.RDF import org.eclipse.rdf4j.model.vocabulary.* -import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.prefix +import org.eclipse.rdf4j.model.vocabulary.RDF import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.`var` as variable +import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.prefix import org.eclipse.rdf4j.sparqlbuilder.core.query.ConstructQuery import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery import org.eclipse.rdf4j.sparqlbuilder.core.query.Queries @@ -23,11 +23,11 @@ import zio.stream.ZStream import dsp.valueobjects.V2 import org.knora.webapi.messages.OntologyConstants.KnoraAdmin import org.knora.webapi.slice.admin.AdminConstants.adminDataNamedGraph +import org.knora.webapi.slice.admin.domain.model.* import org.knora.webapi.slice.admin.domain.model.GroupIri import org.knora.webapi.slice.admin.domain.model.GroupStatus import org.knora.webapi.slice.admin.domain.model.KnoraGroup.Conversions.* import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri -import org.knora.webapi.slice.admin.domain.model._ import org.knora.webapi.slice.admin.domain.service.KnoraGroupRepo import org.knora.webapi.slice.admin.repo.rdf.RdfConversions.projectIriConverter import org.knora.webapi.slice.admin.repo.rdf.Vocabulary diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLive.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLive.scala index 3420762520..e0d8ee2edb 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLive.scala @@ -6,8 +6,8 @@ package org.knora.webapi.slice.admin.repo.service import org.eclipse.rdf4j.model.vocabulary.* -import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.prefix import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.`var` as variable +import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.prefix import org.eclipse.rdf4j.sparqlbuilder.core.query.ConstructQuery import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery import org.eclipse.rdf4j.sparqlbuilder.core.query.Queries diff --git a/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/api/ManagementEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/api/ManagementEndpoints.scala index 8485492915..f902a61a90 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/api/ManagementEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/api/ManagementEndpoints.scala @@ -6,8 +6,8 @@ package org.knora.webapi.slice.infrastructure.api import sttp.model.StatusCode -import sttp.tapir.AnyEndpoint import sttp.tapir.* +import sttp.tapir.AnyEndpoint import sttp.tapir.generic.auto.* import sttp.tapir.json.zio.jsonBody import sttp.tapir.statusCode diff --git a/webapi/src/main/scala/org/knora/webapi/slice/ontology/repo/service/OntologyCache.scala b/webapi/src/main/scala/org/knora/webapi/slice/ontology/repo/service/OntologyCache.scala index b486cc444b..7d1500968b 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/ontology/repo/service/OntologyCache.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/ontology/repo/service/OntologyCache.scala @@ -24,8 +24,8 @@ import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.messages.util.ErrorHandlingMap import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.messages.util.OntologyUtil -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* import org.knora.webapi.messages.v2.responder.ontologymessages.* +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* import org.knora.webapi.responders.v2.ontology.OntologyHelpers import org.knora.webapi.responders.v2.ontology.OntologyHelpers.OntologyGraph import org.knora.webapi.slice.admin.domain.model.User diff --git a/webapi/src/main/scala/org/knora/webapi/slice/search/api/SearchEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/search/api/SearchEndpoints.scala index 82d6b98398..ddcf547863 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/search/api/SearchEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/search/api/SearchEndpoints.scala @@ -24,9 +24,9 @@ import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.User import org.knora.webapi.slice.common.StringValueCompanion import org.knora.webapi.slice.common.Value.StringValue +import org.knora.webapi.slice.common.api.* import org.knora.webapi.slice.common.api.KnoraResponseRenderer.FormatOptions import org.knora.webapi.slice.common.api.KnoraResponseRenderer.RenderedResponse -import org.knora.webapi.slice.common.api.* import org.knora.webapi.slice.resourceinfo.domain.IriConverter import org.knora.webapi.slice.search.api.SearchEndpointsInputs.InputIri import org.knora.webapi.slice.search.api.SearchEndpointsInputs.Offset diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceLive.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceLive.scala index 8276b75b5e..8803787f45 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceLive.scala @@ -49,8 +49,8 @@ import dsp.errors.* import org.knora.webapi.* import org.knora.webapi.config.Triplestore import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.store.triplestoremessages.SparqlResultProtocol.* import org.knora.webapi.messages.store.triplestoremessages.* +import org.knora.webapi.messages.store.triplestoremessages.SparqlResultProtocol.* import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.slice.resourceinfo.domain.InternalIri import org.knora.webapi.store.triplestore.api.TriplestoreService diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdatePlan.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdatePlan.scala index 58e5669af4..4831baf386 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdatePlan.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdatePlan.scala @@ -8,8 +8,8 @@ package org.knora.webapi.store.triplestore.upgrade import com.typesafe.scalalogging.Logger import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject -import org.knora.webapi.store.triplestore.upgrade.plugins.UpgradePluginPR3110 import org.knora.webapi.store.triplestore.upgrade.plugins.* +import org.knora.webapi.store.triplestore.upgrade.plugins.UpgradePluginPR3110 /** * The plan for updating a repository to work with the current version of Knora. diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3110.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3110.scala index c89f3d97c5..2c7ab945d4 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3110.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3110.scala @@ -7,8 +7,8 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import org.eclipse.rdf4j.model.vocabulary.RDF import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.`var` as variable -import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery import org.eclipse.rdf4j.sparqlbuilder.core.query.* +import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf import org.knora.webapi.messages.OntologyConstants.KnoraAdmin.KnoraAdminPrefixExpansion diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3111.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3111.scala index d63c2619a3..661be65ed8 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3111.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3111.scala @@ -6,8 +6,8 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.`var` as variable -import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery import org.eclipse.rdf4j.sparqlbuilder.core.query.* +import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf import org.knora.webapi.slice.admin.AdminConstants diff --git a/webapi/src/main/scala/org/knora/webapi/util/Logger.scala b/webapi/src/main/scala/org/knora/webapi/util/Logger.scala index 83435f1e5a..ec41fde75a 100644 --- a/webapi/src/main/scala/org/knora/webapi/util/Logger.scala +++ b/webapi/src/main/scala/org/knora/webapi/util/Logger.scala @@ -4,11 +4,11 @@ */ package org.knora.webapi.util -import zio.LogLevel import zio.* +import zio.LogLevel +import zio.logging.* import zio.logging.LogFilter import zio.logging.LogFormat.* -import zio.logging.* import zio.logging.slf4j.bridge.Slf4jBridge object Logger { diff --git a/webapi/src/test/scala/dsp/valueobjects/SchemaCommandsSpec.scala b/webapi/src/test/scala/dsp/valueobjects/SchemaCommandsSpec.scala index d22df3395c..8cea6c46b6 100644 --- a/webapi/src/test/scala/dsp/valueobjects/SchemaCommandsSpec.scala +++ b/webapi/src/test/scala/dsp/valueobjects/SchemaCommandsSpec.scala @@ -5,8 +5,8 @@ package dsp.valueobjects -import zio.test.Assertion.* import zio.test.* +import zio.test.Assertion.* import java.time.Instant diff --git a/webapi/src/test/scala/org/knora/webapi/TestDataFactory.scala b/webapi/src/test/scala/org/knora/webapi/TestDataFactory.scala index 6588f42614..846b1ff960 100644 --- a/webapi/src/test/scala/org/knora/webapi/TestDataFactory.scala +++ b/webapi/src/test/scala/org/knora/webapi/TestDataFactory.scala @@ -11,6 +11,7 @@ import zio.NonEmptyChunk import dsp.valueobjects.LanguageCode import dsp.valueobjects.V2 import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* +import org.knora.webapi.slice.admin.domain.model.* import org.knora.webapi.slice.admin.domain.model.Email import org.knora.webapi.slice.admin.domain.model.FamilyName import org.knora.webapi.slice.admin.domain.model.GivenName @@ -23,7 +24,6 @@ import org.knora.webapi.slice.admin.domain.model.SystemAdmin import org.knora.webapi.slice.admin.domain.model.UserIri import org.knora.webapi.slice.admin.domain.model.UserStatus import org.knora.webapi.slice.admin.domain.model.Username -import org.knora.webapi.slice.admin.domain.model._ /** * Helps in creating value objects for tests. diff --git a/webapi/src/test/scala/org/knora/webapi/ValuesValidatorSpec.scala b/webapi/src/test/scala/org/knora/webapi/ValuesValidatorSpec.scala index 55c2111838..246158b04a 100644 --- a/webapi/src/test/scala/org/knora/webapi/ValuesValidatorSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/ValuesValidatorSpec.scala @@ -5,8 +5,8 @@ package org.knora.webapi -import zio.test.Assertion.* import zio.test.* +import zio.test.Assertion.* import java.time.Instant diff --git a/webapi/src/test/scala/org/knora/webapi/core/MessageRelaySpec.scala b/webapi/src/test/scala/org/knora/webapi/core/MessageRelaySpec.scala index 766f929b81..5fbbea46df 100644 --- a/webapi/src/test/scala/org/knora/webapi/core/MessageRelaySpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/core/MessageRelaySpec.scala @@ -6,10 +6,10 @@ package org.knora.webapi.core import zio.* +import zio.test.* import zio.test.Assertion.anything import zio.test.Assertion.dies import zio.test.Assertion.isSubtype -import zio.test.* import org.knora.webapi.messages.ResponderRequest diff --git a/webapi/src/test/scala/org/knora/webapi/routing/RouteUtilZSpec.scala b/webapi/src/test/scala/org/knora/webapi/routing/RouteUtilZSpec.scala index 52faef055f..05d1c818ef 100644 --- a/webapi/src/test/scala/org/knora/webapi/routing/RouteUtilZSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/routing/RouteUtilZSpec.scala @@ -5,9 +5,9 @@ package org.knora.webapi.routing +import zio.test.* import zio.test.Assertion.* import zio.test.ZIOSpecDefault -import zio.test.* import zio.test.assertTrue import dsp.errors.BadRequestException diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/api/service/AuthorizationRestServiceSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/api/service/AuthorizationRestServiceSpec.scala index 5eef5b8fb2..6ca6cecc8c 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/api/service/AuthorizationRestServiceSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/api/service/AuthorizationRestServiceSpec.scala @@ -7,8 +7,8 @@ package org.knora.webapi.slice.admin.api.service import zio.Exit import zio.ZIO -import zio.test.Assertion.failsWithA import zio.test.* +import zio.test.Assertion.failsWithA import dsp.errors.ForbiddenException import org.knora.webapi.TestDataFactory diff --git a/webapi/src/test/scala/org/knora/webapi/slice/common/repo/InMemoryCrudRepositorySpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/common/repo/InMemoryCrudRepositorySpec.scala index ac609cc5d0..e1f8cb00bd 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/common/repo/InMemoryCrudRepositorySpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/common/repo/InMemoryCrudRepositorySpec.scala @@ -8,8 +8,8 @@ package org.knora.webapi.slice.common.repo import zio.Ref import zio.ZIO import zio.ZLayer -import zio.test.Assertion.hasSameElements import zio.test.* +import zio.test.Assertion.hasSameElements final case class SomeEntity(id: Int, name: String) final case class InMemoryRepository(entities: Ref[List[SomeEntity]]) diff --git a/webapi/src/test/scala/org/knora/webapi/slice/common/repo/rdf/RdfModelSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/common/repo/rdf/RdfModelSpec.scala index 543d880bef..93a99d0f58 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/common/repo/rdf/RdfModelSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/common/repo/rdf/RdfModelSpec.scala @@ -6,8 +6,8 @@ package org.knora.webapi.slice.common.repo.rdf import zio.* -import zio.test.Assertion.* import zio.test.* +import zio.test.Assertion.* import org.knora.webapi.slice.common.repo.rdf.Errors.* import org.knora.webapi.slice.resourceinfo.domain.InternalIri diff --git a/webapi/src/test/scala/org/knora/webapi/slice/common/repo/service/InMemoryCrudRepositorySpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/common/repo/service/InMemoryCrudRepositorySpec.scala index 07c4f37eba..8b7f528da9 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/common/repo/service/InMemoryCrudRepositorySpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/common/repo/service/InMemoryCrudRepositorySpec.scala @@ -8,8 +8,8 @@ package org.knora.webapi.slice.common.repo.service import zio.Ref import zio.ZIO import zio.ZLayer -import zio.test.Assertion.hasSameElements import zio.test.* +import zio.test.Assertion.hasSameElements final case class SomeEntity(id: Int, name: String) final case class InMemoryRepository(entities: Ref[List[SomeEntity]]) diff --git a/webapi/src/test/scala/org/knora/webapi/slice/ontology/api/service/RestCardinalityServiceLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/ontology/api/service/RestCardinalityServiceLiveSpec.scala index bfe2d3605d..2b8477364a 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/ontology/api/service/RestCardinalityServiceLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/ontology/api/service/RestCardinalityServiceLiveSpec.scala @@ -21,8 +21,8 @@ import org.knora.webapi.slice.ontology.domain.ReadOntologyV2Builder import org.knora.webapi.slice.ontology.domain.model.Cardinality import org.knora.webapi.slice.ontology.domain.service.CardinalityService import org.knora.webapi.slice.ontology.domain.service.ChangeCardinalityCheckResult -import org.knora.webapi.slice.ontology.domain.service.ChangeCardinalityCheckResult.CanReplaceCardinalityCheckResult.IsInUseCheckFailure import org.knora.webapi.slice.ontology.domain.service.ChangeCardinalityCheckResult.* +import org.knora.webapi.slice.ontology.domain.service.ChangeCardinalityCheckResult.CanReplaceCardinalityCheckResult.IsInUseCheckFailure import org.knora.webapi.slice.ontology.repo.service.OntologyCacheFake import org.knora.webapi.slice.ontology.repo.service.OntologyRepoLive import org.knora.webapi.slice.resourceinfo.domain.InternalIri diff --git a/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/CardinalityServiceLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/CardinalityServiceLiveSpec.scala index 10b7e87c57..a968ce344f 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/CardinalityServiceLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/CardinalityServiceLiveSpec.scala @@ -9,8 +9,8 @@ import org.apache.jena.query.Dataset import zio.Random import zio.Ref import zio.ZLayer -import zio.test.ZIOSpecDefault import zio.test.* +import zio.test.ZIOSpecDefault import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/service/PredicateRepositoryLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/service/PredicateRepositoryLiveSpec.scala index 2e1f06dcd8..ab40fc0ebd 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/service/PredicateRepositoryLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/service/PredicateRepositoryLiveSpec.scala @@ -7,8 +7,8 @@ package org.knora.webapi.slice.ontology.domain.service import org.apache.jena.query.Dataset import zio.Ref import zio.ZLayer -import zio.test.Assertion.* import zio.test.* +import zio.test.Assertion.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.slice.ontology.repo.service.PredicateRepositoryLive diff --git a/webapi/src/test/scala/org/knora/webapi/slice/ontology/repo/OntologyCacheFakeSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/ontology/repo/OntologyCacheFakeSpec.scala index 1297b4049a..e73dddd753 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/ontology/repo/OntologyCacheFakeSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/ontology/repo/OntologyCacheFakeSpec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.slice.ontology.repo -import zio.test.ZIOSpecDefault import zio.test.* +import zio.test.ZIOSpecDefault import org.knora.webapi.messages.StringFormatter import org.knora.webapi.slice.ontology.repo.service.OntologyCache diff --git a/webapi/src/test/scala/org/knora/webapi/slice/ontology/repo/service/OntologyRepoLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/ontology/repo/service/OntologyRepoLiveSpec.scala index c63b425a47..f46d3c381f 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/ontology/repo/service/OntologyRepoLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/ontology/repo/service/OntologyRepoLiveSpec.scala @@ -6,8 +6,8 @@ package org.knora.webapi.slice.ontology.repo.service import zio.Scope -import zio.test.ZIOSpecDefault import zio.test.* +import zio.test.ZIOSpecDefault import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemorySpec.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemorySpec.scala index fe54b5f920..3ea66e1813 100644 --- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemorySpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemorySpec.scala @@ -8,8 +8,8 @@ import org.apache.jena.query.Dataset import org.apache.jena.query.ReadWrite import zio.Ref import zio.ZIO -import zio.test.Assertion.hasSameElements import zio.test.* +import zio.test.Assertion.hasSameElements import java.nio.file.Files import java.util.UUID