diff --git a/.scalafix.conf b/.scalafix.conf index 4e8ddb9f41..23d26b0f7b 100644 --- a/.scalafix.conf +++ b/.scalafix.conf @@ -16,5 +16,5 @@ OrganizeImports { importsOrder = Ascii preset = DEFAULT removeUnused = false - targetDialect = Scala2 + targetDialect = Scala3 } diff --git a/integration/src/test/scala/org/knora/sipi/SipiIT.scala b/integration/src/test/scala/org/knora/sipi/SipiIT.scala index d5e0bf3eb2..a408c874f0 100644 --- a/integration/src/test/scala/org/knora/sipi/SipiIT.scala +++ b/integration/src/test/scala/org/knora/sipi/SipiIT.scala @@ -7,21 +7,21 @@ package org.knora.sipi import com.github.tomakehurst.wiremock.WireMockServer import com.github.tomakehurst.wiremock.client.CountMatchingStrategy -import com.github.tomakehurst.wiremock.client.WireMock._ +import com.github.tomakehurst.wiremock.client.WireMock.* import com.github.tomakehurst.wiremock.core.WireMockConfiguration.options import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.newRequestPattern -import zio._ -import zio.http._ +import zio.* +import zio.http.* import zio.json.DecoderOps import zio.json.ast.Json -import zio.test._ +import zio.test.* import scala.util.Failure import scala.util.Success import scala.util.Try -import org.knora.sipi.MockDspApiServer.verify._ +import org.knora.sipi.MockDspApiServer.verify.* import org.knora.webapi.config.AppConfig import org.knora.webapi.messages.util.KnoraSystemInstances.Users.SystemUser import org.knora.webapi.routing.InvalidTokenCache diff --git a/integration/src/test/scala/org/knora/webapi/CoreSpec.scala b/integration/src/test/scala/org/knora/webapi/CoreSpec.scala index 7c2f6670fd..d991869754 100644 --- a/integration/src/test/scala/org/knora/webapi/CoreSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/CoreSpec.scala @@ -12,8 +12,8 @@ import org.apache.pekko.testkit.TestKitBase import org.scalatest.BeforeAndAfterAll import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import zio.* import zio.ZIO -import zio._ import scala.concurrent.ExecutionContext import scala.concurrent.duration.FiniteDuration diff --git a/integration/src/test/scala/org/knora/webapi/E2ESpec.scala b/integration/src/test/scala/org/knora/webapi/E2ESpec.scala index ebb9fd9561..9b04457f43 100644 --- a/integration/src/test/scala/org/knora/webapi/E2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/E2ESpec.scala @@ -5,18 +5,18 @@ package org.knora.webapi -import com.typesafe.scalalogging._ +import com.typesafe.scalalogging.* import org.apache.pekko import org.apache.pekko.http.scaladsl.client.RequestBuilding -import org.apache.pekko.http.scaladsl.model._ +import org.apache.pekko.http.scaladsl.model.* import org.apache.pekko.testkit.TestKitBase import org.scalatest.BeforeAndAfterAll import org.scalatest.concurrent.ScalaFutures import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import spray.json._ -import zio._ -import zio.json._ +import spray.json.* +import zio.* +import zio.json.* import java.nio.file.Files import java.nio.file.Path @@ -35,7 +35,7 @@ import org.knora.webapi.core.TestStartupUtils import org.knora.webapi.messages.store.sipimessages.SipiUploadResponse import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.routing.KnoraRouteData import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.testservices.FileToUpload diff --git a/integration/src/test/scala/org/knora/webapi/E2EZSpec.scala b/integration/src/test/scala/org/knora/webapi/E2EZSpec.scala index 62919879a6..4226e400ae 100644 --- a/integration/src/test/scala/org/knora/webapi/E2EZSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/E2EZSpec.scala @@ -5,12 +5,12 @@ package org.knora.webapi -import zio._ -import zio.http._ -import zio.json._ +import zio.* +import zio.http.* +import zio.json.* import zio.json.ast.Json import zio.json.ast.JsonCursor -import zio.test._ +import zio.test.* import org.knora.webapi.core.AppServer import org.knora.webapi.core.LayersTest diff --git a/integration/src/test/scala/org/knora/webapi/ITKnoraLiveSpec.scala b/integration/src/test/scala/org/knora/webapi/ITKnoraLiveSpec.scala index eb43e66605..2db0889701 100644 --- a/integration/src/test/scala/org/knora/webapi/ITKnoraLiveSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/ITKnoraLiveSpec.scala @@ -9,13 +9,13 @@ import com.typesafe.scalalogging.LazyLogging import com.typesafe.scalalogging.Logger import org.apache.pekko import org.apache.pekko.http.scaladsl.client.RequestBuilding -import org.apache.pekko.http.scaladsl.model._ +import org.apache.pekko.http.scaladsl.model.* import org.apache.pekko.testkit.TestKitBase import org.scalatest.BeforeAndAfterAll import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import spray.json._ -import zio._ +import spray.json.* +import zio.* import java.util.concurrent.TimeUnit import scala.concurrent.Await @@ -28,7 +28,7 @@ import org.knora.webapi.core.AppRouter import org.knora.webapi.core.AppServer import org.knora.webapi.core.LayersTest.DefaultTestEnvironmentWithSipi import org.knora.webapi.core.TestStartupUtils -import org.knora.webapi.messages.store.sipimessages._ +import org.knora.webapi.messages.store.sipimessages.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol import org.knora.webapi.messages.util.rdf.JsonLDDocument diff --git a/integration/src/test/scala/org/knora/webapi/R2RSpec.scala b/integration/src/test/scala/org/knora/webapi/R2RSpec.scala index e38b16a282..58501df0ec 100644 --- a/integration/src/test/scala/org/knora/webapi/R2RSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/R2RSpec.scala @@ -13,7 +13,7 @@ import org.apache.pekko.http.scaladsl.testkit.ScalatestRouteTest import org.scalatest.BeforeAndAfterAll import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import zio._ +import zio.* import java.nio.file.Files import java.nio.file.Path @@ -28,7 +28,7 @@ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.AppServer import org.knora.webapi.core.TestStartupUtils import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.routing.KnoraRouteData import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.util.FileUtil diff --git a/integration/src/test/scala/org/knora/webapi/config/AppConfigForTestContainers.scala b/integration/src/test/scala/org/knora/webapi/config/AppConfigForTestContainers.scala index 2b548cdcee..af16e6fb23 100644 --- a/integration/src/test/scala/org/knora/webapi/config/AppConfigForTestContainers.scala +++ b/integration/src/test/scala/org/knora/webapi/config/AppConfigForTestContainers.scala @@ -6,8 +6,8 @@ package org.knora.webapi.config import com.typesafe.config.ConfigFactory -import zio._ -import zio.config._ +import zio.* +import zio.config.* import zio.config.typesafe.TypesafeConfigProvider import org.knora.webapi.config.AppConfig.AppConfigurations diff --git a/integration/src/test/scala/org/knora/webapi/config/AppConfigForTestContainersZSpec.scala b/integration/src/test/scala/org/knora/webapi/config/AppConfigForTestContainersZSpec.scala index 452dc0633b..5d17f88929 100644 --- a/integration/src/test/scala/org/knora/webapi/config/AppConfigForTestContainersZSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/config/AppConfigForTestContainersZSpec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.config -import zio._ -import zio.test._ +import zio.* +import zio.test.* import org.knora.webapi.testcontainers.DspIngestTestContainer import org.knora.webapi.testcontainers.FusekiTestContainer diff --git a/integration/src/test/scala/org/knora/webapi/core/ActorSystemTest.scala b/integration/src/test/scala/org/knora/webapi/core/ActorSystemTest.scala index 2314ac581e..e95614994d 100644 --- a/integration/src/test/scala/org/knora/webapi/core/ActorSystemTest.scala +++ b/integration/src/test/scala/org/knora/webapi/core/ActorSystemTest.scala @@ -6,7 +6,7 @@ package org.knora.webapi.core import org.apache.pekko.actor.ActorSystem -import zio._ +import zio.* object ActorSystemTest { def layer(sys: ActorSystem): ZLayer[Any, Nothing, ActorSystem] = ZLayer.succeed(sys) diff --git a/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala b/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala index 69ed50ff9c..66030eecce 100644 --- a/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala +++ b/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala @@ -6,7 +6,7 @@ package org.knora.webapi.core import org.apache.pekko -import zio._ +import zio.* import org.knora.sipi.SipiServiceTestDelegator import org.knora.sipi.WhichSipiService @@ -15,7 +15,7 @@ import org.knora.webapi.config.AppConfig.AppConfigurationsTest import org.knora.webapi.config.AppConfigForTestContainers import org.knora.webapi.config.JwtConfig import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util._ +import org.knora.webapi.messages.util.* import org.knora.webapi.messages.util.search.QueryTraverser import org.knora.webapi.messages.util.search.gravsearch.prequery.InferenceOptimizationService import org.knora.webapi.messages.util.search.gravsearch.transformers.ConstructTransformer @@ -24,22 +24,22 @@ import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInsp import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2Live import org.knora.webapi.responders.IriService -import org.knora.webapi.responders.admin._ -import org.knora.webapi.responders.v2._ +import org.knora.webapi.responders.admin.* +import org.knora.webapi.responders.v2.* import org.knora.webapi.responders.v2.ontology.CardinalityHandler import org.knora.webapi.responders.v2.ontology.OntologyHelpers import org.knora.webapi.responders.v2.ontology.OntologyHelpersLive -import org.knora.webapi.routing._ +import org.knora.webapi.routing.* import org.knora.webapi.slice.admin.AdminModule +import org.knora.webapi.slice.admin.api.* import org.knora.webapi.slice.admin.api.AdminApiModule -import org.knora.webapi.slice.admin.api._ import org.knora.webapi.slice.admin.api.service.GroupRestService import org.knora.webapi.slice.admin.api.service.PermissionRestService import org.knora.webapi.slice.admin.api.service.ProjectRestService import org.knora.webapi.slice.admin.api.service.UserRestService +import org.knora.webapi.slice.admin.domain.service.* import org.knora.webapi.slice.admin.domain.service.ProjectExportStorageService -import org.knora.webapi.slice.admin.domain.service._ -import org.knora.webapi.slice.common.api._ +import org.knora.webapi.slice.common.api.* import org.knora.webapi.slice.common.repo.service.PredicateObjectMapper import org.knora.webapi.slice.infrastructure.JwtService import org.knora.webapi.slice.infrastructure.JwtServiceLive diff --git a/integration/src/test/scala/org/knora/webapi/core/TestStartupUtils.scala b/integration/src/test/scala/org/knora/webapi/core/TestStartupUtils.scala index dd31ea0f01..a4e0ca457f 100644 --- a/integration/src/test/scala/org/knora/webapi/core/TestStartupUtils.scala +++ b/integration/src/test/scala/org/knora/webapi/core/TestStartupUtils.scala @@ -6,7 +6,7 @@ package org.knora.webapi.core import com.typesafe.scalalogging.LazyLogging -import zio._ +import zio.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.util.KnoraSystemInstances diff --git a/integration/src/test/scala/org/knora/webapi/e2e/CORSSupportE2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/CORSSupportE2ESpec.scala index 1bbb9cee12..4d8e10c216 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/CORSSupportE2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/CORSSupportE2ESpec.scala @@ -13,10 +13,10 @@ import scala.concurrent.duration.NANOSECONDS import org.knora.webapi.E2ESpec import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject -import pekko.http.scaladsl.model.HttpMethods._ +import pekko.http.scaladsl.model.HttpMethods.* import pekko.http.scaladsl.model.HttpResponse import pekko.http.scaladsl.model.StatusCodes -import pekko.http.scaladsl.model.headers._ +import pekko.http.scaladsl.model.headers.* import pekko.http.scaladsl.testkit.RouteTestTimeout /** diff --git a/integration/src/test/scala/org/knora/webapi/e2e/ExceptionHandlerR2RSpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/ExceptionHandlerR2RSpec.scala index 127fb16892..c8f34038ca 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/ExceptionHandlerR2RSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/ExceptionHandlerR2RSpec.scala @@ -7,12 +7,12 @@ package org.knora.webapi.e2e import org.apache.pekko -import dsp.errors._ -import org.knora.webapi._ +import dsp.errors.* +import org.knora.webapi.* import org.knora.webapi.http.handler -import pekko.http.scaladsl.model._ -import pekko.http.scaladsl.server.Directives._ +import pekko.http.scaladsl.model.* +import pekko.http.scaladsl.server.Directives.* import pekko.http.scaladsl.server.Route /** diff --git a/integration/src/test/scala/org/knora/webapi/e2e/HealthRouteE2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/HealthRouteE2ESpec.scala index b64bbc9e04..32e0a3cae2 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/HealthRouteE2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/HealthRouteE2ESpec.scala @@ -16,7 +16,7 @@ import org.knora.webapi.E2ESpec import org.knora.webapi.core.State import org.knora.webapi.core.domain.AppState -import pekko.http.scaladsl.model._ +import pekko.http.scaladsl.model.* import pekko.http.scaladsl.testkit.RouteTestTimeout /** diff --git a/integration/src/test/scala/org/knora/webapi/e2e/InstanceChecker.scala b/integration/src/test/scala/org/knora/webapi/e2e/InstanceChecker.scala index ddba02044e..690f29724d 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/InstanceChecker.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/InstanceChecker.scala @@ -12,14 +12,14 @@ import scala.collection.mutable import dsp.errors.AssertionException import dsp.errors.BadRequestException -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util._ -import org.knora.webapi.messages.util.rdf._ -import org.knora.webapi.messages.v2.responder.ontologymessages._ +import org.knora.webapi.messages.util.* +import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.v2.responder.ontologymessages.* import org.knora.webapi.slice.ontology.domain.model.Cardinality.AtLeastOne import org.knora.webapi.slice.ontology.domain.model.Cardinality.ExactlyOne import org.knora.webapi.slice.ontology.domain.model.Cardinality.ZeroOrOne diff --git a/integration/src/test/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala index 7774a2b331..4344db0211 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala @@ -13,7 +13,7 @@ import scala.concurrent.duration.NANOSECONDS import dsp.errors.AssertionException import org.knora.webapi.E2ESpec -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.util.FileUtil diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/AdminFilesE2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/AdminFilesE2ESpec.scala index faa386d4c1..6f1f55e436 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/admin/AdminFilesE2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/admin/AdminFilesE2ESpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.e2e.admin -import org.apache.pekko.http.scaladsl.model._ +import org.apache.pekko.http.scaladsl.model.* import org.apache.pekko.http.scaladsl.model.headers.BasicHttpCredentials import zio.ZIO diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/GroupsADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/GroupsADME2ESpec.scala index c502d0cc5d..1bcacf945c 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/admin/GroupsADME2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/admin/GroupsADME2ESpec.scala @@ -9,18 +9,18 @@ import org.apache.pekko import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport import scala.concurrent.Await -import scala.concurrent.duration._ +import scala.concurrent.duration.* import org.knora.webapi.E2ESpec -import org.knora.webapi.messages.admin.responder.IntegrationTestAdminJsonProtocol._ +import org.knora.webapi.messages.admin.responder.IntegrationTestAdminJsonProtocol.* import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.slice.admin.domain.model.Group import org.knora.webapi.util.AkkaHttpUtils import org.knora.webapi.util.MutableTestIri -import pekko.http.scaladsl.model._ -import pekko.http.scaladsl.model.headers._ +import pekko.http.scaladsl.model.* +import pekko.http.scaladsl.model.headers.* import pekko.http.scaladsl.testkit.RouteTestTimeout import pekko.http.scaladsl.unmarshalling.Unmarshal diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/PermissionsADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/PermissionsADME2ESpec.scala index 16d539446c..356691d7d0 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/admin/PermissionsADME2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/admin/PermissionsADME2ESpec.scala @@ -6,15 +6,15 @@ package org.knora.webapi.e2e.admin import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport -import org.apache.pekko.http.scaladsl.model._ +import org.apache.pekko.http.scaladsl.model.* import org.apache.pekko.http.scaladsl.model.headers.BasicHttpCredentials -import spray.json._ +import spray.json.* import zio.durationInt import java.net.URLEncoder import org.knora.webapi.E2ESpec -import org.knora.webapi.messages.admin.responder.IntegrationTestAdminJsonProtocol._ +import org.knora.webapi.messages.admin.responder.IntegrationTestAdminJsonProtocol.* import org.knora.webapi.messages.admin.responder.permissionsmessages.AdministrativePermissionGetResponseADM import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM import org.knora.webapi.sharedtestdata.SharedTestDataADM diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/ProjectsADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/ProjectsADME2ESpec.scala index c573879b69..c651e0cff7 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/admin/ProjectsADME2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/admin/ProjectsADME2ESpec.scala @@ -18,17 +18,17 @@ import spray.json.jsonReader import java.net.URLEncoder import scala.concurrent.Await import scala.concurrent.Future -import scala.concurrent.duration._ +import scala.concurrent.duration.* import org.knora.webapi.E2ESpec import org.knora.webapi.IRI -import org.knora.webapi.messages.admin.responder.IntegrationTestAdminJsonProtocol._ +import org.knora.webapi.messages.admin.responder.IntegrationTestAdminJsonProtocol.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.messages.util.rdf.RdfModel import org.knora.webapi.sharedtestdata.SharedTestDataADM +import org.knora.webapi.slice.admin.api.model.* import org.knora.webapi.slice.admin.api.model.ProjectMembersGetResponseADM -import org.knora.webapi.slice.admin.api.model._ import org.knora.webapi.slice.admin.domain.model.User import org.knora.webapi.util.AkkaHttpUtils import org.knora.webapi.util.MutableTestIri diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/UsersADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/UsersADME2ESpec.scala index 92512eee78..1d8565f428 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/admin/UsersADME2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/admin/UsersADME2ESpec.scala @@ -10,11 +10,11 @@ import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport import java.net.URLEncoder import scala.concurrent.Await -import scala.concurrent.duration._ +import scala.concurrent.duration.* +import org.knora.webapi.* import org.knora.webapi.E2ESpec -import org.knora.webapi._ -import org.knora.webapi.messages.admin.responder.IntegrationTestAdminJsonProtocol._ +import org.knora.webapi.messages.admin.responder.IntegrationTestAdminJsonProtocol.* import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.sharedtestdata.SharedTestDataADM2 @@ -24,8 +24,8 @@ import org.knora.webapi.slice.admin.domain.model.User import org.knora.webapi.util.AkkaHttpUtils import org.knora.webapi.util.MutableTestIri -import pekko.http.scaladsl.model._ -import pekko.http.scaladsl.model.headers._ +import pekko.http.scaladsl.model.* +import pekko.http.scaladsl.model.headers.* import pekko.http.scaladsl.unmarshalling.Unmarshal /** diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/CreateListItemsRouteADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/CreateListItemsRouteADME2ESpec.scala index 92e7f7215a..0954174867 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/CreateListItemsRouteADME2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/CreateListItemsRouteADME2ESpec.scala @@ -8,19 +8,19 @@ package org.knora.webapi.e2e.admin.lists import org.apache.pekko import scala.concurrent.Await -import scala.concurrent.duration._ +import scala.concurrent.duration.* import org.knora.webapi.E2ESpec import org.knora.webapi.IRI import org.knora.webapi.e2e.admin.lists -import org.knora.webapi.messages.admin.responder.listsmessages._ +import org.knora.webapi.messages.admin.responder.listsmessages.* import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.util.AkkaHttpUtils import org.knora.webapi.util.MutableTestIri -import pekko.http.scaladsl.model._ +import pekko.http.scaladsl.model.* import pekko.http.scaladsl.testkit.RouteTestTimeout import pekko.http.scaladsl.unmarshalling.Unmarshal diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/DeleteListItemsRouteADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/DeleteListItemsRouteADME2ESpec.scala index 1eda523d6c..05e06ccf26 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/DeleteListItemsRouteADME2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/DeleteListItemsRouteADME2ESpec.scala @@ -7,10 +7,10 @@ package org.knora.webapi.e2e.admin.lists import org.apache.pekko -import scala.concurrent.duration._ +import scala.concurrent.duration.* import org.knora.webapi.E2ESpec -import org.knora.webapi.messages.admin.responder.listsmessages._ +import org.knora.webapi.messages.admin.responder.listsmessages.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol import org.knora.webapi.sharedtestdata.SharedListsTestDataADM diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/GetListItemsRouteADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/GetListItemsRouteADME2ESpec.scala index ec6806479f..f5b1862598 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/GetListItemsRouteADME2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/GetListItemsRouteADME2ESpec.scala @@ -7,18 +7,18 @@ package org.knora.webapi.e2e.admin.lists import org.apache.pekko -import scala.concurrent.duration._ +import scala.concurrent.duration.* import org.knora.webapi.E2ESpec -import org.knora.webapi.messages.admin.responder.listsmessages._ +import org.knora.webapi.messages.admin.responder.listsmessages.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol import org.knora.webapi.sharedtestdata.SharedListsTestDataADM import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.util.AkkaHttpUtils -import pekko.http.scaladsl.model._ -import pekko.http.scaladsl.model.headers._ +import pekko.http.scaladsl.model.* +import pekko.http.scaladsl.model.headers.* import pekko.http.scaladsl.testkit.RouteTestTimeout /** diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/UpdateListItemsRouteADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/UpdateListItemsRouteADME2ESpec.scala index f8d86c5c66..c9a8d367a9 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/UpdateListItemsRouteADME2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/UpdateListItemsRouteADME2ESpec.scala @@ -7,10 +7,10 @@ package org.knora.webapi.e2e.admin.lists import org.apache.pekko -import scala.concurrent.duration._ +import scala.concurrent.duration.* import org.knora.webapi.E2ESpec -import org.knora.webapi.messages.admin.responder.listsmessages._ +import org.knora.webapi.messages.admin.responder.listsmessages.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol diff --git a/integration/src/test/scala/org/knora/webapi/e2e/v2/AuthenticationV2E2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/v2/AuthenticationV2E2ESpec.scala index 6a7663500c..fd62999cc1 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/v2/AuthenticationV2E2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/v2/AuthenticationV2E2ESpec.scala @@ -10,7 +10,7 @@ import zio.ZIO import zio.json.ast.Json import scala.concurrent.Await -import scala.concurrent.duration._ +import scala.concurrent.duration.* import org.knora.webapi.E2ESpec import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol @@ -21,8 +21,8 @@ import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.util.MutableTestString -import pekko.http.scaladsl.model._ -import pekko.http.scaladsl.model.headers._ +import pekko.http.scaladsl.model.* +import pekko.http.scaladsl.model.headers.* import pekko.http.scaladsl.unmarshalling.Unmarshal /** diff --git a/integration/src/test/scala/org/knora/webapi/e2e/v2/JSONLDHandlingV2R2RSpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/v2/JSONLDHandlingV2R2RSpec.scala index 397de7d9f1..62daa0273b 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/v2/JSONLDHandlingV2R2RSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/v2/JSONLDHandlingV2R2RSpec.scala @@ -6,14 +6,14 @@ package org.knora.webapi.e2e.v2 import org.apache.pekko -import spray.json._ +import spray.json.* import java.net.URLEncoder import java.nio.file.Paths import scala.concurrent.ExecutionContextExecutor -import org.knora.webapi._ -import org.knora.webapi.e2e.v2.ResponseCheckerV2._ +import org.knora.webapi.* +import org.knora.webapi.e2e.v2.ResponseCheckerV2.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.util.rdf.JsonLDUtil import org.knora.webapi.routing.v2.ResourcesRouteV2 diff --git a/integration/src/test/scala/org/knora/webapi/e2e/v2/ListsRouteV2R2RSpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/v2/ListsRouteV2R2RSpec.scala index 814d7d66d8..93cd096c18 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/v2/ListsRouteV2R2RSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/v2/ListsRouteV2R2RSpec.scala @@ -13,7 +13,7 @@ import java.net.URLEncoder import java.nio.file.Paths import scala.concurrent.ExecutionContextExecutor -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.util.rdf.RdfModel import org.knora.webapi.routing.v2.ListsRouteV2 diff --git a/integration/src/test/scala/org/knora/webapi/e2e/v2/OntologyFormatsE2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/v2/OntologyFormatsE2ESpec.scala index 1c0a67df54..7845002796 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/v2/OntologyFormatsE2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/v2/OntologyFormatsE2ESpec.scala @@ -4,17 +4,17 @@ */ package org.knora.webapi.e2e.v2 -import org.apache.pekko.http.scaladsl.model._ +import org.apache.pekko.http.scaladsl.model.* import org.apache.pekko.http.scaladsl.model.headers.Accept import org.scalatest.Inspectors.forEvery -import spray.json._ +import spray.json.* import java.net.URLEncoder import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Complex import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Simple import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject @@ -22,7 +22,7 @@ import org.knora.webapi.messages.util.rdf.RdfFormatUtil import org.knora.webapi.messages.util.rdf.Turtle import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM import org.knora.webapi.sharedtestdata.SharedTestDataADM -import org.knora.webapi.util._ +import org.knora.webapi.util.* class OntologyFormatsE2ESpec extends E2ESpec { diff --git a/integration/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala index 7b59535e41..e7e7abff83 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala @@ -16,26 +16,26 @@ import dsp.errors.BadRequestException import dsp.valueobjects.Iri import dsp.valueobjects.LangString import dsp.valueobjects.LanguageCode -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.http.directives.DSPApiDirectives -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Complex import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.ValuesValidator import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.v2.responder.ontologymessages.InputOntologyV2 import org.knora.webapi.messages.v2.responder.ontologymessages.TestResponseParsingModeV2 -import org.knora.webapi.models._ +import org.knora.webapi.models.* import org.knora.webapi.routing.v2.OntologiesRouteV2 import org.knora.webapi.routing.v2.ResourcesRouteV2 import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM import org.knora.webapi.sharedtestdata.SharedTestDataADM -import org.knora.webapi.util._ +import org.knora.webapi.util.* -import pekko.http.scaladsl.model._ +import pekko.http.scaladsl.model.* import pekko.http.scaladsl.model.headers.BasicHttpCredentials object OntologyV2R2RSpec { diff --git a/integration/src/test/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala index 99248f95c5..5e6425e288 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala @@ -30,22 +30,22 @@ import scala.concurrent.duration.SECONDS import dsp.errors.AssertionException import dsp.errors.BadRequestException import dsp.valueobjects.Iri -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.e2e.InstanceChecker -import org.knora.webapi.e2e.v2.ResponseCheckerV2._ +import org.knora.webapi.e2e.v2.ResponseCheckerV2.* import org.knora.webapi.http.directives.DSPApiDirectives -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Complex import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.ValuesValidator import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject -import org.knora.webapi.messages.util._ -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.* +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.routing.v2.OntologiesRouteV2 import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM import org.knora.webapi.sharedtestdata.SharedTestDataADM -import org.knora.webapi.util._ +import org.knora.webapi.util.* /** * Tests the API v2 resources route. diff --git a/integration/src/test/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2.scala b/integration/src/test/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2.scala index 518e5bda9e..4d34a8f006 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2.scala @@ -8,7 +8,7 @@ package org.knora.webapi.e2e.v2 import dsp.errors.AssertionException 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.* object ResponseCheckerV2 { diff --git a/integration/src/test/scala/org/knora/webapi/e2e/v2/SearchRouteV2R2RSpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/v2/SearchRouteV2R2RSpec.scala index 6beb2945af..efdaeb8191 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/v2/SearchRouteV2R2RSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/v2/SearchRouteV2R2RSpec.scala @@ -6,7 +6,7 @@ package org.knora.webapi.e2e.v2 import org.apache.pekko -import org.apache.pekko.http.scaladsl.server.RouteConcatenation._ +import org.apache.pekko.http.scaladsl.server.RouteConcatenation.* import org.xmlunit.builder.DiffBuilder import org.xmlunit.builder.Input import org.xmlunit.diff.Diff @@ -18,10 +18,10 @@ import scala.concurrent.ExecutionContextExecutor import dsp.errors.BadRequestException import dsp.valueobjects.Iri -import org.knora.webapi._ -import org.knora.webapi.e2e.v2.ResponseCheckerV2._ +import org.knora.webapi.* +import org.knora.webapi.e2e.v2.ResponseCheckerV2.* import org.knora.webapi.http.directives.DSPApiDirectives -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject diff --git a/integration/src/test/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala index f66702a51c..b88e55d2b9 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.e2e.v2 -import org.apache.pekko.http.scaladsl.model._ +import org.apache.pekko.http.scaladsl.model.* import org.apache.pekko.http.scaladsl.model.headers.BasicHttpCredentials import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal import org.scalatest.compatible.Assertion @@ -18,26 +18,26 @@ import java.nio.file.Paths import java.time.Instant import java.util.UUID import scala.concurrent.Await -import scala.concurrent.duration._ +import scala.concurrent.duration.* import dsp.errors.AssertionException import dsp.errors.BadRequestException import dsp.valueobjects.Iri import dsp.valueobjects.UuidUtil -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.e2e.v2.ResponseCheckerV2.compareJSONLDForResourcesResponse -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Complex import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.ValuesValidator import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.util.search.SparqlQueryConstants import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM -import org.knora.webapi.util._ +import org.knora.webapi.util.* class ValuesRouteV2E2ESpec extends E2ESpec { diff --git a/integration/src/test/scala/org/knora/webapi/e2e/v2/ValuesV2R2RSpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/v2/ValuesV2R2RSpec.scala index 11db2e1804..15cc3dc5c2 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/v2/ValuesV2R2RSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/v2/ValuesV2R2RSpec.scala @@ -8,7 +8,7 @@ package org.knora.webapi.e2e.v2 import org.apache.pekko.http.scaladsl.model.HttpEntity import org.apache.pekko.http.scaladsl.model.StatusCodes import org.apache.pekko.http.scaladsl.model.headers.BasicHttpCredentials -import org.apache.pekko.http.scaladsl.server.RouteConcatenation._ +import org.apache.pekko.http.scaladsl.server.RouteConcatenation.* import zio.ZIO import scala.concurrent.ExecutionContextExecutor @@ -16,13 +16,13 @@ import scala.concurrent.ExecutionContextExecutor import dsp.errors.AssertionException import dsp.errors.BadRequestException import dsp.valueobjects.Iri -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants 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.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.util.search.SparqlQueryConstants import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.routing.v2.ValuesRouteV2 diff --git a/integration/src/test/scala/org/knora/webapi/e2ez/KnoraBaseJsonModels.scala b/integration/src/test/scala/org/knora/webapi/e2ez/KnoraBaseJsonModels.scala index a205a14c58..e75eea9a7a 100644 --- a/integration/src/test/scala/org/knora/webapi/e2ez/KnoraBaseJsonModels.scala +++ b/integration/src/test/scala/org/knora/webapi/e2ez/KnoraBaseJsonModels.scala @@ -1,9 +1,9 @@ package org.knora.webapi.e2ez -import zio.json._ +import zio.json.* -import KnoraBaseJsonModels.ValuePrimitives._ -import KnoraBaseJsonModels.ValueObjects._ +import KnoraBaseJsonModels.ValuePrimitives.* +import KnoraBaseJsonModels.ValueObjects.* object KnoraBaseJsonModels { diff --git a/integration/src/test/scala/org/knora/webapi/e2ez/SampleE2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2ez/SampleE2ESpec.scala index 6a5b2f90e9..ca2b6a56e6 100644 --- a/integration/src/test/scala/org/knora/webapi/e2ez/SampleE2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2ez/SampleE2ESpec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.e2ez -import zio.json._ -import zio.test._ +import zio.json.* +import zio.test.* import org.knora.webapi.E2EZSpec import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject diff --git a/integration/src/test/scala/org/knora/webapi/e2ez/SegmentE2EZSpec.scala b/integration/src/test/scala/org/knora/webapi/e2ez/SegmentE2EZSpec.scala index 4b64405572..40a5829242 100644 --- a/integration/src/test/scala/org/knora/webapi/e2ez/SegmentE2EZSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2ez/SegmentE2EZSpec.scala @@ -5,9 +5,9 @@ package org.knora.webapi.e2ez -import zio._ -import zio.json._ -import zio.test._ +import zio.* +import zio.json.* +import zio.test.* import org.knora.webapi.E2EZSpec import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject diff --git a/integration/src/test/scala/org/knora/webapi/it/VersionRouteITSpec.scala b/integration/src/test/scala/org/knora/webapi/it/VersionRouteITSpec.scala index a0e6a981d4..78c531a4df 100644 --- a/integration/src/test/scala/org/knora/webapi/it/VersionRouteITSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/it/VersionRouteITSpec.scala @@ -6,14 +6,14 @@ package org.knora.webapi.it import org.apache.pekko -import spray.json._ +import spray.json.* import scala.concurrent.Await -import scala.concurrent.duration._ +import scala.concurrent.duration.* import org.knora.webapi.ITKnoraLiveSpec -import pekko.http.scaladsl.model._ +import pekko.http.scaladsl.model.* /** * End-to-End (E2E) test specification for testing route rejections. diff --git a/integration/src/test/scala/org/knora/webapi/it/v2/KnoraSipiAuthenticationITSpec.scala b/integration/src/test/scala/org/knora/webapi/it/v2/KnoraSipiAuthenticationITSpec.scala index ba7f019151..d1fba8d2b8 100644 --- a/integration/src/test/scala/org/knora/webapi/it/v2/KnoraSipiAuthenticationITSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/it/v2/KnoraSipiAuthenticationITSpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.it.v2 -import org.apache.pekko.http.scaladsl.model._ +import org.apache.pekko.http.scaladsl.model.* import org.apache.pekko.http.scaladsl.model.headers.BasicHttpCredentials import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal import zio.ZIO @@ -13,12 +13,12 @@ import zio.ZIO import java.nio.file.Files import java.nio.file.Paths import scala.concurrent.Await -import scala.concurrent.duration._ +import scala.concurrent.duration.* -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol -import org.knora.webapi.messages.v2.routing.authenticationmessages._ +import org.knora.webapi.messages.v2.routing.authenticationmessages.* import org.knora.webapi.routing.Authenticator import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM diff --git a/integration/src/test/scala/org/knora/webapi/it/v2/KnoraSipiIntegrationV2ITSpec.scala b/integration/src/test/scala/org/knora/webapi/it/v2/KnoraSipiIntegrationV2ITSpec.scala index 355582f678..e7691084c9 100644 --- a/integration/src/test/scala/org/knora/webapi/it/v2/KnoraSipiIntegrationV2ITSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/it/v2/KnoraSipiIntegrationV2ITSpec.scala @@ -5,29 +5,29 @@ package org.knora.webapi.it.v2 -import org.apache.pekko.http.scaladsl.model._ +import org.apache.pekko.http.scaladsl.model.* import org.apache.pekko.http.scaladsl.model.headers.BasicHttpCredentials import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal import java.net.URLEncoder import java.nio.file.Paths import scala.concurrent.Await -import scala.concurrent.duration._ +import scala.concurrent.duration.* import dsp.errors.AssertionException import dsp.errors.BadRequestException import dsp.valueobjects.Iri -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Complex._ +import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Complex.* import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.store.sipimessages._ +import org.knora.webapi.messages.store.sipimessages.* import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol -import org.knora.webapi.messages.util.rdf._ -import org.knora.webapi.messages.v2.routing.authenticationmessages._ -import org.knora.webapi.models.filemodels._ +import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.v2.routing.authenticationmessages.* +import org.knora.webapi.models.filemodels.* import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.testservices.FileToUpload 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 15ca1bd992..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 @@ -9,20 +9,20 @@ import org.apache.pekko import org.xmlunit.builder.DiffBuilder import org.xmlunit.builder.Input import org.xmlunit.diff.Diff -import spray.json._ +import spray.json.* import java.net.URLEncoder import java.nio.file.Paths import scala.concurrent.Await -import scala.concurrent.duration._ +import scala.concurrent.duration.* import dsp.errors.BadRequestException import dsp.valueobjects.Iri -import org.knora.webapi._ +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.* +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 @@ -37,7 +37,7 @@ import org.knora.webapi.util.FileUtil import org.knora.webapi.util.MutableTestIri import pekko.http.javadsl.model.StatusCodes -import pekko.http.scaladsl.model._ +import pekko.http.scaladsl.model.* import pekko.http.scaladsl.model.headers.BasicHttpCredentials import pekko.http.scaladsl.unmarshalling.Unmarshal diff --git a/integration/src/test/scala/org/knora/webapi/messages/StringFormatterSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/StringFormatterSpec.scala index 16bcf7928c..65fb46dfe7 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/StringFormatterSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/StringFormatterSpec.scala @@ -9,8 +9,8 @@ import java.time.Instant import dsp.errors.AssertionException import dsp.valueobjects.Iri -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* /** * Tests [[StringFormatter]]. diff --git a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/IntegrationTestAdminJsonProtocol.scala b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/IntegrationTestAdminJsonProtocol.scala index 8b0266b7b4..fd36ebe999 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/IntegrationTestAdminJsonProtocol.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/IntegrationTestAdminJsonProtocol.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.admin.responder -import spray.json._ +import spray.json.* import org.knora.webapi.messages.admin.responder.groupsmessages.GroupGetResponseADM import org.knora.webapi.messages.admin.responder.groupsmessages.GroupsGetResponseADM diff --git a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/IntegrationTestListADMJsonProtocol.scala b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/IntegrationTestListADMJsonProtocol.scala index 972fbccf25..668236504b 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/IntegrationTestListADMJsonProtocol.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/IntegrationTestListADMJsonProtocol.scala @@ -1,6 +1,7 @@ package org.knora.webapi.messages.admin.responder.listsmessages import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport +import spray.json.* import spray.json.DefaultJsonProtocol import spray.json.DeserializationException import spray.json.JsArray @@ -8,7 +9,6 @@ import spray.json.JsObject import spray.json.JsValue import spray.json.JsonFormat import spray.json.RootJsonFormat -import spray.json._ import scala.util.Try diff --git a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala index 8fad45748f..1f2a4527a5 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.admin.responder.listsmessages -import spray.json._ +import spray.json.* import org.knora.webapi.CoreSpec import org.knora.webapi.messages.store.triplestoremessages.StringLiteralSequenceV2 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 00018f9fbd..6159c4cc67 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 @@ -14,9 +14,9 @@ import dsp.errors.ForbiddenException import org.knora.webapi.CoreSpec import org.knora.webapi.responders.admin.PermissionsResponder import org.knora.webapi.routing.UnsafeZioRun -import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM._ -import org.knora.webapi.sharedtestdata.SharedTestDataADM2._ -import org.knora.webapi.sharedtestdata._ +import org.knora.webapi.sharedtestdata.* +import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM.* +import org.knora.webapi.sharedtestdata.SharedTestDataADM2.* import org.knora.webapi.slice.admin.api.service.PermissionRestService import org.knora.webapi.slice.admin.domain.model.Permission import org.knora.webapi.slice.admin.domain.service.KnoraGroupRepo diff --git a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala index 39c6fdfcda..c5234229ce 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.admin.responder.usersmessages -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionProfileType import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.slice.admin.domain.model.User diff --git a/integration/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala index f018e761a0..db3c5a85ae 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala @@ -7,7 +7,7 @@ package org.knora.webapi.messages.store.triplestoremessages import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike -import spray.json._ +import spray.json.* import dsp.errors.BadRequestException diff --git a/integration/src/test/scala/org/knora/webapi/messages/util/CalendarDateUtilV2Spec.scala b/integration/src/test/scala/org/knora/webapi/messages/util/CalendarDateUtilV2Spec.scala index c5d3b58742..d6ebe62bbd 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/CalendarDateUtilV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/CalendarDateUtilV2Spec.scala @@ -9,7 +9,7 @@ import org.scalatest.compatible.Assertion import dsp.errors.BadRequestException import org.knora.webapi.CoreSpec -import org.knora.webapi.messages.util._ +import org.knora.webapi.messages.util.* /** * Tests [[CalendarDateUtilV2]]. diff --git a/integration/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2Spec.scala b/integration/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2Spec.scala index 61d7942815..3891709e38 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2Spec.scala @@ -13,9 +13,9 @@ import zio.ZIO import java.nio.file.Paths import scala.concurrent.Await import scala.concurrent.Future -import scala.concurrent.duration._ +import scala.concurrent.duration.* -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.SparqlExtendedConstructResponse import org.knora.webapi.messages.v2.responder.resourcemessages.ReadResourcesSequenceV2 diff --git a/integration/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2SpecFullData.scala b/integration/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2SpecFullData.scala index 7e0f3aa40c..cb7461f37e 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2SpecFullData.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2SpecFullData.scala @@ -9,14 +9,14 @@ import java.time.Instant import dsp.valueobjects.UuidUtil import org.knora.webapi.InternalSchema -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.v2.responder.resourcemessages.ReadResourceV2 import org.knora.webapi.messages.v2.responder.resourcemessages.ReadResourcesSequenceV2 import org.knora.webapi.messages.v2.responder.standoffmessages.StandoffDataTypeClasses import org.knora.webapi.messages.v2.responder.standoffmessages.StandoffTagIriAttributeV2 import org.knora.webapi.messages.v2.responder.standoffmessages.StandoffTagV2 -import org.knora.webapi.messages.v2.responder.valuemessages._ +import org.knora.webapi.messages.v2.responder.valuemessages.* import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.slice.admin.domain.model.Permission diff --git a/integration/src/test/scala/org/knora/webapi/messages/util/PermissionUtilADMSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/util/PermissionUtilADMSpec.scala index 2c523a86e1..cf504dd3c7 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/PermissionUtilADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/PermissionUtilADMSpec.scala @@ -9,7 +9,7 @@ import org.apache.pekko import scala.collection.Map -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionADM import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionType diff --git a/integration/src/test/scala/org/knora/webapi/messages/util/rdf/JsonLDUtilSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/util/rdf/JsonLDUtilSpec.scala index 39678df426..55e2d3d5f0 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/rdf/JsonLDUtilSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/rdf/JsonLDUtilSpec.scala @@ -11,7 +11,7 @@ import spray.json.JsonParser import java.nio.file.Paths import org.knora.webapi.CoreSpec -import org.knora.webapi.messages.util.rdf._ +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/KnoraResponseV2Spec.scala b/integration/src/test/scala/org/knora/webapi/messages/util/rdf/KnoraResponseV2Spec.scala index b3095dd285..b229405c97 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/rdf/KnoraResponseV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/rdf/KnoraResponseV2Spec.scala @@ -7,9 +7,9 @@ package org.knora.webapi.util.rdf import java.nio.file.Paths -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.config.AppConfig -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.v2.responder.KnoraJsonLDResponseV2 import org.knora.webapi.messages.v2.responder.KnoraTurtleResponseV2 import org.knora.webapi.util.FileUtil 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 c8bd76c587..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 41f7f50728..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.* import org.knora.webapi.messages.util.rdf.JenaRepository -import org.knora.webapi.messages.util.rdf._ /** * Tests implementations of [[RdfModel]]. diff --git a/integration/src/test/scala/org/knora/webapi/messages/util/search/SparqlTransformerSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/util/search/SparqlTransformerSpec.scala index e2cc1e11f6..5449f23e1e 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/search/SparqlTransformerSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/search/SparqlTransformerSpec.scala @@ -6,11 +6,11 @@ package org.knora.webapi.util.search import org.knora.webapi.CoreSpec -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search._ -import org.knora.webapi.messages.util.search.gravsearch.transformers._ +import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search.gravsearch.transformers.* import org.knora.webapi.routing.UnsafeZioRun /** diff --git a/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToCountPrequeryTransformerSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToCountPrequeryTransformerSpec.scala index e55a17445a..86a727a5dd 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToCountPrequeryTransformerSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToCountPrequeryTransformerSpec.scala @@ -5,14 +5,14 @@ package org.knora.webapi.messages.util.search.gravsearch.prequery -import zio._ +import zio.* import dsp.errors.AssertionException import org.knora.webapi.CoreSpec import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* import org.knora.webapi.messages.util.search.gravsearch.GravsearchParser import org.knora.webapi.messages.util.search.gravsearch.GravsearchQueryChecker import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInspectionRunner diff --git a/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToPrequeryTransformerSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToPrequeryTransformerSpec.scala index 6feae46e29..527b63dbcb 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToPrequeryTransformerSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToPrequeryTransformerSpec.scala @@ -12,10 +12,10 @@ import scala.collection.mutable.ArrayBuffer import dsp.errors.AssertionException import org.knora.webapi.CoreSpec import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* import org.knora.webapi.messages.util.search.gravsearch.GravsearchParser import org.knora.webapi.messages.util.search.gravsearch.GravsearchQueryChecker import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInspectionRunner diff --git a/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectorSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectorSpec.scala index 1a5217d757..74e32a0e3f 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectorSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectorSpec.scala @@ -6,16 +6,16 @@ package org.knora.webapi.messages.util.search.gravsearch.types import org.apache.pekko -import org.scalatest.matchers.must.Matchers._ +import org.scalatest.matchers.must.Matchers.* import zio.RIO import zio.ZIO import dsp.errors.GravsearchException -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* import org.knora.webapi.messages.util.search.gravsearch.GravsearchParser import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM diff --git a/integration/src/test/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2Spec.scala b/integration/src/test/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2Spec.scala index 0cbb340595..398309e9fe 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2Spec.scala @@ -11,10 +11,10 @@ import java.util.UUID import dsp.valueobjects.UuidUtil import org.knora.webapi.CoreSpec -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 -import org.knora.webapi.messages.v2.responder.standoffmessages._ +import org.knora.webapi.messages.v2.responder.standoffmessages.* import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM diff --git a/integration/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala b/integration/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala index 2f13a07cde..f20d513585 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala @@ -10,7 +10,7 @@ import java.time.Instant import dsp.errors.BadRequestException import org.knora.webapi.ApiV2Complex import org.knora.webapi.CoreSpec -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.SmartIriLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 diff --git a/integration/src/test/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/ResourcesMessagesV2Spec.scala b/integration/src/test/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/ResourcesMessagesV2Spec.scala index 8fa7313a81..84e3c5ab04 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/ResourcesMessagesV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/ResourcesMessagesV2Spec.scala @@ -7,8 +7,8 @@ package org.knora.webapi.messages.v2.responder.resourcesmessages import dsp.errors.BadRequestException import org.knora.webapi.CoreSpec -import org.knora.webapi.messages.v2.responder.resourcemessages._ -import org.knora.webapi.sharedtestdata._ +import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.sharedtestdata.* /** * Tests [[ResourceMessagesV2]]. diff --git a/integration/src/test/scala/org/knora/webapi/models/filemodels/FileModelUtil.scala b/integration/src/test/scala/org/knora/webapi/models/filemodels/FileModelUtil.scala index fb326c697a..b2ed066a31 100644 --- a/integration/src/test/scala/org/knora/webapi/models/filemodels/FileModelUtil.scala +++ b/integration/src/test/scala/org/knora/webapi/models/filemodels/FileModelUtil.scala @@ -6,11 +6,11 @@ package org.knora.webapi.models.filemodels import org.knora.webapi.ApiV2Complex -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.v2.responder.valuemessages._ +import org.knora.webapi.messages.v2.responder.valuemessages.* import org.knora.webapi.slice.resources.IiifImageRequestUrl object FileModelUtil { diff --git a/integration/src/test/scala/org/knora/webapi/models/filemodels/FileModels.scala b/integration/src/test/scala/org/knora/webapi/models/filemodels/FileModels.scala index a7f1992671..95a24683e4 100644 --- a/integration/src/test/scala/org/knora/webapi/models/filemodels/FileModels.scala +++ b/integration/src/test/scala/org/knora/webapi/models/filemodels/FileModels.scala @@ -8,7 +8,7 @@ package org.knora.webapi.models.filemodels import java.time.Instant import java.util.UUID -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceV2 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 34cd4d94a5..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.* +import spray.json.DefaultJsonProtocol.* import java.time.Instant import java.util.UUID @@ -14,7 +14,7 @@ import java.util.UUID import dsp.errors.AssertionException import org.knora.webapi.ApiV2Complex import org.knora.webapi.CoreSpec -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.v2.responder.resourcemessages.CreateValueInNewResourceV2 import org.knora.webapi.messages.v2.responder.valuemessages.DocumentFileValueContentV2 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 3c2e1440d9..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,12 +5,12 @@ package org.knora.webapi.models.standoffmodels -import spray.json.DefaultJsonProtocol._ -import spray.json._ +import spray.json.* +import spray.json.DefaultJsonProtocol.* import java.util.UUID -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.util.rdf.JsonLDKeywords diff --git a/integration/src/test/scala/org/knora/webapi/models/standoffmodels/StandoffModelsSpec.scala b/integration/src/test/scala/org/knora/webapi/models/standoffmodels/StandoffModelsSpec.scala index 396ae56b4b..74ac242fa7 100644 --- a/integration/src/test/scala/org/knora/webapi/models/standoffmodels/StandoffModelsSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/models/standoffmodels/StandoffModelsSpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.models.standoffmodels -import spray.json._ +import spray.json.* import org.knora.webapi.CoreSpec import org.knora.webapi.messages.StringFormatter diff --git a/integration/src/test/scala/org/knora/webapi/responders/IriLockerSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/IriLockerSpec.scala index b33fb44d2e..12b087db8d 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/IriLockerSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/IriLockerSpec.scala @@ -11,7 +11,7 @@ import org.scalatest.wordspec.AnyWordSpecLike import java.util.UUID import scala.concurrent.Await import scala.concurrent.Future -import scala.concurrent.duration._ +import scala.concurrent.duration.* import dsp.errors.ApplicationLockException import org.knora.webapi.IRI diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/AssetPermissionsResponderSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/AssetPermissionsResponderSpec.scala index a9869e9cc1..7372dce1ff 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/AssetPermissionsResponderSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/AssetPermissionsResponderSpec.scala @@ -5,10 +5,10 @@ package org.knora.webapi.responders.admin -import org.apache.pekko.testkit._ +import org.apache.pekko.testkit.* import zio.ZIO -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/GroupRestServiceSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/GroupRestServiceSpec.scala index 231530b517..ac1bb8ed81 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/GroupRestServiceSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/GroupRestServiceSpec.scala @@ -5,14 +5,14 @@ package org.knora.webapi.responders.admin -import zio._ +import zio.* -import dsp.errors._ -import org.knora.webapi._ -import org.knora.webapi.messages.admin.responder.usersmessages._ +import dsp.errors.* +import org.knora.webapi.* +import org.knora.webapi.messages.admin.responder.usersmessages.* import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.routing.UnsafeZioRun -import org.knora.webapi.sharedtestdata.SharedTestDataADM._ +import org.knora.webapi.sharedtestdata.SharedTestDataADM.* 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 diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/ListsResponderSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/ListsResponderSpec.scala index 737c135efb..c7add548b7 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/ListsResponderSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/ListsResponderSpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.responders.admin -import org.apache.pekko.testkit._ +import org.apache.pekko.testkit.* import java.util.UUID @@ -13,20 +13,20 @@ import dsp.errors.BadRequestException import dsp.errors.DuplicateValueException import dsp.errors.UpdateNotPerformedException import dsp.valueobjects.Iri -import org.knora.webapi._ -import org.knora.webapi.messages.admin.responder.listsmessages._ +import org.knora.webapi.* +import org.knora.webapi.messages.admin.responder.listsmessages.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedListsTestDataADM import org.knora.webapi.sharedtestdata.SharedTestDataADM -import org.knora.webapi.sharedtestdata.SharedTestDataADM2._ +import org.knora.webapi.sharedtestdata.SharedTestDataADM2.* import org.knora.webapi.slice.admin.api.Requests.ListChangePositionRequest import org.knora.webapi.slice.admin.api.Requests.ListChangeRequest import org.knora.webapi.slice.admin.api.Requests.ListCreateChildNodeRequest import org.knora.webapi.slice.admin.api.Requests.ListCreateRootNodeRequest import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri -import org.knora.webapi.slice.admin.domain.model.ListProperties._ +import org.knora.webapi.slice.admin.domain.model.ListProperties.* import org.knora.webapi.util.MutableTestIri import org.knora.webapi.util.ZioScalaTestUtil.assertFailsWithA diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderSpec.scala index 5d15976cf1..1eed24cec9 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderSpec.scala @@ -16,15 +16,15 @@ import dsp.errors.BadRequestException import dsp.errors.DuplicateValueException import dsp.errors.ForbiddenException import dsp.errors.NotFoundException -import org.knora.webapi._ +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.permissionsmessages.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.messages.util.PermissionUtilADM import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM -import org.knora.webapi.sharedtestdata.SharedPermissionsTestData._ +import org.knora.webapi.sharedtestdata.SharedPermissionsTestData.* import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.sharedtestdata.SharedTestDataADM.imagesProjectIri import org.knora.webapi.sharedtestdata.SharedTestDataADM.imagesUser02 diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/ProjectRestServiceSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/ProjectRestServiceSpec.scala index aea4284044..07490a56de 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/ProjectRestServiceSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/ProjectRestServiceSpec.scala @@ -12,18 +12,18 @@ import dsp.errors.DuplicateValueException import dsp.errors.ForbiddenException import dsp.errors.NotFoundException import dsp.valueobjects.Iri -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.IriConversions.ConvertibleIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.admin.responder.permissionsmessages._ +import org.knora.webapi.messages.admin.responder.permissionsmessages.* import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM +import org.knora.webapi.slice.admin.api.model.* 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._ import org.knora.webapi.slice.admin.api.service.ProjectRestService -import org.knora.webapi.slice.admin.domain.model.KnoraProject._ +import org.knora.webapi.slice.admin.domain.model.KnoraProject.* import org.knora.webapi.slice.admin.domain.model.Permission import org.knora.webapi.slice.admin.domain.model.RestrictedView import org.knora.webapi.slice.admin.domain.service.KnoraGroupRepo diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/UserRestServiceSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/UserRestServiceSpec.scala index c3cb95f6b1..d56e3b5760 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/UserRestServiceSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/UserRestServiceSpec.scala @@ -14,8 +14,8 @@ import dsp.errors.DuplicateValueException import dsp.errors.ForbiddenException import dsp.errors.NotFoundException import dsp.valueobjects.LanguageCode -import org.knora.webapi._ -import org.knora.webapi.messages.admin.responder.usersmessages._ +import org.knora.webapi.* +import org.knora.webapi.messages.admin.responder.usersmessages.* import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.messages.v2.routing.authenticationmessages.CredentialsIdentifier import org.knora.webapi.messages.v2.routing.authenticationmessages.KnoraCredentialsV2 @@ -30,9 +30,9 @@ import org.knora.webapi.slice.admin.api.UsersEndpoints.Requests.UserCreateReques import org.knora.webapi.slice.admin.api.service.GroupRestService import org.knora.webapi.slice.admin.api.service.ProjectRestService import org.knora.webapi.slice.admin.api.service.UserRestService +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.Username -import org.knora.webapi.slice.admin.domain.model._ import org.knora.webapi.slice.admin.domain.service.KnoraUserRepo 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 6c9842d551..b3ebae983e 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 @@ -13,27 +13,27 @@ import java.time.Instant import java.util.UUID import dsp.constants.SalsahGui -import dsp.errors._ +import dsp.errors.* import dsp.valueobjects.Iri import dsp.valueobjects.Schema -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.store.triplestoremessages._ +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.* 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.resourcemessages.CreateResourceRequestV2 import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceV2 import org.knora.webapi.messages.v2.responder.resourcemessages.CreateValueInNewResourceV2 import org.knora.webapi.messages.v2.responder.valuemessages.IntegerValueContentV2 import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM -import org.knora.webapi.slice.ontology.domain.model.Cardinality._ +import org.knora.webapi.slice.ontology.domain.model.Cardinality.* import org.knora.webapi.slice.ontology.repo.service.OntologyCache import org.knora.webapi.store.triplestore.api.TriplestoreService import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.Select diff --git a/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala b/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala index 2930786612..c1cf0e9e95 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala @@ -15,26 +15,26 @@ import zio.ZIO import java.time.Instant import java.time.temporal.ChronoUnit import java.util.UUID -import scala.concurrent.duration._ +import scala.concurrent.duration.* -import dsp.errors._ +import dsp.errors.* import dsp.valueobjects.UuidUtil -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.store.triplestoremessages._ +import org.knora.webapi.messages.store.triplestoremessages.* import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.messages.util.CalendarNameGregorian 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.v2.responder.SuccessResponseV2 -import org.knora.webapi.messages.v2.responder.resourcemessages._ -import org.knora.webapi.messages.v2.responder.standoffmessages._ -import org.knora.webapi.messages.v2.responder.valuemessages._ -import org.knora.webapi.models.filemodels._ +import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.messages.v2.responder.standoffmessages.* +import org.knora.webapi.messages.v2.responder.valuemessages.* +import org.knora.webapi.models.filemodels.* import org.knora.webapi.responders.v2.ResourcesResponseCheckerV2.compareReadResourcesSequenceV2Response import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM @@ -43,7 +43,7 @@ import org.knora.webapi.slice.resources.IiifImageRequestUrl import org.knora.webapi.store.triplestore.api.TriplestoreService import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.Ask import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.Select -import org.knora.webapi.util._ +import org.knora.webapi.util.* import pekko.testkit.ImplicitSender diff --git a/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2SpecFullData.scala b/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2SpecFullData.scala index 9a678e55b9..f2a2ea3706 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2SpecFullData.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2SpecFullData.scala @@ -9,12 +9,12 @@ import java.time.Instant import dsp.valueobjects.UuidUtil import org.knora.webapi.InternalSchema -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.util.CalendarNameJulian import org.knora.webapi.messages.util.DatePrecisionYear -import org.knora.webapi.messages.v2.responder.resourcemessages._ -import org.knora.webapi.messages.v2.responder.valuemessages._ +import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.messages.v2.responder.valuemessages.* import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.slice.admin.domain.model.Permission diff --git a/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2.scala b/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2.scala index ae72e7c58d..a8ebdd5126 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2.scala @@ -6,8 +6,8 @@ package org.knora.webapi.responders.v2 import org.knora.webapi.messages.SmartIri -import org.knora.webapi.messages.v2.responder.resourcemessages._ -import org.knora.webapi.messages.v2.responder.valuemessages._ +import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.messages.v2.responder.valuemessages.* object ResourcesResponseCheckerV2 { diff --git a/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2SpecFullData.scala b/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2SpecFullData.scala index 2fae5c45ed..a18ed52c8b 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2SpecFullData.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2SpecFullData.scala @@ -9,12 +9,12 @@ import java.time.Instant import dsp.valueobjects.UuidUtil import org.knora.webapi.InternalSchema -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.util.CalendarNameJulian import org.knora.webapi.messages.util.DatePrecisionYear -import org.knora.webapi.messages.v2.responder.resourcemessages._ -import org.knora.webapi.messages.v2.responder.valuemessages._ +import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.messages.v2.responder.valuemessages.* import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.slice.admin.domain.model.Permission 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 3de135b980..b8fa79b87b 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 @@ -8,16 +8,16 @@ package org.knora.webapi.responders.v2 import zio.ZIO import dsp.errors.BadRequestException +import org.knora.webapi.* import org.knora.webapi.ApiV2Schema import org.knora.webapi.SchemaRendering import org.knora.webapi.SchemaRendering.apiV2SchemaWithOption -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* 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.util.search.ConstructQuery -import org.knora.webapi.messages.v2.responder.resourcemessages._ +import org.knora.webapi.messages.v2.responder.resourcemessages.* import org.knora.webapi.messages.v2.responder.valuemessages.ReadValueV2 import org.knora.webapi.messages.v2.responder.valuemessages.StillImageFileValueContentV2 import org.knora.webapi.responders.v2.ResourcesResponseCheckerV2.compareReadResourcesSequenceV2Response diff --git a/integration/src/test/scala/org/knora/webapi/responders/v2/SearchResponderV2SpecFullData.scala b/integration/src/test/scala/org/knora/webapi/responders/v2/SearchResponderV2SpecFullData.scala index b53d98113a..bfeda2a9f4 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/v2/SearchResponderV2SpecFullData.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/v2/SearchResponderV2SpecFullData.scala @@ -10,12 +10,12 @@ import org.apache.pekko import java.time.Instant import dsp.valueobjects.UuidUtil -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search._ -import org.knora.webapi.messages.v2.responder.resourcemessages._ -import org.knora.webapi.messages.v2.responder.valuemessages._ +import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.messages.v2.responder.valuemessages.* import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.slice.admin.domain.model.Permission diff --git a/integration/src/test/scala/org/knora/webapi/responders/v2/StandoffResponderV2Spec.scala b/integration/src/test/scala/org/knora/webapi/responders/v2/StandoffResponderV2Spec.scala index 5a83e04304..35f2d6bbf8 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/v2/StandoffResponderV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/v2/StandoffResponderV2Spec.scala @@ -8,13 +8,13 @@ package org.knora.webapi.responders.v2 import org.apache.pekko import zio.ZIO -import scala.concurrent.duration._ +import scala.concurrent.duration.* -import dsp.errors._ -import org.knora.webapi._ -import org.knora.webapi.messages.store.triplestoremessages._ +import dsp.errors.* +import org.knora.webapi.* +import org.knora.webapi.messages.store.triplestoremessages.* import org.knora.webapi.messages.twirl.queries.sparql -import org.knora.webapi.messages.v2.responder.standoffmessages._ +import org.knora.webapi.messages.v2.responder.standoffmessages.* import org.knora.webapi.models.standoffmodels.DefineStandoffMapping import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM 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 221685945f..cea05a3f2b 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 @@ -12,24 +12,24 @@ import zio.ZIO import java.time.Instant import java.util.UUID import java.util.UUID.randomUUID -import scala.concurrent.duration._ +import scala.concurrent.duration.* -import dsp.errors._ +import dsp.errors.* import dsp.valueobjects.UuidUtil -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.store.triplestoremessages._ +import org.knora.webapi.messages.store.triplestoremessages.* import org.knora.webapi.messages.util.CalendarNameGregorian 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._ -import org.knora.webapi.messages.v2.responder.standoffmessages._ -import org.knora.webapi.messages.v2.responder.valuemessages._ +import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.messages.v2.responder.standoffmessages.* +import org.knora.webapi.messages.v2.responder.valuemessages.* import org.knora.webapi.models.filemodels.FileModelUtil import org.knora.webapi.models.filemodels.FileType import org.knora.webapi.routing.UnsafeZioRun 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 18c6018caf..aca47a0955 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 @@ -11,14 +11,14 @@ import java.util.UUID import org.knora.webapi.ApiV2Complex import org.knora.webapi.CoreSpec -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants 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.* +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/responders/v2/ontology/CardinalitiesSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/v2/ontology/CardinalitiesSpec.scala index 395c0dcad3..ef2273fdc5 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/v2/ontology/CardinalitiesSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/v2/ontology/CardinalitiesSpec.scala @@ -8,7 +8,7 @@ package org.knora.webapi.responders.v2.ontology import zio.ZIO import org.knora.webapi.CoreSpec -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.routing.UnsafeZioRun diff --git a/integration/src/test/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpersSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpersSpec.scala index 4b66b49b48..cc3c14020b 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpersSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpersSpec.scala @@ -9,13 +9,13 @@ import zio.ZIO import org.knora.webapi.CoreSpec import org.knora.webapi.InternalSchema -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.slice.ontology.domain.model.Cardinality -import org.knora.webapi.slice.ontology.domain.model.Cardinality._ +import org.knora.webapi.slice.ontology.domain.model.Cardinality.* import org.knora.webapi.slice.ontology.repo.model.OntologyCacheData import org.knora.webapi.slice.ontology.repo.service.OntologyCache diff --git a/integration/src/test/scala/org/knora/webapi/routing/AuthenticatorSpec.scala b/integration/src/test/scala/org/knora/webapi/routing/AuthenticatorSpec.scala index 9a75fe63ae..b62e705f96 100644 --- a/integration/src/test/scala/org/knora/webapi/routing/AuthenticatorSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/routing/AuthenticatorSpec.scala @@ -10,7 +10,7 @@ import org.scalatest.PrivateMethodTester import zio.ZIO import dsp.errors.BadCredentialsException -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.v2.routing.authenticationmessages.CredentialsIdentifier import org.knora.webapi.messages.v2.routing.authenticationmessages.KnoraCredentialsV2.KnoraJWTTokenCredentialsV2 diff --git a/integration/src/test/scala/org/knora/webapi/sharedtestdata/SharedPermissionsTestData.scala b/integration/src/test/scala/org/knora/webapi/sharedtestdata/SharedPermissionsTestData.scala index b169d97149..2fa2063998 100644 --- a/integration/src/test/scala/org/knora/webapi/sharedtestdata/SharedPermissionsTestData.scala +++ b/integration/src/test/scala/org/knora/webapi/sharedtestdata/SharedPermissionsTestData.scala @@ -10,8 +10,8 @@ import org.knora.webapi.messages.admin.responder.permissionsmessages.Administrat import org.knora.webapi.messages.admin.responder.permissionsmessages.DefaultObjectAccessPermissionADM import org.knora.webapi.messages.admin.responder.permissionsmessages.ObjectAccessPermissionADM import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionADM -import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM._ -import org.knora.webapi.sharedtestdata.SharedTestDataADM2._ +import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM.* +import org.knora.webapi.sharedtestdata.SharedTestDataADM2.* import org.knora.webapi.slice.admin.domain.model.Permission import org.knora.webapi.slice.admin.domain.service.KnoraGroupRepo import org.knora.webapi.slice.admin.domain.service.KnoraProjectRepo diff --git a/integration/src/test/scala/org/knora/webapi/slice/admin/domain/service/ProjectImportServiceIT.scala b/integration/src/test/scala/org/knora/webapi/slice/admin/domain/service/ProjectImportServiceIT.scala index 00d1ad0887..dd7905cd93 100644 --- a/integration/src/test/scala/org/knora/webapi/slice/admin/domain/service/ProjectImportServiceIT.scala +++ b/integration/src/test/scala/org/knora/webapi/slice/admin/domain/service/ProjectImportServiceIT.scala @@ -5,9 +5,9 @@ package org.knora.webapi.slice.admin.domain.service -import zio._ -import zio.nio.file._ -import zio.test._ +import zio.* +import zio.nio.file.* +import zio.test.* import java.io.IOException diff --git a/integration/src/test/scala/org/knora/webapi/store/iiif/impl/SipiServiceMock.scala b/integration/src/test/scala/org/knora/webapi/store/iiif/impl/SipiServiceMock.scala index f58cfd175f..c545681902 100644 --- a/integration/src/test/scala/org/knora/webapi/store/iiif/impl/SipiServiceMock.scala +++ b/integration/src/test/scala/org/knora/webapi/store/iiif/impl/SipiServiceMock.scala @@ -5,10 +5,10 @@ package org.knora.webapi.store.iiif.impl -import zio._ +import zio.* import zio.nio.file.Path -import org.knora.webapi.messages.store.sipimessages._ +import org.knora.webapi.messages.store.sipimessages.* import org.knora.webapi.messages.v2.responder.SuccessResponseV2 import org.knora.webapi.slice.admin.api.model.MaintenanceRequests.AssetId import org.knora.webapi.slice.admin.domain.model.KnoraProject diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/TriplestoreServiceLiveSpec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/TriplestoreServiceLiveSpec.scala index bc7332f763..bb63b5c80b 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/TriplestoreServiceLiveSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/TriplestoreServiceLiveSpec.scala @@ -8,10 +8,10 @@ package org.knora.webapi.store.triplestore import org.apache.pekko import zio.ZIO -import scala.concurrent.duration._ +import scala.concurrent.duration.* import org.knora.webapi.CoreSpec -import org.knora.webapi.messages.store.triplestoremessages._ +import org.knora.webapi.messages.store.triplestoremessages.* import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.store.triplestore.api.TriplestoreService import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.Select 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 a05c2a07e0..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.* import org.knora.webapi.messages.util.rdf.JenaRepository -import org.knora.webapi.messages.util.rdf._ 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 e1af89368d..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.* import org.knora.webapi.messages.util.rdf.JenaRepository -import org.knora.webapi.messages.util.rdf._ class UpgradePluginPR1322Spec extends UpgradePluginSpec { "Upgrade plugin PR1322" should { diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala index 4c08c5da0f..9b33e70c73 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala @@ -7,7 +7,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import dsp.errors.AssertionException import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* class UpgradePluginPR1367Spec extends UpgradePluginSpec { "Upgrade plugin PR1367" 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 ed2c06325e..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.* import org.knora.webapi.messages.util.rdf.JenaRepository -import org.knora.webapi.messages.util.rdf._ 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 a36067d354..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.* import org.knora.webapi.messages.util.rdf.JenaRepository -import org.knora.webapi.messages.util.rdf._ class UpgradePluginPR1615Spec extends UpgradePluginSpec { "Upgrade plugin PR1615" should { diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala index 2d62d2ac2c..cc45e270f2 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala @@ -10,7 +10,7 @@ import org.scalatest.compatible.Assertion import dsp.errors.AssertionException import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* class UpgradePluginPR1746Spec extends UpgradePluginSpec with LazyLogging { private def checkLiteral(model: RdfModel, subj: IriNode, pred: IriNode, expectedObj: RdfLiteral): Assertion = diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala index 390c996e24..b81df04b07 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala @@ -9,7 +9,7 @@ import com.typesafe.scalalogging.LazyLogging import org.scalatest.compatible.Assertion import dsp.errors.AssertionException -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* class UpgradePluginPR1921Spec extends UpgradePluginSpec with LazyLogging { private def checkLiteral(model: RdfModel, subj: IriNode, pred: IriNode, expectedObj: RdfLiteral): Assertion = 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 7ab1ea18a1..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.* import org.knora.webapi.messages.util.rdf.JenaRepository -import org.knora.webapi.messages.util.rdf._ class UpgradePluginPR2018Spec extends UpgradePluginSpec with LazyLogging { "Upgrade plugin PR2018" should { diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079Spec.scala index 88eb37b150..4269477a83 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079Spec.scala @@ -9,7 +9,7 @@ import com.typesafe.scalalogging.LazyLogging import dsp.errors.AssertionException import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* class UpgradePluginPR2079Spec extends UpgradePluginSpec with LazyLogging { "Upgrade plugin PR2079" should { diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2081Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2081Spec.scala index d40f78912c..aa00360665 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2081Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2081Spec.scala @@ -9,7 +9,7 @@ import com.typesafe.scalalogging.LazyLogging import dsp.errors.AssertionException import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* class UpgradePluginPR2081Spec extends UpgradePluginSpec with LazyLogging { private def getDateValue(model: RdfModel, subj: IriNode, pred: IriNode): String = { diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2094Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2094Spec.scala index b1f0655dfe..efa666f014 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2094Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2094Spec.scala @@ -9,7 +9,7 @@ import com.typesafe.scalalogging.LazyLogging import dsp.errors.AssertionException import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* class UpgradePluginPR2094Spec extends UpgradePluginSpec with LazyLogging { "Upgrade plugin PR2094" should { diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginSpec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginSpec.scala index e4eaa7e4b7..f451e16a4e 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginSpec.scala @@ -17,7 +17,7 @@ import scala.util.Success import scala.util.Using import org.knora.webapi.messages.util.ErrorHandlingMap -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* /** * Provides helper methods for specs that test upgrade plugins. diff --git a/integration/src/test/scala/org/knora/webapi/testcontainers/TestContainerOps.scala b/integration/src/test/scala/org/knora/webapi/testcontainers/TestContainerOps.scala index 281d5f6362..fc0da54f2a 100644 --- a/integration/src/test/scala/org/knora/webapi/testcontainers/TestContainerOps.scala +++ b/integration/src/test/scala/org/knora/webapi/testcontainers/TestContainerOps.scala @@ -6,7 +6,7 @@ package org.knora.webapi.testcontainers import org.testcontainers.lifecycle.Startable -import zio._ +import zio.* object ZioTestContainers { 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 d22253bbaa..f91a9a72a4 100644 --- a/integration/src/test/scala/org/knora/webapi/testservices/TestClientService.scala +++ b/integration/src/test/scala/org/knora/webapi/testservices/TestClientService.scala @@ -20,9 +20,9 @@ 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.* import spray.json.JsObject -import spray.json._ -import zio._ +import zio.* import java.nio.file.Path import java.util.concurrent.TimeUnit @@ -35,9 +35,9 @@ import dsp.errors.BadRequestException import dsp.errors.NotFoundException import org.knora.webapi.config.AppConfig import org.knora.webapi.messages.store.sipimessages.SipiUploadResponse -import org.knora.webapi.messages.store.sipimessages.SipiUploadResponseJsonProtocol._ +import org.knora.webapi.messages.store.sipimessages.SipiUploadResponseJsonProtocol.* import org.knora.webapi.messages.store.sipimessages.SipiUploadWithoutProcessingResponse -import org.knora.webapi.messages.store.sipimessages.SipiUploadWithoutProcessingResponseJsonProtocol._ +import org.knora.webapi.messages.store.sipimessages.SipiUploadWithoutProcessingResponseJsonProtocol.* import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol import org.knora.webapi.messages.util.rdf.JsonLDDocument import org.knora.webapi.messages.util.rdf.JsonLDUtil diff --git a/integration/src/test/scala/org/knora/webapi/util/AkkaHttpUtils.scala b/integration/src/test/scala/org/knora/webapi/util/AkkaHttpUtils.scala index db80f8b285..6f526b472e 100644 --- a/integration/src/test/scala/org/knora/webapi/util/AkkaHttpUtils.scala +++ b/integration/src/test/scala/org/knora/webapi/util/AkkaHttpUtils.scala @@ -7,12 +7,12 @@ package org.knora.webapi.util import com.typesafe.scalalogging.LazyLogging import org.apache.pekko -import spray.json._ +import spray.json.* import scala.concurrent.Await import scala.concurrent.ExecutionContext import scala.concurrent.Future -import scala.concurrent.duration._ +import scala.concurrent.duration.* import pekko.actor.ActorSystem import pekko.http.scaladsl.model.HttpResponse diff --git a/integration/src/test/scala/org/knora/webapi/util/ZioScalaTestUtil.scala b/integration/src/test/scala/org/knora/webapi/util/ZioScalaTestUtil.scala index 981f98781b..aca4a2305b 100644 --- a/integration/src/test/scala/org/knora/webapi/util/ZioScalaTestUtil.scala +++ b/integration/src/test/scala/org/knora/webapi/util/ZioScalaTestUtil.scala @@ -6,7 +6,7 @@ package org.knora.webapi.util import org.scalatest.Assertions -import org.scalatest.matchers.should.Matchers._ +import org.scalatest.matchers.should.Matchers.* import zio.Exit import scala.reflect.ClassTag diff --git a/webapi/src/main/scala/dsp/constants/SalsahGui.scala b/webapi/src/main/scala/dsp/constants/SalsahGui.scala index 1136f5e0cd..71710b6342 100644 --- a/webapi/src/main/scala/dsp/constants/SalsahGui.scala +++ b/webapi/src/main/scala/dsp/constants/SalsahGui.scala @@ -5,7 +5,7 @@ package dsp.constants -import dsp.errors._ +import dsp.errors.* /** * Contains string constants for IRIs from ontologies used by the application. diff --git a/webapi/src/main/scala/dsp/valueobjects/Schema.scala b/webapi/src/main/scala/dsp/valueobjects/Schema.scala index f69d2dc8ba..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/Main.scala b/webapi/src/main/scala/org/knora/webapi/Main.scala index e99ec7fbcf..367e02103e 100644 --- a/webapi/src/main/scala/org/knora/webapi/Main.scala +++ b/webapi/src/main/scala/org/knora/webapi/Main.scala @@ -5,9 +5,9 @@ package org.knora.webapi -import zio._ +import zio.* -import org.knora.webapi.core._ +import org.knora.webapi.core.* import org.knora.webapi.slice.infrastructure.MetricsServer import org.knora.webapi.util.Logger diff --git a/webapi/src/main/scala/org/knora/webapi/config/AppConfig.scala b/webapi/src/main/scala/org/knora/webapi/config/AppConfig.scala index 26a04a6c09..70b78aca2a 100644 --- a/webapi/src/main/scala/org/knora/webapi/config/AppConfig.scala +++ b/webapi/src/main/scala/org/knora/webapi/config/AppConfig.scala @@ -6,11 +6,11 @@ package org.knora.webapi.config import com.typesafe.config.ConfigFactory -import zio._ -import zio.config._ +import zio.* +import zio.config.* +import zio.config.magnolia.* import zio.config.magnolia.DeriveConfig.given -import zio.config.magnolia._ -import zio.config.typesafe._ +import zio.config.typesafe.* import java.time.Duration diff --git a/webapi/src/main/scala/org/knora/webapi/core/ActorSystem.scala b/webapi/src/main/scala/org/knora/webapi/core/ActorSystem.scala index b414f5276e..24b3c2dac9 100644 --- a/webapi/src/main/scala/org/knora/webapi/core/ActorSystem.scala +++ b/webapi/src/main/scala/org/knora/webapi/core/ActorSystem.scala @@ -6,7 +6,7 @@ package org.knora.webapi.core import org.apache.pekko.actor -import zio._ +import zio.* import scala.concurrent.ExecutionContext diff --git a/webapi/src/main/scala/org/knora/webapi/core/AppServer.scala b/webapi/src/main/scala/org/knora/webapi/core/AppServer.scala index d8ad54036b..fd70c75549 100644 --- a/webapi/src/main/scala/org/knora/webapi/core/AppServer.scala +++ b/webapi/src/main/scala/org/knora/webapi/core/AppServer.scala @@ -6,7 +6,7 @@ package org.knora.webapi.core import org.apache.pekko.actor -import zio._ +import zio.* import org.knora.webapi.config.AppConfig import org.knora.webapi.core.domain.AppState diff --git a/webapi/src/main/scala/org/knora/webapi/core/HttpServer.scala b/webapi/src/main/scala/org/knora/webapi/core/HttpServer.scala index 0aa18ce856..9bbc27d04c 100644 --- a/webapi/src/main/scala/org/knora/webapi/core/HttpServer.scala +++ b/webapi/src/main/scala/org/knora/webapi/core/HttpServer.scala @@ -7,7 +7,7 @@ package org.knora.webapi.core import org.apache.pekko.actor.ActorSystem import org.apache.pekko.http.scaladsl.Http -import zio._ +import zio.* import org.knora.webapi.config.AppConfig import org.knora.webapi.routing.ApiRoutes diff --git a/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala b/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala index f3088dc50e..4ccbc05299 100644 --- a/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala @@ -13,7 +13,7 @@ import org.knora.webapi.config.AppConfig import org.knora.webapi.config.AppConfig.AppConfigurations import org.knora.webapi.config.InstrumentationServerConfig import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util._ +import org.knora.webapi.messages.util.* import org.knora.webapi.messages.util.search.QueryTraverser import org.knora.webapi.messages.util.search.gravsearch.prequery.InferenceOptimizationService import org.knora.webapi.messages.util.search.gravsearch.transformers.ConstructTransformer @@ -22,22 +22,22 @@ import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInsp import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2Live import org.knora.webapi.responders.IriService +import org.knora.webapi.responders.admin.* import org.knora.webapi.responders.admin.ListsResponder -import org.knora.webapi.responders.admin._ -import org.knora.webapi.responders.v2._ +import org.knora.webapi.responders.v2.* import org.knora.webapi.responders.v2.ontology.CardinalityHandler import org.knora.webapi.responders.v2.ontology.OntologyHelpers import org.knora.webapi.responders.v2.ontology.OntologyHelpersLive -import org.knora.webapi.routing._ +import org.knora.webapi.routing.* import org.knora.webapi.slice.admin.AdminModule +import org.knora.webapi.slice.admin.api.* import org.knora.webapi.slice.admin.api.AdminApiModule -import org.knora.webapi.slice.admin.api._ import org.knora.webapi.slice.admin.api.service.GroupRestService import org.knora.webapi.slice.admin.api.service.PermissionRestService import org.knora.webapi.slice.admin.api.service.ProjectRestService import org.knora.webapi.slice.admin.api.service.UserRestService -import org.knora.webapi.slice.admin.domain.service._ -import org.knora.webapi.slice.common.api._ +import org.knora.webapi.slice.admin.domain.service.* +import org.knora.webapi.slice.common.api.* import org.knora.webapi.slice.common.repo.service.PredicateObjectMapper import org.knora.webapi.slice.infrastructure.JwtService import org.knora.webapi.slice.infrastructure.JwtServiceLive diff --git a/webapi/src/main/scala/org/knora/webapi/core/MessageRelay.scala b/webapi/src/main/scala/org/knora/webapi/core/MessageRelay.scala index cd2b8b8a6b..29efa66e23 100644 --- a/webapi/src/main/scala/org/knora/webapi/core/MessageRelay.scala +++ b/webapi/src/main/scala/org/knora/webapi/core/MessageRelay.scala @@ -5,7 +5,7 @@ package org.knora.webapi.core -import zio._ +import zio.* import org.knora.webapi.messages.ResponderRequest diff --git a/webapi/src/main/scala/org/knora/webapi/core/State.scala b/webapi/src/main/scala/org/knora/webapi/core/State.scala index 9667db911e..5ce1a5e9fd 100644 --- a/webapi/src/main/scala/org/knora/webapi/core/State.scala +++ b/webapi/src/main/scala/org/knora/webapi/core/State.scala @@ -5,7 +5,7 @@ package org.knora.webapi.core -import zio._ +import zio.* import org.knora.webapi.core.domain.AppState diff --git a/webapi/src/main/scala/org/knora/webapi/core/actors/RoutingActor.scala b/webapi/src/main/scala/org/knora/webapi/core/actors/RoutingActor.scala index c7154537f4..c504bf340d 100644 --- a/webapi/src/main/scala/org/knora/webapi/core/actors/RoutingActor.scala +++ b/webapi/src/main/scala/org/knora/webapi/core/actors/RoutingActor.scala @@ -6,7 +6,7 @@ package org.knora.webapi.core.actors import org.apache.pekko.actor.Actor -import zio._ +import zio.* import dsp.errors.UnexpectedMessageException import org.knora.webapi.core.MessageRelay diff --git a/webapi/src/main/scala/org/knora/webapi/http/handler/KnoraExceptionHandler.scala b/webapi/src/main/scala/org/knora/webapi/http/handler/KnoraExceptionHandler.scala index 4a586b89c3..2c05fd8f6c 100644 --- a/webapi/src/main/scala/org/knora/webapi/http/handler/KnoraExceptionHandler.scala +++ b/webapi/src/main/scala/org/knora/webapi/http/handler/KnoraExceptionHandler.scala @@ -20,7 +20,7 @@ import org.knora.webapi.messages.util.rdf.JsonLDDocument import org.knora.webapi.messages.util.rdf.JsonLDObject import org.knora.webapi.messages.util.rdf.JsonLDString -import pekko.http.scaladsl.model._ +import pekko.http.scaladsl.model.* import pekko.http.scaladsl.server.Directives.complete import pekko.http.scaladsl.server.Directives.extractRequest import pekko.http.scaladsl.server.ExceptionHandler diff --git a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesADM.scala b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesADM.scala index 40d462e191..57987d0b5f 100644 --- a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesADM.scala @@ -7,7 +7,7 @@ package org.knora.webapi.http.status import org.apache.pekko -import dsp.errors._ +import dsp.errors.* import pekko.http.scaladsl.model.StatusCode import pekko.http.scaladsl.model.StatusCodes diff --git a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV2.scala b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV2.scala index 12aa6e2022..2b2329739e 100644 --- a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV2.scala @@ -7,7 +7,7 @@ package org.knora.webapi.http.status import org.apache.pekko -import dsp.errors._ +import dsp.errors.* import org.knora.webapi.store.triplestore.errors.TriplestoreTimeoutException import pekko.http.scaladsl.model.StatusCode diff --git a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesZ.scala b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesZ.scala index 5a38daec4f..315a9a2ddd 100644 --- a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesZ.scala +++ b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesZ.scala @@ -7,7 +7,7 @@ package org.knora.webapi.http.status import zio.http.Status -import dsp.errors._ +import dsp.errors.* import org.knora.webapi.store.triplestore.errors.TriplestoreTimeoutException /** diff --git a/webapi/src/main/scala/org/knora/webapi/messages/StringFormatter.scala b/webapi/src/main/scala/org/knora/webapi/messages/StringFormatter.scala index d786f5032f..8ccc2fb646 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/StringFormatter.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/StringFormatter.scala @@ -5,10 +5,10 @@ package org.knora.webapi.messages -import spray.json._ +import spray.json.* import zio.ZLayer -import java.time._ +import java.time.* import java.time.temporal.ChronoField import java.util.UUID import java.util.concurrent.ConcurrentHashMap @@ -17,12 +17,12 @@ import scala.util.Success import scala.util.Try import scala.util.matching.Regex -import dsp.errors._ +import dsp.errors.* import dsp.valueobjects.Iri import dsp.valueobjects.UuidUtil -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.config.AppConfig -import org.knora.webapi.messages.StringFormatter._ +import org.knora.webapi.messages.StringFormatter.* import org.knora.webapi.messages.XmlPatterns.nCNamePattern import org.knora.webapi.messages.XmlPatterns.nCNameRegex import org.knora.webapi.messages.store.triplestoremessages.StringLiteralSequenceV2 diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADM.scala index 0fda306bb7..f67fc5e8c0 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADM.scala @@ -11,7 +11,7 @@ import zio.json.JsonCodec import zio.json.jsonDiscriminator import dsp.valueobjects.Iri -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.AdminKnoraResponseADM import org.knora.webapi.messages.store.triplestoremessages.StringLiteralSequenceV2 diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADM.scala index c59aafe974..cddc9879fd 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADM.scala @@ -16,7 +16,7 @@ import java.util.UUID import dsp.errors.BadRequestException import dsp.errors.ForbiddenException import dsp.valueobjects.Iri -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.core.RelayedMessage import org.knora.webapi.messages.ResponderRequest.KnoraRequestADM import org.knora.webapi.messages.StringFormatter 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 fa2df77d84..c05c0060a0 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 @@ -10,8 +10,8 @@ import zio.json.JsonCodec import org.knora.webapi.messages.admin.responder.AdminKnoraResponseADM import org.knora.webapi.slice.admin.api.model.Project +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._ /** * Represents an answer to a request for a list of all users. diff --git a/webapi/src/main/scala/org/knora/webapi/messages/store/sipimessages/SipiMessages.scala b/webapi/src/main/scala/org/knora/webapi/messages/store/sipimessages/SipiMessages.scala index be462ef352..4d81c4040b 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/store/sipimessages/SipiMessages.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/store/sipimessages/SipiMessages.scala @@ -6,7 +6,7 @@ package org.knora.webapi.messages.store.sipimessages import org.apache.pekko -import spray.json._ +import spray.json.* import org.knora.webapi.core.RelayedMessage import org.knora.webapi.messages.store.StoreRequest 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 b0ee462630..6271d985e8 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 @@ -7,21 +7,21 @@ package org.knora.webapi.messages.store.triplestoremessages import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf import org.eclipse.rdf4j.sparqlbuilder.rdf.RdfLiteral.StringLiteral -import spray.json._ +import spray.json.* import sttp.tapir.Schema -import zio._ +import zio.* import zio.json.DeriveJsonCodec import zio.json.JsonCodec import java.time.Instant import scala.collection.mutable -import dsp.errors._ -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ -import org.knora.webapi.messages._ +import dsp.errors.* +import org.knora.webapi.* +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._ +import org.knora.webapi.messages.util.rdf.* /** * A response to a [[org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.Construct]] query. diff --git a/webapi/src/main/scala/org/knora/webapi/messages/twirl/SparqlTemplateResourceToCreate.scala b/webapi/src/main/scala/org/knora/webapi/messages/twirl/SparqlTemplateResourceToCreate.scala index 435cfe3fd8..860024c109 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/twirl/SparqlTemplateResourceToCreate.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/twirl/SparqlTemplateResourceToCreate.scala @@ -7,7 +7,7 @@ package org.knora.webapi.messages.twirl import java.time.Instant -import org.knora.webapi._ +import org.knora.webapi.* /** * Represents a resource to be created with its index, label, IRI, permissions, and SPARQL for creating its values diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/CalendarDateUtilV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/CalendarDateUtilV2.scala index 5af2f6b397..4c84a2be11 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/CalendarDateUtilV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/CalendarDateUtilV2.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util -import com.ibm.icu.util._ +import com.ibm.icu.util.* import java.util.Date 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 bb78184d27..dc01603195 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 @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util -import zio._ +import zio.* import java.time.Instant import java.util.UUID @@ -15,15 +15,15 @@ import dsp.errors.InconsistentRepositoryDataException import dsp.errors.NotFoundException import dsp.errors.NotImplementedException import dsp.valueobjects.UuidUtil -import org.knora.webapi._ +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.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter +import org.knora.webapi.messages.store.triplestoremessages.* import org.knora.webapi.messages.store.triplestoremessages.SparqlExtendedConstructResponse.ConstructPredicateObjects -import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.util.ConstructResponseUtilV2.FlatPredicateObjects import org.knora.webapi.messages.util.ConstructResponseUtilV2.FlatStatements import org.knora.webapi.messages.util.ConstructResponseUtilV2.MainResourcesAndValueRdfData @@ -49,7 +49,7 @@ import org.knora.webapi.messages.v2.responder.standoffmessages.GetMappingRespons import org.knora.webapi.messages.v2.responder.standoffmessages.GetXSLTransformationRequestV2 import org.knora.webapi.messages.v2.responder.standoffmessages.GetXSLTransformationResponseV2 import org.knora.webapi.messages.v2.responder.standoffmessages.MappingXMLtoStandoff -import org.knora.webapi.messages.v2.responder.valuemessages._ +import org.knora.webapi.messages.v2.responder.valuemessages.* import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.Permission import org.knora.webapi.slice.admin.domain.model.User diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/UserUtilADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/UserUtilADM.scala index ae896f8f4b..8a9ec20677 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/UserUtilADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/UserUtilADM.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util -import zio._ +import zio.* import dsp.errors.ForbiddenException import dsp.errors.NotFoundException diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JenaModel.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JenaModel.scala index 3373ead9b5..a1f6a4c2e3 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JenaModel.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JenaModel.scala @@ -8,13 +8,13 @@ package org.knora.webapi.messages.util.rdf import org.apache.jena import scala.collection.mutable.ArrayBuffer -import scala.jdk.CollectionConverters._ +import scala.jdk.CollectionConverters.* import dsp.errors.RdfProcessingException import org.knora.webapi.IRI import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.util.ErrorHandlingMap -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* sealed trait JenaNode extends RdfNode { def node: jena.graph.Node diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JsonLDUtil.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JsonLDUtil.scala index c99ac28b49..1bfa1d129f 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JsonLDUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JsonLDUtil.scala @@ -5,9 +5,9 @@ package org.knora.webapi.messages.util.rdf -import com.apicatalog.jsonld._ -import com.apicatalog.jsonld.document._ -import jakarta.json._ +import com.apicatalog.jsonld.* +import com.apicatalog.jsonld.document.* +import jakarta.json.* import jakarta.json.stream.JsonGenerator import org.apache.commons.lang3.builder.HashCodeBuilder import zio.IO @@ -19,14 +19,14 @@ import java.net.URI import java.net.URL import java.util import java.util.UUID -import scala.jdk.CollectionConverters._ -import scala.util.control.Exception._ +import scala.jdk.CollectionConverters.* +import scala.util.control.Exception.* -import dsp.errors._ +import dsp.errors.* import dsp.valueobjects.Iri import dsp.valueobjects.UuidUtil -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Complex.ValueHasComment import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/FullTextMainQueryGenerator.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/FullTextMainQueryGenerator.scala index dd059b6a36..f8e98b57d2 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/FullTextMainQueryGenerator.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/FullTextMainQueryGenerator.scala @@ -5,8 +5,8 @@ package org.knora.webapi.messages.util.search -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/MainQueryResultProcessor.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/MainQueryResultProcessor.scala index 6b3f0d918e..dd9bf43fb3 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/MainQueryResultProcessor.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/MainQueryResultProcessor.scala @@ -6,8 +6,8 @@ package org.knora.webapi.messages.util.search import dsp.errors.AssertionException -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.util.ConstructResponseUtilV2 diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/QueryTraverser.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/QueryTraverser.scala index b6a3253449..d67a574f55 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/QueryTraverser.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/QueryTraverser.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util.search -import zio._ +import zio.* import dsp.errors.GravsearchOptimizationException import org.knora.webapi.InternalSchema diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/SparqlQuery.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/SparqlQuery.scala index 3a6831b4be..8a33ec8ffd 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/SparqlQuery.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/SparqlQuery.scala @@ -8,8 +8,8 @@ package org.knora.webapi.messages.util.search import org.apache.pekko import dsp.errors.GravsearchException -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParser.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParser.scala index c212b1a8c8..9523ac4997 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParser.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParser.scala @@ -9,18 +9,18 @@ import org.eclipse.rdf4j import org.eclipse.rdf4j.query.MalformedQueryException import org.eclipse.rdf4j.query.algebra import org.eclipse.rdf4j.query.parser.QueryParser -import org.eclipse.rdf4j.query.parser.sparql._ +import org.eclipse.rdf4j.query.parser.sparql.* -import scala.jdk.CollectionConverters._ -import scala.jdk.OptionConverters._ +import scala.jdk.CollectionConverters.* +import scala.jdk.OptionConverters.* import dsp.errors.GravsearchException -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* /** * Parses a Gravsearch query. The syntax that is accepted is that of a SPARQL CONSTRUCT query, with some restrictions: diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchQueryChecker.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchQueryChecker.scala index 529b06a230..a10a9c71fa 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchQueryChecker.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchQueryChecker.scala @@ -5,13 +5,13 @@ package org.knora.webapi.messages.util.search.gravsearch -import zio._ +import zio.* import dsp.errors.AssertionException import dsp.errors.GravsearchException -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchEntityTypeInfo import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInspectionResult import org.knora.webapi.messages.util.search.gravsearch.types.NonPropertyTypeInfo diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/mainquery/GravsearchMainQueryGenerator.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/mainquery/GravsearchMainQueryGenerator.scala index e000ad1d12..a83124b330 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/mainquery/GravsearchMainQueryGenerator.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/mainquery/GravsearchMainQueryGenerator.scala @@ -6,14 +6,14 @@ package org.knora.webapi.messages.util.search.gravsearch.mainquery import dsp.errors.GravsearchException -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter 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.util.search._ +import org.knora.webapi.messages.util.search.* import org.knora.webapi.messages.util.search.gravsearch.prequery.GravsearchToPrequeryTransformer object GravsearchMainQueryGenerator { diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/AbstractPrequeryGenerator.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/AbstractPrequeryGenerator.scala index 6c6891b424..b9310eb89d 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/AbstractPrequeryGenerator.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/AbstractPrequeryGenerator.scala @@ -10,18 +10,18 @@ import zio.ZIO import scala.collection.mutable -import dsp.errors._ -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import dsp.errors.* +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.ValuesValidator -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* import org.knora.webapi.messages.util.search.gravsearch.GravsearchQueryChecker import org.knora.webapi.messages.util.search.gravsearch.transformers.SparqlTransformer import org.knora.webapi.messages.util.search.gravsearch.transformers.WhereTransformer -import org.knora.webapi.messages.util.search.gravsearch.types._ +import org.knora.webapi.messages.util.search.gravsearch.types.* import org.knora.webapi.messages.v2.responder.valuemessages.DateValueContentV2 import org.knora.webapi.util.ApacheLuceneSupport.LuceneQueryString diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchQueryOptimisation.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchQueryOptimisation.scala index 012d3c11fc..4b2420b473 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchQueryOptimisation.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchQueryOptimisation.scala @@ -10,7 +10,7 @@ import scalax.collection.immutable.Graph import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* import org.knora.webapi.messages.util.search.gravsearch.prequery.RemoveEntitiesInferredFromProperty.removeEntitiesInferredFromProperty import org.knora.webapi.messages.util.search.gravsearch.prequery.RemoveRedundantKnoraApiResource.removeRedundantKnoraApiResource import org.knora.webapi.messages.util.search.gravsearch.prequery.ReorderPatternsByDependency.reorderPatternsByDependency diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToCountPrequeryTransformer.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToCountPrequeryTransformer.scala index befa5a8fa7..122e1bfe9a 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToCountPrequeryTransformer.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToCountPrequeryTransformer.scala @@ -9,7 +9,7 @@ import zio.Task import zio.ZIO import org.knora.webapi.ApiV2Schema -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInspectionResult /** diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToPrequeryTransformer.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToPrequeryTransformer.scala index 9d6d31f9c7..2dbb9cddea 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToPrequeryTransformer.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToPrequeryTransformer.scala @@ -10,10 +10,10 @@ import zio.ZIO import dsp.errors.AssertionException import dsp.errors.GravsearchException -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.config.AppConfig import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* import org.knora.webapi.messages.util.search.gravsearch.transformers.SparqlTransformer import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInspectionResult import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInspectionUtil diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/InferenceOptimizationService.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/InferenceOptimizationService.scala index 82164bf4d0..194c6df2a2 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/InferenceOptimizationService.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/InferenceOptimizationService.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util.search.gravsearch.prequery -import zio._ +import zio.* import dsp.errors.ValidationException import org.knora.webapi.InternalSchema diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/ConstructTransformer.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/ConstructTransformer.scala index 17ed22ae10..17d442b211 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/ConstructTransformer.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/ConstructTransformer.scala @@ -5,10 +5,10 @@ package org.knora.webapi.messages.util.search.gravsearch.transformers -import zio._ +import zio.* import org.knora.webapi.messages.SmartIri -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* import org.knora.webapi.slice.resourceinfo.domain.IriConverter final case class ConstructTransformer( 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 d77f6da957..b98bebcbae 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,15 +5,15 @@ package org.knora.webapi.messages.util.search.gravsearch.transformers +import zio.* import zio.ZLayer -import zio._ import dsp.errors.GravsearchException -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* import org.knora.webapi.slice.ontology.repo.model.OntologyCacheData import org.knora.webapi.slice.ontology.repo.service.OntologyCache diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SelectTransformer.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SelectTransformer.scala index 6b576e9fc1..b16b3251ff 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SelectTransformer.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SelectTransformer.scala @@ -5,13 +5,13 @@ package org.knora.webapi.messages.util.search.gravsearch.transformers -import zio._ +import zio.* import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* -import SparqlTransformer._ +import SparqlTransformer.* class SelectTransformer( simulateInference: Boolean, diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SparqlTransformer.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SparqlTransformer.scala index 943dd52a43..36640022a7 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SparqlTransformer.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SparqlTransformer.scala @@ -7,12 +7,12 @@ package org.knora.webapi.messages.util.search.gravsearch.transformers import dsp.errors.AssertionException import dsp.errors.GravsearchException -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* object SparqlTransformer { diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/WhereTransformer.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/WhereTransformer.scala index c55af6276e..1d1bbe2cb2 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/WhereTransformer.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/WhereTransformer.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util.search.gravsearch.transformers -import zio._ +import zio.* import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.util.search.FilterPattern diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/AnnotationReadingGravsearchTypeInspector.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/AnnotationReadingGravsearchTypeInspector.scala index d2fc9594ac..b631a7b525 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/AnnotationReadingGravsearchTypeInspector.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/AnnotationReadingGravsearchTypeInspector.scala @@ -10,10 +10,10 @@ import zio.ZIO import dsp.errors.AssertionException import dsp.errors.GravsearchException -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInspectionUtil.TypeAnnotationProperties import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInspectionUtil.TypeAnnotationProperty diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionRunner.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionRunner.scala index 62edeb89b8..26a7f06d2b 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionRunner.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionRunner.scala @@ -13,7 +13,7 @@ import dsp.errors.GravsearchException import org.knora.webapi.core.MessageRelay import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* import org.knora.webapi.slice.admin.domain.model.User /** diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionUtil.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionUtil.scala index 2bff98e195..accd6e2612 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionUtil.scala @@ -5,14 +5,14 @@ package org.knora.webapi.messages.util.search.gravsearch.types -import zio._ +import zio.* import dsp.errors.AssertionException import dsp.errors.GravsearchException import org.knora.webapi.IRI import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* /** * Utilities for Gravsearch type inspection. diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/InferringGravsearchTypeInspector.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/InferringGravsearchTypeInspector.scala index b3ebd82127..e0efad7f25 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/InferringGravsearchTypeInspector.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/InferringGravsearchTypeInspector.scala @@ -14,13 +14,13 @@ import scala.annotation.tailrec import dsp.errors.AssertionException import dsp.errors.GravsearchException -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* import org.knora.webapi.messages.v2.responder.KnoraReadV2 import org.knora.webapi.messages.v2.responder.ontologymessages.EntityInfoGetRequestV2 import org.knora.webapi.messages.v2.responder.ontologymessages.EntityInfoGetResponseV2 diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/IntermediateTypeInspectionResult.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/IntermediateTypeInspectionResult.scala index 5f90aa4816..980bd38e64 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/IntermediateTypeInspectionResult.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/IntermediateTypeInspectionResult.scala @@ -7,7 +7,7 @@ package org.knora.webapi.messages.util.search.gravsearch.types import dsp.errors.AssertionException import org.knora.webapi.IRI -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter 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 c1d5bc6ca8..5522560476 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 @@ -11,12 +11,12 @@ import zio.ZLayer import java.time.Instant import java.util.UUID -import dsp.errors._ +import dsp.errors.* import dsp.valueobjects.Iri import dsp.valueobjects.UuidUtil import org.knora.webapi.IRI import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter @@ -27,9 +27,9 @@ 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.standoffmessages._ +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 import org.knora.webapi.slice.ontology.domain.model.Cardinality.ExactlyOne diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtil.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtil.scala index 63c023c6ab..aba294029d 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtil.scala @@ -6,7 +6,7 @@ package org.knora.webapi.messages.util.standoff import com.sksamuel.diffpatch.DiffMatchPatch -import com.sksamuel.diffpatch.DiffMatchPatch._ +import com.sksamuel.diffpatch.DiffMatchPatch.* import org.apache.commons.text.StringEscapeUtils import java.io.StringReader @@ -15,11 +15,11 @@ import java.util.UUID import javax.xml.parsers.SAXParserFactory import javax.xml.transform.stream.StreamSource import scala.util.control.NonFatal -import scala.xml._ +import scala.xml.* -import dsp.errors._ +import dsp.errors.* import dsp.valueobjects.UuidUtil -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.util.ErrorHandlingMap diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/KnoraResponseV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/KnoraResponseV2.scala index a353e7f53c..0242ce22ae 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/KnoraResponseV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/KnoraResponseV2.scala @@ -7,10 +7,10 @@ package org.knora.webapi.messages.v2.responder import dsp.errors.AssertionException import dsp.errors.BadRequestException -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.config.AppConfig import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.slice.admin.api.model.Project import org.knora.webapi.slice.common.api.KnoraResponseRenderer diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/listsmessages/ListsMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/listsmessages/ListsMessagesV2.scala index 42f77909bd..b844117f9c 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/listsmessages/ListsMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/listsmessages/ListsMessagesV2.scala @@ -5,17 +5,17 @@ package org.knora.webapi.messages.v2.responder.listsmessages -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.config.AppConfig import org.knora.webapi.core.RelayedMessage -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.ResponderRequest.KnoraRequestV2 import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.admin.responder.listsmessages._ +import org.knora.webapi.messages.admin.responder.listsmessages.* import org.knora.webapi.messages.store.triplestoremessages.StringLiteralSequenceV2 import org.knora.webapi.messages.util.rdf -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.v2.responder.KnoraJsonLDResponseV2 import org.knora.webapi.slice.admin.domain.model.User diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2ComplexTransformationRules.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2ComplexTransformationRules.scala index d9523534f5..494f469d53 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2ComplexTransformationRules.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2ComplexTransformationRules.scala @@ -5,17 +5,17 @@ package org.knora.webapi.messages.v2.responder.ontologymessages -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.OntologyLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.SmartIriLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality._ +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* import org.knora.webapi.slice.admin.domain.service.KnoraProjectRepo -import org.knora.webapi.slice.ontology.domain.model.Cardinality._ +import org.knora.webapi.slice.ontology.domain.model.Cardinality.* /** * Rules for converting `knora-base` (or an ontology based on it) into `knora-api` in the [[ApiV2Complex]] schema. diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2SimpleTransformationRules.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2SimpleTransformationRules.scala index f391b816b7..2909e151ac 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2SimpleTransformationRules.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2SimpleTransformationRules.scala @@ -5,17 +5,17 @@ package org.knora.webapi.messages.v2.responder.ontologymessages -import org.knora.webapi._ -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.OntologyLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.SmartIriLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality._ +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* import org.knora.webapi.slice.admin.domain.service.KnoraProjectRepo -import org.knora.webapi.slice.ontology.domain.model.Cardinality._ +import org.knora.webapi.slice.ontology.domain.model.Cardinality.* /** * Rules for converting `knora-base` (or an ontology based on it) into `knora-api` in the [[ApiV2Simple]] schema. diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala index 53c04e5fd1..45f9b76803 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala @@ -8,7 +8,7 @@ package org.knora.webapi.messages.v2.responder.ontologymessages import com.typesafe.scalalogging.Logger import org.apache.commons.lang3.builder.HashCodeBuilder import org.apache.pekko -import zio._ +import zio.* import java.time.Instant import java.util.UUID @@ -22,10 +22,10 @@ import dsp.errors.DataConversionException import dsp.errors.InconsistentRepositoryDataException import dsp.valueobjects.Iri import dsp.valueobjects.Schema -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.config.AppConfig import org.knora.webapi.core.RelayedMessage -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Complex import org.knora.webapi.messages.OntologyConstants.Rdfs @@ -33,9 +33,9 @@ import org.knora.webapi.messages.ResponderRequest.KnoraRequestV2 import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.ValuesValidator -import org.knora.webapi.messages.store.triplestoremessages._ -import org.knora.webapi.messages.util.rdf._ -import org.knora.webapi.messages.v2.responder._ +import org.knora.webapi.messages.store.triplestoremessages.* +import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.v2.responder.* import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.KnoraCardinalityInfo import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.OwlCardinalityInfo import org.knora.webapi.messages.v2.responder.standoffmessages.StandoffDataTypeClasses 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 1537a5d084..dd5d5f79b0 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 @@ -5,33 +5,33 @@ package org.knora.webapi.messages.v2.responder.resourcemessages -import zio._ +import zio.* import java.time.Instant import java.util.UUID -import dsp.errors._ +import dsp.errors.* import dsp.valueobjects.Iri import dsp.valueobjects.UuidUtil -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageRelay import org.knora.webapi.core.RelayedMessage -import org.knora.webapi.messages.IriConversions._ -import org.knora.webapi.messages.OntologyConstants._ +import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.OntologyConstants.* import org.knora.webapi.messages.ResponderRequest.KnoraRequestV2 import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.ValuesValidator.xsdDateTimeStampToInstant -import org.knora.webapi.messages.util._ -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.* +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 import org.knora.webapi.messages.util.standoff.XMLUtil -import org.knora.webapi.messages.v2.responder._ +import org.knora.webapi.messages.v2.responder.* import org.knora.webapi.messages.v2.responder.standoffmessages.MappingXMLtoStandoff -import org.knora.webapi.messages.v2.responder.valuemessages._ +import org.knora.webapi.messages.v2.responder.valuemessages.* import org.knora.webapi.routing.v2.AssetIngestState -import org.knora.webapi.routing.v2.AssetIngestState._ +import org.knora.webapi.routing.v2.AssetIngestState.* import org.knora.webapi.slice.admin.api.model.Project import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.Permission @@ -40,7 +40,7 @@ import org.knora.webapi.slice.admin.domain.service.ProjectService import org.knora.webapi.slice.admin.domain.service.UserService import org.knora.webapi.slice.resourceinfo.domain.IriConverter import org.knora.webapi.store.iiif.api.SipiService -import org.knora.webapi.util._ +import org.knora.webapi.util.* /** * An abstract trait for messages that can be sent to `ResourcesResponderV2`. diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/standoffmessages/StandoffMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/standoffmessages/StandoffMessagesV2.scala index cd395600fd..49a387fa78 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/standoffmessages/StandoffMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/standoffmessages/StandoffMessagesV2.scala @@ -18,15 +18,15 @@ import scala.concurrent.Future import dsp.errors.AssertionException import dsp.valueobjects.Iri import dsp.valueobjects.UuidUtil -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.config.AppConfig import org.knora.webapi.core.RelayedMessage -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.ResponderRequest.KnoraRequestV2 import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.v2.responder.KnoraContentV2 import org.knora.webapi.messages.v2.responder.KnoraJsonLDRequestReaderV2 import org.knora.webapi.messages.v2.responder.KnoraJsonLDResponseV2 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 71e5ebc022..79716f4289 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 @@ -18,30 +18,30 @@ import dsp.errors.NotImplementedException import dsp.valueobjects.Iri import dsp.valueobjects.IriErrorMessages import dsp.valueobjects.UuidUtil -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageRelay import org.knora.webapi.core.RelayedMessage -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Complex -import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Complex._ +import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Complex.* import org.knora.webapi.messages.ResponderRequest.KnoraRequestV2 import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.ValuesValidator -import org.knora.webapi.messages.util._ -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.* +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.util.standoff.StandoffStringUtil import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 import org.knora.webapi.messages.util.standoff.XMLUtil -import org.knora.webapi.messages.v2.responder._ +import org.knora.webapi.messages.v2.responder.* import org.knora.webapi.messages.v2.responder.resourcemessages.ReadResourceV2 -import org.knora.webapi.messages.v2.responder.standoffmessages._ +import org.knora.webapi.messages.v2.responder.standoffmessages.* import org.knora.webapi.routing.RouteUtilV2 import org.knora.webapi.routing.RouteUtilZ import org.knora.webapi.routing.v2.AssetIngestState -import org.knora.webapi.routing.v2.AssetIngestState._ +import org.knora.webapi.routing.v2.AssetIngestState.* import org.knora.webapi.slice.admin.api.model.MaintenanceRequests.AssetId import org.knora.webapi.slice.admin.api.model.Project import org.knora.webapi.slice.admin.domain.model.KnoraProject.Shortcode diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/routing/authenticationmessages/AuthenticationMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/routing/authenticationmessages/AuthenticationMessagesV2.scala index e92422ffa3..4a2ec71cb0 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/routing/authenticationmessages/AuthenticationMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/routing/authenticationmessages/AuthenticationMessagesV2.scala @@ -6,13 +6,13 @@ package org.knora.webapi.messages.v2.routing.authenticationmessages import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport -import spray.json._ +import spray.json.* import zio.json.DeriveJsonCodec import zio.json.JsonCodec import dsp.errors.BadRequestException import org.knora.webapi.IRI -import org.knora.webapi.slice.admin.domain.model._ +import org.knora.webapi.slice.admin.domain.model.* ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // API requests diff --git a/webapi/src/main/scala/org/knora/webapi/responders/IriService.scala b/webapi/src/main/scala/org/knora/webapi/responders/IriService.scala index 24758885ed..06fa39c57e 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/IriService.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/IriService.scala @@ -6,9 +6,9 @@ package org.knora.webapi.responders import com.typesafe.scalalogging.LazyLogging -import zio._ +import zio.* -import dsp.errors._ +import dsp.errors.* import dsp.valueobjects.UuidUtil import org.knora.webapi.IRI import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/main/scala/org/knora/webapi/responders/Responder.scala b/webapi/src/main/scala/org/knora/webapi/responders/Responder.scala index 85523ad86e..a9e4ccaa1a 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/Responder.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/Responder.scala @@ -6,9 +6,9 @@ package org.knora.webapi package responders -import zio._ +import zio.* -import dsp.errors._ +import dsp.errors.* object Responder { diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/AssetPermissionsResponder.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/AssetPermissionsResponder.scala index 40c2d6ab5b..fa68dda557 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/AssetPermissionsResponder.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/AssetPermissionsResponder.scala @@ -5,7 +5,7 @@ package org.knora.webapi.responders.admin -import zio._ +import zio.* import dsp.errors.InconsistentRepositoryDataException import dsp.errors.NotFoundException 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 10c4e5ae78..f5adf07fdc 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 @@ -12,23 +12,23 @@ import zio.ZLayer import java.util.UUID -import dsp.errors._ +import dsp.errors.* import dsp.valueobjects.Iri -import dsp.valueobjects.Iri._ +import dsp.valueobjects.Iri.* import org.knora.webapi.config.AppConfig -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants.KnoraBase 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.admin.responder.listsmessages.* +import org.knora.webapi.messages.store.triplestoremessages.* import org.knora.webapi.messages.store.triplestoremessages.SparqlExtendedConstructResponse.ConstructPredicateObjects -import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.responders.IriLocker import org.knora.webapi.responders.IriService import org.knora.webapi.responders.admin.ListsResponder.Queries -import org.knora.webapi.slice.admin.api.Requests._ +import org.knora.webapi.slice.admin.api.Requests.* import org.knora.webapi.slice.admin.domain.model.KnoraProject import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.ListProperties.ListIri diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponder.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponder.scala index 10a926fd67..dd52a40248 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponder.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponder.scala @@ -6,13 +6,13 @@ package org.knora.webapi.responders.admin import com.typesafe.scalalogging.LazyLogging -import zio._ +import zio.* import java.util.UUID import scala.collection.mutable.ListBuffer -import dsp.errors._ -import org.knora.webapi._ +import dsp.errors.* +import org.knora.webapi.* import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay @@ -21,7 +21,7 @@ import org.knora.webapi.messages.ResponderRequest import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.permissionsmessages -import org.knora.webapi.messages.admin.responder.permissionsmessages._ +import org.knora.webapi.messages.admin.responder.permissionsmessages.* import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.messages.util.PermissionUtilADM @@ -38,7 +38,7 @@ import org.knora.webapi.slice.admin.domain.model.PermissionIri import org.knora.webapi.slice.admin.domain.model.User import org.knora.webapi.slice.admin.domain.service.AdministrativePermissionService import org.knora.webapi.slice.admin.domain.service.GroupService -import org.knora.webapi.slice.admin.domain.service.KnoraGroupRepo._ +import org.knora.webapi.slice.admin.domain.service.KnoraGroupRepo.* import org.knora.webapi.slice.admin.domain.service.KnoraProjectRepo import org.knora.webapi.slice.admin.domain.service.KnoraProjectService import org.knora.webapi.slice.common.api.AuthorizationRestService diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ListsResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ListsResponderV2.scala index 5e31632799..e411759671 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ListsResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ListsResponderV2.scala @@ -5,7 +5,7 @@ package org.knora.webapi.responders.v2 -import zio._ +import zio.* import org.knora.webapi.IRI import org.knora.webapi.config.AppConfig @@ -14,7 +14,7 @@ import org.knora.webapi.core.MessageRelay import org.knora.webapi.messages.ResponderRequest import org.knora.webapi.messages.admin.responder.listsmessages.ChildNodeInfoGetResponseADM import org.knora.webapi.messages.admin.responder.listsmessages.ListGetResponseADM -import org.knora.webapi.messages.v2.responder.listsmessages._ +import org.knora.webapi.messages.v2.responder.listsmessages.* import org.knora.webapi.responders.Responder import org.knora.webapi.responders.admin.ListsResponder import org.knora.webapi.slice.admin.domain.model.User 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 6e379579c3..4eace6d229 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 @@ -14,21 +14,21 @@ import zio.ZLayer import java.time.Instant import dsp.constants.SalsahGui -import dsp.errors._ -import org.knora.webapi._ +import dsp.errors.* +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.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.store.triplestoremessages.SmartIriLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 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.* import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.KnoraCardinalityInfo -import org.knora.webapi.messages.v2.responder.ontologymessages._ 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 2e6451cbaf..e57c20ce1e 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.* import zio.Task -import zio._ import dsp.errors.ForbiddenException import org.knora.webapi.IRI @@ -29,7 +29,7 @@ import org.knora.webapi.messages.v2.responder.valuemessages.FileValueContentV2 import org.knora.webapi.messages.v2.responder.valuemessages.ReadValueV2 import org.knora.webapi.messages.v2.responder.valuemessages.StillImageExternalFileValueContentV2 import org.knora.webapi.routing.v2.AssetIngestState -import org.knora.webapi.routing.v2.AssetIngestState._ +import org.knora.webapi.routing.v2.AssetIngestState.* import org.knora.webapi.slice.admin.domain.model.Permission import org.knora.webapi.slice.admin.domain.model.User import org.knora.webapi.store.triplestore.api.TriplestoreService 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 37914ee0ef..89bdacf21e 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 @@ -6,37 +6,37 @@ package org.knora.webapi.responders.v2 import com.typesafe.scalalogging.LazyLogging +import zio.* import zio.ZIO -import zio._ import java.time.Instant import java.util.UUID -import dsp.errors._ +import dsp.errors.* import dsp.valueobjects.Iri import dsp.valueobjects.UuidUtil +import org.knora.webapi.* import org.knora.webapi.SchemaRendering.apiV2SchemaWithOption -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.* +import org.knora.webapi.messages.IriConversions.* 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._ -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.util.search.gravsearch.GravsearchParser import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 import org.knora.webapi.messages.v2.responder.SuccessResponseV2 -import org.knora.webapi.messages.v2.responder.resourcemessages._ +import org.knora.webapi.messages.v2.responder.resourcemessages.* import org.knora.webapi.messages.v2.responder.standoffmessages.GetMappingRequestV2 import org.knora.webapi.messages.v2.responder.standoffmessages.GetMappingResponseV2 import org.knora.webapi.messages.v2.responder.standoffmessages.GetXSLTransformationRequestV2 import org.knora.webapi.messages.v2.responder.standoffmessages.GetXSLTransformationResponseV2 -import org.knora.webapi.messages.v2.responder.valuemessages._ +import org.knora.webapi.messages.v2.responder.valuemessages.* 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/SearchResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala index 69bb222d1f..f9e9ab4608 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala @@ -6,21 +6,21 @@ package org.knora.webapi.responders.v2 import com.typesafe.scalalogging.LazyLogging -import zio._ +import zio.* import dsp.errors.AssertionException import dsp.errors.BadRequestException import dsp.errors.GravsearchException import dsp.errors.InconsistentRepositoryDataException import dsp.valueobjects.Iri -import org.knora.webapi._ +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.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.store.triplestoremessages._ +import org.knora.webapi.messages.store.triplestoremessages.* import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.messages.util.ConstructResponseUtilV2 import org.knora.webapi.messages.util.ConstructResponseUtilV2.MappingAndXSLTransformation @@ -32,7 +32,7 @@ import org.knora.webapi.messages.util.rdf.JsonLDString import org.knora.webapi.messages.util.rdf.SparqlSelectResult import org.knora.webapi.messages.util.rdf.SparqlSelectResultBody import org.knora.webapi.messages.util.rdf.VariableResultsRow -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* import org.knora.webapi.messages.util.search.gravsearch.GravsearchParser import org.knora.webapi.messages.util.search.gravsearch.GravsearchQueryChecker import org.knora.webapi.messages.util.search.gravsearch.mainquery.GravsearchMainQueryGenerator @@ -42,14 +42,14 @@ import org.knora.webapi.messages.util.search.gravsearch.prequery.InferenceOptimi import org.knora.webapi.messages.util.search.gravsearch.transformers.ConstructTransformer import org.knora.webapi.messages.util.search.gravsearch.transformers.OntologyInferencer import org.knora.webapi.messages.util.search.gravsearch.transformers.SelectTransformer -import org.knora.webapi.messages.util.search.gravsearch.types._ +import org.knora.webapi.messages.util.search.gravsearch.types.* import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 import org.knora.webapi.messages.v2.responder.KnoraJsonLDResponseV2 import org.knora.webapi.messages.v2.responder.ontologymessages.EntityInfoGetRequestV2 import org.knora.webapi.messages.v2.responder.ontologymessages.EntityInfoGetResponseV2 import org.knora.webapi.messages.v2.responder.ontologymessages.ReadClassInfoV2 import org.knora.webapi.messages.v2.responder.ontologymessages.ReadPropertyInfoV2 -import org.knora.webapi.messages.v2.responder.resourcemessages._ +import org.knora.webapi.messages.v2.responder.resourcemessages.* import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.User import org.knora.webapi.slice.ontology.repo.service.OntologyCache @@ -57,7 +57,7 @@ import org.knora.webapi.slice.resourceinfo.domain.IriConverter import org.knora.webapi.store.triplestore.api.TriplestoreService import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.Construct import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.Select -import org.knora.webapi.util.ApacheLuceneSupport._ +import org.knora.webapi.util.ApacheLuceneSupport.* /** * Represents the number of resources found by a search query. 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 a93209e574..a1a2bdb9a5 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 @@ -7,9 +7,9 @@ package org.knora.webapi.responders.v2 import com.typesafe.scalalogging.LazyLogging import org.xml.sax.SAXException -import zio._ +import zio.* -import java.io._ +import java.io.* import java.util.UUID import javax.xml.XMLConstants import javax.xml.transform.stream.StreamSource @@ -18,14 +18,14 @@ import scala.xml.Node import scala.xml.NodeSeq import scala.xml.XML -import dsp.errors._ +import dsp.errors.* import dsp.valueobjects.Iri -import org.knora.webapi._ +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.* +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileRequest import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileResponse import org.knora.webapi.messages.twirl.MappingElement @@ -36,13 +36,13 @@ import org.knora.webapi.messages.util.ConstructResponseUtilV2 import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2.XMLTagItem -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality._ +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* import org.knora.webapi.messages.v2.responder.ontologymessages.ReadClassInfoV2 import org.knora.webapi.messages.v2.responder.ontologymessages.StandoffEntityInfoGetRequestV2 import org.knora.webapi.messages.v2.responder.ontologymessages.StandoffEntityInfoGetResponseV2 -import org.knora.webapi.messages.v2.responder.resourcemessages._ -import org.knora.webapi.messages.v2.responder.standoffmessages._ -import org.knora.webapi.messages.v2.responder.valuemessages._ +import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.messages.v2.responder.standoffmessages.* +import org.knora.webapi.messages.v2.responder.valuemessages.* import org.knora.webapi.responders.IriLocker import org.knora.webapi.responders.Responder import org.knora.webapi.slice.admin.domain.model.KnoraProject 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 a65188b21e..2f9bb1ffed 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 @@ -5,34 +5,34 @@ package org.knora.webapi.responders.v2 -import zio._ +import zio.* import java.time.Instant import java.util.UUID -import dsp.errors._ +import dsp.errors.* import dsp.valueobjects.UuidUtil +import org.knora.webapi.* import org.knora.webapi.SchemaRendering.apiV2SchemaWithOption -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.OntologyConstants.KnoraBase.StillImageExternalFileValue import org.knora.webapi.messages.OntologyConstants.KnoraBase.StillImageFileValue -import org.knora.webapi.messages._ 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 import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.messages.util.PermissionUtilADM -import org.knora.webapi.messages.util.PermissionUtilADM._ +import org.knora.webapi.messages.util.PermissionUtilADM.* import org.knora.webapi.messages.util.search.gravsearch.GravsearchParser import org.knora.webapi.messages.v2.responder.SuccessResponseV2 -import org.knora.webapi.messages.v2.responder.ontologymessages._ -import org.knora.webapi.messages.v2.responder.resourcemessages._ -import org.knora.webapi.messages.v2.responder.valuemessages._ +import org.knora.webapi.messages.v2.responder.ontologymessages.* +import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.messages.v2.responder.valuemessages.* 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/ontology/CardinalityHandler.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/CardinalityHandler.scala index b63afb6be6..9d86460715 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/CardinalityHandler.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/CardinalityHandler.scala @@ -5,20 +5,20 @@ package org.knora.webapi.responders.v2.ontology -import zio._ +import zio.* import java.time.Instant import dsp.errors.BadRequestException import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.InternalSchema -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.messages.v2.responder.CanDoResponseV2 -import org.knora.webapi.messages.v2.responder.ontologymessages._ +import org.knora.webapi.messages.v2.responder.ontologymessages.* import org.knora.webapi.slice.ontology.repo.model.OntologyCacheData import org.knora.webapi.slice.ontology.repo.service.OntologyCache import org.knora.webapi.slice.resourceinfo.domain.InternalIri 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 2a96a55a1d..982ecbb6e7 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 @@ -5,7 +5,7 @@ package org.knora.webapi.responders.v2.ontology -import zio._ +import zio.* import zio.prelude.Validation import java.time.Instant @@ -13,27 +13,27 @@ import scala.collection.immutable import scala.util.Try import dsp.constants.SalsahGui -import dsp.errors._ -import org.knora.webapi._ +import dsp.errors.* +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.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.ValuesValidator -import org.knora.webapi.messages.store.triplestoremessages._ +import org.knora.webapi.messages.store.triplestoremessages.* 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.* +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 import org.knora.webapi.slice.admin.domain.service.KnoraProjectRepo -import org.knora.webapi.slice.ontology.domain.model.Cardinality._ +import org.knora.webapi.slice.ontology.domain.model.Cardinality.* import org.knora.webapi.slice.ontology.repo.model.OntologyCacheData import org.knora.webapi.slice.ontology.repo.service.OntologyCache import org.knora.webapi.store.triplestore.api.TriplestoreService 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 81e25b99ed..47fd7a4685 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 @@ -5,18 +5,18 @@ package org.knora.webapi.responders.v2.resources -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.v2.responder.ontologymessages._ -import org.knora.webapi.messages.v2.responder.resourcemessages._ -import org.knora.webapi.messages.v2.responder.valuemessages._ +import zio.* + +import dsp.errors.* +import org.knora.webapi.* +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.* import org.knora.webapi.slice.ontology.domain.service.OntologyRepo -import OntologyConstants.{KnoraBase => Constants} +import OntologyConstants.KnoraBase as Constants object CheckObjectClassConstraints { 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 31b08b07dd..6bfdd94a13 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 @@ -6,34 +6,34 @@ package org.knora.webapi.responders.v2.resources import com.typesafe.scalalogging.LazyLogging -import zio._ +import zio.* import java.time.Instant -import dsp.errors._ +import dsp.errors.* import dsp.valueobjects.Iri -import org.knora.webapi._ +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.* +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.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._ -import org.knora.webapi.messages.v2.responder.valuemessages._ +import org.knora.webapi.messages.v2.responder.ontologymessages.* +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* +import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.messages.v2.responder.valuemessages.* import org.knora.webapi.responders.IriLocker import org.knora.webapi.responders.IriService -import org.knora.webapi.responders.v2._ -import org.knora.webapi.slice.admin.api.model._ +import org.knora.webapi.responders.v2.* +import org.knora.webapi.slice.admin.api.model.* import org.knora.webapi.slice.admin.domain.model.User import org.knora.webapi.slice.admin.domain.service.KnoraProjectRepo import org.knora.webapi.slice.admin.domain.service.ProjectService diff --git a/webapi/src/main/scala/org/knora/webapi/routing/ApiRoutes.scala b/webapi/src/main/scala/org/knora/webapi/routing/ApiRoutes.scala index 67367a6b2f..1709cc3100 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/ApiRoutes.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/ApiRoutes.scala @@ -8,10 +8,10 @@ package org.knora.webapi.routing import org.apache.pekko.actor.ActorSystem import org.apache.pekko.http.cors.scaladsl.CorsDirectives import org.apache.pekko.http.cors.scaladsl.settings.CorsSettings -import org.apache.pekko.http.scaladsl.model.HttpMethods._ -import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.model.HttpMethods.* +import org.apache.pekko.http.scaladsl.server.Directives.* import org.apache.pekko.http.scaladsl.server.Route -import zio._ +import zio.* import org.knora.webapi.config.AppConfig import org.knora.webapi.core @@ -23,7 +23,7 @@ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.responders.v2.SearchResponderV2 import org.knora.webapi.responders.v2.ValuesResponderV2 import org.knora.webapi.routing -import org.knora.webapi.routing.v2._ +import org.knora.webapi.routing.v2.* import org.knora.webapi.slice.admin.api.AdminApiRoutes import org.knora.webapi.slice.admin.domain.service.ProjectService import org.knora.webapi.slice.admin.domain.service.UserService diff --git a/webapi/src/main/scala/org/knora/webapi/routing/AroundDirectives.scala b/webapi/src/main/scala/org/knora/webapi/routing/AroundDirectives.scala index 0e3a00a39f..c8487d68f6 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/AroundDirectives.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/AroundDirectives.scala @@ -13,7 +13,7 @@ import org.apache.pekko.http.scaladsl.model.StatusCodes.NotFound import org.slf4j.LoggerFactory import pekko.http.scaladsl.server.Directive0 -import pekko.http.scaladsl.server.Directives._ +import pekko.http.scaladsl.server.Directives.* /** * Pekko HTTP directives which can be wrapped around a [[pekko.http.scaladsl.server.Route]]]. 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 86cf066200..cd0c73de27 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala @@ -6,26 +6,26 @@ package org.knora.webapi.routing import org.apache.commons.codec.binary.Base32 -import org.apache.pekko.http.scaladsl.model._ +import org.apache.pekko.http.scaladsl.model.* import org.apache.pekko.http.scaladsl.model.headers import org.apache.pekko.http.scaladsl.model.headers.HttpCookie import org.apache.pekko.http.scaladsl.model.headers.HttpCookiePair import org.apache.pekko.http.scaladsl.server.RequestContext import org.apache.pekko.util.ByteString -import spray.json._ -import zio._ +import spray.json.* +import zio.* import java.util.Base64 import dsp.errors.AuthenticationException import dsp.errors.BadCredentialsException import org.knora.webapi.config.AppConfig -import org.knora.webapi.messages.admin.responder.usersmessages._ +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.BAD_CRED_NONE_SUPPLIED import org.knora.webapi.routing.Authenticator.BAD_CRED_NOT_VALID import org.knora.webapi.slice.admin.domain.model.Email diff --git a/webapi/src/main/scala/org/knora/webapi/routing/KnoraRoute.scala b/webapi/src/main/scala/org/knora/webapi/routing/KnoraRoute.scala index 9515892676..1eecb23921 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/KnoraRoute.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/KnoraRoute.scala @@ -7,7 +7,7 @@ package org.knora.webapi.routing import com.typesafe.scalalogging.Logger import org.apache.pekko -import zio._ +import zio.* import zio.prelude.Validation import scala.concurrent.ExecutionContext diff --git a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV2.scala index 8440882941..5654e93c4d 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV2.scala @@ -5,17 +5,17 @@ package org.knora.webapi.routing -import org.apache.pekko.http.scaladsl.model._ +import org.apache.pekko.http.scaladsl.model.* import org.apache.pekko.http.scaladsl.server.RequestContext import org.apache.pekko.http.scaladsl.server.RouteResult -import zio._ +import zio.* import zio.prelude.Validation import scala.concurrent.Future import scala.util.control.Exception.catching import dsp.errors.BadRequestException -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageRelay import org.knora.webapi.messages.ResponderRequest.KnoraRequestV2 diff --git a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilZ.scala b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilZ.scala index 3f2c44ec98..e5a58d73bd 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilZ.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilZ.scala @@ -6,7 +6,7 @@ package org.knora.webapi.routing import org.apache.pekko -import zio._ +import zio.* import java.net.URLDecoder import java.util.UUID diff --git a/webapi/src/main/scala/org/knora/webapi/routing/UnsafeZioRun.scala b/webapi/src/main/scala/org/knora/webapi/routing/UnsafeZioRun.scala index 4a8d5506fb..6a1b6ccf4e 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/UnsafeZioRun.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/UnsafeZioRun.scala @@ -5,7 +5,7 @@ package org.knora.webapi.routing -import zio._ +import zio.* import scala.concurrent.Future diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/AuthenticationRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/AuthenticationRouteV2.scala index 744ef93b27..20ce119c6f 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/AuthenticationRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/AuthenticationRouteV2.scala @@ -5,9 +5,9 @@ package org.knora.webapi.routing.v2 -import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Directives.* import org.apache.pekko.http.scaladsl.server.Route -import zio._ +import zio.* import dsp.errors.BadRequestException import org.knora.webapi.messages.v2.routing.authenticationmessages.AuthenticationV2JsonProtocol diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/ListsRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/ListsRouteV2.scala index e6fe39eb6b..4e3cd071db 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/ListsRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/ListsRouteV2.scala @@ -6,7 +6,7 @@ package org.knora.webapi.routing.v2 import org.apache.pekko -import zio._ +import zio.* import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageRelay @@ -17,7 +17,7 @@ import org.knora.webapi.routing.Authenticator import org.knora.webapi.routing.RouteUtilV2 import org.knora.webapi.routing.RouteUtilZ -import pekko.http.scaladsl.server.Directives._ +import pekko.http.scaladsl.server.Directives.* import pekko.http.scaladsl.server.Route /** diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/OntologiesRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/OntologiesRouteV2.scala index 08d1631fcf..1890f9c9cf 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/OntologiesRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/OntologiesRouteV2.scala @@ -5,11 +5,11 @@ package org.knora.webapi.routing.v2 -import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Directives.* import org.apache.pekko.http.scaladsl.server.PathMatcher import org.apache.pekko.http.scaladsl.server.RequestContext import org.apache.pekko.http.scaladsl.server.Route -import zio._ +import zio.* import zio.prelude.Validation import java.time.Instant @@ -18,10 +18,10 @@ import dsp.constants.SalsahGui import dsp.errors.BadRequestException import dsp.errors.ValidationException import dsp.valueobjects.CreatePropertyCommand -import dsp.valueobjects.Iri._ +import dsp.valueobjects.Iri.* import dsp.valueobjects.LangString -import dsp.valueobjects.Schema._ -import org.knora.webapi._ +import dsp.valueobjects.Schema.* +import org.knora.webapi.* import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageRelay import org.knora.webapi.messages.OntologyConstants @@ -31,7 +31,7 @@ import org.knora.webapi.messages.ValuesValidator import org.knora.webapi.messages.store.triplestoremessages.SmartIriLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.messages.util.rdf.JsonLDDocument -import org.knora.webapi.messages.v2.responder.ontologymessages._ +import org.knora.webapi.messages.v2.responder.ontologymessages.* import org.knora.webapi.routing.Authenticator import org.knora.webapi.routing.RouteUtilV2 import org.knora.webapi.routing.RouteUtilV2.completeResponse 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 78522d7135..f6f9bb5c63 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 @@ -6,17 +6,17 @@ package org.knora.webapi.routing.v2 import com.typesafe.scalalogging.LazyLogging -import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Directives.* import org.apache.pekko.http.scaladsl.server.PathMatcher import org.apache.pekko.http.scaladsl.server.Route +import zio.* import zio.ZIO -import zio._ import java.time.Instant import dsp.errors.BadRequestException import dsp.valueobjects.Iri -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.config.AppConfig import org.knora.webapi.config.GraphRoute import org.knora.webapi.config.Sipi @@ -27,8 +27,8 @@ 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.valuemessages._ +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 import org.knora.webapi.routing.RouteUtilV2 diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/StandoffRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/StandoffRouteV2.scala index e71c17f3b0..5411ef6fe8 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/StandoffRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/StandoffRouteV2.scala @@ -12,7 +12,7 @@ import zio.ZIO import scala.concurrent.ExecutionContext import scala.concurrent.Future -import scala.concurrent.duration._ +import scala.concurrent.duration.* import dsp.errors.BadRequestException import org.knora.webapi.config.AppConfig @@ -30,7 +30,7 @@ import org.knora.webapi.slice.resourceinfo.domain.IriConverter import pekko.actor.ActorSystem import pekko.http.scaladsl.model.Multipart import pekko.http.scaladsl.model.Multipart.BodyPart -import pekko.http.scaladsl.server.Directives._ +import pekko.http.scaladsl.server.Directives.* import pekko.http.scaladsl.server.Route /** diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/ValuesRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/ValuesRouteV2.scala index da8ca8bb76..9f38c38823 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/ValuesRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/ValuesRouteV2.scala @@ -5,19 +5,19 @@ package org.knora.webapi.routing.v2 -import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Directives.* import org.apache.pekko.http.scaladsl.server.PathMatcher import org.apache.pekko.http.scaladsl.server.Route -import zio._ +import zio.* import dsp.errors.BadRequestException -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageRelay import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.ValuesValidator import org.knora.webapi.messages.v2.responder.resourcemessages.ResourcesGetRequestV2 -import org.knora.webapi.messages.v2.responder.valuemessages._ +import org.knora.webapi.messages.v2.responder.valuemessages.* import org.knora.webapi.responders.v2.ValuesResponderV2 import org.knora.webapi.routing.Authenticator import org.knora.webapi.routing.RouteUtilV2 diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminApiModule.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminApiModule.scala index c49887d79f..658ab2c4b5 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminApiModule.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminApiModule.scala @@ -29,7 +29,7 @@ import org.knora.webapi.slice.admin.domain.service.ProjectImportService import org.knora.webapi.slice.admin.domain.service.ProjectService import org.knora.webapi.slice.admin.domain.service.UserService import org.knora.webapi.slice.admin.domain.service.maintenance.MaintenanceService -import org.knora.webapi.slice.common.api._ +import org.knora.webapi.slice.common.api.* import org.knora.webapi.slice.infrastructure.CacheManager import org.knora.webapi.slice.ontology.repo.service.OntologyCache import org.knora.webapi.store.triplestore.api.TriplestoreService 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 fd311f5e37..1d3a040a13 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,7 +5,7 @@ package org.knora.webapi.slice.admin.api -import sttp.tapir._ +import sttp.tapir.* import org.knora.webapi.slice.admin.api.Codecs.TapirCodec import org.knora.webapi.slice.admin.domain.model.GroupIri 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 a05072b2be..7a92b5c308 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,7 +11,8 @@ import zio.json.JsonCodec import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.slice.admin.api.model.MaintenanceRequests.AssetId -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.admin.domain.model.ListProperties.Comments import org.knora.webapi.slice.admin.domain.model.ListProperties.Labels import org.knora.webapi.slice.admin.domain.model.ListProperties.ListIri @@ -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 25492b2112..88f69a3c64 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.* import sttp.tapir.EndpointInput.PathCapture -import sttp.tapir._ 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 188971d966..f3cd8dd865 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 @@ -5,21 +5,21 @@ package org.knora.webapi.slice.admin.api -import sttp.tapir._ -import sttp.tapir.generic.auto._ +import sttp.tapir.* +import sttp.tapir.generic.auto.* import sttp.tapir.json.zio.jsonBody -import zio._ +import zio.* import zio.json.DeriveJsonCodec import zio.json.JsonCodec -import org.knora.webapi.messages.admin.responder.groupsmessages._ +import org.knora.webapi.messages.admin.responder.groupsmessages.* import org.knora.webapi.messages.admin.responder.usersmessages.GroupMembersGetResponseADM 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.* +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/ListsEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ListsEndpoints.scala index 4375ae32b8..79eaa68529 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ListsEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ListsEndpoints.scala @@ -5,14 +5,14 @@ package org.knora.webapi.slice.admin.api -import sttp.tapir._ -import sttp.tapir.generic.auto._ +import sttp.tapir.* +import sttp.tapir.generic.auto.* import sttp.tapir.json.zio.jsonBody import zio.ZLayer import zio.json.DeriveJsonCodec import zio.json.JsonCodec -import org.knora.webapi.messages.admin.responder.listsmessages._ +import org.knora.webapi.messages.admin.responder.listsmessages.* import org.knora.webapi.slice.admin.api.Requests.ListChangeCommentsRequest import org.knora.webapi.slice.admin.api.Requests.ListChangeLabelsRequest import org.knora.webapi.slice.admin.api.Requests.ListChangeNameRequest @@ -22,7 +22,7 @@ import org.knora.webapi.slice.admin.api.Requests.ListCreateChildNodeRequest import org.knora.webapi.slice.admin.api.Requests.ListCreateRootNodeRequest import org.knora.webapi.slice.admin.api.model.AdminQueryVariables import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri -import org.knora.webapi.slice.admin.domain.model.ListProperties._ +import org.knora.webapi.slice.admin.domain.model.ListProperties.* import org.knora.webapi.slice.common.api.BaseEndpoints case class ListsEndpoints(baseEndpoints: BaseEndpoints) { diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ListsEndpointsHandlers.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ListsEndpointsHandlers.scala index 42da8223e0..46495cbb79 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ListsEndpointsHandlers.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ListsEndpointsHandlers.scala @@ -19,7 +19,7 @@ import org.knora.webapi.messages.admin.responder.listsmessages.ListNodeCommentsD import org.knora.webapi.messages.admin.responder.listsmessages.NodeInfoGetResponseADM import org.knora.webapi.messages.admin.responder.listsmessages.NodePositionChangeResponseADM import org.knora.webapi.responders.admin.ListsResponder -import org.knora.webapi.slice.admin.api.Requests._ +import org.knora.webapi.slice.admin.api.Requests.* import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.ListProperties.ListIri import org.knora.webapi.slice.admin.domain.model.User diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/MaintenanceEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/MaintenanceEndpoints.scala index 73436dec3d..96f505aff2 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/MaintenanceEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/MaintenanceEndpoints.scala @@ -6,8 +6,8 @@ package org.knora.webapi.slice.admin.api import sttp.model.StatusCode +import sttp.tapir.* import sttp.tapir.EndpointIO.Example -import sttp.tapir._ import sttp.tapir.json.zio.jsonBody import zio.ZLayer diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/MaintenanceEndpointsHandlers.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/MaintenanceEndpointsHandlers.scala index 5f6694db93..294ab581d0 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/MaintenanceEndpointsHandlers.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/MaintenanceEndpointsHandlers.scala @@ -7,7 +7,7 @@ package org.knora.webapi.slice.admin.api import zio.ZIO import zio.ZLayer -import zio.json._ +import zio.json.* import zio.json.ast.Json import dsp.errors.BadRequestException diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/PermissionsEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/PermissionsEndpoints.scala index 4556a42d0e..f8bc6a838d 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/PermissionsEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/PermissionsEndpoints.scala @@ -5,12 +5,12 @@ package org.knora.webapi.slice.admin.api -import sttp.tapir._ -import sttp.tapir.generic.auto._ +import sttp.tapir.* +import sttp.tapir.generic.auto.* import sttp.tapir.json.zio.jsonBody import zio.ZLayer -import org.knora.webapi.messages.admin.responder.permissionsmessages._ +import org.knora.webapi.messages.admin.responder.permissionsmessages.* import org.knora.webapi.slice.admin.api.AdminPathVariables.groupIriPathVar import org.knora.webapi.slice.admin.api.AdminPathVariables.permissionIri import org.knora.webapi.slice.admin.api.AdminPathVariables.projectIri diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpoints.scala index cc235fd2a9..89b07e9593 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpoints.scala @@ -7,8 +7,8 @@ package org.knora.webapi.slice.admin.api import sttp.capabilities.pekko.PekkoStreams import sttp.model.StatusCode -import sttp.tapir._ -import sttp.tapir.generic.auto._ +import sttp.tapir.* +import sttp.tapir.generic.auto.* import sttp.tapir.json.zio.jsonBody import zio.Chunk import zio.ZLayer @@ -16,13 +16,13 @@ import zio.ZLayer import org.knora.webapi.slice.admin.api.AdminPathVariables.projectIri import org.knora.webapi.slice.admin.api.AdminPathVariables.projectShortcode import org.knora.webapi.slice.admin.api.AdminPathVariables.projectShortname +import org.knora.webapi.slice.admin.api.model.* import org.knora.webapi.slice.admin.api.model.ProjectExportInfoResponse import org.knora.webapi.slice.admin.api.model.ProjectImportResponse 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 import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.SetRestrictedViewRequest -import org.knora.webapi.slice.admin.api.model._ import org.knora.webapi.slice.admin.domain.model.RestrictedView import org.knora.webapi.slice.common.api.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 390b88ad6d..1371abb106 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,11 +11,11 @@ import zio.ZLayer import java.nio.file.Files import scala.concurrent.ExecutionContext +import org.knora.webapi.slice.admin.api.model.* 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 import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.SetRestrictedViewRequest -import org.knora.webapi.slice.admin.api.model._ import org.knora.webapi.slice.admin.api.service.ProjectRestService import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.KnoraProject.Shortcode diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/StoreEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/StoreEndpoints.scala index 468e61fcaf..1902ffac45 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/StoreEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/StoreEndpoints.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.admin.api -import sttp.tapir._ +import sttp.tapir.* 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/UsersEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/UsersEndpoints.scala index 309469f023..929fecfd85 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/UsersEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/UsersEndpoints.scala @@ -5,10 +5,10 @@ package org.knora.webapi.slice.admin.api -import sttp.tapir._ -import sttp.tapir.generic.auto._ +import sttp.tapir.* +import sttp.tapir.generic.auto.* import sttp.tapir.json.zio.jsonBody -import zio._ +import zio.* import zio.json.DeriveJsonCodec import zio.json.JsonCodec diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/MaintenanceRequests.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/MaintenanceRequests.scala index 3a55ceb2d8..28ce82bdfa 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/MaintenanceRequests.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/MaintenanceRequests.scala @@ -13,9 +13,9 @@ import eu.timepit.refined.string.MatchesRegex import zio.Chunk import zio.json.DeriveJsonCodec import zio.json.JsonCodec -import zio.json.interop.refined._ +import zio.json.interop.refined.* -import org.knora.webapi.slice.admin.api.Codecs.ZioJsonCodec._ +import org.knora.webapi.slice.admin.api.Codecs.ZioJsonCodec.* import org.knora.webapi.slice.admin.domain.model.KnoraProject.Shortcode object MaintenanceRequests { diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/ProjectsEndpointsRequestsAndResponses.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/ProjectsEndpointsRequestsAndResponses.scala index da2a697355..89b8bce775 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/ProjectsEndpointsRequestsAndResponses.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/ProjectsEndpointsRequestsAndResponses.scala @@ -11,8 +11,8 @@ import zio.json.DeriveJsonCodec import zio.json.JsonCodec import dsp.errors.BadRequestException -import org.knora.webapi.slice.admin.api.Codecs.ZioJsonCodec._ -import org.knora.webapi.slice.admin.domain.model.KnoraProject._ +import org.knora.webapi.slice.admin.api.Codecs.ZioJsonCodec.* +import org.knora.webapi.slice.admin.domain.model.KnoraProject.* import org.knora.webapi.slice.admin.domain.model.RestrictedView object ProjectsEndpointsRequestsAndResponses { diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/ProjectsMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/ProjectsMessagesADM.scala index 5b472dad42..dcb3b218f2 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/ProjectsMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/ProjectsMessagesADM.scala @@ -11,7 +11,7 @@ import zio.json.JsonCodec import org.knora.webapi.IRI import org.knora.webapi.messages.admin.responder.AdminKnoraResponseADM import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 -import org.knora.webapi.slice.admin.domain.model.KnoraProject._ +import org.knora.webapi.slice.admin.domain.model.KnoraProject.* import org.knora.webapi.slice.admin.domain.model.RestrictedView import org.knora.webapi.slice.admin.domain.model.User diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/GroupRestService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/GroupRestService.scala index 3406d7b95a..56e750b426 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/GroupRestService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/GroupRestService.scala @@ -5,11 +5,11 @@ package org.knora.webapi.slice.admin.api.service -import zio._ +import zio.* import dsp.errors.BadRequestException import dsp.errors.NotFoundException -import org.knora.webapi.messages.admin.responder.groupsmessages._ +import org.knora.webapi.messages.admin.responder.groupsmessages.* import org.knora.webapi.messages.admin.responder.usersmessages.GroupMembersGetResponseADM import org.knora.webapi.slice.admin.api.GroupsRequests.GroupCreateRequest import org.knora.webapi.slice.admin.api.GroupsRequests.GroupStatusUpdateRequest diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/ProjectRestService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/ProjectRestService.scala index b54335eeb5..9226ac47df 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/ProjectRestService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/ProjectRestService.scala @@ -5,11 +5,12 @@ package org.knora.webapi.slice.admin.api.service -import zio._ +import zio.* import dsp.errors.BadRequestException import dsp.errors.NotFoundException import org.knora.webapi.responders.admin.PermissionsResponder +import org.knora.webapi.slice.admin.api.model.* import org.knora.webapi.slice.admin.api.model.ProjectDataGetResponseADM import org.knora.webapi.slice.admin.api.model.ProjectExportInfoResponse import org.knora.webapi.slice.admin.api.model.ProjectImportResponse @@ -18,7 +19,6 @@ import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndRespon import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.RestrictedViewResponse import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.SetRestrictedViewRequest import org.knora.webapi.slice.admin.api.model.ProjectsGetResponse -import org.knora.webapi.slice.admin.api.model._ import org.knora.webapi.slice.admin.domain.model.KnoraProject import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.KnoraProject.Shortcode diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/StoreRestService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/StoreRestService.scala index 86ef63b77a..7947b523e6 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/StoreRestService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/StoreRestService.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.admin.api.service -import zio._ +import zio.* import dsp.errors.ForbiddenException import org.knora.webapi.config.AppConfig diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/UserRestService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/UserRestService.scala index bbd903e799..77ec93bcd3 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/UserRestService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/UserRestService.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.admin.api.service -import zio._ +import zio.* import dsp.errors.BadRequestException import dsp.errors.ForbiddenException diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/AdminDomainModule.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/AdminDomainModule.scala index 6f172a91fb..5c7d092f9c 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/AdminDomainModule.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/AdminDomainModule.scala @@ -9,12 +9,12 @@ import zio.ZLayer import org.knora.webapi.config.AppConfig import org.knora.webapi.responders.IriService +import org.knora.webapi.slice.admin.domain.service.* import org.knora.webapi.slice.admin.domain.service.GroupService import org.knora.webapi.slice.admin.domain.service.KnoraGroupService import org.knora.webapi.slice.admin.domain.service.KnoraProjectService import org.knora.webapi.slice.admin.domain.service.PasswordService import org.knora.webapi.slice.admin.domain.service.ProjectService -import org.knora.webapi.slice.admin.domain.service._ import org.knora.webapi.slice.admin.domain.service.maintenance.MaintenanceService import org.knora.webapi.slice.admin.repo.AdminRepoModule import org.knora.webapi.slice.infrastructure.CacheManager diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/KnoraProject.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/KnoraProject.scala index 92228aa090..42889abb00 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/KnoraProject.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/KnoraProject.scala @@ -15,7 +15,7 @@ import dsp.valueobjects.UuidUtil import org.knora.webapi.messages.OntologyConstants.KnoraAdmin.KnoraAdminPrefixExpansion import org.knora.webapi.messages.StringFormatter.IriDomain import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 -import org.knora.webapi.slice.admin.domain.model.KnoraProject._ +import org.knora.webapi.slice.admin.domain.model.KnoraProject.* import org.knora.webapi.slice.admin.repo.service.EntityWithId import org.knora.webapi.slice.common.StringValueCompanion import org.knora.webapi.slice.common.Value diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/GroupService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/GroupService.scala index 4eedecab47..1266efa4b9 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/GroupService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/GroupService.scala @@ -5,8 +5,8 @@ package org.knora.webapi.slice.admin.domain.service +import zio.* import zio.ZIO -import zio._ import org.knora.webapi.slice.admin.api.GroupsRequests.GroupCreateRequest import org.knora.webapi.slice.admin.api.GroupsRequests.GroupUpdateRequest diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectExportService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectExportService.scala index 0fcf2adf2a..6c10891e9e 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectExportService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectExportService.scala @@ -23,7 +23,7 @@ import zio.nio.file.Path import java.io.OutputStream import scala.collection.mutable -import org.knora.webapi.messages.twirl.queries._ +import org.knora.webapi.messages.twirl.queries.* import org.knora.webapi.messages.util.rdf.TriG import org.knora.webapi.slice.admin.AdminConstants.adminDataNamedGraph import org.knora.webapi.slice.admin.AdminConstants.permissionsDataNamedGraph diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectExportStorageService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectExportStorageService.scala index 21050cc89d..99f462963c 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectExportStorageService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectExportStorageService.scala @@ -5,8 +5,8 @@ package org.knora.webapi.slice.admin.domain.service -import zio._ -import zio.nio.file._ +import zio.* +import zio.nio.file.* import org.knora.webapi.config.AppConfig import org.knora.webapi.slice.admin.domain.model.KnoraProject diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectImportService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectImportService.scala index 53a32d7857..1d12ece23b 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectImportService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectImportService.scala @@ -9,7 +9,7 @@ import org.apache.jena.query.QueryExecution import org.apache.jena.query.ResultSet import org.apache.jena.rdfconnection.RDFConnection import org.apache.jena.rdfconnection.RDFConnectionFuseki -import zio._ +import zio.* import zio.http.URL import zio.nio.file.Files import zio.nio.file.Path diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectService.scala index 4f6d379bed..119e8e0fa0 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectService.scala @@ -5,14 +5,14 @@ package org.knora.webapi.slice.admin.domain.service -import zio._ +import zio.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.slice.admin.api.model.Project import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.ProjectUpdateRequest import org.knora.webapi.slice.admin.domain.model.KnoraProject -import org.knora.webapi.slice.admin.domain.model.KnoraProject._ +import org.knora.webapi.slice.admin.domain.model.KnoraProject.* import org.knora.webapi.slice.admin.domain.model.RestrictedView import org.knora.webapi.slice.ontology.domain.service.OntologyRepo import org.knora.webapi.slice.resourceinfo.domain.InternalIri diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ZipUtility.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ZipUtility.scala index 39b9fe1cfc..96432f4d54 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ZipUtility.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ZipUtility.scala @@ -5,8 +5,8 @@ package org.knora.webapi.slice.admin.domain.service -import zio._ -import zio.nio.file._ +import zio.* +import zio.nio.file.* import java.util.zip.ZipEntry import java.util.zip.ZipInputStream diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/maintenance/MaintenanceService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/maintenance/MaintenanceService.scala index 7d83c35a72..76045e3b17 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/maintenance/MaintenanceService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/maintenance/MaintenanceService.scala @@ -9,7 +9,7 @@ import zio.Task import zio.ZIO import zio.ZLayer -import org.knora.webapi.slice.admin.api.model.MaintenanceRequests._ +import org.knora.webapi.slice.admin.api.model.MaintenanceRequests.* import org.knora.webapi.slice.admin.domain.service.KnoraProjectService import org.knora.webapi.store.triplestore.api.TriplestoreService diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/rdf/RdfConversions.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/rdf/RdfConversions.scala index c6c500b0cf..a0461ceadf 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/rdf/RdfConversions.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/rdf/RdfConversions.scala @@ -13,7 +13,7 @@ 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 import org.knora.webapi.slice.admin.domain.model.GroupIri -import org.knora.webapi.slice.admin.domain.model.KnoraProject._ +import org.knora.webapi.slice.admin.domain.model.KnoraProject.* import org.knora.webapi.slice.admin.domain.model.PasswordHash import org.knora.webapi.slice.admin.domain.model.SystemAdmin import org.knora.webapi.slice.admin.domain.model.UserStatus diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/AbstractEntityRepo.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/AbstractEntityRepo.scala index 36e9c09cf3..4e5b3f6b1e 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/AbstractEntityRepo.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/AbstractEntityRepo.scala @@ -8,8 +8,8 @@ package org.knora.webapi.slice.admin.repo.service import org.eclipse.rdf4j.common.net.ParsedIRI import org.eclipse.rdf4j.model.vocabulary.RDF import org.eclipse.rdf4j.model.vocabulary.XSD +import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.`var` as variable import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.prefix -import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.{`var` => variable} import org.eclipse.rdf4j.sparqlbuilder.core.query.Queries import org.eclipse.rdf4j.sparqlbuilder.graphpattern.GraphPattern import org.eclipse.rdf4j.sparqlbuilder.graphpattern.TriplePattern diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/AdministrativePermissionRepoLive.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/AdministrativePermissionRepoLive.scala index 908b540912..3d92183e39 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/AdministrativePermissionRepoLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/AdministrativePermissionRepoLive.scala @@ -27,7 +27,7 @@ import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.Permission import org.knora.webapi.slice.admin.domain.model.Permission.Administrative import org.knora.webapi.slice.admin.domain.model.PermissionIri -import org.knora.webapi.slice.admin.repo.rdf.RdfConversions._ +import org.knora.webapi.slice.admin.repo.rdf.RdfConversions.* import org.knora.webapi.slice.admin.repo.rdf.Vocabulary import org.knora.webapi.slice.common.repo.rdf.Errors.ConversionError import org.knora.webapi.slice.common.repo.rdf.Errors.RdfError 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 01a64077c1..78b56d7d49 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 @@ -19,15 +19,15 @@ import zio.ZLayer import org.knora.webapi.messages.OntologyConstants.KnoraAdmin import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 +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.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 -import org.knora.webapi.slice.admin.repo.rdf.Vocabulary.KnoraAdmin._ +import org.knora.webapi.slice.admin.repo.rdf.Vocabulary.KnoraAdmin.* import org.knora.webapi.slice.common.repo.rdf.Errors.ConversionError import org.knora.webapi.slice.common.repo.rdf.Errors.RdfError import org.knora.webapi.slice.common.repo.rdf.RdfResource diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraProjectRepoLive.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraProjectRepoLive.scala index e2daaf35c5..3e229eb0fe 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraProjectRepoLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraProjectRepoLive.scala @@ -10,15 +10,15 @@ import org.eclipse.rdf4j.model.vocabulary.RDF import org.eclipse.rdf4j.sparqlbuilder.graphpattern.TriplePattern import org.eclipse.rdf4j.sparqlbuilder.rdf.Iri import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf -import zio._ +import zio.* import org.knora.webapi.messages.OntologyConstants.KnoraAdmin -import org.knora.webapi.messages.OntologyConstants.KnoraAdmin._ +import org.knora.webapi.messages.OntologyConstants.KnoraAdmin.* import org.knora.webapi.slice.admin.domain.model.KnoraProject -import org.knora.webapi.slice.admin.domain.model.KnoraProject._ +import org.knora.webapi.slice.admin.domain.model.KnoraProject.* import org.knora.webapi.slice.admin.domain.model.RestrictedView import org.knora.webapi.slice.admin.domain.service.KnoraProjectRepo -import org.knora.webapi.slice.admin.repo.rdf.RdfConversions._ +import org.knora.webapi.slice.admin.repo.rdf.RdfConversions.* import org.knora.webapi.slice.admin.repo.rdf.Vocabulary import org.knora.webapi.slice.common.repo.rdf.Errors.RdfError import org.knora.webapi.slice.common.repo.rdf.RdfResource 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 eede066a24..36935a5c17 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 @@ -31,8 +31,8 @@ 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.service.KnoraUserRepo -import org.knora.webapi.slice.admin.repo.rdf.RdfConversions._ -import org.knora.webapi.slice.admin.repo.rdf.Vocabulary.KnoraAdmin._ +import org.knora.webapi.slice.admin.repo.rdf.RdfConversions.* +import org.knora.webapi.slice.admin.repo.rdf.Vocabulary.KnoraAdmin.* import org.knora.webapi.slice.common.repo.rdf.Errors.ConversionError import org.knora.webapi.slice.common.repo.rdf.Errors.RdfError import org.knora.webapi.slice.common.repo.rdf.RdfResource diff --git a/webapi/src/main/scala/org/knora/webapi/slice/common/api/AuthorizationRestService.scala b/webapi/src/main/scala/org/knora/webapi/slice/common/api/AuthorizationRestService.scala index 366743dcc5..07278a6b0a 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/common/api/AuthorizationRestService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/common/api/AuthorizationRestService.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.common.api -import zio._ +import zio.* import dsp.errors.ForbiddenException import org.knora.webapi.slice.admin.domain.model.GroupIri diff --git a/webapi/src/main/scala/org/knora/webapi/slice/common/api/BaseEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/common/api/BaseEndpoints.scala index 8ecd267228..398a24dbde 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/common/api/BaseEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/common/api/BaseEndpoints.scala @@ -12,7 +12,7 @@ import sttp.tapir.EndpointOutput import sttp.tapir.auth import sttp.tapir.cookie import sttp.tapir.endpoint -import sttp.tapir.generic.auto._ +import sttp.tapir.generic.auto.* import sttp.tapir.json.zio.jsonBody import sttp.tapir.model.UsernamePassword import sttp.tapir.oneOf @@ -23,7 +23,7 @@ import zio.ZLayer import scala.concurrent.Future -import dsp.errors._ +import dsp.errors.* import org.knora.webapi.messages.util.KnoraSystemInstances.Users.AnonymousUser import org.knora.webapi.messages.v2.routing.authenticationmessages.CredentialsIdentifier import org.knora.webapi.messages.v2.routing.authenticationmessages.KnoraCredentialsV2.KnoraPasswordCredentialsV2 diff --git a/webapi/src/main/scala/org/knora/webapi/slice/common/api/TapirToPekkoInterpreter.scala b/webapi/src/main/scala/org/knora/webapi/slice/common/api/TapirToPekkoInterpreter.scala index 623bf8e8a3..f46a8077bb 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/common/api/TapirToPekkoInterpreter.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/common/api/TapirToPekkoInterpreter.scala @@ -9,7 +9,7 @@ import org.apache.pekko.actor.ActorSystem import org.apache.pekko.http.scaladsl.server.Route import sttp.capabilities.WebSockets import sttp.capabilities.pekko.PekkoStreams -import sttp.tapir.generic.auto._ +import sttp.tapir.generic.auto.* import sttp.tapir.json.zio.jsonBody import sttp.tapir.server.ServerEndpoint import sttp.tapir.server.metrics.zio.ZioMetrics diff --git a/webapi/src/main/scala/org/knora/webapi/slice/common/repo/rdf/RdfModel.scala b/webapi/src/main/scala/org/knora/webapi/slice/common/repo/rdf/RdfModel.scala index 8cea899fb3..084cd1793d 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/common/repo/rdf/RdfModel.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/common/repo/rdf/RdfModel.scala @@ -5,14 +5,14 @@ package org.knora.webapi.slice.common.repo.rdf -import org.apache.jena.rdf.model._ +import org.apache.jena.rdf.model.* import org.apache.jena.vocabulary.RDF -import zio._ +import zio.* import java.io.StringReader -import scala.jdk.CollectionConverters._ +import scala.jdk.CollectionConverters.* -import org.knora.webapi.slice.common.repo.rdf.Errors._ +import org.knora.webapi.slice.common.repo.rdf.Errors.* import org.knora.webapi.slice.resourceinfo.domain.InternalIri object Errors { diff --git a/webapi/src/main/scala/org/knora/webapi/slice/common/repo/service/PredicateObjectMapper.scala b/webapi/src/main/scala/org/knora/webapi/slice/common/repo/service/PredicateObjectMapper.scala index 11528f202c..3384f11085 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/common/repo/service/PredicateObjectMapper.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/common/repo/service/PredicateObjectMapper.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.common.repo.service -import zio._ +import zio.* import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.IRI diff --git a/webapi/src/main/scala/org/knora/webapi/slice/common/repo/service/Repository.scala b/webapi/src/main/scala/org/knora/webapi/slice/common/repo/service/Repository.scala index 0881bdb302..573ae3bae2 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/common/repo/service/Repository.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/common/repo/service/Repository.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.common.repo.service -import zio._ +import zio.* /** * Trait for generic readonly operations on a repository for a specific type. diff --git a/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/MetricsServer.scala b/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/MetricsServer.scala index 2ace40334b..4e2d68c890 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/MetricsServer.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/MetricsServer.scala @@ -11,8 +11,8 @@ import sttp.apispec.openapi.Info import sttp.apispec.openapi.OpenAPI import sttp.tapir.server.ziohttp.ZioHttpInterpreter import sttp.tapir.swagger.bundle.SwaggerInterpreter -import zio._ -import zio.http._ +import zio.* +import zio.http.* import zio.metrics.connectors.MetricsConfig import zio.metrics.connectors.prometheus import zio.metrics.jvm.DefaultJvmMetrics 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 d0ebf13704..578e7f19ed 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,9 +6,9 @@ package org.knora.webapi.slice.infrastructure.api import sttp.model.StatusCode +import sttp.tapir.* import sttp.tapir.AnyEndpoint -import sttp.tapir._ -import sttp.tapir.generic.auto._ +import sttp.tapir.generic.auto.* import sttp.tapir.json.zio.jsonBody import sttp.tapir.statusCode import zio.UIO diff --git a/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/api/PrometheusApp.scala b/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/api/PrometheusApp.scala index 8cce1b925b..104dc6f611 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/api/PrometheusApp.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/api/PrometheusApp.scala @@ -5,8 +5,8 @@ package org.knora.webapi.slice.infrastructure.api -import zio._ -import zio.http._ +import zio.* +import zio.http.* import zio.metrics.connectors.prometheus.PrometheusPublisher /** diff --git a/webapi/src/main/scala/org/knora/webapi/slice/ontology/domain/service/CardinalityService.scala b/webapi/src/main/scala/org/knora/webapi/slice/ontology/domain/service/CardinalityService.scala index 7ca11d0629..8d0ee67aa8 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/ontology/domain/service/CardinalityService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/ontology/domain/service/CardinalityService.scala @@ -9,7 +9,7 @@ import zio.Task import zio.ZIO import zio.ZLayer -import org.knora.webapi.messages._ +import org.knora.webapi.messages.* import org.knora.webapi.messages.v2.responder.ontologymessages.ClassInfoContentV2 import org.knora.webapi.messages.v2.responder.ontologymessages.ReadClassInfoV2 import org.knora.webapi.slice.ontology.domain.model.Cardinality 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 28d204b37a..eb64b63da7 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 @@ -6,16 +6,16 @@ package org.knora.webapi.slice.ontology.repo.service import com.typesafe.scalalogging.LazyLogging -import zio._ +import zio.* import java.time.Instant -import dsp.errors._ +import dsp.errors.* import org.knora.webapi.ApiV2Complex import org.knora.webapi.InternalSchema import org.knora.webapi.KnoraBaseVersionString import org.knora.webapi.OntologySchema -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter @@ -23,8 +23,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.* +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/resourceinfo/api/ResourceInfoEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/ResourceInfoEndpoints.scala index 31b95015cf..82fc292103 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/ResourceInfoEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/ResourceInfoEndpoints.scala @@ -5,9 +5,9 @@ package org.knora.webapi.slice.resourceinfo.api -import sttp.tapir._ -import sttp.tapir.generic.auto._ -import sttp.tapir.json.zio._ +import sttp.tapir.* +import sttp.tapir.generic.auto.* +import sttp.tapir.json.zio.* import zio.ZLayer import org.knora.webapi.slice.admin.api.Codecs.TapirCodec.projectIri diff --git a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/model/ResourceInfoDto.scala b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/model/ResourceInfoDto.scala index 5fc1b8578c..3b53e123dd 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/model/ResourceInfoDto.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/model/ResourceInfoDto.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.resourceinfo.api.model -import zio.json._ +import zio.json.* import java.time.Instant diff --git a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/service/RestResourceInfoService.scala b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/service/RestResourceInfoService.scala index 16a1a94349..2d8bc0435e 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/service/RestResourceInfoService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/service/RestResourceInfoService.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.resourceinfo.api.service -import zio._ +import zio.* import java.time.Instant @@ -13,7 +13,7 @@ import dsp.errors.BadRequestException import org.knora.webapi.IRI import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.resourceinfo.api.model.ListResponseDto -import org.knora.webapi.slice.resourceinfo.api.model.QueryParams._ +import org.knora.webapi.slice.resourceinfo.api.model.QueryParams.* import org.knora.webapi.slice.resourceinfo.api.model.ResourceInfoDto import org.knora.webapi.slice.resourceinfo.domain.IriConverter import org.knora.webapi.slice.resourceinfo.domain.ResourceInfoRepo diff --git a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/repo/ResourceInfoRepoLive.scala b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/repo/ResourceInfoRepoLive.scala index 4c97ca3a55..29881ac4db 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/repo/ResourceInfoRepoLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/repo/ResourceInfoRepoLive.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.resourceinfo.repo -import zio._ +import zio.* import java.time.Instant 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 9e5b2dc8fd..2d75ff0b06 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 @@ -11,22 +11,22 @@ import eu.timepit.refined.numeric.Greater import org.apache.pekko.http.scaladsl.server.Route import sttp.model.HeaderNames import sttp.model.MediaType -import sttp.tapir._ -import sttp.tapir.codec.refined._ +import sttp.tapir.* +import sttp.tapir.codec.refined.* import zio.Task import zio.ZIO import zio.ZLayer import dsp.valueobjects.Iri import org.knora.webapi.responders.v2.SearchResponderV2 -import org.knora.webapi.slice.admin.api.Codecs.TapirCodec._ +import org.knora.webapi.slice.admin.api.Codecs.TapirCodec.* 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/iiif/IIIFRequestMessageHandler.scala b/webapi/src/main/scala/org/knora/webapi/store/iiif/IIIFRequestMessageHandler.scala index 7ea2914232..3364ea90ca 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/iiif/IIIFRequestMessageHandler.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/iiif/IIIFRequestMessageHandler.scala @@ -5,7 +5,7 @@ package org.knora.webapi.store.iiif -import zio._ +import zio.* import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay diff --git a/webapi/src/main/scala/org/knora/webapi/store/iiif/api/SipiService.scala b/webapi/src/main/scala/org/knora/webapi/store/iiif/api/SipiService.scala index 959bcbabbf..96ae4ef350 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/iiif/api/SipiService.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/iiif/api/SipiService.scala @@ -5,12 +5,12 @@ package org.knora.webapi.store.iiif.api -import zio._ +import zio.* import zio.json.DeriveJsonDecoder import zio.json.JsonDecoder import zio.nio.file.Path -import org.knora.webapi.messages.store.sipimessages._ +import org.knora.webapi.messages.store.sipimessages.* import org.knora.webapi.messages.v2.responder.SuccessResponseV2 import org.knora.webapi.slice.admin.api.model.MaintenanceRequests.AssetId import org.knora.webapi.slice.admin.domain.model.KnoraProject.Shortcode diff --git a/webapi/src/main/scala/org/knora/webapi/store/iiif/impl/SipiServiceLive.scala b/webapi/src/main/scala/org/knora/webapi/store/iiif/impl/SipiServiceLive.scala index 034fec0b14..c47c306074 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/iiif/impl/SipiServiceLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/iiif/impl/SipiServiceLive.scala @@ -13,7 +13,7 @@ import org.apache.http.HttpResponse import org.apache.http.NameValuePair import org.apache.http.client.config.RequestConfig import org.apache.http.client.entity.UrlEncodedFormEntity -import org.apache.http.client.methods._ +import org.apache.http.client.methods.* import org.apache.http.client.protocol.HttpClientContext import org.apache.http.config.SocketConfig import org.apache.http.impl.client.CloseableHttpClient @@ -22,8 +22,8 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager import org.apache.http.message.BasicHeader import org.apache.http.message.BasicNameValuePair import org.apache.http.util.EntityUtils -import spray.json._ -import zio._ +import spray.json.* +import zio.* import zio.json.DecoderOps import zio.nio.file.Path @@ -34,7 +34,7 @@ import dsp.errors.BadRequestException import dsp.errors.NotFoundException import org.knora.webapi.config.AppConfig import org.knora.webapi.config.Sipi -import org.knora.webapi.messages.store.sipimessages._ +import org.knora.webapi.messages.store.sipimessages.* import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.messages.v2.responder.SuccessResponseV2 import org.knora.webapi.slice.admin.api.model.MaintenanceRequests.AssetId diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/api/TriplestoreService.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/api/TriplestoreService.scala index 5d37a309d2..549fbd4d2e 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/api/TriplestoreService.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/api/TriplestoreService.scala @@ -9,11 +9,11 @@ import org.eclipse.rdf4j.sparqlbuilder.core.query.ConstructQuery import org.eclipse.rdf4j.sparqlbuilder.core.query.InsertDataQuery import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery import play.twirl.api.TxtFormat -import zio._ +import zio.* import java.nio.file.Path -import org.knora.webapi.messages.store.triplestoremessages._ +import org.knora.webapi.messages.store.triplestoremessages.* import org.knora.webapi.messages.util.rdf.QuadFormat import org.knora.webapi.messages.util.rdf.SparqlSelectResult import org.knora.webapi.slice.common.repo.rdf.RdfModel 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 4238328add..0eaed62295 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 @@ -29,8 +29,8 @@ import org.apache.http.impl.client.HttpClients import org.apache.http.impl.conn.PoolingHttpClientConnectionManager import org.apache.http.message.BasicNameValuePair import org.apache.http.util.EntityUtils -import spray.json._ -import zio._ +import spray.json.* +import zio.* import zio.metrics.Metric import java.io.BufferedInputStream @@ -45,22 +45,22 @@ import java.time.temporal.ChronoUnit import java.util import scala.io.Source -import dsp.errors._ -import org.knora.webapi._ +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.util.rdf._ +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 -import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries._ +import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.* import org.knora.webapi.store.triplestore.defaults.DefaultRdfData import org.knora.webapi.store.triplestore.domain.TriplestoreStatus import org.knora.webapi.store.triplestore.domain.TriplestoreStatus.Available import org.knora.webapi.store.triplestore.domain.TriplestoreStatus.NotInitialized import org.knora.webapi.store.triplestore.domain.TriplestoreStatus.Unavailable -import org.knora.webapi.store.triplestore.errors._ +import org.knora.webapi.store.triplestore.errors.* import org.knora.webapi.store.triplestore.upgrade.GraphsForMigration import org.knora.webapi.store.triplestore.upgrade.MigrateAllGraphs import org.knora.webapi.store.triplestore.upgrade.MigrateSpecificGraphs 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 bd3c1594fe..d4f59e4d5c 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,7 +8,7 @@ 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._ +import org.knora.webapi.store.triplestore.upgrade.plugins.* /** * 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/RepositoryUpdater.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdater.scala index 6a1712866f..0b2ba98388 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdater.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdater.scala @@ -21,7 +21,7 @@ import org.knora.webapi.KnoraBaseVersion import org.knora.webapi.KnoraBaseVersionString import org.knora.webapi.knoraBaseVersionFrom import org.knora.webapi.messages.store.triplestoremessages.RepositoryUpdatedResponse -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.store.triplestore.api.TriplestoreService import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.Select import org.knora.webapi.store.triplestore.upgrade.RepositoryUpdatePlan.PluginForKnoraBaseVersion diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/AbstractSparqlUpdatePlugin.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/AbstractSparqlUpdatePlugin.scala index 03af6b0059..f499b7d3b7 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/AbstractSparqlUpdatePlugin.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/AbstractSparqlUpdatePlugin.scala @@ -11,7 +11,7 @@ import org.apache.jena.update.UpdateExecutionFactory import org.apache.jena.update.UpdateFactory import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin abstract class AbstractSparqlUpdatePlugin extends UpgradePlugin { diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307.scala index 060bd806b7..9f3c997656 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307.scala @@ -8,7 +8,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import dsp.errors.InconsistentRepositoryDataException 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.* import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322.scala index 1e7328aec9..1a7bd2dab6 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322.scala @@ -8,7 +8,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import dsp.errors.InconsistentRepositoryDataException import dsp.valueobjects.UuidUtil import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367.scala index 449979c24d..e327baab2c 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367.scala @@ -6,7 +6,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372.scala index 03463c846a..463e112fd3 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372.scala @@ -7,7 +7,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615.scala index e409db41e9..bbcc527f16 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615.scala @@ -5,7 +5,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746.scala index 903aa00e4e..c105db67fa 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746.scala @@ -8,7 +8,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import com.typesafe.scalalogging.Logger import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921.scala index 9ced52536f..07b3df2718 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921.scala @@ -8,7 +8,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import com.typesafe.scalalogging.Logger import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018.scala index 286c6f38a2..131e2c7fa8 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018.scala @@ -14,7 +14,7 @@ import org.knora.webapi.messages.OntologyConstants.KnoraBase.AttachedToProject import org.knora.webapi.messages.OntologyConstants.KnoraBase.LastModificationDate import org.knora.webapi.messages.OntologyConstants.Owl.Ontology import org.knora.webapi.messages.OntologyConstants.Xsd.DateTime -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.slice.admin.domain.service.KnoraProjectRepo.builtIn.SystemProject import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079.scala index b76731260a..6577c65698 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079.scala @@ -8,7 +8,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import com.typesafe.scalalogging.Logger import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2081.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2081.scala index ed7fc78b90..0dd5f672c9 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2081.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2081.scala @@ -10,7 +10,7 @@ import com.typesafe.scalalogging.Logger import java.time.Instant import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2094.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2094.scala index 10583af2f3..5b1ea6d1be 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2094.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2094.scala @@ -8,7 +8,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import com.typesafe.scalalogging.Logger import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** 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 ef3cfe2244..a94dc1dd56 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 @@ -6,9 +6,9 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import org.eclipse.rdf4j.model.vocabulary.RDF -import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.{`var` => variable} +import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.`var` as variable +import org.eclipse.rdf4j.sparqlbuilder.core.query.* import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery -import org.eclipse.rdf4j.sparqlbuilder.core.query._ 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 0d0f9360e6..d746ca1f7b 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 @@ -5,9 +5,9 @@ package org.knora.webapi.store.triplestore.upgrade.plugins -import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.{`var` => variable} +import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.`var` as variable +import org.eclipse.rdf4j.sparqlbuilder.core.query.* import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery -import org.eclipse.rdf4j.sparqlbuilder.core.query._ import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf import org.knora.webapi.slice.admin.AdminConstants diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3112.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3112.scala index fe6416fba4..a15ec073e7 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3112.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3112.scala @@ -5,9 +5,9 @@ package org.knora.webapi.store.triplestore.upgrade.plugins -import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.{`var` => variable} +import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.`var` as variable +import org.eclipse.rdf4j.sparqlbuilder.core.query.* import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery -import org.eclipse.rdf4j.sparqlbuilder.core.query._ 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/ActorUtil.scala b/webapi/src/main/scala/org/knora/webapi/util/ActorUtil.scala index 39a39cdfbc..298df55440 100644 --- a/webapi/src/main/scala/org/knora/webapi/util/ActorUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/util/ActorUtil.scala @@ -6,9 +6,9 @@ package org.knora.webapi.util import org.apache.pekko -import zio._ +import zio.* -import dsp.errors._ +import dsp.errors.* import org.knora.webapi.routing.UnsafeZioRun import pekko.actor.ActorRef diff --git a/webapi/src/main/scala/org/knora/webapi/util/LogAspect.scala b/webapi/src/main/scala/org/knora/webapi/util/LogAspect.scala index 54dfed590f..40f4a38e12 100644 --- a/webapi/src/main/scala/org/knora/webapi/util/LogAspect.scala +++ b/webapi/src/main/scala/org/knora/webapi/util/LogAspect.scala @@ -5,7 +5,7 @@ package org.knora.webapi.util -import zio._ +import zio.* object LogAspect { 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 f2496ff96b..4b57be7a52 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.* import zio.LogLevel -import zio._ +import zio.logging.* import zio.logging.LogFilter -import zio.logging.LogFormat._ -import zio.logging._ +import zio.logging.LogFormat.* import zio.logging.slf4j.bridge.Slf4jBridge object Logger { diff --git a/webapi/src/main/scala/org/knora/webapi/util/SipiUtil.scala b/webapi/src/main/scala/org/knora/webapi/util/SipiUtil.scala index c55c10b36b..454458a08e 100644 --- a/webapi/src/main/scala/org/knora/webapi/util/SipiUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/util/SipiUtil.scala @@ -5,7 +5,7 @@ package org.knora.webapi.util -import spray.json._ +import spray.json.* import scala.util.Failure import scala.util.Success diff --git a/webapi/src/main/scala/org/knora/webapi/util/ZScopedJavaIoStreams.scala b/webapi/src/main/scala/org/knora/webapi/util/ZScopedJavaIoStreams.scala index bcfc1cfbe4..2369e2df57 100644 --- a/webapi/src/main/scala/org/knora/webapi/util/ZScopedJavaIoStreams.scala +++ b/webapi/src/main/scala/org/knora/webapi/util/ZScopedJavaIoStreams.scala @@ -5,9 +5,9 @@ package org.knora.webapi.util -import zio._ +import zio.* -import java.io._ +import java.io.* import java.nio.file.Files import java.nio.file.Path import java.util.zip.ZipInputStream diff --git a/webapi/src/test/scala/dsp/valueobjects/IriSpec.scala b/webapi/src/test/scala/dsp/valueobjects/IriSpec.scala index 50eb76e5f4..90e1c3df92 100644 --- a/webapi/src/test/scala/dsp/valueobjects/IriSpec.scala +++ b/webapi/src/test/scala/dsp/valueobjects/IriSpec.scala @@ -6,10 +6,10 @@ package dsp.valueobjects import zio.prelude.Validation -import zio.test._ +import zio.test.* import dsp.errors.ValidationException -import dsp.valueobjects.Iri._ +import dsp.valueobjects.Iri.* /** * This spec is used to test the [[Iri]] value objects creation. diff --git a/webapi/src/test/scala/dsp/valueobjects/LangStringSpec.scala b/webapi/src/test/scala/dsp/valueobjects/LangStringSpec.scala index 54b9b9be4b..24311e052c 100644 --- a/webapi/src/test/scala/dsp/valueobjects/LangStringSpec.scala +++ b/webapi/src/test/scala/dsp/valueobjects/LangStringSpec.scala @@ -6,7 +6,7 @@ package dsp.valueobjects import zio.prelude.Validation -import zio.test._ +import zio.test.* import dsp.errors.ValidationException diff --git a/webapi/src/test/scala/dsp/valueobjects/LanguageCodeSpec.scala b/webapi/src/test/scala/dsp/valueobjects/LanguageCodeSpec.scala index 89d493541a..c343d2d62d 100644 --- a/webapi/src/test/scala/dsp/valueobjects/LanguageCodeSpec.scala +++ b/webapi/src/test/scala/dsp/valueobjects/LanguageCodeSpec.scala @@ -6,7 +6,7 @@ package dsp.valueobjects import zio.prelude.Validation -import zio.test._ +import zio.test.* import dsp.errors.ValidationException diff --git a/webapi/src/test/scala/dsp/valueobjects/RestrictedViewSpec.scala b/webapi/src/test/scala/dsp/valueobjects/RestrictedViewSpec.scala index 3047ce0b43..f13e1d39c4 100644 --- a/webapi/src/test/scala/dsp/valueobjects/RestrictedViewSpec.scala +++ b/webapi/src/test/scala/dsp/valueobjects/RestrictedViewSpec.scala @@ -6,7 +6,7 @@ package dsp.valueobjects import zio.Scope -import zio.test._ +import zio.test.* import org.knora.webapi.slice.admin.domain.model.RestrictedView diff --git a/webapi/src/test/scala/dsp/valueobjects/SchemaCommandsSpec.scala b/webapi/src/test/scala/dsp/valueobjects/SchemaCommandsSpec.scala index 0360400e83..6945975301 100644 --- a/webapi/src/test/scala/dsp/valueobjects/SchemaCommandsSpec.scala +++ b/webapi/src/test/scala/dsp/valueobjects/SchemaCommandsSpec.scala @@ -6,8 +6,8 @@ package dsp.valueobjects import zio.ZIO -import zio.test.Assertion._ -import zio.test._ +import zio.test.* +import zio.test.Assertion.* import java.time.Instant diff --git a/webapi/src/test/scala/dsp/valueobjects/SchemaSpec.scala b/webapi/src/test/scala/dsp/valueobjects/SchemaSpec.scala index 4912e55566..e3500874ff 100644 --- a/webapi/src/test/scala/dsp/valueobjects/SchemaSpec.scala +++ b/webapi/src/test/scala/dsp/valueobjects/SchemaSpec.scala @@ -7,7 +7,7 @@ package dsp.valueobjects import zio.NonEmptyChunk import zio.prelude.Validation -import zio.test._ +import zio.test.* import dsp.constants.SalsahGui import dsp.errors.ValidationException diff --git a/webapi/src/test/scala/dsp/valueobjects/UuidUtilSpec.scala b/webapi/src/test/scala/dsp/valueobjects/UuidUtilSpec.scala index 5caddd2a54..aeb65f2a7d 100644 --- a/webapi/src/test/scala/dsp/valueobjects/UuidUtilSpec.scala +++ b/webapi/src/test/scala/dsp/valueobjects/UuidUtilSpec.scala @@ -6,7 +6,7 @@ package dsp.valueobjects import zio.Scope -import zio.test._ +import zio.test.* import java.util.UUID diff --git a/webapi/src/test/scala/org/knora/webapi/TestDataFactory.scala b/webapi/src/test/scala/org/knora/webapi/TestDataFactory.scala index ab26f2ba4a..aa361d10d1 100644 --- a/webapi/src/test/scala/org/knora/webapi/TestDataFactory.scala +++ b/webapi/src/test/scala/org/knora/webapi/TestDataFactory.scala @@ -10,19 +10,19 @@ import zio.NonEmptyChunk import dsp.valueobjects.LanguageCode import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 +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 import org.knora.webapi.slice.admin.domain.model.GroupIri import org.knora.webapi.slice.admin.domain.model.KnoraProject -import org.knora.webapi.slice.admin.domain.model.KnoraProject._ +import org.knora.webapi.slice.admin.domain.model.KnoraProject.* import org.knora.webapi.slice.admin.domain.model.KnoraUser import org.knora.webapi.slice.admin.domain.model.PasswordHash 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 91d32e7036..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.* +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 cacd5b35b2..b3223487bd 100644 --- a/webapi/src/test/scala/org/knora/webapi/core/MessageRelaySpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/core/MessageRelaySpec.scala @@ -5,11 +5,11 @@ package org.knora.webapi.core -import zio._ +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/messages/util/rdf/JsonLDObjectSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/JsonLDObjectSpec.scala index 02961e9c85..c42c252f7d 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/JsonLDObjectSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/JsonLDObjectSpec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.messages.util.rdf -import zio._ -import zio.test._ +import zio.* +import zio.test.* import java.util.UUID diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/ConstructTransformerSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/ConstructTransformerSpec.scala index 02ee8b88d0..de4e50f2ee 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/ConstructTransformerSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/ConstructTransformerSpec.scala @@ -10,10 +10,10 @@ import zio.test.Spec import zio.test.ZIOSpecDefault import zio.test.assertTrue -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* import org.knora.webapi.slice.ontology.repo.service.OntologyCacheFake import org.knora.webapi.slice.resourceinfo.domain.IriConverter diff --git a/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueContentV2Spec.scala b/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueContentV2Spec.scala index 453edc7aa8..a44f5c8b12 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueContentV2Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueContentV2Spec.scala @@ -23,7 +23,7 @@ import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileResponse import org.knora.webapi.messages.util.rdf.JsonLDUtil import org.knora.webapi.messages.v2.responder.SuccessResponseV2 import org.knora.webapi.routing.v2.AssetIngestState -import org.knora.webapi.routing.v2.AssetIngestState._ +import org.knora.webapi.routing.v2.AssetIngestState.* import org.knora.webapi.slice.admin.api.model.MaintenanceRequests.AssetId import org.knora.webapi.slice.admin.domain.model.KnoraProject import org.knora.webapi.slice.admin.domain.model.User 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 3f3f0e55c1..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.Assertion._ +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 e167f0b363..7fc07d796b 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.* import zio.test.Assertion.failsWithA -import zio.test._ import dsp.errors.ForbiddenException import org.knora.webapi.TestDataFactory diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/api/service/MaintenanceServiceSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/api/service/MaintenanceServiceSpec.scala index 4cb95bcf87..a6eacf9f4a 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/api/service/MaintenanceServiceSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/api/service/MaintenanceServiceSpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.admin.api.service -import eu.timepit.refined.auto._ +import eu.timepit.refined.auto.* import zio.Chunk import zio.ZIO import zio.test.Spec @@ -15,7 +15,7 @@ import zio.test.assertTrue import org.knora.webapi.TestDataFactory import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.slice.admin.api.model.MaintenanceRequests._ +import org.knora.webapi.slice.admin.api.model.MaintenanceRequests.* import org.knora.webapi.slice.admin.domain.repo.KnoraProjectRepoInMemory import org.knora.webapi.slice.admin.domain.service.KnoraProjectService import org.knora.webapi.slice.admin.domain.service.ProjectService diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraGroupSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraGroupSpec.scala index b3847d7df7..1ef7490671 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraGroupSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraGroupSpec.scala @@ -5,10 +5,10 @@ package dsp.valueobjects -import zio.test._ +import zio.test.* import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 -import org.knora.webapi.slice.admin.domain.model._ +import org.knora.webapi.slice.admin.domain.model.* /** * This spec is used to test the [[Group]] value objects creation. diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraProjectSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraProjectSpec.scala index 60bfdec7a2..2dfd5a19c8 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraProjectSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraProjectSpec.scala @@ -6,12 +6,12 @@ package org.knora.webapi.slice.admin.domain.model import zio.Scope -import zio.test._ +import zio.test.* import scala.util.Random import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 -import org.knora.webapi.slice.admin.domain.model.KnoraProject._ +import org.knora.webapi.slice.admin.domain.model.KnoraProject.* /** * This spec is used to test the [[org.knora.webapi.slice.admin.domain.model.KnoraProject]] value objects creation. diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/ListPropertiesSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/ListPropertiesSpec.scala index 6293683771..822ebb75fa 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/ListPropertiesSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/ListPropertiesSpec.scala @@ -12,7 +12,7 @@ import zio.test.assertTrue import zio.test.check import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 -import org.knora.webapi.slice.admin.domain.model.ListProperties._ +import org.knora.webapi.slice.admin.domain.model.ListProperties.* /** * This spec is used to test the [[List]] value objects creation. diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/UserSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/UserSpec.scala index dd76f8fed8..618f675d95 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/UserSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/UserSpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.admin.domain.model -import zio.test._ +import zio.test.* object UserSpec extends ZIOSpecDefault { private val validPassword = "pass-word" diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/GroupServiceSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/GroupServiceSpec.scala index 53ccbcfd97..33bb1c9b5e 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/GroupServiceSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/GroupServiceSpec.scala @@ -7,10 +7,10 @@ package org.knora.webapi.slice.admin.domain.service import zio.Scope import zio.ZIO +import zio.test.* import zio.test.Spec import zio.test.TestEnvironment import zio.test.ZIOSpecDefault -import zio.test._ import org.knora.webapi.config.AppConfig import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ProjectServiceSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ProjectServiceSpec.scala index 1840d51b9d..659c4433b8 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ProjectServiceSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ProjectServiceSpec.scala @@ -13,7 +13,7 @@ import zio.test.assertTrue import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.slice.admin.api.model.Project import org.knora.webapi.slice.admin.domain.model.KnoraProject -import org.knora.webapi.slice.admin.domain.model.KnoraProject._ +import org.knora.webapi.slice.admin.domain.model.KnoraProject.* import org.knora.webapi.slice.admin.domain.model.RestrictedView import org.knora.webapi.slice.resourceinfo.domain.IriTestConstants diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ZipUtilitySpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ZipUtilitySpec.scala index 02ec6dd9c7..59fc3a62d4 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ZipUtilitySpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ZipUtilitySpec.scala @@ -5,9 +5,9 @@ package org.knora.webapi.slice.admin.domain.service -import zio._ -import zio.nio.file._ -import zio.test._ +import zio.* +import zio.nio.file.* +import zio.test.* object ZipUtilitySpec extends ZIOSpecDefault { private val testFolderName = "test-folder" diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLiveSpec.scala index 3141ec7374..cbf246f0b8 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLiveSpec.scala @@ -16,7 +16,7 @@ import zio.test.ZIOSpecDefault import zio.test.assertTrue import zio.test.check -import org.knora.webapi.TestDataFactory.UserGroup._ +import org.knora.webapi.TestDataFactory.UserGroup.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.slice.admin.domain.model.GroupIri import org.knora.webapi.slice.admin.domain.model.GroupName diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLiveSpec.scala index 10e9eb2288..c87e4afca8 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLiveSpec.scala @@ -22,7 +22,7 @@ import zio.test.check import dsp.valueobjects.LanguageCode import org.knora.webapi.TestDataFactory -import org.knora.webapi.TestDataFactory.User._ +import org.knora.webapi.TestDataFactory.User.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.slice.admin.AdminConstants.adminDataNamedGraph import org.knora.webapi.slice.admin.domain.model.Email @@ -36,7 +36,7 @@ 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.service._ +import org.knora.webapi.slice.admin.domain.service.* import org.knora.webapi.slice.admin.repo.rdf.Vocabulary import org.knora.webapi.slice.infrastructure.CacheManager import org.knora.webapi.store.triplestore.api.TestTripleStore 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 51185761f8..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 @@ -5,11 +5,11 @@ package org.knora.webapi.slice.common.repo.rdf -import zio._ -import zio.test.Assertion._ -import zio.test._ +import zio.* +import zio.test.* +import zio.test.Assertion.* -import org.knora.webapi.slice.common.repo.rdf.Errors._ +import org.knora.webapi.slice.common.repo.rdf.Errors.* import org.knora.webapi.slice.resourceinfo.domain.InternalIri object RdfModelSpec extends ZIOSpecDefault { diff --git a/webapi/src/test/scala/org/knora/webapi/slice/common/repo/service/AbstractInMemoryCrudRepository.scala b/webapi/src/test/scala/org/knora/webapi/slice/common/repo/service/AbstractInMemoryCrudRepository.scala index a51c7d7214..621aad6de2 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/common/repo/service/AbstractInMemoryCrudRepository.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/common/repo/service/AbstractInMemoryCrudRepository.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.common.repo.service -import zio._ +import zio.* abstract class AbstractInMemoryCrudRepository[Entity, Id](entities: Ref[Chunk[Entity]], getId: Entity => Id) extends CrudRepository[Entity, Id] { 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 9d61ad2881..59ac955d69 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 @@ -9,8 +9,8 @@ import zio.Chunk import zio.Ref import zio.ZIO import zio.ZLayer +import zio.test.* import zio.test.Assertion.hasSameElements -import zio.test._ final case class SomeEntity(id: Int, name: String) final case class InMemoryRepository(entities: Ref[Chunk[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 f11a380938..f8cafb8dc1 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 @@ -5,8 +5,8 @@ package org.knora.webapi.slice.ontology.api.service -import zio._ -import zio.test._ +import zio.* +import zio.test.* import org.knora.webapi.IRI import org.knora.webapi.config.AppConfig @@ -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.* 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.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 efdf6eee51..a8fca93823 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 @@ -10,24 +10,24 @@ import zio.Random import zio.Ref import zio.ZIO import zio.ZLayer +import zio.test.* import zio.test.ZIOSpecDefault -import zio.test._ import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.slice.ontology.domain.model.Cardinality -import org.knora.webapi.slice.ontology.domain.model.Cardinality._ +import org.knora.webapi.slice.ontology.domain.model.Cardinality.* import org.knora.webapi.slice.ontology.domain.model.CardinalitySpec.Generator.cardinalitiesGen import org.knora.webapi.slice.ontology.domain.service.CardinalityService -import org.knora.webapi.slice.ontology.domain.service.ChangeCardinalityCheckResult.CanSetCardinalityCheckResult._ +import org.knora.webapi.slice.ontology.domain.service.ChangeCardinalityCheckResult.CanSetCardinalityCheckResult.* import org.knora.webapi.slice.ontology.repo.model.OntologyCacheData import org.knora.webapi.slice.ontology.repo.service.OntologyCacheFake import org.knora.webapi.slice.ontology.repo.service.OntologyRepoLive import org.knora.webapi.slice.ontology.repo.service.PredicateRepositoryLive import org.knora.webapi.slice.resourceinfo.domain.InternalIri import org.knora.webapi.slice.resourceinfo.domain.IriConverter -import org.knora.webapi.slice.resourceinfo.domain.IriTestConstants._ -import org.knora.webapi.store.triplestore.TestDatasetBuilder._ +import org.knora.webapi.slice.resourceinfo.domain.IriTestConstants.* +import org.knora.webapi.store.triplestore.TestDatasetBuilder.* import org.knora.webapi.store.triplestore.api.TriplestoreServiceInMemory object CardinalityServiceLiveSpec extends ZIOSpecDefault { diff --git a/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/model/CardinalitySpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/model/CardinalitySpec.scala index 79a35729cd..7ded1e5b7b 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/model/CardinalitySpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/model/CardinalitySpec.scala @@ -7,10 +7,10 @@ package org.knora.webapi.slice.ontology.domain.model import zio.Random import zio.Scope -import zio.test._ +import zio.test.* import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality -import org.knora.webapi.slice.ontology.domain.model.Cardinality._ +import org.knora.webapi.slice.ontology.domain.model.Cardinality.* import org.knora.webapi.slice.ontology.domain.model.CardinalitySpec.Generator.cardinalitiesGen object CardinalitySpec extends ZIOSpecDefault { 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 2aa38128c3..fb162be348 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 @@ -8,8 +8,8 @@ import org.apache.jena.query.Dataset import zio.Ref import zio.ZIO import zio.ZLayer -import zio.test.Assertion._ -import zio.test._ +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 d1fd6e390f..34a7ebb2d0 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 @@ -6,8 +6,8 @@ package org.knora.webapi.slice.ontology.repo import zio.ZIO +import zio.test.* import zio.test.ZIOSpecDefault -import zio.test._ 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 81c7ff19c0..58fd838bb8 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 @@ -8,8 +8,8 @@ package org.knora.webapi.slice.ontology.repo.service import zio.Chunk import zio.Scope import zio.ZIO +import zio.test.* import zio.test.ZIOSpecDefault -import zio.test._ import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/api/IriConverterLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/api/IriConverterLiveSpec.scala index d6f6add68f..15700ea1ee 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/api/IriConverterLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/api/IriConverterLiveSpec.scala @@ -6,7 +6,7 @@ package org.knora.webapi.slice.resourceinfo.api import zio.ZIO -import zio.test._ +import zio.test.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.slice.resourceinfo.domain.InternalIri diff --git a/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/api/LiveRestResourceInfoServiceSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/api/LiveRestResourceInfoServiceSpec.scala index 438d8e3f22..5ecab0ebd6 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/api/LiveRestResourceInfoServiceSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/api/LiveRestResourceInfoServiceSpec.scala @@ -7,7 +7,7 @@ package org.knora.webapi.slice.resourceinfo.api import zio.Exit import zio.ZIO -import zio.test._ +import zio.test.* import java.time.Instant.now import java.time.temporal.ChronoUnit.DAYS diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/TestDatasetBuilder.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/TestDatasetBuilder.scala index 2468be59ac..f8f53b3ca8 100644 --- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/TestDatasetBuilder.scala +++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/TestDatasetBuilder.scala @@ -11,7 +11,7 @@ import org.apache.jena.query.ReadWrite import org.apache.jena.rdf.model.Model import org.apache.jena.riot.Lang import org.apache.jena.riot.RDFDataMgr -import zio._ +import zio.* import java.io.StringReader diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemory.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemory.scala index d05422c139..7e5818064c 100644 --- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemory.scala +++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemory.scala @@ -5,7 +5,7 @@ package org.knora.webapi.store.triplestore.api -import org.apache.jena.query._ +import org.apache.jena.query.* import org.apache.jena.rdf.model import org.apache.jena.rdf.model.Model import org.apache.jena.rdf.model.ModelFactory @@ -29,13 +29,13 @@ import java.io.InputStream import java.nio.charset.StandardCharsets import java.nio.file.Path import java.nio.file.Paths -import scala.jdk.CollectionConverters._ +import scala.jdk.CollectionConverters.* import org.knora.webapi.IRI import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.store.triplestoremessages.SparqlConstructResponse -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.slice.resourceinfo.domain.InternalIri import org.knora.webapi.store.triplestore.TestDatasetBuilder import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.Ask 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 77ea7c6f30..25fb966e77 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,19 +8,19 @@ import org.apache.jena.query.Dataset import org.apache.jena.query.ReadWrite import zio.Ref import zio.ZIO +import zio.test.* import zio.test.Assertion.hasSameElements -import zio.test._ import java.nio.file.Files import java.util.UUID -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.IriLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.IriSubjectV2 import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.store.triplestoremessages.SubjectV2 -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.slice.resourceinfo.domain.InternalIri import org.knora.webapi.slice.resourceinfo.domain.IriTestConstants.Biblio import org.knora.webapi.store.triplestore.TestDatasetBuilder.datasetLayerFromTurtle diff --git a/webapi/src/test/scala/org/knora/webapi/util/ZioHelperSpec.scala b/webapi/src/test/scala/org/knora/webapi/util/ZioHelperSpec.scala index 1ac3445022..6f8f64a5b2 100644 --- a/webapi/src/test/scala/org/knora/webapi/util/ZioHelperSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/util/ZioHelperSpec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.util -import zio._ -import zio.test._ +import zio.* +import zio.test.* object ZioHelperSpec extends ZIOSpecDefault { diff --git a/webapi/src/test/scala/org/knora/webapi/util/search/gravsearch/GravsearchParserSpec.scala b/webapi/src/test/scala/org/knora/webapi/util/search/gravsearch/GravsearchParserSpec.scala index 3d54b686a7..e779a74975 100644 --- a/webapi/src/test/scala/org/knora/webapi/util/search/gravsearch/GravsearchParserSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/util/search/gravsearch/GravsearchParserSpec.scala @@ -17,9 +17,9 @@ import zio.test.assertTrue import dsp.errors.GravsearchException import org.knora.webapi.ApiV2Complex import org.knora.webapi.ApiV2Simple -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search._ +import org.knora.webapi.messages.util.search.* import org.knora.webapi.messages.util.search.gravsearch.GravsearchParser object GravsearchParserSpec extends ZIOSpecDefault {