diff --git a/build.sbt b/build.sbt index 3b39f57034..64de5322a2 100644 --- a/build.sbt +++ b/build.sbt @@ -138,6 +138,28 @@ lazy val webApiCommonSettings = Seq( ) testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework") +val customScalacOptions = Seq( + "-Xsource:3", + "-Wconf:msg=constructor modifiers are assumed:s", + "-feature", + "-unchecked", + "-deprecation", + "-Yresolve-term-conflict:package", + "-Ymacro-annotations", + "-Wunused:imports", + "-Wunused:privates", + "-Wunused:locals", + "-Wunused:explicits", + "-Wunused:implicits", + "-Wunused:params", + "-Wunused:patvars", + "-Wdead-code", + "-Wvalue-discard", + "-Xlint:doc-detached", + // silence twirl templates unused imports warnings + "-Wconf:src=target/.*:s" +) + lazy val webapi: Project = Project(id = "webapi", base = file("webapi")) .settings(buildSettings) .settings( @@ -172,27 +194,7 @@ lazy val webapi: Project = Project(id = "webapi", base = file("webapi")) Compile / exportJars := true ) .settings( - scalacOptions ++= Seq( - "-Xsource:3", - "-Wconf:msg=constructor modifiers are assumed:s", - "-feature", - "-unchecked", - "-deprecation", - "-Yresolve-term-conflict:package", - "-Ymacro-annotations", - "-Wunused:imports", - "-Wunused:privates", - "-Wunused:locals", - "-Wunused:explicits", - "-Wunused:implicits", - "-Wunused:params", - "-Wunused:patvars", - "-Wdead-code", - "-Wvalue-discard", - "-Xlint:doc-detached", - // silence twirl templates unused imports warnings - "-Wconf:src=target/.*:s" - ), + scalacOptions ++= customScalacOptions, logLevel := Level.Info, javaAgents += Dependencies.aspectjweaver ) @@ -271,16 +273,7 @@ lazy val integration: Project = Project(id = "integration", base = file("integra inConfig(Test) { Defaults.testSettings ++ Defaults.testTasks ++ baseAssemblySettings ++ headerSettings(Test) }, - scalacOptions ++= Seq( - "-feature", - "-unchecked", - // "-deprecation", - "-Yresolve-term-conflict:package", - "-Ymacro-annotations", - "-Wunused:imports", - // silence twirl templates unused imports warnings - "-Wconf:src=target/.*:s" - ), + scalacOptions ++= customScalacOptions, logLevel := Level.Info, javaAgents += Dependencies.aspectjweaver, Test / testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"), diff --git a/docs/05-internals/design/api-v2/overview.md b/docs/05-internals/design/api-v2/overview.md index ad5795c6d4..650c3eee3d 100644 --- a/docs/05-internals/design/api-v2/overview.md +++ b/docs/05-internals/design/api-v2/overview.md @@ -110,7 +110,7 @@ following: ```scala import org.knora.webapi.messages.{SmartIri, StringFormatter} -import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.IriConversions.* ``` Ensure that an implicit instance of `StringFormatter` is in scope: diff --git a/integration/src/test/scala/org/knora/sipi/SipiIT.scala b/integration/src/test/scala/org/knora/sipi/SipiIT.scala index c9b913e99d..e309738cb3 100644 --- a/integration/src/test/scala/org/knora/sipi/SipiIT.scala +++ b/integration/src/test/scala/org/knora/sipi/SipiIT.scala @@ -7,24 +7,24 @@ 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.admin.responder.KnoraResponseADM -import org.knora.webapi.messages.admin.responder.sipimessages._ +import org.knora.webapi.messages.admin.responder.sipimessages.* import org.knora.webapi.messages.util.KnoraSystemInstances.Users.SystemUser import org.knora.webapi.routing.JwtService import org.knora.webapi.routing.JwtServiceLive @@ -34,8 +34,6 @@ import org.knora.webapi.testcontainers.SipiTestContainer object SipiIT extends ZIOSpecDefault { private val imageTestfile = "FGiLaT4zzuV-CqwbEDFAFeS.jp2" - private val infoTestfile = "FGiLaT4zzuV-CqwbEDFAFeS.info" - private val origTestfile = "FGiLaT4zzuV-CqwbEDFAFeS.jp2.orig" private val prefix = "0001" private def getWithoutAuthorization(path: Path) = @@ -269,7 +267,7 @@ object SipiIT extends ZIOSpecDefault { ) ) - override def spec: Spec[TestEnvironment with Scope, Any] = + override def spec: Spec[TestEnvironment & Scope, Any] = suite("Sipi integration tests with mocked dsp-api")( cookiesSuite, knoraJsonEndpointSuite, @@ -282,10 +280,10 @@ object SipiIT extends ZIOSpecDefault { } yield assertTrue(response.status.isSuccess, verifyNoInteractionWith(server)) } ) - .provideSomeLayerShared[Scope with Client with WireMockServer]( + .provideSomeLayerShared[Scope & Client & WireMockServer]( SharedVolumes.Images.layer >+> SipiTestContainer.layer ) - .provideSomeLayerShared[Scope with Client](MockDspApiServer.layer) + .provideSomeLayerShared[Scope & Client](MockDspApiServer.layer) .provideSomeLayer[Scope](Client.default) @@ TestAspect.sequential } diff --git a/integration/src/test/scala/org/knora/webapi/CoreSpec.scala b/integration/src/test/scala/org/knora/webapi/CoreSpec.scala index f712b3f93a..a75b2dc035 100644 --- a/integration/src/test/scala/org/knora/webapi/CoreSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/CoreSpec.scala @@ -12,7 +12,7 @@ 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.* 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 4bedc664d0..6392eb0e0f 100644 --- a/integration/src/test/scala/org/knora/webapi/E2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/E2ESpec.scala @@ -5,14 +5,14 @@ package org.knora.webapi -import com.typesafe.scalalogging._ +import com.typesafe.scalalogging.* import org.apache.pekko 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 spray.json.* +import zio.* import java.nio.file.Files import java.nio.file.Path @@ -31,7 +31,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 @@ -40,7 +40,7 @@ import org.knora.webapi.util.FileUtil import org.knora.webapi.util.LogAspect import pekko.http.scaladsl.client.RequestBuilding -import pekko.http.scaladsl.model._ +import pekko.http.scaladsl.model.* import pekko.testkit.TestKitBase /** diff --git a/integration/src/test/scala/org/knora/webapi/ITKnoraLiveSpec.scala b/integration/src/test/scala/org/knora/webapi/ITKnoraLiveSpec.scala index 719b587d92..fee3b44cb9 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/ITTestDataFactory.scala b/integration/src/test/scala/org/knora/webapi/ITTestDataFactory.scala index c1b7a5b19a..91756ea5bb 100644 --- a/integration/src/test/scala/org/knora/webapi/ITTestDataFactory.scala +++ b/integration/src/test/scala/org/knora/webapi/ITTestDataFactory.scala @@ -5,7 +5,7 @@ package org.knora.webapi -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM._ +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* /** * Helps in creating value objects for tests. diff --git a/integration/src/test/scala/org/knora/webapi/R2RSpec.scala b/integration/src/test/scala/org/knora/webapi/R2RSpec.scala index 75d4503daf..81f0c08809 100644 --- a/integration/src/test/scala/org/knora/webapi/R2RSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/R2RSpec.scala @@ -14,7 +14,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 @@ -29,7 +29,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 97f4aacc14..d53c9eb58f 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 68e2c8e99a..014908bfc8 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 dd825c7eae..239884b5e5 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 -import zio._ +import zio.* import org.knora.webapi.config.AppConfig import org.knora.webapi.store.cache.settings.CacheServiceSettings @@ -15,12 +15,11 @@ object ActorSystemTest { def layer(sys: pekko.actor.ActorSystem): ZLayer[AppConfig, Nothing, ActorSystem] = ZLayer.scoped { - for { - appConfig <- ZIO.service[AppConfig] - context <- ZIO.executor.map(_.asExecutionContext) - } yield new ActorSystem { - override val system: pekko.actor.ActorSystem = sys - override val cacheServiceSettings: CacheServiceSettings = new CacheServiceSettings(appConfig) + ZIO.serviceWith[AppConfig] { config => + new ActorSystem { + override val system: pekko.actor.ActorSystem = sys + override val cacheServiceSettings: CacheServiceSettings = new CacheServiceSettings(config) + } } } } 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 e6b4db1af3..867f2fa944 100644 --- a/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala +++ b/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala @@ -6,12 +6,12 @@ package org.knora.webapi.core import org.apache.pekko -import zio._ +import zio.* import org.knora.webapi.config.AppConfig.AppConfigurations import org.knora.webapi.config.AppConfigForTestContainers 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 @@ -20,23 +20,23 @@ 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.CardinalityHandlerLive 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.slice.admin.api._ +import org.knora.webapi.routing.* +import org.knora.webapi.slice.admin.api.* import org.knora.webapi.slice.admin.api.service.GroupsRestServiceLive import org.knora.webapi.slice.admin.api.service.MaintenanceRestService import org.knora.webapi.slice.admin.api.service.PermissionsRestService import org.knora.webapi.slice.admin.api.service.ProjectADMRestService import org.knora.webapi.slice.admin.api.service.ProjectsADMRestServiceLive import org.knora.webapi.slice.admin.api.service.UsersADMRestServiceLive -import org.knora.webapi.slice.admin.domain.service._ +import org.knora.webapi.slice.admin.domain.service.* import org.knora.webapi.slice.admin.repo.service.KnoraProjectRepoLive -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.ontology.api.service.RestCardinalityService import org.knora.webapi.slice.ontology.api.service.RestCardinalityServiceLive 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 869f36af00..97eb05edd0 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 8be9264a7f..66ccf0abfd 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/CORSSupportE2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/CORSSupportE2ESpec.scala @@ -14,10 +14,10 @@ import org.knora.webapi.E2ESpec import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import pekko.actor.ActorSystem -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 2a1a5b8bd1..8955182425 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 67f6e09f2c..b1d3a70395 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/HealthRouteE2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/HealthRouteE2ESpec.scala @@ -17,7 +17,7 @@ import org.knora.webapi.core.State import org.knora.webapi.core.domain.AppState import pekko.actor.ActorSystem -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 6f33741257..e69b8f8d7d 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 0126e4d0f8..3444aa7373 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/RejectingRouteE2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/RejectingRouteE2ESpec.scala index f8d092b383..6cec22b577 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/RejectingRouteE2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/RejectingRouteE2ESpec.scala @@ -9,7 +9,7 @@ import org.apache.pekko import org.knora.webapi.E2ESpec -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/e2e/admin/FilesADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/FilesADME2ESpec.scala index a00b740b3f..6dba812e99 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/admin/FilesADME2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/admin/FilesADME2ESpec.scala @@ -8,18 +8,18 @@ package org.knora.webapi.e2e.admin 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.messages.admin.responder.sipimessages.SipiFileInfoGetResponseADM -import org.knora.webapi.messages.admin.responder.sipimessages.SipiResponderResponseADMJsonProtocol._ +import org.knora.webapi.messages.admin.responder.sipimessages.SipiResponderResponseADMJsonProtocol.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol import org.knora.webapi.routing.Authenticator import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM2 -import pekko.http.scaladsl.model._ +import pekko.http.scaladsl.model.* import pekko.http.scaladsl.unmarshalling.Unmarshal /** 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 f5a3f2b915..60db5ba427 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 @@ -8,7 +8,7 @@ package org.knora.webapi.e2e.admin 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.e2e.ClientTestDataCollector @@ -22,8 +22,8 @@ import org.knora.webapi.util.AkkaHttpUtils import org.knora.webapi.util.MutableTestIri import pekko.actor.ActorSystem -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 8a8fe977e3..731ac70fe6 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 @@ -5,9 +5,9 @@ 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 spray.json._ +import spray.json.* import zio.durationInt import java.net.URLEncoder 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 5a460c1dc9..1b41b3e02e 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 @@ -10,7 +10,7 @@ import org.apache.pekko import java.net.URLEncoder import scala.concurrent.Await import scala.concurrent.Future -import scala.concurrent.duration._ +import scala.concurrent.duration.* import dsp.valueobjects.V2 import org.knora.webapi.E2ESpec @@ -18,8 +18,8 @@ import org.knora.webapi.IRI import org.knora.webapi.e2e.ClientTestDataCollector import org.knora.webapi.e2e.TestDataFileContent import org.knora.webapi.e2e.TestDataFilePath -import org.knora.webapi.messages.admin.responder.projectsmessages._ -import org.knora.webapi.messages.admin.responder.usersmessages.UsersADMJsonProtocol._ +import org.knora.webapi.messages.admin.responder.projectsmessages.* +import org.knora.webapi.messages.admin.responder.usersmessages.UsersADMJsonProtocol.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.util.rdf.RdfModel import org.knora.webapi.sharedtestdata.SharedTestDataADM diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/StoreADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/StoreADME2ESpec.scala index 383cf1baf8..ea31b7d114 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/admin/StoreADME2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/admin/StoreADME2ESpec.scala @@ -6,7 +6,7 @@ package org.knora.webapi.e2e.admin import org.apache.pekko -import spray.json._ +import spray.json.* import zio.Duration import org.knora.webapi.E2ESpec 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 778801d58b..0f9c2f8684 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 @@ -9,9 +9,9 @@ import org.apache.pekko import java.net.URLEncoder import scala.concurrent.Await -import scala.concurrent.duration._ +import scala.concurrent.duration.* -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.e2e.ClientTestDataCollector import org.knora.webapi.e2e.TestDataFileContent import org.knora.webapi.e2e.TestDataFilePath @@ -19,7 +19,7 @@ import org.knora.webapi.messages.admin.responder.groupsmessages.GroupADM import org.knora.webapi.messages.admin.responder.groupsmessages.GroupsADMJsonProtocol import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectsADMJsonProtocol -import org.knora.webapi.messages.admin.responder.usersmessages.UsersADMJsonProtocol._ +import org.knora.webapi.messages.admin.responder.usersmessages.UsersADMJsonProtocol.* import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.sharedtestdata.SharedTestDataADM @@ -29,8 +29,8 @@ import org.knora.webapi.util.AkkaHttpUtils import org.knora.webapi.util.MutableTestIri import pekko.actor.ActorSystem -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/lists/CreateListItemsRouteADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/CreateListItemsRouteADME2ESpec.scala index 84b7c61cac..37b96da0e9 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,7 +8,7 @@ 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 @@ -16,7 +16,7 @@ import org.knora.webapi.e2e.ClientTestDataCollector import org.knora.webapi.e2e.TestDataFileContent import org.knora.webapi.e2e.TestDataFilePath 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 @@ -24,7 +24,7 @@ import org.knora.webapi.util.AkkaHttpUtils import org.knora.webapi.util.MutableTestIri import pekko.actor.ActorSystem -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 3797989eef..5e7dddf313 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,13 +7,13 @@ 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.e2e.ClientTestDataCollector import org.knora.webapi.e2e.TestDataFileContent import org.knora.webapi.e2e.TestDataFilePath -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 466c0059f9..b9596f179a 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,13 +7,13 @@ 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.e2e.ClientTestDataCollector import org.knora.webapi.e2e.TestDataFileContent import org.knora.webapi.e2e.TestDataFilePath -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 @@ -21,8 +21,8 @@ import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.util.AkkaHttpUtils import pekko.actor.ActorSystem -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 f700565348..201f890d35 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,13 +7,13 @@ 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.e2e.ClientTestDataCollector import org.knora.webapi.e2e.TestDataFileContent import org.knora.webapi.e2e.TestDataFilePath -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/http/ServerVersionE2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/http/ServerVersionE2ESpec.scala index 77b0ae9862..2e80ab1961 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/http/ServerVersionE2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/http/ServerVersionE2ESpec.scala @@ -14,7 +14,7 @@ import org.knora.webapi.E2ESpec import org.knora.webapi.http.version.ServerVersion import pekko.actor.ActorSystem -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/v2/AuthenticationV2E2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/v2/AuthenticationV2E2ESpec.scala index 149a8de2db..3023388cce 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 @@ -8,7 +8,7 @@ package org.knora.webapi.e2e.v2 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.messages.store.triplestoremessages.TriplestoreJsonProtocol @@ -19,8 +19,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 4fccac70d5..8cec8fea35 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 4aac843230..b13b159add 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.e2e.ClientTestDataCollector import org.knora.webapi.e2e.TestDataFileContent import org.knora.webapi.e2e.TestDataFilePath 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 910521a6a1..f3630c0ca8 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 @@ -6,8 +6,8 @@ package org.knora.webapi.e2e.v2 import org.apache.pekko -import spray.json._ -import zio._ +import spray.json.* +import zio.* import java.net.URLEncoder import java.nio.file.Files @@ -22,31 +22,31 @@ 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.e2e.ClientTestDataCollector import org.knora.webapi.e2e.TestDataFileContent import org.knora.webapi.e2e.TestDataFilePath 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.UnsafeZioRun 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.slice.ontology.domain.model.Cardinality._ -import org.knora.webapi.util._ +import org.knora.webapi.slice.ontology.domain.model.Cardinality.* +import org.knora.webapi.util.* -import pekko.http.scaladsl.model._ +import pekko.http.scaladsl.model.* import pekko.http.scaladsl.model.headers.Accept import pekko.http.scaladsl.model.headers.BasicHttpCredentials @@ -65,7 +65,7 @@ object OntologyV2R2RSpec { */ class OntologyV2R2RSpec extends R2RSpec { - import OntologyV2R2RSpec._ + import OntologyV2R2RSpec.* private implicit val stringFormatter: StringFormatter = StringFormatter.getGeneralInstance 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 7a1b8a9f37..e43c3e380d 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 @@ -32,25 +32,25 @@ 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.ClientTestDataCollector import org.knora.webapi.e2e.InstanceChecker import org.knora.webapi.e2e.TestDataFileContent import org.knora.webapi.e2e.TestDataFilePath -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 fc72105cc0..2a5d21f9f7 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 685ff798da..2c60f5412c 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,13 +18,13 @@ import scala.concurrent.ExecutionContextExecutor import dsp.errors.BadRequestException import dsp.valueobjects.Iri -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.e2e.ClientTestDataCollector import org.knora.webapi.e2e.TestDataFileContent import org.knora.webapi.e2e.TestDataFilePath -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.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 c7ecd60179..fe143f8f0b 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.xmlunit.builder.DiffBuilder @@ -17,29 +17,29 @@ 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.ClientTestDataCollector import org.knora.webapi.e2e.TestDataFileContent import org.knora.webapi.e2e.TestDataFilePath 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 096e28286e..b229310082 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,16 +16,16 @@ import scala.concurrent.ExecutionContextExecutor 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.ClientTestDataCollector import org.knora.webapi.e2e.TestDataFileContent import org.knora.webapi.e2e.TestDataFilePath -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.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/it/VersionRouteITSpec.scala b/integration/src/test/scala/org/knora/webapi/it/VersionRouteITSpec.scala index bd678e6e4c..4c7d9ad1e6 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 672806dd6b..ec2d96805e 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,19 +5,19 @@ 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.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 418d25979f..cd0ba5e547 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,28 +5,28 @@ 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.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 44f9761317..93fe9cd514 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.SipiUploadResponseJsonProtocol.* +import org.knora.webapi.messages.store.sipimessages.* 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 ec08e84a4e..d1f0ec685b 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/listsmessages/ListsMessagesADMSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala index 1d717e8574..0bfb27de00 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,13 +5,13 @@ package org.knora.webapi.messages.admin.responder.listsmessages -import spray.json._ +import spray.json.* import java.util.UUID import dsp.errors.BadRequestException -import dsp.valueobjects.Iri._ -import dsp.valueobjects.List._ +import dsp.valueobjects.Iri.* +import dsp.valueobjects.List.* import dsp.valueobjects.ListErrorMessages import dsp.valueobjects.V2 import org.knora.webapi.CoreSpec 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 3ff4755f7f..5b43b85bd5 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 @@ -17,9 +17,9 @@ import org.knora.webapi.messages.OntologyConstants.KnoraBase.EntityPermissionAbb import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsMessagesUtilADM.PermissionTypeAndCodes import org.knora.webapi.responders.admin.PermissionsResponderADM import org.knora.webapi.routing.UnsafeZioRun -import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM._ -import org.knora.webapi.sharedtestdata.SharedTestDataADM2._ -import org.knora.webapi.sharedtestdata._ +import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM.* +import org.knora.webapi.sharedtestdata.SharedTestDataADM2.* +import org.knora.webapi.sharedtestdata.* import org.knora.webapi.slice.admin.api.service.PermissionsRestService import org.knora.webapi.util.ZioScalaTestUtil.assertFailsWithA diff --git a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala index 50a9d82647..c01f78c67a 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala @@ -8,8 +8,8 @@ package org.knora.webapi.messages.admin.responder.projectsmessages import dsp.errors.BadRequestException import dsp.errors.OntologyConstraintException import dsp.valueobjects.V2 -import org.knora.webapi._ -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM._ +import org.knora.webapi.* +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* import org.knora.webapi.sharedtestdata.SharedTestDataADM /** 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 c5e792f32a..0f59ad41e6 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 @@ -9,7 +9,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder import dsp.errors.BadRequestException -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionProfileType import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsDataADM 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 06e8a37b7b..4739aa37c9 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,10 +7,10 @@ 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 -import org.knora.webapi.messages.admin.responder.listsmessages._ +import org.knora.webapi.messages.admin.responder.listsmessages.* /** * This spec is used to test 'ListAdminMessages'. 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 11ba86c1ca..ec3c789dc0 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 @@ -7,7 +7,7 @@ package org.knora.webapi.util 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 43a67e7cd9..07a5a192bc 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 d2f23e3e41..a0567c98c1 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,7 +9,7 @@ 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.PermissionUtilADM.ChangeRightsPermission import org.knora.webapi.messages.util.PermissionUtilADM.ViewPermission @@ -18,7 +18,7 @@ import org.knora.webapi.messages.v2.responder.resourcemessages.ReadResourcesSequ 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 class ConstructResponseUtilV2SpecFullData(implicit stringFormatter: StringFormatter) { 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 3bf3c8dfe7..01d2676a60 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,12 +9,12 @@ 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 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.sharedtestdata.SharedTestDataADM import org.knora.webapi.sharedtestdata.SharedTestDataADM2 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 1c478d91f5..e8172c28c5 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 c70208f9fb..9aca789991 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 d736f97153..e0c3eb4c46 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 @@ -22,7 +22,7 @@ import org.knora.webapi.messages.OntologyConstants 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.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 2e6f2d5343..40563fa57a 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,7 +13,7 @@ import org.knora.webapi.CoreSpec import org.knora.webapi.IRI import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.util.rdf.JenaRepository -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* /** * 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 787851743d..0ab1d07778 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 1000b97699..aa5399ac07 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 50d3def6e5..e6cd3350e6 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/prequery/TopologicalSortUtilSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/TopologicalSortUtilSpec.scala index 255ad8d819..b64085e62b 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/TopologicalSortUtilSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/TopologicalSortUtilSpec.scala @@ -6,7 +6,7 @@ package org.knora.webapi.util.search.gravsearch.prequery import scalax.collection.Graph -import scalax.collection.GraphEdge._ +import scalax.collection.GraphEdge.* import org.knora.webapi.CoreSpec import org.knora.webapi.messages.util.search.gravsearch.prequery.TopologicalSortUtil @@ -17,10 +17,7 @@ import org.knora.webapi.messages.util.search.gravsearch.prequery.TopologicalSort class TopologicalSortUtilSpec extends CoreSpec { type NodeT = Graph[Int, DiHyperEdge]#NodeT - private def nodesToValues(orders: Set[Vector[NodeT]]): Set[Vector[Int]] = - orders.map { order: Vector[NodeT] => - order.map(_.value) - } + private def nodesToValues(orders: Set[Vector[NodeT]]): Set[Vector[Int]] = orders.map(_.map(_.value)) "TopologicalSortUtilSpec" should { 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 7e884c2f4f..4556e6aafa 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 @@ -11,11 +11,11 @@ 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 66d6127efc..2fd3c492de 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 7c264e77a1..440b69078c 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 @@ -23,7 +23,7 @@ import org.knora.webapi.slice.ontology.domain.model.Cardinality.ZeroOrOne */ class InputOntologyV2Spec extends CoreSpec { - import InputOntologyV2Spec._ + import InputOntologyV2Spec.* "InputOntologyV2" should { "parse a property definition" in { 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 df17279448..3b26ded898 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 d4760d297b..b8bd0a1549 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.* object FileModelUtil { private implicit val stringFormatter: StringFormatter = StringFormatter.getGeneralInstance 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 4046f55493..a6a732ea7c 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.admin.responder.projectsmessages.ProjectADM 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 11b1b6d243..a55dec1ffe 100644 --- a/integration/src/test/scala/org/knora/webapi/models/filemodels/FileModelsSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/models/filemodels/FileModelsSpec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.models.filemodels -import spray.json.DefaultJsonProtocol._ -import spray.json._ +import spray.json.DefaultJsonProtocol.* +import spray.json.* 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 0ab3305233..e64303765d 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.DefaultJsonProtocol.* +import spray.json.* 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 78c733abb9..1bb7e0b19b 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 cd8606aa2c..1e52ad440a 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/GroupsResponderADMSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/GroupsResponderADMSpec.scala index e2f2587493..1942bc0710 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/GroupsResponderADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/GroupsResponderADMSpec.scala @@ -12,10 +12,10 @@ import java.util.UUID import dsp.errors.BadRequestException import dsp.errors.DuplicateValueException import dsp.errors.NotFoundException -import dsp.valueobjects.Group._ +import dsp.valueobjects.Group.* import dsp.valueobjects.V2 -import org.knora.webapi._ -import org.knora.webapi.messages.admin.responder.groupsmessages._ +import org.knora.webapi.* +import org.knora.webapi.messages.admin.responder.groupsmessages.* import org.knora.webapi.messages.admin.responder.usersmessages.UserInformationTypeADM import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.sharedtestdata.SharedTestDataADM diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/ListsResponderADMSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/ListsResponderADMSpec.scala index 4f54113be4..85700388af 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/ListsResponderADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/ListsResponderADMSpec.scala @@ -6,7 +6,7 @@ package org.knora.webapi.responders.admin import org.apache.pekko.actor.Status.Failure -import org.apache.pekko.testkit._ +import org.apache.pekko.testkit.* import java.util.UUID @@ -14,18 +14,18 @@ import dsp.errors.BadRequestException import dsp.errors.DuplicateValueException import dsp.errors.UpdateNotPerformedException import dsp.valueobjects.Iri -import dsp.valueobjects.Iri._ -import dsp.valueobjects.List._ +import dsp.valueobjects.Iri.* +import dsp.valueobjects.List.* import dsp.valueobjects.V2 -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.admin.responder.listsmessages.ListNodeCreatePayloadADM.ListChildNodeCreatePayloadADM import org.knora.webapi.messages.admin.responder.listsmessages.ListNodeCreatePayloadADM.ListRootNodeCreatePayloadADM -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.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.domain.model.KnoraProject.ProjectIri import org.knora.webapi.util.MutableTestIri diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala index 120ca1b990..df29c0cb3b 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala @@ -16,17 +16,17 @@ 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.OntologyConstants.KnoraBase.EntityPermissionAbbreviations import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsMessagesUtilADM.PermissionTypeAndCodes -import org.knora.webapi.messages.admin.responder.permissionsmessages._ +import org.knora.webapi.messages.admin.responder.permissionsmessages.* 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/ProjectsResponderADMSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala index 46819290ee..75713c6b51 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala @@ -19,17 +19,17 @@ import dsp.errors.DuplicateValueException import dsp.errors.NotFoundException import dsp.valueobjects.Iri import dsp.valueobjects.V2 -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.projectsmessages.ProjectIdentifierADM._ -import org.knora.webapi.messages.admin.responder.projectsmessages._ +import org.knora.webapi.messages.admin.responder.permissionsmessages.* +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* +import org.knora.webapi.messages.admin.responder.projectsmessages.* import org.knora.webapi.messages.admin.responder.usersmessages.UserInformationTypeADM import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequests.ProjectCreateRequest import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequests.ProjectUpdateRequest -import org.knora.webapi.slice.admin.domain.model.KnoraProject._ +import org.knora.webapi.slice.admin.domain.model.KnoraProject.* import org.knora.webapi.util.MutableTestIri /** @@ -195,18 +195,19 @@ class ProjectsResponderADMSpec extends CoreSpec with ImplicitSender { val receivedApAdmin = UnsafeZioRun.runOrThrow(PermissionsResponderADM.getPermissionsApByProjectIri(received.project.id)) - val hasAPForProjectAdmin = receivedApAdmin.administrativePermissions.filter { ap: AdministrativePermissionADM => - ap.forProject == received.project.id && ap.forGroup == OntologyConstants.KnoraAdmin.ProjectAdmin && - ap.hasPermissions.equals( - Set(PermissionADM.ProjectAdminAllPermission, PermissionADM.ProjectResourceCreateAllPermission) - ) + val hasAPForProjectAdmin = receivedApAdmin.administrativePermissions.filter { + (ap: AdministrativePermissionADM) => + ap.forProject == received.project.id && ap.forGroup == OntologyConstants.KnoraAdmin.ProjectAdmin && + ap.hasPermissions.equals( + Set(PermissionADM.ProjectAdminAllPermission, PermissionADM.ProjectResourceCreateAllPermission) + ) } hasAPForProjectAdmin.size shouldBe 1 // Check Administrative Permission of ProjectMember val hasAPForProjectMember = receivedApAdmin.administrativePermissions.filter { - ap: AdministrativePermissionADM => + (ap: AdministrativePermissionADM) => ap.forProject == received.project.id && ap.forGroup == OntologyConstants.KnoraAdmin.ProjectMember && ap.hasPermissions.equals(Set(PermissionADM.ProjectResourceCreateAllPermission)) } @@ -219,7 +220,7 @@ class ProjectsResponderADMSpec extends CoreSpec with ImplicitSender { // Check Default Object Access permission of ProjectAdmin val hasDOAPForProjectAdmin = receivedDoaps.defaultObjectAccessPermissions.filter { - doap: DefaultObjectAccessPermissionADM => + (doap: DefaultObjectAccessPermissionADM) => doap.forProject == received.project.id && doap.forGroup.contains( OntologyConstants.KnoraAdmin.ProjectAdmin ) && @@ -234,7 +235,7 @@ class ProjectsResponderADMSpec extends CoreSpec with ImplicitSender { // Check Default Object Access permission of ProjectMember val hasDOAPForProjectMember = receivedDoaps.defaultObjectAccessPermissions.filter { - doap: DefaultObjectAccessPermissionADM => + (doap: DefaultObjectAccessPermissionADM) => doap.forProject == received.project.id && doap.forGroup.contains( OntologyConstants.KnoraAdmin.ProjectMember ) && diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/SipiResponderADMSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/SipiResponderADMSpec.scala index 8f35254b2e..113f116ea0 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/SipiResponderADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/SipiResponderADMSpec.scala @@ -5,13 +5,13 @@ package org.knora.webapi.responders.admin -import org.apache.pekko.testkit._ +import org.apache.pekko.testkit.* -import scala.concurrent.duration._ +import scala.concurrent.duration.* -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectRestrictedViewSettingsADM -import org.knora.webapi.messages.admin.responder.sipimessages._ +import org.knora.webapi.messages.admin.responder.sipimessages.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.slice.admin.domain.model.KnoraProject.Shortcode diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/UsersResponderADMSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/UsersResponderADMSpec.scala index d05235c796..adf10ee48a 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/UsersResponderADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/UsersResponderADMSpec.scala @@ -15,22 +15,22 @@ import dsp.errors.DuplicateValueException import dsp.errors.ForbiddenException import dsp.errors.NotFoundException import dsp.valueobjects.LanguageCode -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.groupsmessages.GroupMembersGetRequestADM import org.knora.webapi.messages.admin.responder.groupsmessages.GroupMembersGetResponseADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectAdminMembersGetRequestADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectAdminMembersGetResponseADM -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM._ +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectMembersGetRequestADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectMembersGetResponseADM -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.KnoraCredentialsV2 import org.knora.webapi.routing.Authenticator import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM -import org.knora.webapi.slice.admin.domain.model._ +import org.knora.webapi.slice.admin.domain.model.* /** * This spec is used to test the messages received by the [[UsersResponderADM]] actor. 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 fedc866d1b..64ecd218d3 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 @@ -12,11 +12,11 @@ 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 @@ -25,19 +25,19 @@ import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetRequ import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetResponseADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM import org.knora.webapi.messages.store.cacheservicemessages.CacheServiceGetProjectADM -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.OwlCardinality.KnoraCardinalityInfo -import org.knora.webapi.messages.v2.responder.ontologymessages._ +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 9df64773cd..73baaa16e6 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 @@ -14,26 +14,26 @@ import org.xmlunit.diff.Diff 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 @@ -41,7 +41,7 @@ import org.knora.webapi.slice.admin.domain.model.User 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 @@ -399,7 +399,7 @@ class GraphTestData { */ class ResourcesResponderV2Spec extends CoreSpec with ImplicitSender { - import ResourcesResponderV2Spec._ + import ResourcesResponderV2Spec.* private implicit val stringFormatter: StringFormatter = StringFormatter.getGeneralInstance private val resourcesResponderV2SpecFullData = new ResourcesResponderV2SpecFullData 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 309e190278..50177e5b5c 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,13 +9,13 @@ 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.util.PermissionUtilADM._ -import org.knora.webapi.messages.v2.responder.resourcemessages._ -import org.knora.webapi.messages.v2.responder.valuemessages._ +import org.knora.webapi.messages.util.PermissionUtilADM.* +import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.messages.v2.responder.valuemessages.* import org.knora.webapi.sharedtestdata.SharedTestDataADM // FIXME: Rename to something more generic and without spec in the name since it is not a spec and is used in more then one spec 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 17ad704f18..66d270f086 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 42f6c1778f..0801f085fe 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,13 +9,13 @@ 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.util.PermissionUtilADM._ -import org.knora.webapi.messages.v2.responder.resourcemessages._ -import org.knora.webapi.messages.v2.responder.valuemessages._ +import org.knora.webapi.messages.util.PermissionUtilADM.* +import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.messages.v2.responder.valuemessages.* import org.knora.webapi.sharedtestdata.SharedTestDataADM // FIXME: Rename to something without spec in the name since it is not a spec 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 e760d1aa1c..4440bcc07f 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 @@ -7,11 +7,11 @@ package org.knora.webapi.responders.v2 import dsp.errors.BadRequestException import org.knora.webapi.SchemaRendering.apiV2SchemaWithOption -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.store.triplestoremessages.RdfDataObject -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 @@ -110,7 +110,7 @@ class SearchResponderV2Spec extends CoreSpec { ) val hasImageFileValues: Boolean = - result.resources.flatMap(_.values.values.flatten).exists { readValueV2: ReadValueV2 => + result.resources.flatMap(_.values.values.flatten).exists { (readValueV2: ReadValueV2) => readValueV2.valueContent match { case _: StillImageFileValueContentV2 => true case _ => false 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 5d1ae53c48..3e07c22373 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,13 +10,13 @@ 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.PermissionUtilADM._ -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.PermissionUtilADM.* +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 pekko.actor.ActorSystem 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 73d75b9442..b07401ab93 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 @@ -7,13 +7,13 @@ package org.knora.webapi.responders.v2 import org.apache.pekko -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 8dfd5efb93..d5d6adbb2d 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 @@ -10,25 +10,25 @@ import org.apache.pekko.testkit.ImplicitSender 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.CreateResourceRequestV2.AssetIngestState -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 059b7d175c..206fe09819 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 @@ -9,14 +9,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.OwlCardinality.* +import org.knora.webapi.messages.v2.responder.ontologymessages.* 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 8545179b63..a289e199b2 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 5f410f5c6e..a50bac0b2f 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 c617a5279d..64d47d9cf4 100644 --- a/integration/src/test/scala/org/knora/webapi/routing/AuthenticatorSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/routing/AuthenticatorSpec.scala @@ -11,7 +11,7 @@ import zio.ZIO import dsp.errors.BadCredentialsException import dsp.errors.BadRequestException -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.usersmessages.UserIdentifierADM 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 357f8eb8c0..495475e5b4 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.* /* Helper case classes */ case class ap(iri: String, p: AdministrativePermissionADM) 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 3562dd8299..4173c539c4 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/cache/CacheServiceManagerSpec.scala b/integration/src/test/scala/org/knora/webapi/store/cache/CacheServiceManagerSpec.scala index 1611410e16..b2ca26c98c 100644 --- a/integration/src/test/scala/org/knora/webapi/store/cache/CacheServiceManagerSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/cache/CacheServiceManagerSpec.scala @@ -6,9 +6,9 @@ package org.knora.webapi.store.cache import dsp.errors.BadRequestException -import org.knora.webapi._ +import org.knora.webapi.* import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM._ +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* import org.knora.webapi.messages.admin.responder.usersmessages.UserIdentifierADM import org.knora.webapi.messages.store.cacheservicemessages.CacheServiceGetProjectADM import org.knora.webapi.messages.store.cacheservicemessages.CacheServiceGetUserADM diff --git a/integration/src/test/scala/org/knora/webapi/store/cache/impl/CacheInMemImplZSpec.scala b/integration/src/test/scala/org/knora/webapi/store/cache/impl/CacheInMemImplZSpec.scala index 58c482ed53..e42d040b65 100644 --- a/integration/src/test/scala/org/knora/webapi/store/cache/impl/CacheInMemImplZSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/cache/impl/CacheInMemImplZSpec.scala @@ -6,13 +6,13 @@ package org.knora.webapi.store.cache.impl import zio.ZLayer -import zio.test.Assertion._ -import zio.test._ +import zio.test.Assertion.* +import zio.test.* import dsp.errors.BadRequestException import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM._ +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* import org.knora.webapi.messages.admin.responder.usersmessages.UserIdentifierADM import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.slice.admin.domain.model.User @@ -44,7 +44,8 @@ object CacheInMemImplZSpec extends ZIOSpecDefault { */ val testLayers = ZLayer.make[CacheService](CacheServiceInMemImpl.layer) - def spec = (userTests + projectTests + otherTests).provideLayerShared(testLayers) @@ TestAspect.sequential + def spec: Spec[Any, Throwable] = + (userTests + projectTests + otherTests).provideLayerShared(testLayers) @@ TestAspect.sequential val userTests = suite("CacheInMemImplZSpec - user")( test("successfully store a user and retrieve by IRI") { diff --git a/integration/src/test/scala/org/knora/webapi/store/cache/serialization/CacheSerializationZSpec.scala b/integration/src/test/scala/org/knora/webapi/store/cache/serialization/CacheSerializationZSpec.scala index dcb2a5ec47..773210c8c6 100644 --- a/integration/src/test/scala/org/knora/webapi/store/cache/serialization/CacheSerializationZSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/cache/serialization/CacheSerializationZSpec.scala @@ -5,9 +5,8 @@ package org.knora.webapi.store.cache.serialization -import zio.test.Assertion._ import zio.test.TestAspect.ignore -import zio.test._ +import zio.test.* import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM import org.knora.webapi.sharedtestdata.SharedTestDataADM @@ -18,21 +17,21 @@ import org.knora.webapi.slice.admin.domain.model.User */ object CacheSerializationZSpec extends ZIOSpecDefault { - val user = SharedTestDataADM.imagesUser01 - val project = SharedTestDataADM.imagesProject + private val user = SharedTestDataADM.imagesUser01 + private val project = SharedTestDataADM.imagesProject - def spec = suite("CacheSerializationSpec")( + def spec: Spec[Any, Throwable] = suite("CacheSerializationSpec")( test("successfully serialize and deserialize a user") { for { serialized <- CacheSerialization.serialize(user) deserialized <- CacheSerialization.deserialize[User](serialized) - } yield assert(deserialized)(equalTo(Some(user))) + } yield assertTrue(deserialized.contains(user)) } @@ ignore + test("successfully serialize and deserialize a project") { for { serialized <- CacheSerialization.serialize(project) deserialized <- CacheSerialization.deserialize[ProjectADM](serialized) - } yield assert(deserialized)(equalTo(Some(project))) + } yield assertTrue(deserialized.contains(project)) } ) } 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 2bde92c992..0493392037 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 f9a938ff09..4fd445f356 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 @@ -7,10 +7,10 @@ package org.knora.webapi.store.triplestore import org.apache.pekko -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/impl/TriplestoreServiceLiveZSpec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceLiveZSpec.scala index 8922a62044..c0ec587089 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceLiveZSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceLiveZSpec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.store.triplestore.impl -import zio._ -import zio.test._ +import zio.* +import zio.test.* import dsp.errors.NotFoundException import org.knora.webapi.config.AppConfigForTestContainers 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 3c69ad13eb..650bfcf5be 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 @@ -6,7 +6,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import org.knora.webapi.messages.util.rdf.JenaRepository -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* 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 46d9711fd6..a2385bb925 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 @@ -6,7 +6,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import org.knora.webapi.messages.util.rdf.JenaRepository -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* 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 98a78d83f9..f6170fce68 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 faf2eee72b..e460c2b34e 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 @@ -6,7 +6,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import org.knora.webapi.messages.util.rdf.JenaRepository -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* 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..e05b877235 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 @@ -6,7 +6,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import org.knora.webapi.messages.util.rdf.JenaRepository -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* 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 a9cae668e4..8ddec86c9e 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 @@ -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 UpgradePluginPR1746Spec extends UpgradePluginSpec with LazyLogging { private def checkLiteral(model: RdfModel, subj: IriNode, pred: IriNode, expectedObj: RdfLiteral): Unit = 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 c0a18221dd..4f3628e5ab 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 @@ -8,7 +8,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import com.typesafe.scalalogging.LazyLogging 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): Unit = 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 d3ba2f0c32..b9bd80d42c 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 @@ -8,7 +8,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import com.typesafe.scalalogging.LazyLogging import org.knora.webapi.messages.util.rdf.JenaRepository -import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.util.rdf.* 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 8124512b8f..daffae698a 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 77799d0a6e..b0e404e63e 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 a37047e06d..b162a28419 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,13 +17,13 @@ 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. */ abstract class UpgradePluginSpec extends AnyWordSpecLike with Matchers { - val log: Logger = Logger(this.getClass()) + val log: Logger = Logger(this.getClass) /** * Parses a TriG file and returns it as an [[RdfModel]]. @@ -61,9 +61,7 @@ abstract class UpgradePluginSpec extends AnyWordSpecLike with Matchers { VariableResultsRow( new ErrorHandlingMap[String, String]( mapToWrap, - { key: String => - s"No value found for SPARQL query variable '$key' in query result row" - } + (key: String) => s"No value found for SPARQL query variable '$key' in query result row" ) ) } 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 f695d2c8f3..f37cdf36f5 100644 --- a/integration/src/test/scala/org/knora/webapi/testservices/TestClientService.scala +++ b/integration/src/test/scala/org/knora/webapi/testservices/TestClientService.scala @@ -20,8 +20,8 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager import org.apache.http.util.EntityUtils import org.apache.pekko import spray.json.JsObject -import spray.json._ -import zio._ +import spray.json.* +import zio.* import java.nio.file.Path import java.util.concurrent.TimeUnit @@ -35,9 +35,9 @@ import dsp.errors.NotFoundException import org.knora.webapi.config.AppConfig import org.knora.webapi.core.ActorSystem 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.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/util/AkkaHttpUtils.scala b/integration/src/test/scala/org/knora/webapi/util/AkkaHttpUtils.scala index e246bced8f..1d471b4d31 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 @@ -33,8 +33,8 @@ object AkkaHttpUtils extends LazyLogging { */ def httpResponseToJson(response: HttpResponse)(implicit ec: ExecutionContext, system: ActorSystem): JsObject = { - import DefaultJsonProtocol._ - import pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ + import DefaultJsonProtocol.* + import pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport.* val jsonFuture: Future[JsObject] = response match { case HttpResponse(StatusCodes.OK, _, entity, _) => Unmarshal(entity).to[JsObject]