diff --git a/.scalafix.conf b/.scalafix.conf index 0ead976b00..d7bec70fbf 100644 --- a/.scalafix.conf +++ b/.scalafix.conf @@ -17,7 +17,7 @@ OrganizeImports { importsOrder = Ascii preset = DEFAULT removeUnused = true - targetDialect = Scala3 + targetDialect = Scala2 } RemoveUnused { diff --git a/integration/src/test/scala/org/knora/sipi/SipiIT.scala b/integration/src/test/scala/org/knora/sipi/SipiIT.scala index 2c97b45c65..9e2fee86eb 100644 --- a/integration/src/test/scala/org/knora/sipi/SipiIT.scala +++ b/integration/src/test/scala/org/knora/sipi/SipiIT.scala @@ -7,21 +7,21 @@ package org.knora.sipi import com.github.tomakehurst.wiremock.WireMockServer import com.github.tomakehurst.wiremock.client.CountMatchingStrategy -import com.github.tomakehurst.wiremock.client.WireMock.* +import com.github.tomakehurst.wiremock.client.WireMock._ import com.github.tomakehurst.wiremock.core.WireMockConfiguration.options import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.newRequestPattern -import zio.* -import zio.http.* +import zio._ +import zio.http._ import zio.json.DecoderOps import zio.json.ast.Json -import zio.test.* +import zio.test._ import scala.util.Failure import scala.util.Success import scala.util.Try -import org.knora.sipi.MockDspApiServer.verify.* +import org.knora.sipi.MockDspApiServer.verify._ import org.knora.webapi.config.AppConfig import org.knora.webapi.messages.admin.responder.projectsmessages.PermissionCodeAndProjectRestrictedViewSettings import org.knora.webapi.messages.util.KnoraSystemInstances.Users.SystemUser diff --git a/integration/src/test/scala/org/knora/webapi/CoreSpec.scala b/integration/src/test/scala/org/knora/webapi/CoreSpec.scala index 8136c0ed5e..3cc7e3715e 100644 --- a/integration/src/test/scala/org/knora/webapi/CoreSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/CoreSpec.scala @@ -12,8 +12,8 @@ import org.apache.pekko.testkit.TestKitBase import org.scalatest.BeforeAndAfterAll import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import zio.* import zio.ZIO +import zio._ import scala.concurrent.ExecutionContext import scala.concurrent.duration.FiniteDuration diff --git a/integration/src/test/scala/org/knora/webapi/E2ESpec.scala b/integration/src/test/scala/org/knora/webapi/E2ESpec.scala index 0beefbcb80..adddcc0613 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 @@ -30,7 +30,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 @@ -39,7 +39,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 b2169675e7..2f57f19d13 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 91756ea5bb..c1b7a5b19a 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 a82d0d9a25..ce65cf96c8 100644 --- a/integration/src/test/scala/org/knora/webapi/R2RSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/R2RSpec.scala @@ -13,7 +13,7 @@ import org.apache.pekko.http.scaladsl.testkit.ScalatestRouteTest import org.scalatest.BeforeAndAfterAll import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import zio.* +import zio._ import java.nio.file.Files import java.nio.file.Path @@ -28,7 +28,7 @@ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.AppServer import org.knora.webapi.core.TestStartupUtils import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.routing.KnoraRouteData import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.util.FileUtil diff --git a/integration/src/test/scala/org/knora/webapi/config/AppConfigForTestContainers.scala b/integration/src/test/scala/org/knora/webapi/config/AppConfigForTestContainers.scala index af16e6fb23..2b548cdcee 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 5d17f88929..452dc0633b 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 e95614994d..2314ac581e 100644 --- a/integration/src/test/scala/org/knora/webapi/core/ActorSystemTest.scala +++ b/integration/src/test/scala/org/knora/webapi/core/ActorSystemTest.scala @@ -6,7 +6,7 @@ package org.knora.webapi.core import org.apache.pekko.actor.ActorSystem -import zio.* +import zio._ object ActorSystemTest { def layer(sys: ActorSystem): ZLayer[Any, Nothing, ActorSystem] = ZLayer.succeed(sys) diff --git a/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala b/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala index 05541fa5d5..73e120dee6 100644 --- a/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala +++ b/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala @@ -6,13 +6,13 @@ 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.AppConfig.AppConfigurationsTest 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 @@ -21,21 +21,21 @@ 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.routing._ import org.knora.webapi.slice.admin.AdminModule -import org.knora.webapi.slice.admin.api.* import org.knora.webapi.slice.admin.api.AdminApiModule +import org.knora.webapi.slice.admin.api._ import org.knora.webapi.slice.admin.api.service.PermissionsRestService import org.knora.webapi.slice.admin.api.service.UsersRestService -import org.knora.webapi.slice.admin.domain.service.* import org.knora.webapi.slice.admin.domain.service.ProjectExportStorageService -import org.knora.webapi.slice.common.api.* +import org.knora.webapi.slice.admin.domain.service._ +import org.knora.webapi.slice.common.api._ import org.knora.webapi.slice.common.repo.service.PredicateObjectMapper import org.knora.webapi.slice.infrastructure.api.ManagementEndpoints import org.knora.webapi.slice.infrastructure.api.ManagementRoutes 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 4b495b03be..7ca8562452 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 4d8e10c216..1bbb9cee12 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/CORSSupportE2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/CORSSupportE2ESpec.scala @@ -13,10 +13,10 @@ import scala.concurrent.duration.NANOSECONDS import org.knora.webapi.E2ESpec import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject -import pekko.http.scaladsl.model.HttpMethods.* +import pekko.http.scaladsl.model.HttpMethods._ import pekko.http.scaladsl.model.HttpResponse import pekko.http.scaladsl.model.StatusCodes -import pekko.http.scaladsl.model.headers.* +import pekko.http.scaladsl.model.headers._ import pekko.http.scaladsl.testkit.RouteTestTimeout /** diff --git a/integration/src/test/scala/org/knora/webapi/e2e/ExceptionHandlerR2RSpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/ExceptionHandlerR2RSpec.scala index c8f34038ca..127fb16892 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 3f1d71e326..a27bca46b7 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/HealthRouteE2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/HealthRouteE2ESpec.scala @@ -16,7 +16,7 @@ import org.knora.webapi.E2ESpec import org.knora.webapi.core.State import org.knora.webapi.core.domain.AppState -import pekko.http.scaladsl.model.* +import pekko.http.scaladsl.model._ import pekko.http.scaladsl.testkit.RouteTestTimeout /** diff --git a/integration/src/test/scala/org/knora/webapi/e2e/InstanceChecker.scala b/integration/src/test/scala/org/knora/webapi/e2e/InstanceChecker.scala index 690f29724d..ddba02044e 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 4344db0211..7774a2b331 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala @@ -13,7 +13,7 @@ import scala.concurrent.duration.NANOSECONDS import dsp.errors.AssertionException import org.knora.webapi.E2ESpec -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.util.FileUtil diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/AdminFilesE2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/AdminFilesE2ESpec.scala index cabf1e81f8..51996347ac 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/admin/AdminFilesE2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/admin/AdminFilesE2ESpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.e2e.admin -import org.apache.pekko.http.scaladsl.model.* +import org.apache.pekko.http.scaladsl.model._ import org.apache.pekko.http.scaladsl.model.headers.BasicHttpCredentials import org.knora.webapi.E2ESpec 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 c1476ae921..cc421e4500 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 @@ -21,8 +21,8 @@ import org.knora.webapi.slice.admin.domain.model.Group import org.knora.webapi.util.AkkaHttpUtils import org.knora.webapi.util.MutableTestIri -import pekko.http.scaladsl.model.* -import pekko.http.scaladsl.model.headers.* +import pekko.http.scaladsl.model._ +import pekko.http.scaladsl.model.headers._ import pekko.http.scaladsl.testkit.RouteTestTimeout import pekko.http.scaladsl.unmarshalling.Unmarshal diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/PermissionsADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/PermissionsADME2ESpec.scala index 90b1f16e35..63530da2ca 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 9f10c6cd79..33cc1ee0e8 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 @@ -16,15 +16,15 @@ import org.apache.pekko.util.Timeout import java.net.URLEncoder import scala.concurrent.Await import scala.concurrent.Future -import scala.concurrent.duration.* +import scala.concurrent.duration._ import org.knora.webapi.E2ESpec import org.knora.webapi.IRI import org.knora.webapi.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.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.messages.util.rdf.RdfModel 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 07eb22ced1..a67fe94f62 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,16 +9,16 @@ 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 import org.knora.webapi.messages.admin.responder.groupsmessages.GroupsADMJsonProtocol import org.knora.webapi.messages.admin.responder.projectsmessages.Project 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 @@ -28,8 +28,8 @@ import org.knora.webapi.slice.admin.domain.model.User import org.knora.webapi.util.AkkaHttpUtils import org.knora.webapi.util.MutableTestIri -import pekko.http.scaladsl.model.* -import pekko.http.scaladsl.model.headers.* +import pekko.http.scaladsl.model._ +import pekko.http.scaladsl.model.headers._ import pekko.http.scaladsl.unmarshalling.Unmarshal /** diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/CreateListItemsRouteADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/CreateListItemsRouteADME2ESpec.scala index bbad01ccae..e43405fc8a 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,14 +16,14 @@ 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 import org.knora.webapi.util.AkkaHttpUtils import org.knora.webapi.util.MutableTestIri -import pekko.http.scaladsl.model.* +import pekko.http.scaladsl.model._ import pekko.http.scaladsl.testkit.RouteTestTimeout import pekko.http.scaladsl.unmarshalling.Unmarshal diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/DeleteListItemsRouteADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/DeleteListItemsRouteADME2ESpec.scala index eb8cbeea1a..278ec4200a 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 18c87c2d03..fb60c523c0 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,21 +7,21 @@ 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 import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.util.AkkaHttpUtils -import pekko.http.scaladsl.model.* -import pekko.http.scaladsl.model.headers.* +import pekko.http.scaladsl.model._ +import pekko.http.scaladsl.model.headers._ import pekko.http.scaladsl.testkit.RouteTestTimeout /** diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/UpdateListItemsRouteADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/UpdateListItemsRouteADME2ESpec.scala index 98513443c1..7a337397b1 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/v2/AuthenticationV2E2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/v2/AuthenticationV2E2ESpec.scala index 8e4e4b9eea..231670fbf3 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 62daa0273b..397de7d9f1 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 657d274385..866cbb6645 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/OntologyFormatsE2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/v2/OntologyFormatsE2ESpec.scala index 457572566c..5016ffb55f 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/v2/OntologyFormatsE2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/v2/OntologyFormatsE2ESpec.scala @@ -6,14 +6,14 @@ package org.knora.webapi.e2e.v2 import org.apache.pekko import org.scalatest.Inspectors.forEvery -import spray.json.* +import spray.json._ import java.net.URLEncoder import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.e2e.ClientTestDataCollector import org.knora.webapi.e2e.TestDataFileContent import org.knora.webapi.e2e.TestDataFilePath @@ -22,9 +22,9 @@ import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Simple import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM import org.knora.webapi.sharedtestdata.SharedTestDataADM -import org.knora.webapi.util.* +import org.knora.webapi.util._ -import pekko.http.scaladsl.model.* +import pekko.http.scaladsl.model._ import pekko.http.scaladsl.model.headers.Accept class OntologyFormatsE2ESpec extends E2ESpec { diff --git a/integration/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala index d132b58492..18aa6f1319 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,7 +6,7 @@ package org.knora.webapi.e2e.v2 import org.apache.pekko -import zio.* +import zio._ import java.net.URLEncoder import java.time.Instant @@ -17,31 +17,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.BasicHttpCredentials object OntologyV2R2RSpec { diff --git a/integration/src/test/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala index 895d77bf2d..6effad31de 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 4d34a8f006..518e5bda9e 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 296c9508b5..551aba0eef 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 1b2b966697..493fbb11c1 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.e2e.v2 -import org.apache.pekko.http.scaladsl.model.* +import org.apache.pekko.http.scaladsl.model._ import org.apache.pekko.http.scaladsl.model.headers.BasicHttpCredentials import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal import org.scalatest.compatible.Assertion @@ -18,29 +18,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 c109a622f3..9e6aaf0af0 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 4c7d9ad1e6..bd678e6e4c 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 d96cb84f8d..d8f4e15b6d 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 dba4168242..d499c841fb 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 30ae8f26c7..15ca1bd992 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.* -import org.knora.webapi.messages.store.sipimessages.SipiUploadResponseJsonProtocol.* +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 020361a8f8..f8a48e2846 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 db7b43df60..ef3258db13 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.admin.responder.listsmessages -import spray.json.* +import spray.json._ import org.knora.webapi.CoreSpec import org.knora.webapi.messages.store.triplestoremessages.StringLiteralSequenceV2 diff --git a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala index e467b758e2..711b3c89a4 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 @@ -18,9 +18,9 @@ import org.knora.webapi.messages.OntologyConstants.KnoraBase.EntityPermissionAbb import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsMessagesUtilADM.PermissionTypeAndCodes import org.knora.webapi.responders.admin.PermissionsResponderADM import org.knora.webapi.routing.UnsafeZioRun -import org.knora.webapi.sharedtestdata.* -import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM.* -import org.knora.webapi.sharedtestdata.SharedTestDataADM2.* +import org.knora.webapi.sharedtestdata.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 2c44c9d640..1047a01531 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 @@ -7,8 +7,8 @@ package org.knora.webapi.messages.admin.responder.projectsmessages import dsp.errors.BadRequestException import dsp.errors.OntologyConstraintException -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.messages.store.triplestoremessages.StringLiteralV2 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 c5234229ce..39c6fdfcda 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.admin.responder.usersmessages -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionProfileType import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.slice.admin.domain.model.User diff --git a/integration/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala index 8f15661055..8f60dc06ce 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 d6ebe62bbd..c5d3b58742 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/CalendarDateUtilV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/CalendarDateUtilV2Spec.scala @@ -9,7 +9,7 @@ import org.scalatest.compatible.Assertion import dsp.errors.BadRequestException import org.knora.webapi.CoreSpec -import org.knora.webapi.messages.util.* +import org.knora.webapi.messages.util._ /** * Tests [[CalendarDateUtilV2]]. diff --git a/integration/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2Spec.scala b/integration/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2Spec.scala index 3891709e38..61d7942815 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 6c35d84e5a..38c338219f 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 851e5338c5..c6f2de9b2f 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 55e2d3d5f0..39678df426 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 b229405c97..b3095dd285 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 fcc8f662cc..c8bd76c587 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtilSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtilSpec.scala @@ -20,10 +20,10 @@ import dsp.errors.BadRequestException import org.knora.webapi.CoreSpec import org.knora.webapi.IRI import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.util.rdf.JenaModel import org.knora.webapi.messages.util.rdf.JenaModelFactory import org.knora.webapi.messages.util.rdf.JenaNodeFactory +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.util.FileUtil /** diff --git a/integration/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala index 062fece56d..41f7f50728 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala @@ -13,8 +13,8 @@ import java.io.FileInputStream import dsp.errors.AssertionException import org.knora.webapi.CoreSpec import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.util.rdf.JenaRepository +import org.knora.webapi.messages.util.rdf._ /** * Tests implementations of [[RdfModel]]. diff --git a/integration/src/test/scala/org/knora/webapi/messages/util/search/SparqlTransformerSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/util/search/SparqlTransformerSpec.scala index 5449f23e1e..e2cc1e11f6 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 71c7c131e8..11c875341e 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 114e601b4d..02410fbe91 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToPrequeryTransformerSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToPrequeryTransformerSpec.scala @@ -12,10 +12,10 @@ import scala.collection.mutable.ArrayBuffer import dsp.errors.AssertionException import org.knora.webapi.CoreSpec import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ import org.knora.webapi.messages.util.search.gravsearch.GravsearchParser import org.knora.webapi.messages.util.search.gravsearch.GravsearchQueryChecker import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInspectionRunner diff --git a/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectorSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectorSpec.scala index 75bc179a97..a21890c93b 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 398309e9fe..0cbb340595 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 f20d513585..2f13a07cde 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala @@ -10,7 +10,7 @@ import java.time.Instant import dsp.errors.BadRequestException import org.knora.webapi.ApiV2Complex import org.knora.webapi.CoreSpec -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.SmartIriLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 diff --git a/integration/src/test/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/ResourcesMessagesV2Spec.scala b/integration/src/test/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/ResourcesMessagesV2Spec.scala index 9ede90de0a..8e34861981 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 e88b1cfdb7..0cc6432cb1 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 8418f42c62..4289ba1a43 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.Project 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 a3424eeda3..34cd4d94a5 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.* -import spray.json.DefaultJsonProtocol.* +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 cf61f73b1b..3c2e1440d9 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.* -import spray.json.DefaultJsonProtocol.* +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 74ac242fa7..396ae56b4b 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 12b087db8d..b33fb44d2e 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/IriLockerSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/IriLockerSpec.scala @@ -11,7 +11,7 @@ import org.scalatest.wordspec.AnyWordSpecLike import java.util.UUID import scala.concurrent.Await import scala.concurrent.Future -import scala.concurrent.duration.* +import scala.concurrent.duration._ import dsp.errors.ApplicationLockException import org.knora.webapi.IRI diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/AssetPermissionsResponderSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/AssetPermissionsResponderSpec.scala index cebb54bc45..0b4bba84d7 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/AssetPermissionsResponderSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/AssetPermissionsResponderSpec.scala @@ -5,9 +5,9 @@ package org.knora.webapi.responders.admin -import org.apache.pekko.testkit.* +import org.apache.pekko.testkit._ -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.messages.admin.responder.projectsmessages.PermissionCodeAndProjectRestrictedViewSettings import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.ShortcodeIdentifier import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectRestrictedViewSettingsADM 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 fc4dfab2e6..6d10bae81c 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 @@ -5,16 +5,16 @@ package org.knora.webapi.responders.admin -import zio.* +import zio._ import java.util.UUID -import dsp.errors.* -import org.knora.webapi.* -import org.knora.webapi.messages.admin.responder.usersmessages.* +import dsp.errors._ +import org.knora.webapi._ +import org.knora.webapi.messages.admin.responder.usersmessages._ import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.routing.UnsafeZioRun -import org.knora.webapi.sharedtestdata.SharedTestDataADM.* +import org.knora.webapi.sharedtestdata.SharedTestDataADM._ import org.knora.webapi.slice.admin.api.GroupsRequests.GroupCreateRequest import org.knora.webapi.slice.admin.api.GroupsRequests.GroupStatusUpdateRequest import org.knora.webapi.slice.admin.api.GroupsRequests.GroupUpdateRequest diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/ListsResponderSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/ListsResponderSpec.scala index f552bf74e8..bcd96efaa5 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/ListsResponderSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/ListsResponderSpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.responders.admin -import org.apache.pekko.testkit.* +import org.apache.pekko.testkit._ import java.util.UUID @@ -13,20 +13,20 @@ import dsp.errors.BadRequestException import dsp.errors.DuplicateValueException import dsp.errors.UpdateNotPerformedException import dsp.valueobjects.Iri -import org.knora.webapi.* -import org.knora.webapi.messages.admin.responder.listsmessages.* +import org.knora.webapi._ +import org.knora.webapi.messages.admin.responder.listsmessages._ import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedListsTestDataADM import org.knora.webapi.sharedtestdata.SharedTestDataADM -import org.knora.webapi.sharedtestdata.SharedTestDataADM2.* +import org.knora.webapi.sharedtestdata.SharedTestDataADM2._ import org.knora.webapi.slice.admin.api.Requests.ListChangePositionRequest import org.knora.webapi.slice.admin.api.Requests.ListChangeRequest import org.knora.webapi.slice.admin.api.Requests.ListCreateChildNodeRequest import org.knora.webapi.slice.admin.api.Requests.ListCreateRootNodeRequest import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri -import org.knora.webapi.slice.admin.domain.model.ListProperties.* +import org.knora.webapi.slice.admin.domain.model.ListProperties._ import org.knora.webapi.util.MutableTestIri import org.knora.webapi.util.ZioScalaTestUtil.assertFailsWithA diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala index e5607a4e73..8b93a7e78d 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 @@ -17,17 +17,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.* import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsMessagesUtilADM.PermissionTypeAndCodes +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 2d9053f587..4d94c81167 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.BadRequestException import dsp.errors.DuplicateValueException import dsp.errors.NotFoundException import dsp.valueobjects.Iri -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.* -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* +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.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.ProjectCreateRequest import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.ProjectUpdateRequest -import org.knora.webapi.slice.admin.domain.model.KnoraProject.* +import org.knora.webapi.slice.admin.domain.model.KnoraProject._ import org.knora.webapi.util.MutableTestIri import org.knora.webapi.util.ZioScalaTestUtil.assertFailsWithA diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/UsersRestServiceSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/UsersRestServiceSpec.scala index b6380504ce..f4201d6f4a 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/UsersRestServiceSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/UsersRestServiceSpec.scala @@ -14,9 +14,9 @@ import dsp.errors.DuplicateValueException import dsp.errors.ForbiddenException import dsp.errors.NotFoundException import dsp.valueobjects.LanguageCode -import org.knora.webapi.* -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* -import org.knora.webapi.messages.admin.responder.usersmessages.* +import org.knora.webapi._ +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM._ +import org.knora.webapi.messages.admin.responder.usersmessages._ import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.messages.v2.routing.authenticationmessages.CredentialsIdentifier import org.knora.webapi.messages.v2.routing.authenticationmessages.KnoraCredentialsV2 @@ -29,10 +29,10 @@ import org.knora.webapi.slice.admin.api.UsersEndpoints.Requests.StatusChangeRequ import org.knora.webapi.slice.admin.api.UsersEndpoints.Requests.SystemAdminChangeRequest import org.knora.webapi.slice.admin.api.UsersEndpoints.Requests.UserCreateRequest import org.knora.webapi.slice.admin.api.service.UsersRestService -import org.knora.webapi.slice.admin.domain.model.* import org.knora.webapi.slice.admin.domain.model.Group import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.Username +import org.knora.webapi.slice.admin.domain.model._ import org.knora.webapi.slice.admin.domain.service.UserService import org.knora.webapi.util.ZioScalaTestUtil.assertFailsWithA diff --git a/integration/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala b/integration/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala index 9640f54a4f..75f8a7018e 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.ProjectGetResponse 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.* import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.KnoraCardinalityInfo +import org.knora.webapi.messages.v2.responder.ontologymessages._ import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceRequestV2 import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceV2 import org.knora.webapi.messages.v2.responder.resourcemessages.CreateValueInNewResourceV2 import org.knora.webapi.messages.v2.responder.valuemessages.IntegerValueContentV2 import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM -import org.knora.webapi.slice.ontology.domain.model.Cardinality.* +import org.knora.webapi.slice.ontology.domain.model.Cardinality._ import org.knora.webapi.slice.ontology.repo.service.OntologyCache import org.knora.webapi.store.triplestore.api.TriplestoreService import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.Select diff --git a/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala b/integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala index a91678d878..ed383b803e 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 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 e6ad6e9c94..1234422068 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 a8ebdd5126..ae72e7c58d 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 04ee720ce4..7a1dd4c6c5 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 69d597a715..4724f08fae 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/v2/SearchResponderV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/v2/SearchResponderV2Spec.scala @@ -8,16 +8,16 @@ package org.knora.webapi.responders.v2 import zio.ZIO import dsp.errors.BadRequestException -import org.knora.webapi.* import org.knora.webapi.ApiV2Schema import org.knora.webapi.SchemaRendering import org.knora.webapi.SchemaRendering.apiV2SchemaWithOption -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi._ +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.util.search.ConstructQuery -import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.messages.v2.responder.resourcemessages._ import org.knora.webapi.messages.v2.responder.valuemessages.ReadValueV2 import org.knora.webapi.messages.v2.responder.valuemessages.StillImageFileValueContentV2 import org.knora.webapi.responders.v2.ResourcesResponseCheckerV2.compareReadResourcesSequenceV2Response diff --git a/integration/src/test/scala/org/knora/webapi/responders/v2/SearchResponderV2SpecFullData.scala b/integration/src/test/scala/org/knora/webapi/responders/v2/SearchResponderV2SpecFullData.scala index 36b02bda01..156361f54e 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 5785fec6df..5493781cba 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 d7afdadcc3..4ca04a641a 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/v2/ValuesResponderV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/v2/ValuesResponderV2Spec.scala @@ -12,25 +12,25 @@ import zio.ZIO import java.time.Instant import java.util.UUID import java.util.UUID.randomUUID -import scala.concurrent.duration.* +import scala.concurrent.duration._ -import dsp.errors.* +import dsp.errors._ import dsp.valueobjects.UuidUtil -import org.knora.webapi.* -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi._ +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.store.triplestoremessages.* +import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.util.CalendarNameGregorian import org.knora.webapi.messages.util.DatePrecisionYear import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.messages.util.PermissionUtilADM import org.knora.webapi.messages.util.search.gravsearch.GravsearchParser -import org.knora.webapi.messages.v2.responder.resourcemessages.* import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceRequestV2.AssetIngestState -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 cce56ce736..b78a1ea3e8 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.* -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality._ +import org.knora.webapi.messages.v2.responder.ontologymessages._ 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 d1ea0d1132..10f63c7f50 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 cc3c14020b..4b66b49b48 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 00de3146e9..2ae002929e 100644 --- a/integration/src/test/scala/org/knora/webapi/routing/AuthenticatorSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/routing/AuthenticatorSpec.scala @@ -9,7 +9,7 @@ import org.apache.pekko.testkit.ImplicitSender import org.scalatest.PrivateMethodTester import dsp.errors.BadCredentialsException -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.v2.routing.authenticationmessages.CredentialsIdentifier import org.knora.webapi.messages.v2.routing.authenticationmessages.KnoraCredentialsV2.KnoraJWTTokenCredentialsV2 diff --git a/integration/src/test/scala/org/knora/webapi/sharedtestdata/SharedPermissionsTestData.scala b/integration/src/test/scala/org/knora/webapi/sharedtestdata/SharedPermissionsTestData.scala index 03bc442dfe..3509234852 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 b8268260fb..253c72ef32 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/CacheServiceSpec.scala b/integration/src/test/scala/org/knora/webapi/store/cache/CacheServiceSpec.scala index 5931fbf2ad..0edefbd7b3 100644 --- a/integration/src/test/scala/org/knora/webapi/store/cache/CacheServiceSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/cache/CacheServiceSpec.scala @@ -6,12 +6,12 @@ package org.knora.webapi.store.cache import zio.ZIO -import zio.test.* +import zio.test._ import org.knora.webapi.messages.admin.responder.projectsmessages.Project -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM._ import org.knora.webapi.sharedtestdata.SharedTestDataADM -import org.knora.webapi.slice.admin.domain.model.* +import org.knora.webapi.slice.admin.domain.model._ object CacheServiceSpec extends ZIOSpecDefault { 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 83cfda2100..1336fda300 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 030a59a47c..fa026cd49d 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 d50a7fefa5..b6d6d4e78c 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 55fec8224c..a05c2a07e0 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307Spec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.store.triplestore.upgrade.plugins -import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.util.rdf.JenaRepository +import org.knora.webapi.messages.util.rdf._ class UpgradePluginPR1307Spec extends UpgradePluginSpec { "Upgrade plugin PR1307" should { diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322Spec.scala index 05d59b6001..e1af89368d 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322Spec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.store.triplestore.upgrade.plugins -import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.util.rdf.JenaRepository +import org.knora.webapi.messages.util.rdf._ class UpgradePluginPR1322Spec extends UpgradePluginSpec { "Upgrade plugin PR1322" should { diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala index 9b33e70c73..4c08c5da0f 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 590e1e0464..ed2c06325e 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372Spec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.store.triplestore.upgrade.plugins -import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.util.rdf.JenaRepository +import org.knora.webapi.messages.util.rdf._ class UpgradePluginPR1372Spec extends UpgradePluginSpec { "Upgrade plugin PR1372" should { diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615Spec.scala index 9aee164867..a36067d354 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615Spec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.store.triplestore.upgrade.plugins -import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.util.rdf.JenaRepository +import org.knora.webapi.messages.util.rdf._ class UpgradePluginPR1615Spec extends UpgradePluginSpec { "Upgrade plugin PR1615" should { diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala index cc45e270f2..2d62d2ac2c 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala @@ -10,7 +10,7 @@ import org.scalatest.compatible.Assertion import dsp.errors.AssertionException import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ class UpgradePluginPR1746Spec extends UpgradePluginSpec with LazyLogging { private def checkLiteral(model: RdfModel, subj: IriNode, pred: IriNode, expectedObj: RdfLiteral): Assertion = diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala index b81df04b07..390c996e24 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala @@ -9,7 +9,7 @@ import com.typesafe.scalalogging.LazyLogging import org.scalatest.compatible.Assertion import dsp.errors.AssertionException -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ class UpgradePluginPR1921Spec extends UpgradePluginSpec with LazyLogging { private def checkLiteral(model: RdfModel, subj: IriNode, pred: IriNode, expectedObj: RdfLiteral): Assertion = diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018Spec.scala index 0664c5079c..7ab1ea18a1 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018Spec.scala @@ -7,8 +7,8 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import com.typesafe.scalalogging.LazyLogging -import org.knora.webapi.messages.util.rdf.* import org.knora.webapi.messages.util.rdf.JenaRepository +import org.knora.webapi.messages.util.rdf._ class UpgradePluginPR2018Spec extends UpgradePluginSpec with LazyLogging { "Upgrade plugin PR2018" should { diff --git a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079Spec.scala b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079Spec.scala index 4269477a83..88eb37b150 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 aa00360665..d40f78912c 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 efa666f014..b1f0655dfe 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 f451e16a4e..e4eaa7e4b7 100644 --- a/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginSpec.scala @@ -17,7 +17,7 @@ import scala.util.Success import scala.util.Using import org.knora.webapi.messages.util.ErrorHandlingMap -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ /** * Provides helper methods for specs that test upgrade plugins. diff --git a/integration/src/test/scala/org/knora/webapi/testcontainers/TestContainerOps.scala b/integration/src/test/scala/org/knora/webapi/testcontainers/TestContainerOps.scala index fc0da54f2a..281d5f6362 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 4a47185180..4976dffe44 100644 --- a/integration/src/test/scala/org/knora/webapi/testservices/TestClientService.scala +++ b/integration/src/test/scala/org/knora/webapi/testservices/TestClientService.scala @@ -20,9 +20,9 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager import org.apache.http.util.EntityUtils import org.apache.pekko import org.apache.pekko.actor.ActorSystem -import spray.json.* import spray.json.JsObject -import zio.* +import spray.json._ +import zio._ import java.nio.file.Path import java.util.concurrent.TimeUnit @@ -35,9 +35,9 @@ import dsp.errors.BadRequestException import dsp.errors.NotFoundException import org.knora.webapi.config.AppConfig import org.knora.webapi.messages.store.sipimessages.SipiUploadResponse -import org.knora.webapi.messages.store.sipimessages.SipiUploadResponseJsonProtocol.* +import org.knora.webapi.messages.store.sipimessages.SipiUploadResponseJsonProtocol._ import org.knora.webapi.messages.store.sipimessages.SipiUploadWithoutProcessingResponse -import org.knora.webapi.messages.store.sipimessages.SipiUploadWithoutProcessingResponseJsonProtocol.* +import org.knora.webapi.messages.store.sipimessages.SipiUploadWithoutProcessingResponseJsonProtocol._ import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol import org.knora.webapi.messages.util.rdf.JsonLDDocument import org.knora.webapi.messages.util.rdf.JsonLDUtil diff --git a/integration/src/test/scala/org/knora/webapi/util/AkkaHttpUtils.scala b/integration/src/test/scala/org/knora/webapi/util/AkkaHttpUtils.scala index 1d471b4d31..bb47001104 100644 --- a/integration/src/test/scala/org/knora/webapi/util/AkkaHttpUtils.scala +++ b/integration/src/test/scala/org/knora/webapi/util/AkkaHttpUtils.scala @@ -7,12 +7,12 @@ package org.knora.webapi.util import com.typesafe.scalalogging.LazyLogging import org.apache.pekko -import spray.json.* +import spray.json._ import scala.concurrent.Await import scala.concurrent.ExecutionContext import scala.concurrent.Future -import scala.concurrent.duration.* +import scala.concurrent.duration._ import pekko.actor.ActorSystem import pekko.http.scaladsl.model.HttpResponse diff --git a/webapi/src/main/scala/dsp/constants/SalsahGui.scala b/webapi/src/main/scala/dsp/constants/SalsahGui.scala index 71710b6342..1136f5e0cd 100644 --- a/webapi/src/main/scala/dsp/constants/SalsahGui.scala +++ b/webapi/src/main/scala/dsp/constants/SalsahGui.scala @@ -5,7 +5,7 @@ package dsp.constants -import dsp.errors.* +import dsp.errors._ /** * Contains string constants for IRIs from ontologies used by the application. diff --git a/webapi/src/main/scala/dsp/valueobjects/Schema.scala b/webapi/src/main/scala/dsp/valueobjects/Schema.scala index 1b8f21787b..f69d2dc8ba 100644 --- a/webapi/src/main/scala/dsp/valueobjects/Schema.scala +++ b/webapi/src/main/scala/dsp/valueobjects/Schema.scala @@ -6,9 +6,9 @@ package dsp.valueobjects import com.google.gwt.safehtml.shared.UriUtils.encodeAllowEscapes -import zio.prelude.* import zio.prelude.ZValidation.Failure import zio.prelude.ZValidation.Success +import zio.prelude._ import dsp.constants.SalsahGui import dsp.errors.ValidationException diff --git a/webapi/src/main/scala/org/knora/webapi/Main.scala b/webapi/src/main/scala/org/knora/webapi/Main.scala index 367e02103e..e99ec7fbcf 100644 --- a/webapi/src/main/scala/org/knora/webapi/Main.scala +++ b/webapi/src/main/scala/org/knora/webapi/Main.scala @@ -5,9 +5,9 @@ package org.knora.webapi -import zio.* +import zio._ -import org.knora.webapi.core.* +import org.knora.webapi.core._ import org.knora.webapi.slice.infrastructure.MetricsServer import org.knora.webapi.util.Logger diff --git a/webapi/src/main/scala/org/knora/webapi/config/AppConfig.scala b/webapi/src/main/scala/org/knora/webapi/config/AppConfig.scala index f22bcf6d5c..ccc1dad06a 100644 --- a/webapi/src/main/scala/org/knora/webapi/config/AppConfig.scala +++ b/webapi/src/main/scala/org/knora/webapi/config/AppConfig.scala @@ -6,10 +6,10 @@ package org.knora.webapi.config import com.typesafe.config.ConfigFactory -import zio.* -import zio.config.* -import zio.config.magnolia.* -import zio.config.typesafe.* +import zio._ +import zio.config._ +import zio.config.magnolia._ +import zio.config.typesafe._ import java.time.Duration diff --git a/webapi/src/main/scala/org/knora/webapi/core/ActorSystem.scala b/webapi/src/main/scala/org/knora/webapi/core/ActorSystem.scala index 24b3c2dac9..b414f5276e 100644 --- a/webapi/src/main/scala/org/knora/webapi/core/ActorSystem.scala +++ b/webapi/src/main/scala/org/knora/webapi/core/ActorSystem.scala @@ -6,7 +6,7 @@ package org.knora.webapi.core import org.apache.pekko.actor -import zio.* +import zio._ import scala.concurrent.ExecutionContext diff --git a/webapi/src/main/scala/org/knora/webapi/core/AppServer.scala b/webapi/src/main/scala/org/knora/webapi/core/AppServer.scala index e0f06bf004..b8e883250f 100644 --- a/webapi/src/main/scala/org/knora/webapi/core/AppServer.scala +++ b/webapi/src/main/scala/org/knora/webapi/core/AppServer.scala @@ -6,7 +6,7 @@ package org.knora.webapi.core import org.apache.pekko.actor -import zio.* +import zio._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.domain.AppState diff --git a/webapi/src/main/scala/org/knora/webapi/core/HttpServer.scala b/webapi/src/main/scala/org/knora/webapi/core/HttpServer.scala index 9bbc27d04c..0aa18ce856 100644 --- a/webapi/src/main/scala/org/knora/webapi/core/HttpServer.scala +++ b/webapi/src/main/scala/org/knora/webapi/core/HttpServer.scala @@ -7,7 +7,7 @@ package org.knora.webapi.core import org.apache.pekko.actor.ActorSystem import org.apache.pekko.http.scaladsl.Http -import zio.* +import zio._ import org.knora.webapi.config.AppConfig import org.knora.webapi.routing.ApiRoutes diff --git a/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala b/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala index 9b311cf68e..308c99b8e8 100644 --- a/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala @@ -13,7 +13,7 @@ import org.knora.webapi.config.AppConfig import org.knora.webapi.config.AppConfig.AppConfigurations import org.knora.webapi.config.InstrumentationServerConfig import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.* +import org.knora.webapi.messages.util._ import org.knora.webapi.messages.util.search.QueryTraverser import org.knora.webapi.messages.util.search.gravsearch.prequery.InferenceOptimizationService import org.knora.webapi.messages.util.search.gravsearch.transformers.ConstructTransformer @@ -22,21 +22,21 @@ import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInsp import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2Live import org.knora.webapi.responders.IriService -import org.knora.webapi.responders.admin.* import org.knora.webapi.responders.admin.ListsResponder -import org.knora.webapi.responders.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.routing._ import org.knora.webapi.slice.admin.AdminModule -import org.knora.webapi.slice.admin.api.* import org.knora.webapi.slice.admin.api.AdminApiModule +import org.knora.webapi.slice.admin.api._ import org.knora.webapi.slice.admin.api.service.PermissionsRestService import org.knora.webapi.slice.admin.api.service.UsersRestService -import org.knora.webapi.slice.admin.domain.service.* -import org.knora.webapi.slice.common.api.* +import org.knora.webapi.slice.admin.domain.service._ +import org.knora.webapi.slice.common.api._ import org.knora.webapi.slice.common.repo.service.PredicateObjectMapper import org.knora.webapi.slice.infrastructure.api.ManagementEndpoints import org.knora.webapi.slice.infrastructure.api.ManagementRoutes diff --git a/webapi/src/main/scala/org/knora/webapi/core/MessageRelay.scala b/webapi/src/main/scala/org/knora/webapi/core/MessageRelay.scala index 5ea8d23d4f..437f4c6c25 100644 --- a/webapi/src/main/scala/org/knora/webapi/core/MessageRelay.scala +++ b/webapi/src/main/scala/org/knora/webapi/core/MessageRelay.scala @@ -5,7 +5,7 @@ package org.knora.webapi.core -import zio.* +import zio._ import zio.macros.accessible import org.knora.webapi.messages.ResponderRequest diff --git a/webapi/src/main/scala/org/knora/webapi/core/State.scala b/webapi/src/main/scala/org/knora/webapi/core/State.scala index 5ce1a5e9fd..9667db911e 100644 --- a/webapi/src/main/scala/org/knora/webapi/core/State.scala +++ b/webapi/src/main/scala/org/knora/webapi/core/State.scala @@ -5,7 +5,7 @@ package org.knora.webapi.core -import zio.* +import zio._ import org.knora.webapi.core.domain.AppState diff --git a/webapi/src/main/scala/org/knora/webapi/core/actors/RoutingActor.scala b/webapi/src/main/scala/org/knora/webapi/core/actors/RoutingActor.scala index eaec4dbfab..d65e944468 100644 --- a/webapi/src/main/scala/org/knora/webapi/core/actors/RoutingActor.scala +++ b/webapi/src/main/scala/org/knora/webapi/core/actors/RoutingActor.scala @@ -6,7 +6,7 @@ package org.knora.webapi.core.actors import org.apache.pekko.actor.Actor -import zio.* +import zio._ import dsp.errors.UnexpectedMessageException import org.knora.webapi.core.MessageRelay diff --git a/webapi/src/main/scala/org/knora/webapi/http/handler/KnoraExceptionHandler.scala b/webapi/src/main/scala/org/knora/webapi/http/handler/KnoraExceptionHandler.scala index 5eac2c25ef..82436393e7 100644 --- a/webapi/src/main/scala/org/knora/webapi/http/handler/KnoraExceptionHandler.scala +++ b/webapi/src/main/scala/org/knora/webapi/http/handler/KnoraExceptionHandler.scala @@ -20,7 +20,7 @@ import org.knora.webapi.messages.util.rdf.JsonLDDocument import org.knora.webapi.messages.util.rdf.JsonLDObject import org.knora.webapi.messages.util.rdf.JsonLDString -import pekko.http.scaladsl.model.* +import pekko.http.scaladsl.model._ import pekko.http.scaladsl.server.Directives.complete import pekko.http.scaladsl.server.Directives.extractRequest import pekko.http.scaladsl.server.ExceptionHandler diff --git a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesADM.scala b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesADM.scala index 57987d0b5f..40d462e191 100644 --- a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesADM.scala @@ -7,7 +7,7 @@ package org.knora.webapi.http.status import org.apache.pekko -import dsp.errors.* +import dsp.errors._ import pekko.http.scaladsl.model.StatusCode import pekko.http.scaladsl.model.StatusCodes diff --git a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV2.scala b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV2.scala index 2b2329739e..12aa6e2022 100644 --- a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV2.scala @@ -7,7 +7,7 @@ package org.knora.webapi.http.status import org.apache.pekko -import dsp.errors.* +import dsp.errors._ import org.knora.webapi.store.triplestore.errors.TriplestoreTimeoutException import pekko.http.scaladsl.model.StatusCode diff --git a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesZ.scala b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesZ.scala index 315a9a2ddd..5a38daec4f 100644 --- a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesZ.scala +++ b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesZ.scala @@ -7,7 +7,7 @@ package org.knora.webapi.http.status import zio.http.Status -import dsp.errors.* +import dsp.errors._ import org.knora.webapi.store.triplestore.errors.TriplestoreTimeoutException /** diff --git a/webapi/src/main/scala/org/knora/webapi/messages/StringFormatter.scala b/webapi/src/main/scala/org/knora/webapi/messages/StringFormatter.scala index 3a02a36427..a3de5df34f 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/StringFormatter.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/StringFormatter.scala @@ -5,10 +5,10 @@ package org.knora.webapi.messages -import spray.json.* +import spray.json._ import zio.ZLayer -import java.time.* +import java.time._ import java.time.temporal.ChronoField import java.util.UUID import java.util.concurrent.ConcurrentHashMap @@ -17,12 +17,12 @@ import scala.util.Success import scala.util.Try import scala.util.matching.Regex -import dsp.errors.* +import dsp.errors._ import dsp.valueobjects.Iri import dsp.valueobjects.UuidUtil -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.config.AppConfig -import org.knora.webapi.messages.StringFormatter.* +import org.knora.webapi.messages.StringFormatter._ import org.knora.webapi.messages.XmlPatterns.nCNamePattern import org.knora.webapi.messages.XmlPatterns.nCNameRegex import org.knora.webapi.messages.store.triplestoremessages.StringLiteralSequenceV2 diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADM.scala index 3216544a5a..4003063c0f 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADM.scala @@ -6,12 +6,12 @@ package org.knora.webapi.messages.admin.responder.listsmessages import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport -import spray.json.* +import spray.json._ import scala.util.Try import dsp.valueobjects.Iri -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.AdminKnoraResponseADM import org.knora.webapi.messages.admin.responder.KnoraResponseADM diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADM.scala index 91c512b8e4..7e5e3e336d 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADM.scala @@ -6,14 +6,14 @@ package org.knora.webapi.messages.admin.responder.permissionsmessages import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport -import spray.json.* +import spray.json._ import java.util.UUID import dsp.errors.BadRequestException import dsp.errors.ForbiddenException import dsp.valueobjects.Iri -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.core.RelayedMessage import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.ResponderRequest.KnoraRequestADM diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesUtilADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesUtilADM.scala index b56df84dde..c1cb0af090 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesUtilADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesUtilADM.scala @@ -8,7 +8,7 @@ package org.knora.webapi.messages.admin.responder.permissionsmessages import dsp.errors.BadRequestException import org.knora.webapi.IRI import org.knora.webapi.messages.OntologyConstants.KnoraAdmin.AdministrativePermissionAbbreviations -import org.knora.webapi.messages.OntologyConstants.KnoraBase.* +import org.knora.webapi.messages.OntologyConstants.KnoraBase._ import org.knora.webapi.slice.admin.domain.model.PermissionIri /** diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADM.scala index 3cdf93afc7..db642102a8 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADM.scala @@ -29,12 +29,12 @@ import org.knora.webapi.core.RelayedMessage import org.knora.webapi.messages.ResponderRequest.KnoraRequestADM import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.AdminKnoraResponseADM -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM._ import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.ProjectCreateRequest import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.ProjectUpdateRequest -import org.knora.webapi.slice.admin.domain.model.KnoraProject.* +import org.knora.webapi.slice.admin.domain.model.KnoraProject._ import org.knora.webapi.slice.admin.domain.model.User ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala index 9ea7a61462..89f9bcb5aa 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala @@ -6,7 +6,7 @@ package org.knora.webapi.messages.admin.responder.usersmessages import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport -import spray.json.* +import spray.json._ import org.knora.webapi.core.RelayedMessage import org.knora.webapi.messages.ResponderRequest.KnoraRequestADM @@ -15,8 +15,8 @@ import org.knora.webapi.messages.admin.responder.groupsmessages.GroupsADMJsonPro import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsADMJsonProtocol import org.knora.webapi.messages.admin.responder.projectsmessages.Project import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectsADMJsonProtocol -import org.knora.webapi.slice.admin.domain.model.* import org.knora.webapi.slice.admin.domain.model.Group +import org.knora.webapi.slice.admin.domain.model._ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Messages diff --git a/webapi/src/main/scala/org/knora/webapi/messages/store/sipimessages/SipiMessages.scala b/webapi/src/main/scala/org/knora/webapi/messages/store/sipimessages/SipiMessages.scala index 6dc69a590e..dd419b6db5 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/store/sipimessages/SipiMessages.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/store/sipimessages/SipiMessages.scala @@ -6,7 +6,7 @@ package org.knora.webapi.messages.store.sipimessages import org.apache.pekko -import spray.json.* +import spray.json._ import org.knora.webapi.core.RelayedMessage import org.knora.webapi.messages.store.StoreRequest diff --git a/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessages.scala b/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessages.scala index 73b53fc792..bacf5b6776 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessages.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessages.scala @@ -8,20 +8,20 @@ package org.knora.webapi.messages.store.triplestoremessages import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf import org.eclipse.rdf4j.sparqlbuilder.rdf.RdfLiteral.StringLiteral -import spray.json.* -import zio.* +import spray.json._ +import zio._ import zio.json.DeriveJsonCodec import zio.json.JsonCodec import java.time.Instant import scala.collection.mutable -import dsp.errors.* -import org.knora.webapi.* -import org.knora.webapi.messages.* -import org.knora.webapi.messages.IriConversions.* +import dsp.errors._ +import org.knora.webapi._ +import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages._ import org.knora.webapi.messages.util.ErrorHandlingMap -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ /** * A response to a [[org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.Construct]] query. diff --git a/webapi/src/main/scala/org/knora/webapi/messages/twirl/SparqlTemplateResourceToCreate.scala b/webapi/src/main/scala/org/knora/webapi/messages/twirl/SparqlTemplateResourceToCreate.scala index 860024c109..435cfe3fd8 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/twirl/SparqlTemplateResourceToCreate.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/twirl/SparqlTemplateResourceToCreate.scala @@ -7,7 +7,7 @@ package org.knora.webapi.messages.twirl import java.time.Instant -import org.knora.webapi.* +import org.knora.webapi._ /** * Represents a resource to be created with its index, label, IRI, permissions, and SPARQL for creating its values diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/CalendarDateUtilV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/CalendarDateUtilV2.scala index 357f0c2b12..a5eeb4517e 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/CalendarDateUtilV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/CalendarDateUtilV2.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util -import com.ibm.icu.util.* +import com.ibm.icu.util._ import java.util.Date diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2.scala index 60959d91d7..15b9ad4575 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util -import zio.* +import zio._ import java.time.Instant import java.util.UUID @@ -15,18 +15,18 @@ import dsp.errors.InconsistentRepositoryDataException import dsp.errors.NotFoundException import dsp.errors.NotImplementedException import dsp.valueobjects.UuidUtil -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetRequestADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetResponse -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* -import org.knora.webapi.messages.store.triplestoremessages.* +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM._ import org.knora.webapi.messages.store.triplestoremessages.SparqlExtendedConstructResponse.ConstructPredicateObjects +import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.util.ConstructResponseUtilV2.FlatPredicateObjects import org.knora.webapi.messages.util.ConstructResponseUtilV2.FlatStatements import org.knora.webapi.messages.util.ConstructResponseUtilV2.MainResourcesAndValueRdfData @@ -53,7 +53,7 @@ import org.knora.webapi.messages.v2.responder.standoffmessages.GetMappingRespons import org.knora.webapi.messages.v2.responder.standoffmessages.GetXSLTransformationRequestV2 import org.knora.webapi.messages.v2.responder.standoffmessages.GetXSLTransformationResponseV2 import org.knora.webapi.messages.v2.responder.standoffmessages.MappingXMLtoStandoff -import org.knora.webapi.messages.v2.responder.valuemessages.* +import org.knora.webapi.messages.v2.responder.valuemessages._ import org.knora.webapi.slice.admin.domain.model.User import org.knora.webapi.store.iiif.errors.SipiException import org.knora.webapi.util.ZioHelper diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/UserUtilADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/UserUtilADM.scala index 8a9ec20677..ae896f8f4b 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/UserUtilADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/UserUtilADM.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util -import zio.* +import zio._ import dsp.errors.ForbiddenException import dsp.errors.NotFoundException diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JenaModel.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JenaModel.scala index a5bc36a50e..f9153c13e6 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JenaModel.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JenaModel.scala @@ -8,13 +8,13 @@ package org.knora.webapi.messages.util.rdf import org.apache.jena import scala.collection.mutable.ArrayBuffer -import scala.jdk.CollectionConverters.* +import scala.jdk.CollectionConverters._ import dsp.errors.RdfProcessingException import org.knora.webapi.IRI import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.util.ErrorHandlingMap -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ sealed trait JenaNode extends RdfNode { def node: jena.graph.Node diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JsonLDUtil.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JsonLDUtil.scala index 5da7ca1f0e..7532f4bd03 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JsonLDUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JsonLDUtil.scala @@ -5,9 +5,9 @@ package org.knora.webapi.messages.util.rdf -import com.apicatalog.jsonld.* -import com.apicatalog.jsonld.document.* -import jakarta.json.* +import com.apicatalog.jsonld._ +import com.apicatalog.jsonld.document._ +import jakarta.json._ import jakarta.json.stream.JsonGenerator import org.apache.commons.lang3.builder.HashCodeBuilder import zio.IO @@ -17,14 +17,14 @@ import java.io.StringReader import java.io.StringWriter import java.util import java.util.UUID -import scala.jdk.CollectionConverters.* -import scala.util.control.Exception.* +import scala.jdk.CollectionConverters._ +import scala.util.control.Exception._ -import dsp.errors.* +import dsp.errors._ import dsp.valueobjects.Iri import dsp.valueobjects.UuidUtil -import org.knora.webapi.* -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi._ +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Complex.ValueHasComment import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/FullTextMainQueryGenerator.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/FullTextMainQueryGenerator.scala index f8e98b57d2..dd059b6a36 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/FullTextMainQueryGenerator.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/FullTextMainQueryGenerator.scala @@ -5,8 +5,8 @@ package org.knora.webapi.messages.util.search -import org.knora.webapi.* -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi._ +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/MainQueryResultProcessor.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/MainQueryResultProcessor.scala index dd9bf43fb3..6b3f0d918e 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/MainQueryResultProcessor.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/MainQueryResultProcessor.scala @@ -6,8 +6,8 @@ package org.knora.webapi.messages.util.search import dsp.errors.AssertionException -import org.knora.webapi.* -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi._ +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.util.ConstructResponseUtilV2 diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/QueryTraverser.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/QueryTraverser.scala index 14e4a19b32..8154dba753 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/QueryTraverser.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/QueryTraverser.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util.search -import zio.* +import zio._ import dsp.errors.GravsearchOptimizationException import org.knora.webapi.InternalSchema diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/SparqlQuery.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/SparqlQuery.scala index 2fafa6ac3b..135dee410a 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/SparqlQuery.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/SparqlQuery.scala @@ -8,8 +8,8 @@ package org.knora.webapi.messages.util.search import org.apache.pekko import dsp.errors.GravsearchException -import org.knora.webapi.* -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi._ +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParser.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParser.scala index 824f241435..9ee01e47ed 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParser.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParser.scala @@ -9,18 +9,18 @@ import org.eclipse.rdf4j import org.eclipse.rdf4j.query.MalformedQueryException import org.eclipse.rdf4j.query.algebra import org.eclipse.rdf4j.query.parser.QueryParser -import org.eclipse.rdf4j.query.parser.sparql.* +import org.eclipse.rdf4j.query.parser.sparql._ -import scala.jdk.CollectionConverters.* -import scala.jdk.OptionConverters.* +import scala.jdk.CollectionConverters._ +import scala.jdk.OptionConverters._ import dsp.errors.GravsearchException -import org.knora.webapi.* -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi._ +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ /** * Parses a Gravsearch query. The syntax that is accepted is that of a SPARQL CONSTRUCT query, with some restrictions: diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchQueryChecker.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchQueryChecker.scala index a10a9c71fa..529b06a230 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchQueryChecker.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchQueryChecker.scala @@ -5,13 +5,13 @@ package org.knora.webapi.messages.util.search.gravsearch -import zio.* +import zio._ import dsp.errors.AssertionException import dsp.errors.GravsearchException -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchEntityTypeInfo import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInspectionResult import org.knora.webapi.messages.util.search.gravsearch.types.NonPropertyTypeInfo diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/mainquery/GravsearchMainQueryGenerator.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/mainquery/GravsearchMainQueryGenerator.scala index a83124b330..e000ad1d12 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/mainquery/GravsearchMainQueryGenerator.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/mainquery/GravsearchMainQueryGenerator.scala @@ -6,14 +6,14 @@ package org.knora.webapi.messages.util.search.gravsearch.mainquery import dsp.errors.GravsearchException -import org.knora.webapi.* -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi._ +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.util.ErrorHandlingMap import org.knora.webapi.messages.util.rdf.SparqlSelectResult import org.knora.webapi.messages.util.rdf.VariableResultsRow -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ import org.knora.webapi.messages.util.search.gravsearch.prequery.GravsearchToPrequeryTransformer object GravsearchMainQueryGenerator { diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/AbstractPrequeryGenerator.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/AbstractPrequeryGenerator.scala index b9310eb89d..6c6891b424 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/AbstractPrequeryGenerator.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/AbstractPrequeryGenerator.scala @@ -10,18 +10,18 @@ import zio.ZIO import scala.collection.mutable -import dsp.errors.* -import org.knora.webapi.* -import org.knora.webapi.messages.IriConversions.* +import dsp.errors._ +import org.knora.webapi._ +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.ValuesValidator -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ import org.knora.webapi.messages.util.search.gravsearch.GravsearchQueryChecker import org.knora.webapi.messages.util.search.gravsearch.transformers.SparqlTransformer import org.knora.webapi.messages.util.search.gravsearch.transformers.WhereTransformer -import org.knora.webapi.messages.util.search.gravsearch.types.* +import org.knora.webapi.messages.util.search.gravsearch.types._ import org.knora.webapi.messages.v2.responder.valuemessages.DateValueContentV2 import org.knora.webapi.util.ApacheLuceneSupport.LuceneQueryString diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchQueryOptimisation.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchQueryOptimisation.scala index 1e018f8938..f18bf0338e 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchQueryOptimisation.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchQueryOptimisation.scala @@ -10,7 +10,7 @@ import scalax.collection.immutable.Graph import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ import org.knora.webapi.messages.util.search.gravsearch.prequery.RemoveEntitiesInferredFromProperty.removeEntitiesInferredFromProperty import org.knora.webapi.messages.util.search.gravsearch.prequery.RemoveRedundantKnoraApiResource.removeRedundantKnoraApiResource import org.knora.webapi.messages.util.search.gravsearch.prequery.ReorderPatternsByDependency.reorderPatternsByDependency diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToCountPrequeryTransformer.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToCountPrequeryTransformer.scala index 122e1bfe9a..befa5a8fa7 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToCountPrequeryTransformer.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToCountPrequeryTransformer.scala @@ -9,7 +9,7 @@ import zio.Task import zio.ZIO import org.knora.webapi.ApiV2Schema -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInspectionResult /** diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToPrequeryTransformer.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToPrequeryTransformer.scala index 2dbb9cddea..9d6d31f9c7 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToPrequeryTransformer.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/GravsearchToPrequeryTransformer.scala @@ -10,10 +10,10 @@ import zio.ZIO import dsp.errors.AssertionException import dsp.errors.GravsearchException -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ import org.knora.webapi.messages.util.search.gravsearch.transformers.SparqlTransformer import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInspectionResult import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInspectionUtil diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/InferenceOptimizationService.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/InferenceOptimizationService.scala index 2cc3a9cf65..8487150f58 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/InferenceOptimizationService.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/InferenceOptimizationService.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util.search.gravsearch.prequery -import zio.* +import zio._ import org.knora.webapi.InternalSchema import org.knora.webapi.core.MessageRelay diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/ConstructTransformer.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/ConstructTransformer.scala index 17d442b211..17ed22ae10 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/ConstructTransformer.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/ConstructTransformer.scala @@ -5,10 +5,10 @@ package org.knora.webapi.messages.util.search.gravsearch.transformers -import zio.* +import zio._ import org.knora.webapi.messages.SmartIri -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ import org.knora.webapi.slice.resourceinfo.domain.IriConverter final case class ConstructTransformer( diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/OntologyInferencer.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/OntologyInferencer.scala index b481adb3f5..4fa3c0e991 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/OntologyInferencer.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/OntologyInferencer.scala @@ -5,15 +5,15 @@ package org.knora.webapi.messages.util.search.gravsearch.transformers -import zio.* import zio.ZLayer +import zio._ import dsp.errors.GravsearchException -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ import org.knora.webapi.slice.ontology.repo.model.OntologyCacheData import org.knora.webapi.slice.ontology.repo.service.OntologyCache diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SelectTransformer.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SelectTransformer.scala index b16b3251ff..6b576e9fc1 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SelectTransformer.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SelectTransformer.scala @@ -5,13 +5,13 @@ package org.knora.webapi.messages.util.search.gravsearch.transformers -import zio.* +import zio._ import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ -import SparqlTransformer.* +import SparqlTransformer._ class SelectTransformer( simulateInference: Boolean, diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SparqlTransformer.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SparqlTransformer.scala index 36640022a7..943dd52a43 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SparqlTransformer.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/SparqlTransformer.scala @@ -7,12 +7,12 @@ package org.knora.webapi.messages.util.search.gravsearch.transformers import dsp.errors.AssertionException import dsp.errors.GravsearchException -import org.knora.webapi.* -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi._ +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ object SparqlTransformer { diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/WhereTransformer.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/WhereTransformer.scala index 1d1bbe2cb2..c55af6276e 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/WhereTransformer.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/WhereTransformer.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util.search.gravsearch.transformers -import zio.* +import zio._ import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.util.search.FilterPattern diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/AnnotationReadingGravsearchTypeInspector.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/AnnotationReadingGravsearchTypeInspector.scala index b631a7b525..d2fc9594ac 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/AnnotationReadingGravsearchTypeInspector.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/AnnotationReadingGravsearchTypeInspector.scala @@ -10,10 +10,10 @@ import zio.ZIO import dsp.errors.AssertionException import dsp.errors.GravsearchException -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInspectionUtil.TypeAnnotationProperties import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchTypeInspectionUtil.TypeAnnotationProperty diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionRunner.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionRunner.scala index 879a062939..a39fd981df 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionRunner.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionRunner.scala @@ -13,7 +13,7 @@ import dsp.errors.GravsearchException import org.knora.webapi.core.MessageRelay import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ import org.knora.webapi.slice.admin.domain.model.User /** diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionUtil.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionUtil.scala index accd6e2612..2bff98e195 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionUtil.scala @@ -5,14 +5,14 @@ package org.knora.webapi.messages.util.search.gravsearch.types -import zio.* +import zio._ import dsp.errors.AssertionException import dsp.errors.GravsearchException import org.knora.webapi.IRI import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ /** * Utilities for Gravsearch type inspection. diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/InferringGravsearchTypeInspector.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/InferringGravsearchTypeInspector.scala index 242e4c7cd5..6a9b8e378c 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/InferringGravsearchTypeInspector.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/InferringGravsearchTypeInspector.scala @@ -14,13 +14,13 @@ import scala.annotation.tailrec import dsp.errors.AssertionException import dsp.errors.GravsearchException -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ import org.knora.webapi.messages.v2.responder.KnoraReadV2 import org.knora.webapi.messages.v2.responder.ontologymessages.EntityInfoGetRequestV2 import org.knora.webapi.messages.v2.responder.ontologymessages.EntityInfoGetResponseV2 diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/IntermediateTypeInspectionResult.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/IntermediateTypeInspectionResult.scala index 980bd38e64..5f90aa4816 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/IntermediateTypeInspectionResult.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/IntermediateTypeInspectionResult.scala @@ -7,7 +7,7 @@ package org.knora.webapi.messages.util.search.gravsearch.types import dsp.errors.AssertionException import org.knora.webapi.IRI -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2.scala index 4065b5ba81..37721b29a0 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2.scala @@ -12,12 +12,12 @@ import zio.ZLayer import java.time.Instant import java.util.UUID -import dsp.errors.* +import dsp.errors._ import dsp.valueobjects.Iri import dsp.valueobjects.UuidUtil import org.knora.webapi.IRI import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter @@ -28,9 +28,9 @@ import org.knora.webapi.messages.util import org.knora.webapi.messages.util.DateUtil import org.knora.webapi.messages.util.KnoraCalendarPrecision import org.knora.webapi.messages.util.KnoraCalendarType -import org.knora.webapi.messages.v2.responder.ontologymessages.* -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* -import org.knora.webapi.messages.v2.responder.standoffmessages.* +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality._ +import org.knora.webapi.messages.v2.responder.ontologymessages._ +import org.knora.webapi.messages.v2.responder.standoffmessages._ import org.knora.webapi.slice.admin.domain.model.User import org.knora.webapi.slice.ontology.domain.model.Cardinality.AtLeastOne import org.knora.webapi.slice.ontology.domain.model.Cardinality.ExactlyOne diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtil.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtil.scala index 0f827907b4..da08a5e4e3 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtil.scala @@ -6,7 +6,7 @@ package org.knora.webapi.messages.util.standoff import com.sksamuel.diffpatch.DiffMatchPatch -import com.sksamuel.diffpatch.DiffMatchPatch.* +import com.sksamuel.diffpatch.DiffMatchPatch._ import org.apache.commons.text.StringEscapeUtils import java.io.StringReader @@ -15,11 +15,11 @@ import java.util.UUID import javax.xml.parsers.SAXParserFactory import javax.xml.transform.stream.StreamSource import scala.util.control.NonFatal -import scala.xml.* +import scala.xml._ -import dsp.errors.* +import dsp.errors._ import dsp.valueobjects.UuidUtil -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.util.ErrorHandlingMap diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/KnoraResponseV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/KnoraResponseV2.scala index 9887289509..e68d2bad1f 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/KnoraResponseV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/KnoraResponseV2.scala @@ -7,11 +7,11 @@ package org.knora.webapi.messages.v2.responder import dsp.errors.AssertionException import dsp.errors.BadRequestException -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.admin.responder.projectsmessages.Project -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.slice.common.api.KnoraResponseRenderer /** diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/listsmessages/ListsMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/listsmessages/ListsMessagesV2.scala index b844117f9c..42f77909bd 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/listsmessages/ListsMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/listsmessages/ListsMessagesV2.scala @@ -5,17 +5,17 @@ package org.knora.webapi.messages.v2.responder.listsmessages -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.RelayedMessage -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.ResponderRequest.KnoraRequestV2 import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.admin.responder.listsmessages.* +import org.knora.webapi.messages.admin.responder.listsmessages._ import org.knora.webapi.messages.store.triplestoremessages.StringLiteralSequenceV2 import org.knora.webapi.messages.util.rdf -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.messages.v2.responder.KnoraJsonLDResponseV2 import org.knora.webapi.slice.admin.domain.model.User diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2ComplexTransformationRules.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2ComplexTransformationRules.scala index b767d723d3..577fc7d5eb 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2ComplexTransformationRules.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2ComplexTransformationRules.scala @@ -5,16 +5,16 @@ package org.knora.webapi.messages.v2.responder.ontologymessages -import org.knora.webapi.* -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi._ +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.OntologyLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.SmartIriLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* -import org.knora.webapi.slice.ontology.domain.model.Cardinality.* +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality._ +import org.knora.webapi.slice.ontology.domain.model.Cardinality._ /** * Rules for converting `knora-base` (or an ontology based on it) into `knora-api` in the [[ApiV2Complex]] schema. diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2SimpleTransformationRules.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2SimpleTransformationRules.scala index b1d0f3f03d..80d961634e 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2SimpleTransformationRules.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2SimpleTransformationRules.scala @@ -5,16 +5,16 @@ package org.knora.webapi.messages.v2.responder.ontologymessages -import org.knora.webapi.* -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi._ +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.OntologyLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.SmartIriLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* -import org.knora.webapi.slice.ontology.domain.model.Cardinality.* +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality._ +import org.knora.webapi.slice.ontology.domain.model.Cardinality._ /** * Rules for converting `knora-base` (or an ontology based on it) into `knora-api` in the [[ApiV2Simple]] schema. diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala index 4fe665a0ac..7e59d99dc5 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala @@ -8,7 +8,7 @@ package org.knora.webapi.messages.v2.responder.ontologymessages import com.typesafe.scalalogging.Logger import org.apache.commons.lang3.builder.HashCodeBuilder import org.apache.pekko -import zio.* +import zio._ import java.time.Instant import java.util.UUID @@ -22,10 +22,10 @@ import dsp.errors.DataConversionException import dsp.errors.InconsistentRepositoryDataException import dsp.valueobjects.Iri import dsp.valueobjects.Schema -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.RelayedMessage -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Complex import org.knora.webapi.messages.OntologyConstants.Rdfs @@ -33,9 +33,9 @@ import org.knora.webapi.messages.ResponderRequest.KnoraRequestV2 import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.ValuesValidator -import org.knora.webapi.messages.store.triplestoremessages.* -import org.knora.webapi.messages.util.rdf.* -import org.knora.webapi.messages.v2.responder.* +import org.knora.webapi.messages.store.triplestoremessages._ +import org.knora.webapi.messages.util.rdf._ +import org.knora.webapi.messages.v2.responder._ import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.KnoraCardinalityInfo import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.OwlCardinalityInfo import org.knora.webapi.messages.v2.responder.standoffmessages.StandoffDataTypeClasses diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/resourcemessages/ResourceMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/resourcemessages/ResourceMessagesV2.scala index 5f57395504..d1fe57403e 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/resourcemessages/ResourceMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/resourcemessages/ResourceMessagesV2.scala @@ -5,20 +5,20 @@ package org.knora.webapi.messages.v2.responder.resourcemessages -import zio.* +import zio._ import java.time.Instant import java.util.UUID -import dsp.errors.* +import dsp.errors._ import dsp.valueobjects.Iri import dsp.valueobjects.UuidUtil -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageRelay import org.knora.webapi.core.RelayedMessage -import org.knora.webapi.messages.IriConversions.* -import org.knora.webapi.messages.OntologyConstants.* +import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.OntologyConstants._ import org.knora.webapi.messages.ResponderRequest.KnoraRequestV2 import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter @@ -26,22 +26,22 @@ import org.knora.webapi.messages.ValuesValidator.xsdDateTimeStampToInstant import org.knora.webapi.messages.admin.responder.projectsmessages.Project import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetRequestADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetResponse -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* -import org.knora.webapi.messages.util.* +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM._ import org.knora.webapi.messages.util.PermissionUtilADM.EntityPermission -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util._ +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 import org.knora.webapi.messages.util.standoff.XMLUtil -import org.knora.webapi.messages.v2.responder.* +import org.knora.webapi.messages.v2.responder._ import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceRequestV2.AssetIngestState import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceRequestV2.AssetIngestState.AssetInTemp import org.knora.webapi.messages.v2.responder.standoffmessages.MappingXMLtoStandoff -import org.knora.webapi.messages.v2.responder.valuemessages.* +import org.knora.webapi.messages.v2.responder.valuemessages._ import org.knora.webapi.slice.admin.domain.model.User import org.knora.webapi.slice.admin.domain.service.UserService import org.knora.webapi.slice.resourceinfo.domain.IriConverter import org.knora.webapi.store.iiif.api.SipiService -import org.knora.webapi.util.* +import org.knora.webapi.util._ /** * An abstract trait for messages that can be sent to `ResourcesResponderV2`. diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/standoffmessages/StandoffMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/standoffmessages/StandoffMessagesV2.scala index 49a387fa78..cd395600fd 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/standoffmessages/StandoffMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/standoffmessages/StandoffMessagesV2.scala @@ -18,15 +18,15 @@ import scala.concurrent.Future import dsp.errors.AssertionException import dsp.valueobjects.Iri import dsp.valueobjects.UuidUtil -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.RelayedMessage -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.ResponderRequest.KnoraRequestV2 import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.messages.v2.responder.KnoraContentV2 import org.knora.webapi.messages.v2.responder.KnoraJsonLDRequestReaderV2 import org.knora.webapi.messages.v2.responder.KnoraJsonLDResponseV2 diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala index 7708702779..5c9818bcba 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala @@ -17,30 +17,30 @@ import dsp.errors.NotImplementedException import dsp.valueobjects.Iri import dsp.valueobjects.IriErrorMessages import dsp.valueobjects.UuidUtil -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageRelay import org.knora.webapi.core.RelayedMessage -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Complex -import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Complex.* +import org.knora.webapi.messages.OntologyConstants.KnoraApiV2Complex._ import org.knora.webapi.messages.ResponderRequest.KnoraRequestV2 import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.ValuesValidator import org.knora.webapi.messages.admin.responder.projectsmessages.Project -import org.knora.webapi.messages.util.* import org.knora.webapi.messages.util.PermissionUtilADM.EntityPermission -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util._ +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.messages.util.standoff.StandoffStringUtil import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 import org.knora.webapi.messages.util.standoff.XMLUtil -import org.knora.webapi.messages.v2.responder.* +import org.knora.webapi.messages.v2.responder._ import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceRequestV2.AssetIngestState import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceRequestV2.AssetIngestState.AssetInTemp import org.knora.webapi.messages.v2.responder.resourcemessages.ReadResourceV2 -import org.knora.webapi.messages.v2.responder.standoffmessages.* +import org.knora.webapi.messages.v2.responder.standoffmessages._ import org.knora.webapi.routing.RouteUtilV2 import org.knora.webapi.routing.RouteUtilZ import org.knora.webapi.slice.admin.api.model.MaintenanceRequests.AssetId diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/routing/authenticationmessages/AuthenticationMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/routing/authenticationmessages/AuthenticationMessagesV2.scala index 4a2ec71cb0..e92422ffa3 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/routing/authenticationmessages/AuthenticationMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/routing/authenticationmessages/AuthenticationMessagesV2.scala @@ -6,13 +6,13 @@ package org.knora.webapi.messages.v2.routing.authenticationmessages import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport -import spray.json.* +import spray.json._ import zio.json.DeriveJsonCodec import zio.json.JsonCodec import dsp.errors.BadRequestException import org.knora.webapi.IRI -import org.knora.webapi.slice.admin.domain.model.* +import org.knora.webapi.slice.admin.domain.model._ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // API requests diff --git a/webapi/src/main/scala/org/knora/webapi/responders/IriService.scala b/webapi/src/main/scala/org/knora/webapi/responders/IriService.scala index 926afd654c..3cc530fcbf 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/IriService.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/IriService.scala @@ -6,9 +6,9 @@ package org.knora.webapi.responders import com.typesafe.scalalogging.LazyLogging -import zio.* +import zio._ -import dsp.errors.* +import dsp.errors._ import dsp.valueobjects.UuidUtil import org.knora.webapi.IRI import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/main/scala/org/knora/webapi/responders/Responder.scala b/webapi/src/main/scala/org/knora/webapi/responders/Responder.scala index a9e4ccaa1a..85523ad86e 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/Responder.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/Responder.scala @@ -6,9 +6,9 @@ package org.knora.webapi package responders -import zio.* +import zio._ -import dsp.errors.* +import dsp.errors._ object Responder { diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/AssetPermissionsResponder.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/AssetPermissionsResponder.scala index ef5ab36111..24d0cc156a 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/AssetPermissionsResponder.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/AssetPermissionsResponder.scala @@ -5,7 +5,7 @@ package org.knora.webapi.responders.admin -import zio.* +import zio._ import dsp.errors.InconsistentRepositoryDataException import dsp.errors.NotFoundException diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala index 274321056f..c1172834b5 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala @@ -6,27 +6,27 @@ package org.knora.webapi.responders.admin import com.typesafe.scalalogging.LazyLogging -import zio.* +import zio._ import java.util.UUID -import dsp.errors.* -import org.knora.webapi.* +import dsp.errors._ +import org.knora.webapi._ import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.OntologyConstants.KnoraAdmin.* +import org.knora.webapi.messages.OntologyConstants.KnoraAdmin._ import org.knora.webapi.messages.ResponderRequest import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.admin.responder.groupsmessages.* +import org.knora.webapi.messages.admin.responder.groupsmessages._ import org.knora.webapi.messages.admin.responder.projectsmessages.Project import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetADM -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* -import org.knora.webapi.messages.admin.responder.usersmessages.* -import org.knora.webapi.messages.store.triplestoremessages.* +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM._ +import org.knora.webapi.messages.admin.responder.usersmessages._ import org.knora.webapi.messages.store.triplestoremessages.SparqlExtendedConstructResponse.ConstructPredicateObjects +import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.responders.IriLocker @@ -44,7 +44,7 @@ import org.knora.webapi.slice.admin.domain.model.User import org.knora.webapi.slice.admin.domain.model.UserIri import org.knora.webapi.slice.admin.domain.service.KnoraUserService import org.knora.webapi.store.triplestore.api.TriplestoreService -import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.* +import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries._ import org.knora.webapi.util.ZioHelper /** diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/ListsResponder.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/ListsResponder.scala index 83b613205e..6abe27e425 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/ListsResponder.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/ListsResponder.scala @@ -11,23 +11,23 @@ import zio.ZLayer import java.util.UUID -import dsp.errors.* +import dsp.errors._ import dsp.valueobjects.Iri -import dsp.valueobjects.Iri.* +import dsp.valueobjects.Iri._ import org.knora.webapi.config.AppConfig -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants.KnoraBase import org.knora.webapi.messages.OntologyConstants.Rdfs import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.admin.responder.listsmessages.* -import org.knora.webapi.messages.store.triplestoremessages.* +import org.knora.webapi.messages.admin.responder.listsmessages._ import org.knora.webapi.messages.store.triplestoremessages.SparqlExtendedConstructResponse.ConstructPredicateObjects +import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.responders.IriLocker import org.knora.webapi.responders.IriService import org.knora.webapi.responders.admin.ListsResponder.Queries -import org.knora.webapi.slice.admin.api.Requests.* +import org.knora.webapi.slice.admin.api.Requests._ import org.knora.webapi.slice.admin.domain.model.KnoraProject import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.ListProperties.ListIri diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponderADM.scala index 8f544f8e54..d1c6b5f5e3 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponderADM.scala @@ -6,19 +6,19 @@ package org.knora.webapi.responders.admin import com.typesafe.scalalogging.LazyLogging -import zio.* +import zio._ import java.util.UUID import scala.collection.immutable.Iterable import scala.collection.mutable.ListBuffer -import dsp.errors.* +import dsp.errors._ import dsp.valueobjects.Iri -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.OntologyConstants.KnoraBase.EntityPermissionAbbreviations import org.knora.webapi.messages.ResponderRequest @@ -26,11 +26,11 @@ import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.groupsmessages.GroupGetADM import org.knora.webapi.messages.admin.responder.permissionsmessages -import org.knora.webapi.messages.admin.responder.permissionsmessages.* 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.projectsmessages.Project import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetADM -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM._ import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.messages.util.PermissionUtilADM import org.knora.webapi.messages.util.rdf.SparqlSelectResult diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala index 82e5e49cd0..f7bc9d506d 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala @@ -5,22 +5,22 @@ package org.knora.webapi.responders.admin import com.typesafe.scalalogging.LazyLogging -import zio.* +import zio._ import java.util.UUID -import dsp.errors.* +import dsp.errors._ import dsp.valueobjects.Iri -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.* -import org.knora.webapi.messages.IriConversions.* -import org.knora.webapi.messages.admin.responder.permissionsmessages.* -import org.knora.webapi.messages.admin.responder.projectsmessages.* -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* -import org.knora.webapi.messages.store.triplestoremessages.* +import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages._ +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.store.triplestoremessages.StringLiteralV2 +import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.responders.IriLocker import org.knora.webapi.responders.IriService diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/UsersResponder.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/UsersResponder.scala index 47f70fc5e2..5a41d5a892 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/UsersResponder.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/UsersResponder.scala @@ -13,7 +13,7 @@ import zio.ZLayer import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay import org.knora.webapi.messages.ResponderRequest -import org.knora.webapi.messages.admin.responder.usersmessages.* +import org.knora.webapi.messages.admin.responder.usersmessages._ import org.knora.webapi.responders.Responder import org.knora.webapi.slice.admin.domain.service.UserService diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ListsResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ListsResponderV2.scala index e411759671..5e31632799 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ListsResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ListsResponderV2.scala @@ -5,7 +5,7 @@ package org.knora.webapi.responders.v2 -import zio.* +import zio._ import org.knora.webapi.IRI import org.knora.webapi.config.AppConfig @@ -14,7 +14,7 @@ import org.knora.webapi.core.MessageRelay import org.knora.webapi.messages.ResponderRequest import org.knora.webapi.messages.admin.responder.listsmessages.ChildNodeInfoGetResponseADM import org.knora.webapi.messages.admin.responder.listsmessages.ListGetResponseADM -import org.knora.webapi.messages.v2.responder.listsmessages.* +import org.knora.webapi.messages.v2.responder.listsmessages._ import org.knora.webapi.responders.Responder import org.knora.webapi.responders.admin.ListsResponder import org.knora.webapi.slice.admin.domain.model.User diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala index 090ace9a6a..93727bf23c 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala @@ -14,21 +14,21 @@ import zio.ZLayer import java.time.Instant import dsp.constants.SalsahGui -import dsp.errors.* -import org.knora.webapi.* +import dsp.errors._ +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.* -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages._ import org.knora.webapi.messages.store.triplestoremessages.SmartIriLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.messages.util.ErrorHandlingMap import org.knora.webapi.messages.v2.responder.CanDoResponseV2 import org.knora.webapi.messages.v2.responder.SuccessResponseV2 -import org.knora.webapi.messages.v2.responder.ontologymessages.* import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.KnoraCardinalityInfo +import org.knora.webapi.messages.v2.responder.ontologymessages._ import org.knora.webapi.responders.IriLocker import org.knora.webapi.responders.IriService import org.knora.webapi.responders.Responder diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourceUtilV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourceUtilV2.scala index 560412a131..bba13cf20c 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourceUtilV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourceUtilV2.scala @@ -6,8 +6,8 @@ package org.knora.webapi.responders.v2 import com.typesafe.scalalogging.LazyLogging -import zio.* import zio.Task +import zio._ import dsp.errors.ForbiddenException import org.knora.webapi.IRI diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala index 12c96e3f7d..e713fb1b68 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala @@ -6,40 +6,40 @@ package org.knora.webapi.responders.v2 import com.typesafe.scalalogging.LazyLogging -import zio.* import zio.ZIO +import zio._ import java.time.Instant import java.util.UUID import scala.concurrent.Future -import dsp.errors.* +import dsp.errors._ import dsp.valueobjects.Iri import dsp.valueobjects.UuidUtil -import org.knora.webapi.* import org.knora.webapi.SchemaRendering.apiV2SchemaWithOption +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.* -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages._ import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileRequest import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileResponse import org.knora.webapi.messages.twirl.queries.sparql -import org.knora.webapi.messages.util.* import org.knora.webapi.messages.util.ConstructResponseUtilV2.MappingAndXSLTransformation import org.knora.webapi.messages.util.PermissionUtilADM.DeletePermission import org.knora.webapi.messages.util.PermissionUtilADM.ModifyPermission -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util._ +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.messages.util.search.gravsearch.GravsearchParser import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 import org.knora.webapi.messages.v2.responder.SuccessResponseV2 -import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.messages.v2.responder.resourcemessages._ import org.knora.webapi.messages.v2.responder.standoffmessages.GetMappingRequestV2 import org.knora.webapi.messages.v2.responder.standoffmessages.GetMappingResponseV2 import org.knora.webapi.messages.v2.responder.standoffmessages.GetXSLTransformationRequestV2 import org.knora.webapi.messages.v2.responder.standoffmessages.GetXSLTransformationResponseV2 -import org.knora.webapi.messages.v2.responder.valuemessages.* +import org.knora.webapi.messages.v2.responder.valuemessages._ import org.knora.webapi.responders.IriLocker import org.knora.webapi.responders.IriService import org.knora.webapi.responders.Responder diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala index f9e9ab4608..69bb222d1f 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala @@ -6,21 +6,21 @@ package org.knora.webapi.responders.v2 import com.typesafe.scalalogging.LazyLogging -import zio.* +import zio._ import dsp.errors.AssertionException import dsp.errors.BadRequestException import dsp.errors.GravsearchException import dsp.errors.InconsistentRepositoryDataException import dsp.valueobjects.Iri -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.store.triplestoremessages.* +import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.messages.util.ConstructResponseUtilV2 import org.knora.webapi.messages.util.ConstructResponseUtilV2.MappingAndXSLTransformation @@ -32,7 +32,7 @@ import org.knora.webapi.messages.util.rdf.JsonLDString import org.knora.webapi.messages.util.rdf.SparqlSelectResult import org.knora.webapi.messages.util.rdf.SparqlSelectResultBody import org.knora.webapi.messages.util.rdf.VariableResultsRow -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ import org.knora.webapi.messages.util.search.gravsearch.GravsearchParser import org.knora.webapi.messages.util.search.gravsearch.GravsearchQueryChecker import org.knora.webapi.messages.util.search.gravsearch.mainquery.GravsearchMainQueryGenerator @@ -42,14 +42,14 @@ import org.knora.webapi.messages.util.search.gravsearch.prequery.InferenceOptimi import org.knora.webapi.messages.util.search.gravsearch.transformers.ConstructTransformer import org.knora.webapi.messages.util.search.gravsearch.transformers.OntologyInferencer import org.knora.webapi.messages.util.search.gravsearch.transformers.SelectTransformer -import org.knora.webapi.messages.util.search.gravsearch.types.* +import org.knora.webapi.messages.util.search.gravsearch.types._ import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 import org.knora.webapi.messages.v2.responder.KnoraJsonLDResponseV2 import org.knora.webapi.messages.v2.responder.ontologymessages.EntityInfoGetRequestV2 import org.knora.webapi.messages.v2.responder.ontologymessages.EntityInfoGetResponseV2 import org.knora.webapi.messages.v2.responder.ontologymessages.ReadClassInfoV2 import org.knora.webapi.messages.v2.responder.ontologymessages.ReadPropertyInfoV2 -import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.messages.v2.responder.resourcemessages._ import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.User import org.knora.webapi.slice.ontology.repo.service.OntologyCache @@ -57,7 +57,7 @@ import org.knora.webapi.slice.resourceinfo.domain.IriConverter import org.knora.webapi.store.triplestore.api.TriplestoreService import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.Construct import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.Select -import org.knora.webapi.util.ApacheLuceneSupport.* +import org.knora.webapi.util.ApacheLuceneSupport._ /** * Represents the number of resources found by a search query. diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/StandoffResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/StandoffResponderV2.scala index e85f1a984b..237ce34344 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/StandoffResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/StandoffResponderV2.scala @@ -7,9 +7,9 @@ package org.knora.webapi.responders.v2 import com.typesafe.scalalogging.LazyLogging import org.xml.sax.SAXException -import zio.* +import zio._ -import java.io.* +import java.io._ import java.util.UUID import javax.xml.XMLConstants import javax.xml.transform.stream.StreamSource @@ -18,17 +18,17 @@ import scala.xml.Node import scala.xml.NodeSeq import scala.xml.XML -import dsp.errors.* +import dsp.errors._ import dsp.valueobjects.Iri -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.* -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages._ import org.knora.webapi.messages.admin.responder.projectsmessages.Project import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetADM -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM._ import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileRequest import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileResponse import org.knora.webapi.messages.twirl.MappingElement @@ -39,13 +39,13 @@ import org.knora.webapi.messages.util.ConstructResponseUtilV2 import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2.XMLTagItem -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality._ import org.knora.webapi.messages.v2.responder.ontologymessages.ReadClassInfoV2 import org.knora.webapi.messages.v2.responder.ontologymessages.StandoffEntityInfoGetRequestV2 import org.knora.webapi.messages.v2.responder.ontologymessages.StandoffEntityInfoGetResponseV2 -import org.knora.webapi.messages.v2.responder.resourcemessages.* -import org.knora.webapi.messages.v2.responder.standoffmessages.* -import org.knora.webapi.messages.v2.responder.valuemessages.* +import org.knora.webapi.messages.v2.responder.resourcemessages._ +import org.knora.webapi.messages.v2.responder.standoffmessages._ +import org.knora.webapi.messages.v2.responder.valuemessages._ import org.knora.webapi.responders.IriLocker import org.knora.webapi.responders.Responder import org.knora.webapi.slice.admin.domain.model.User diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ValuesResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ValuesResponderV2.scala index 875ac2bc5b..7c69ea962f 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ValuesResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ValuesResponderV2.scala @@ -6,33 +6,33 @@ package org.knora.webapi.responders.v2 import org.apache.pekko.http.scaladsl.util.FastFuture -import zio.* +import zio._ import zio.macros.accessible import java.time.Instant import java.util.UUID -import dsp.errors.* +import dsp.errors._ import dsp.valueobjects.UuidUtil -import org.knora.webapi.* import org.knora.webapi.SchemaRendering.apiV2SchemaWithOption +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.* -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages._ import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionADM import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionType import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.messages.util.PermissionUtilADM -import org.knora.webapi.messages.util.PermissionUtilADM.* +import org.knora.webapi.messages.util.PermissionUtilADM._ import org.knora.webapi.messages.util.search.gravsearch.GravsearchParser import org.knora.webapi.messages.v2.responder.SuccessResponseV2 -import org.knora.webapi.messages.v2.responder.ontologymessages.* -import org.knora.webapi.messages.v2.responder.resourcemessages.* -import org.knora.webapi.messages.v2.responder.valuemessages.* +import org.knora.webapi.messages.v2.responder.ontologymessages._ +import org.knora.webapi.messages.v2.responder.resourcemessages._ +import org.knora.webapi.messages.v2.responder.valuemessages._ import org.knora.webapi.responders.IriLocker import org.knora.webapi.responders.IriService import org.knora.webapi.responders.Responder diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/CardinalityHandler.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/CardinalityHandler.scala index 7c607f495d..a1a6d7adab 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/CardinalityHandler.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/CardinalityHandler.scala @@ -5,7 +5,7 @@ package org.knora.webapi.responders.v2.ontology -import zio.* +import zio._ import java.time.Instant @@ -13,13 +13,13 @@ import dsp.errors.BadRequestException import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.InternalSchema import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.messages.v2.responder.CanDoResponseV2 -import org.knora.webapi.messages.v2.responder.ontologymessages.* +import org.knora.webapi.messages.v2.responder.ontologymessages._ import org.knora.webapi.slice.ontology.repo.model.OntologyCacheData import org.knora.webapi.slice.ontology.repo.service.OntologyCache import org.knora.webapi.slice.resourceinfo.domain.InternalIri diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpers.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpers.scala index eac457e369..ce908de234 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpers.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpers.scala @@ -5,7 +5,7 @@ package org.knora.webapi.responders.v2.ontology -import zio.* +import zio._ import zio.prelude.Validation import java.time.Instant @@ -13,26 +13,26 @@ import scala.collection.immutable import scala.util.Try import dsp.constants.SalsahGui -import dsp.errors.* -import org.knora.webapi.* +import dsp.errors._ +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.ValuesValidator -import org.knora.webapi.messages.store.triplestoremessages.* +import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.messages.util.ErrorHandlingMap import org.knora.webapi.messages.util.rdf.SparqlSelectResult import org.knora.webapi.messages.util.rdf.VariableResultsRow -import org.knora.webapi.messages.v2.responder.ontologymessages.* -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality._ +import org.knora.webapi.messages.v2.responder.ontologymessages._ import org.knora.webapi.messages.v2.responder.standoffmessages.StandoffDataTypeClasses import org.knora.webapi.responders.IriService import org.knora.webapi.slice.admin.domain.model.User -import org.knora.webapi.slice.ontology.domain.model.Cardinality.* +import org.knora.webapi.slice.ontology.domain.model.Cardinality._ import org.knora.webapi.slice.ontology.repo.model.OntologyCacheData import org.knora.webapi.slice.ontology.repo.service.OntologyCache import org.knora.webapi.store.triplestore.api.TriplestoreService diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/resources/CheckObjectClassConstraints.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/resources/CheckObjectClassConstraints.scala index 6c20218acf..81da081ec8 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/resources/CheckObjectClassConstraints.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/resources/CheckObjectClassConstraints.scala @@ -5,15 +5,15 @@ package org.knora.webapi.responders.v2.resources -import zio.* - -import dsp.errors.* -import org.knora.webapi.* -import org.knora.webapi.messages.* -import org.knora.webapi.messages.IriConversions.* -import org.knora.webapi.messages.v2.responder.ontologymessages.* -import org.knora.webapi.messages.v2.responder.resourcemessages.* -import org.knora.webapi.messages.v2.responder.valuemessages.* +import zio._ + +import dsp.errors._ +import org.knora.webapi._ +import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages._ +import org.knora.webapi.messages.v2.responder.ontologymessages._ +import org.knora.webapi.messages.v2.responder.resourcemessages._ +import org.knora.webapi.messages.v2.responder.valuemessages._ object CheckObjectClassConstraints { diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/resources/CreateResourceV2Handler.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/resources/CreateResourceV2Handler.scala index 34603d65df..f65400abf9 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/resources/CreateResourceV2Handler.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/resources/CreateResourceV2Handler.scala @@ -6,35 +6,35 @@ package org.knora.webapi.responders.v2.resources import com.typesafe.scalalogging.LazyLogging -import zio.* +import zio._ import java.time.Instant -import dsp.errors.* +import dsp.errors._ import dsp.valueobjects.Iri -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageRelay -import org.knora.webapi.messages.* -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages._ import org.knora.webapi.messages.admin.responder.permissionsmessages.DefaultObjectAccessPermissionsStringForResourceClassGetADM import org.knora.webapi.messages.admin.responder.permissionsmessages.DefaultObjectAccessPermissionsStringResponseADM import org.knora.webapi.messages.admin.responder.permissionsmessages.ResourceCreateOperation -import org.knora.webapi.messages.admin.responder.projectsmessages.* +import org.knora.webapi.messages.admin.responder.projectsmessages._ import org.knora.webapi.messages.twirl.SparqlTemplateResourceToCreate import org.knora.webapi.messages.twirl.queries.sparql -import org.knora.webapi.messages.util.* import org.knora.webapi.messages.util.PermissionUtilADM.AGreaterThanB import org.knora.webapi.messages.util.PermissionUtilADM.PermissionComparisonResult +import org.knora.webapi.messages.util._ import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 -import org.knora.webapi.messages.v2.responder.ontologymessages.* -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* -import org.knora.webapi.messages.v2.responder.resourcemessages.* +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality._ +import org.knora.webapi.messages.v2.responder.ontologymessages._ import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceRequestV2.AssetIngestState -import org.knora.webapi.messages.v2.responder.valuemessages.* +import org.knora.webapi.messages.v2.responder.resourcemessages._ +import org.knora.webapi.messages.v2.responder.valuemessages._ import org.knora.webapi.responders.IriLocker import org.knora.webapi.responders.IriService -import org.knora.webapi.responders.v2.* +import org.knora.webapi.responders.v2._ import org.knora.webapi.responders.v2.resources.CheckObjectClassConstraints import org.knora.webapi.slice.admin.domain.model.User import org.knora.webapi.slice.admin.domain.service.ProjectService diff --git a/webapi/src/main/scala/org/knora/webapi/routing/ApiRoutes.scala b/webapi/src/main/scala/org/knora/webapi/routing/ApiRoutes.scala index 7b5d5f808b..092ad0fc69 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/ApiRoutes.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/ApiRoutes.scala @@ -8,10 +8,10 @@ package org.knora.webapi.routing import org.apache.pekko.actor.ActorSystem import org.apache.pekko.http.cors.scaladsl.CorsDirectives import org.apache.pekko.http.cors.scaladsl.settings.CorsSettings -import org.apache.pekko.http.scaladsl.model.HttpMethods.* -import org.apache.pekko.http.scaladsl.server.Directives.* +import org.apache.pekko.http.scaladsl.model.HttpMethods._ +import org.apache.pekko.http.scaladsl.server.Directives._ import org.apache.pekko.http.scaladsl.server.Route -import zio.* +import zio._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core @@ -23,7 +23,7 @@ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.responders.v2.SearchResponderV2 import org.knora.webapi.responders.v2.ValuesResponderV2 import org.knora.webapi.routing -import org.knora.webapi.routing.v2.* +import org.knora.webapi.routing.v2._ import org.knora.webapi.slice.admin.api.AdminApiRoutes import org.knora.webapi.slice.admin.domain.service.UserService import org.knora.webapi.slice.common.api.AuthorizationRestService diff --git a/webapi/src/main/scala/org/knora/webapi/routing/AroundDirectives.scala b/webapi/src/main/scala/org/knora/webapi/routing/AroundDirectives.scala index c8487d68f6..0e3a00a39f 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/AroundDirectives.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/AroundDirectives.scala @@ -13,7 +13,7 @@ import org.apache.pekko.http.scaladsl.model.StatusCodes.NotFound import org.slf4j.LoggerFactory import pekko.http.scaladsl.server.Directive0 -import pekko.http.scaladsl.server.Directives.* +import pekko.http.scaladsl.server.Directives._ /** * Pekko HTTP directives which can be wrapped around a [[pekko.http.scaladsl.server.Route]]]. diff --git a/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala b/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala index 0f4ada8139..c0ee86b15c 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala @@ -6,14 +6,14 @@ package org.knora.webapi.routing import org.apache.commons.codec.binary.Base32 -import org.apache.pekko.http.scaladsl.model.* +import org.apache.pekko.http.scaladsl.model._ import org.apache.pekko.http.scaladsl.model.headers import org.apache.pekko.http.scaladsl.model.headers.HttpCookie import org.apache.pekko.http.scaladsl.model.headers.HttpCookiePair import org.apache.pekko.http.scaladsl.server.RequestContext import org.apache.pekko.util.ByteString -import spray.json.* -import zio.* +import spray.json._ +import zio._ import zio.macros.accessible import java.util.Base64 @@ -22,12 +22,12 @@ import dsp.errors.AuthenticationException import dsp.errors.BadCredentialsException import org.knora.webapi.config.AppConfig import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.admin.responder.usersmessages.* +import org.knora.webapi.messages.admin.responder.usersmessages._ import org.knora.webapi.messages.util.KnoraSystemInstances -import org.knora.webapi.messages.v2.routing.authenticationmessages.* import org.knora.webapi.messages.v2.routing.authenticationmessages.KnoraCredentialsV2.KnoraJWTTokenCredentialsV2 import org.knora.webapi.messages.v2.routing.authenticationmessages.KnoraCredentialsV2.KnoraPasswordCredentialsV2 import org.knora.webapi.messages.v2.routing.authenticationmessages.KnoraCredentialsV2.KnoraSessionCredentialsV2 +import org.knora.webapi.messages.v2.routing.authenticationmessages._ import org.knora.webapi.routing.Authenticator.AUTHENTICATION_INVALIDATION_CACHE_NAME import org.knora.webapi.routing.Authenticator.BAD_CRED_NONE_SUPPLIED import org.knora.webapi.routing.Authenticator.BAD_CRED_NOT_VALID diff --git a/webapi/src/main/scala/org/knora/webapi/routing/KnoraRoute.scala b/webapi/src/main/scala/org/knora/webapi/routing/KnoraRoute.scala index 9df7183ff4..553a98ba13 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/KnoraRoute.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/KnoraRoute.scala @@ -7,7 +7,7 @@ package org.knora.webapi.routing import com.typesafe.scalalogging.Logger import org.apache.pekko -import zio.* +import zio._ import zio.prelude.Validation import scala.concurrent.ExecutionContext diff --git a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilADM.scala b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilADM.scala index 6eba756653..d0bf8e75e6 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilADM.scala @@ -5,13 +5,13 @@ package org.knora.webapi.routing -import org.apache.pekko.http.scaladsl.model.* import org.apache.pekko.http.scaladsl.model.ContentTypes.`application/json` import org.apache.pekko.http.scaladsl.model.StatusCodes.OK +import org.apache.pekko.http.scaladsl.model._ import org.apache.pekko.http.scaladsl.server.RequestContext import org.apache.pekko.http.scaladsl.server.RouteResult import org.apache.pekko.util.ByteString -import zio.* +import zio._ import java.util.UUID import scala.concurrent.Future @@ -24,9 +24,9 @@ import org.knora.webapi.core.MessageRelay import org.knora.webapi.messages.ResponderRequest.KnoraRequestADM import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.KnoraResponseADM -import org.knora.webapi.messages.admin.responder.groupsmessages.* -import org.knora.webapi.messages.admin.responder.projectsmessages.* -import org.knora.webapi.messages.admin.responder.usersmessages.* +import org.knora.webapi.messages.admin.responder.groupsmessages._ +import org.knora.webapi.messages.admin.responder.projectsmessages._ +import org.knora.webapi.messages.admin.responder.usersmessages._ import org.knora.webapi.slice.admin.domain.model.Group import org.knora.webapi.slice.admin.domain.model.User diff --git a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV2.scala index 25d935cb36..51c87e441f 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV2.scala @@ -5,17 +5,17 @@ package org.knora.webapi.routing -import org.apache.pekko.http.scaladsl.model.* +import org.apache.pekko.http.scaladsl.model._ import org.apache.pekko.http.scaladsl.server.RequestContext import org.apache.pekko.http.scaladsl.server.RouteResult -import zio.* +import zio._ import zio.prelude.Validation import scala.concurrent.Future import scala.util.control.Exception.catching import dsp.errors.BadRequestException -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageRelay import org.knora.webapi.messages.ResponderRequest.KnoraRequestV2 diff --git a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilZ.scala b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilZ.scala index e5a58d73bd..3f2c44ec98 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilZ.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilZ.scala @@ -6,7 +6,7 @@ package org.knora.webapi.routing import org.apache.pekko -import zio.* +import zio._ import java.net.URLDecoder import java.util.UUID diff --git a/webapi/src/main/scala/org/knora/webapi/routing/UnsafeZioRun.scala b/webapi/src/main/scala/org/knora/webapi/routing/UnsafeZioRun.scala index 6a1b6ccf4e..4a8d5506fb 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/UnsafeZioRun.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/UnsafeZioRun.scala @@ -5,7 +5,7 @@ package org.knora.webapi.routing -import zio.* +import zio._ import scala.concurrent.Future diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/AuthenticationRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/AuthenticationRouteV2.scala index df1e8ef5c0..f06642b3e5 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/AuthenticationRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/AuthenticationRouteV2.scala @@ -5,9 +5,9 @@ package org.knora.webapi.routing.v2 -import org.apache.pekko.http.scaladsl.server.Directives.* +import org.apache.pekko.http.scaladsl.server.Directives._ import org.apache.pekko.http.scaladsl.server.Route -import zio.* +import zio._ import dsp.errors.BadRequestException import org.knora.webapi.messages.v2.routing.authenticationmessages.AuthenticationV2JsonProtocol diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/ListsRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/ListsRouteV2.scala index c42cc9e389..ec7fbfbac5 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/ListsRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/ListsRouteV2.scala @@ -6,7 +6,7 @@ package org.knora.webapi.routing.v2 import org.apache.pekko -import zio.* +import zio._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageRelay @@ -17,7 +17,7 @@ import org.knora.webapi.routing.Authenticator import org.knora.webapi.routing.RouteUtilV2 import org.knora.webapi.routing.RouteUtilZ -import pekko.http.scaladsl.server.Directives.* +import pekko.http.scaladsl.server.Directives._ import pekko.http.scaladsl.server.Route /** diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/OntologiesRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/OntologiesRouteV2.scala index cdce70605e..6e95c1309d 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/OntologiesRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/OntologiesRouteV2.scala @@ -5,11 +5,11 @@ package org.knora.webapi.routing.v2 -import org.apache.pekko.http.scaladsl.server.Directives.* +import org.apache.pekko.http.scaladsl.server.Directives._ import org.apache.pekko.http.scaladsl.server.PathMatcher import org.apache.pekko.http.scaladsl.server.RequestContext import org.apache.pekko.http.scaladsl.server.Route -import zio.* +import zio._ import zio.prelude.Validation import java.time.Instant @@ -18,10 +18,10 @@ import dsp.constants.SalsahGui import dsp.errors.BadRequestException import dsp.errors.ValidationException import dsp.valueobjects.CreatePropertyCommand -import dsp.valueobjects.Iri.* +import dsp.valueobjects.Iri._ import dsp.valueobjects.LangString -import dsp.valueobjects.Schema.* -import org.knora.webapi.* +import dsp.valueobjects.Schema._ +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageRelay import org.knora.webapi.messages.OntologyConstants @@ -31,7 +31,7 @@ import org.knora.webapi.messages.ValuesValidator import org.knora.webapi.messages.store.triplestoremessages.SmartIriLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.messages.util.rdf.JsonLDDocument -import org.knora.webapi.messages.v2.responder.ontologymessages.* +import org.knora.webapi.messages.v2.responder.ontologymessages._ import org.knora.webapi.routing.Authenticator import org.knora.webapi.routing.RouteUtilV2 import org.knora.webapi.routing.RouteUtilV2.completeResponse diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/ResourcesRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/ResourcesRouteV2.scala index 85efc4f68f..2336b5d57c 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/ResourcesRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/ResourcesRouteV2.scala @@ -6,17 +6,17 @@ package org.knora.webapi.routing.v2 import com.typesafe.scalalogging.LazyLogging -import org.apache.pekko.http.scaladsl.server.Directives.* +import org.apache.pekko.http.scaladsl.server.Directives._ import org.apache.pekko.http.scaladsl.server.PathMatcher import org.apache.pekko.http.scaladsl.server.Route -import zio.* import zio.ZIO +import zio._ import java.time.Instant import dsp.errors.BadRequestException import dsp.valueobjects.Iri -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.config.GraphRoute import org.knora.webapi.config.Sipi @@ -27,10 +27,10 @@ import org.knora.webapi.messages.ValuesValidator import org.knora.webapi.messages.ValuesValidator.arkTimestampToInstant import org.knora.webapi.messages.ValuesValidator.xsdDateTimeStampToInstant import org.knora.webapi.messages.util.rdf.JsonLDUtil -import org.knora.webapi.messages.v2.responder.resourcemessages.* import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceRequestV2.AssetIngestState.AssetInTemp import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceRequestV2.AssetIngestState.AssetIngested -import org.knora.webapi.messages.v2.responder.valuemessages.* +import org.knora.webapi.messages.v2.responder.resourcemessages._ +import org.knora.webapi.messages.v2.responder.valuemessages._ import org.knora.webapi.responders.v2.SearchResponderV2 import org.knora.webapi.routing.Authenticator import org.knora.webapi.routing.RouteUtilV2 diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/StandoffRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/StandoffRouteV2.scala index 90b46273f0..52daa7d3cd 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/StandoffRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/StandoffRouteV2.scala @@ -12,7 +12,7 @@ import zio.ZIO import scala.concurrent.ExecutionContext import scala.concurrent.Future -import scala.concurrent.duration.* +import scala.concurrent.duration._ import dsp.errors.BadRequestException import org.knora.webapi.config.AppConfig @@ -30,7 +30,7 @@ import org.knora.webapi.slice.resourceinfo.domain.IriConverter import pekko.actor.ActorSystem import pekko.http.scaladsl.model.Multipart import pekko.http.scaladsl.model.Multipart.BodyPart -import pekko.http.scaladsl.server.Directives.* +import pekko.http.scaladsl.server.Directives._ import pekko.http.scaladsl.server.Route /** diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/ValuesRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/ValuesRouteV2.scala index 37bef3cdf7..29252861c5 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/ValuesRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/ValuesRouteV2.scala @@ -5,20 +5,20 @@ package org.knora.webapi.routing.v2 -import org.apache.pekko.http.scaladsl.server.Directives.* +import org.apache.pekko.http.scaladsl.server.Directives._ import org.apache.pekko.http.scaladsl.server.PathMatcher import org.apache.pekko.http.scaladsl.server.Route -import zio.* +import zio._ import dsp.errors.BadRequestException -import org.knora.webapi.* +import org.knora.webapi._ import org.knora.webapi.config.AppConfig import org.knora.webapi.core.MessageRelay import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.ValuesValidator import org.knora.webapi.messages.v2.responder.resourcemessages.CreateResourceRequestV2.AssetIngestState import org.knora.webapi.messages.v2.responder.resourcemessages.ResourcesGetRequestV2 -import org.knora.webapi.messages.v2.responder.valuemessages.* +import org.knora.webapi.messages.v2.responder.valuemessages._ import org.knora.webapi.responders.v2.ValuesResponderV2 import org.knora.webapi.routing.Authenticator import org.knora.webapi.routing.RouteUtilV2 diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/AdminModule.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/AdminModule.scala index 198009acae..dc39cf7d31 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/AdminModule.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/AdminModule.scala @@ -10,12 +10,12 @@ import zio.ZLayer import org.knora.webapi.config.AppConfig import org.knora.webapi.responders.IriService import org.knora.webapi.slice.admin.domain.AdminDomainModule -import org.knora.webapi.slice.admin.domain.service.* import org.knora.webapi.slice.admin.domain.service.GroupService import org.knora.webapi.slice.admin.domain.service.KnoraGroupService import org.knora.webapi.slice.admin.domain.service.KnoraProjectService import org.knora.webapi.slice.admin.domain.service.PasswordService import org.knora.webapi.slice.admin.domain.service.ProjectService +import org.knora.webapi.slice.admin.domain.service._ import org.knora.webapi.slice.admin.repo.AdminRepoModule import org.knora.webapi.slice.common.repo.service.PredicateObjectMapper import org.knora.webapi.slice.ontology.domain.service.OntologyRepo diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminApiModule.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminApiModule.scala index 66aecaf4b8..faba52e75d 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminApiModule.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminApiModule.scala @@ -29,8 +29,8 @@ import org.knora.webapi.slice.admin.domain.service.ProjectExportService import org.knora.webapi.slice.admin.domain.service.ProjectImportService import org.knora.webapi.slice.admin.domain.service.ProjectService import org.knora.webapi.slice.admin.domain.service.UserService -import org.knora.webapi.slice.common.api.* import org.knora.webapi.slice.common.api.KnoraResponseRenderer +import org.knora.webapi.slice.common.api._ import org.knora.webapi.slice.ontology.repo.service.OntologyCache import org.knora.webapi.store.cache.CacheService import org.knora.webapi.store.triplestore.api.TriplestoreService diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminPathVariables.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminPathVariables.scala index 06517b7dad..d710d4e30f 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminPathVariables.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminPathVariables.scala @@ -5,8 +5,8 @@ package org.knora.webapi.slice.admin.api -import sttp.tapir.* import sttp.tapir.CodecFormat.TextPlain +import sttp.tapir._ import dsp.errors.BadRequestException import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.IriIdentifier diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/Codecs.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/Codecs.scala index db73f9becb..80c01a1bae 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/Codecs.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/Codecs.scala @@ -11,8 +11,7 @@ import zio.json.JsonCodec import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.slice.admin.api.model.MaintenanceRequests.AssetId -import org.knora.webapi.slice.admin.domain.model.* -import org.knora.webapi.slice.admin.domain.model.KnoraProject.* +import org.knora.webapi.slice.admin.domain.model.KnoraProject._ import org.knora.webapi.slice.admin.domain.model.ListProperties.Comments import org.knora.webapi.slice.admin.domain.model.ListProperties.Labels import org.knora.webapi.slice.admin.domain.model.ListProperties.ListIri @@ -24,6 +23,7 @@ import org.knora.webapi.slice.admin.domain.model.SystemAdmin import org.knora.webapi.slice.admin.domain.model.UserIri import org.knora.webapi.slice.admin.domain.model.UserStatus import org.knora.webapi.slice.admin.domain.model.Username +import org.knora.webapi.slice.admin.domain.model._ import org.knora.webapi.slice.common.Value.BooleanValue import org.knora.webapi.slice.common.Value.IntValue import org.knora.webapi.slice.common.Value.StringValue diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/FilesEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/FilesEndpoints.scala index 6b86a9be11..fdfcb4ebe6 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/FilesEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/FilesEndpoints.scala @@ -5,8 +5,8 @@ package org.knora.webapi.slice.admin.api -import sttp.tapir.* import sttp.tapir.EndpointInput.PathCapture +import sttp.tapir._ import sttp.tapir.generic.auto.schemaForCaseClass import sttp.tapir.json.zio.jsonBody import zio.ZLayer diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/GroupsEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/GroupsEndpoints.scala index f36a096da6..0dcf20fc86 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/GroupsEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/GroupsEndpoints.scala @@ -5,23 +5,23 @@ package org.knora.webapi.slice.admin.api -import sttp.tapir.* -import sttp.tapir.generic.auto.* -import sttp.tapir.json.spray.jsonBody as sprayJsonBody -import sttp.tapir.json.zio.jsonBody as zioJsonBody -import zio.* +import sttp.tapir._ +import sttp.tapir.generic.auto._ +import sttp.tapir.json.spray.{jsonBody => sprayJsonBody} +import sttp.tapir.json.zio.{jsonBody => zioJsonBody} +import zio._ import zio.json.DeriveJsonCodec import zio.json.JsonCodec -import org.knora.webapi.messages.admin.responder.groupsmessages.* +import org.knora.webapi.messages.admin.responder.groupsmessages._ import org.knora.webapi.messages.admin.responder.usersmessages.GroupMembersGetResponseADM -import org.knora.webapi.messages.admin.responder.usersmessages.UsersADMJsonProtocol.* +import org.knora.webapi.messages.admin.responder.usersmessages.UsersADMJsonProtocol._ import org.knora.webapi.slice.admin.api.AdminPathVariables.groupIriPathVar import org.knora.webapi.slice.admin.api.GroupsRequests.GroupCreateRequest import org.knora.webapi.slice.admin.api.GroupsRequests.GroupStatusUpdateRequest import org.knora.webapi.slice.admin.api.GroupsRequests.GroupUpdateRequest -import org.knora.webapi.slice.admin.domain.model.* -import org.knora.webapi.slice.admin.domain.model.KnoraProject.* +import org.knora.webapi.slice.admin.domain.model.KnoraProject._ +import org.knora.webapi.slice.admin.domain.model._ import org.knora.webapi.slice.common.api.BaseEndpoints final case class GroupsEndpoints(baseEndpoints: BaseEndpoints) { diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ListsEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ListsEndpoints.scala index 738c168b07..e76f40cdda 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ListsEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ListsEndpoints.scala @@ -5,15 +5,15 @@ package org.knora.webapi.slice.admin.api -import sttp.tapir.* -import sttp.tapir.generic.auto.* -import sttp.tapir.json.spray.jsonBody as sprayJsonBody -import sttp.tapir.json.zio.jsonBody as zioJsonBody +import sttp.tapir._ +import sttp.tapir.generic.auto._ +import sttp.tapir.json.spray.{jsonBody => sprayJsonBody} +import sttp.tapir.json.zio.{jsonBody => zioJsonBody} import zio.ZLayer import zio.json.DeriveJsonCodec import zio.json.JsonCodec -import org.knora.webapi.messages.admin.responder.listsmessages.* +import org.knora.webapi.messages.admin.responder.listsmessages._ import org.knora.webapi.slice.admin.api.Requests.ListChangeCommentsRequest import org.knora.webapi.slice.admin.api.Requests.ListChangeLabelsRequest import org.knora.webapi.slice.admin.api.Requests.ListChangeNameRequest @@ -23,7 +23,7 @@ import org.knora.webapi.slice.admin.api.Requests.ListCreateChildNodeRequest import org.knora.webapi.slice.admin.api.Requests.ListCreateRootNodeRequest import org.knora.webapi.slice.admin.api.model.AdminQueryVariables import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri -import org.knora.webapi.slice.admin.domain.model.ListProperties.* +import org.knora.webapi.slice.admin.domain.model.ListProperties._ import org.knora.webapi.slice.common.api.BaseEndpoints case class ListsEndpoints(baseEndpoints: BaseEndpoints) extends ListADMJsonProtocol { diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ListsEndpointsHandlers.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ListsEndpointsHandlers.scala index 46495cbb79..42da8223e0 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ListsEndpointsHandlers.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ListsEndpointsHandlers.scala @@ -19,7 +19,7 @@ import org.knora.webapi.messages.admin.responder.listsmessages.ListNodeCommentsD import org.knora.webapi.messages.admin.responder.listsmessages.NodeInfoGetResponseADM import org.knora.webapi.messages.admin.responder.listsmessages.NodePositionChangeResponseADM import org.knora.webapi.responders.admin.ListsResponder -import org.knora.webapi.slice.admin.api.Requests.* +import org.knora.webapi.slice.admin.api.Requests._ import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.ListProperties.ListIri import org.knora.webapi.slice.admin.domain.model.User diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/MaintenanceEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/MaintenanceEndpoints.scala index e67320e417..06654ba09f 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/MaintenanceEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/MaintenanceEndpoints.scala @@ -6,9 +6,9 @@ package org.knora.webapi.slice.admin.api import sttp.model.StatusCode -import sttp.tapir.* -import sttp.tapir.generic.auto.* -import sttp.tapir.json.zio.jsonBody as zioJsonBody +import sttp.tapir._ +import sttp.tapir.generic.auto._ +import sttp.tapir.json.zio.{jsonBody => zioJsonBody} import zio.ZLayer import zio.json.ast.Json diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/PermissionsEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/PermissionsEndpoints.scala index f2920bda35..88874b1326 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/PermissionsEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/PermissionsEndpoints.scala @@ -5,12 +5,12 @@ package org.knora.webapi.slice.admin.api -import sttp.tapir.* -import sttp.tapir.generic.auto.* -import sttp.tapir.json.spray.jsonBody as sprayJsonBody +import sttp.tapir._ +import sttp.tapir.generic.auto._ +import sttp.tapir.json.spray.{jsonBody => sprayJsonBody} import zio.ZLayer -import org.knora.webapi.messages.admin.responder.permissionsmessages.* +import org.knora.webapi.messages.admin.responder.permissionsmessages._ import org.knora.webapi.slice.admin.api.AdminPathVariables.groupIriPathVar import org.knora.webapi.slice.admin.api.AdminPathVariables.permissionIri import org.knora.webapi.slice.admin.api.AdminPathVariables.projectIri diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpoints.scala index 7f31162442..db94286781 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpoints.scala @@ -7,14 +7,14 @@ package org.knora.webapi.slice.admin.api import sttp.capabilities.pekko.PekkoStreams import sttp.model.StatusCode -import sttp.tapir.* -import sttp.tapir.generic.auto.* -import sttp.tapir.json.spray.jsonBody as sprayJsonBody -import sttp.tapir.json.zio.jsonBody as zioJsonBody +import sttp.tapir._ +import sttp.tapir.generic.auto._ +import sttp.tapir.json.spray.{jsonBody => sprayJsonBody} +import sttp.tapir.json.zio.{jsonBody => zioJsonBody} import zio.Chunk import zio.ZLayer -import org.knora.webapi.messages.admin.responder.projectsmessages.* +import org.knora.webapi.messages.admin.responder.projectsmessages._ import org.knora.webapi.slice.admin.api.AdminPathVariables.projectIri import org.knora.webapi.slice.admin.api.AdminPathVariables.projectShortcode import org.knora.webapi.slice.admin.api.AdminPathVariables.projectShortname diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpointsHandler.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpointsHandler.scala index 6d0640e2a5..a9c585c399 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpointsHandler.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/ProjectsEndpointsHandler.scala @@ -11,10 +11,10 @@ import zio.ZLayer import java.nio.file.Files import scala.concurrent.ExecutionContext -import org.knora.webapi.messages.admin.responder.projectsmessages.* import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.IriIdentifier import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.ShortcodeIdentifier import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.ShortnameIdentifier +import org.knora.webapi.messages.admin.responder.projectsmessages._ import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.ProjectCreateRequest import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.ProjectUpdateRequest import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.RestrictedViewResponse diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/StoreEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/StoreEndpoints.scala index 1902ffac45..468e61fcaf 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/StoreEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/StoreEndpoints.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.admin.api -import sttp.tapir.* +import sttp.tapir._ import sttp.tapir.generic.auto.schemaForCaseClass import sttp.tapir.json.zio.jsonBody import zio.ZLayer diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/UsersEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/UsersEndpoints.scala index c3fc04ce08..a402ed387f 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/UsersEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/UsersEndpoints.scala @@ -5,11 +5,11 @@ package org.knora.webapi.slice.admin.api -import sttp.tapir.* -import sttp.tapir.generic.auto.* -import sttp.tapir.json.spray.jsonBody as sprayJsonBody -import sttp.tapir.json.zio.jsonBody as zioJsonBody -import zio.* +import sttp.tapir._ +import sttp.tapir.generic.auto._ +import sttp.tapir.json.spray.{jsonBody => sprayJsonBody} +import sttp.tapir.json.zio.{jsonBody => zioJsonBody} +import zio._ import zio.json.DeriveJsonCodec import zio.json.JsonCodec @@ -18,7 +18,7 @@ import org.knora.webapi.messages.admin.responder.usersmessages.UserGroupMembersh import org.knora.webapi.messages.admin.responder.usersmessages.UserProjectAdminMembershipsGetResponseADM import org.knora.webapi.messages.admin.responder.usersmessages.UserProjectMembershipsGetResponseADM import org.knora.webapi.messages.admin.responder.usersmessages.UserResponseADM -import org.knora.webapi.messages.admin.responder.usersmessages.UsersADMJsonProtocol.* +import org.knora.webapi.messages.admin.responder.usersmessages.UsersADMJsonProtocol._ import org.knora.webapi.messages.admin.responder.usersmessages.UsersGetResponseADM import org.knora.webapi.slice.admin.api.PathVars.emailPathVar import org.knora.webapi.slice.admin.api.PathVars.userIriPathVar diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/MaintenanceRequests.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/MaintenanceRequests.scala index a8f8e0cffb..f00918f558 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/MaintenanceRequests.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/MaintenanceRequests.scala @@ -13,9 +13,9 @@ import eu.timepit.refined.string.MatchesRegex import zio.Chunk import zio.json.DeriveJsonCodec import zio.json.JsonCodec -import zio.json.interop.refined.* +import zio.json.interop.refined._ -import org.knora.webapi.slice.admin.api.Codecs.ZioJsonCodec.* +import org.knora.webapi.slice.admin.api.Codecs.ZioJsonCodec._ import org.knora.webapi.slice.admin.domain.model.KnoraProject.Shortcode object MaintenanceRequests { diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/ProjectsEndpointsRequestsAndResponses.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/ProjectsEndpointsRequestsAndResponses.scala index 89b8bce775..da2a697355 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/ProjectsEndpointsRequestsAndResponses.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/ProjectsEndpointsRequestsAndResponses.scala @@ -11,8 +11,8 @@ import zio.json.DeriveJsonCodec import zio.json.JsonCodec import dsp.errors.BadRequestException -import org.knora.webapi.slice.admin.api.Codecs.ZioJsonCodec.* -import org.knora.webapi.slice.admin.domain.model.KnoraProject.* +import org.knora.webapi.slice.admin.api.Codecs.ZioJsonCodec._ +import org.knora.webapi.slice.admin.domain.model.KnoraProject._ import org.knora.webapi.slice.admin.domain.model.RestrictedView object ProjectsEndpointsRequestsAndResponses { diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/GroupsRestService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/GroupsRestService.scala index db5cf8198a..2912217030 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/GroupsRestService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/GroupsRestService.scala @@ -5,10 +5,10 @@ package org.knora.webapi.slice.admin.api.service -import zio.* +import zio._ import dsp.errors.NotFoundException -import org.knora.webapi.messages.admin.responder.groupsmessages.* +import org.knora.webapi.messages.admin.responder.groupsmessages._ import org.knora.webapi.messages.admin.responder.usersmessages.GroupMembersGetResponseADM import org.knora.webapi.responders.admin.GroupsResponderADM import org.knora.webapi.slice.admin.api.GroupsRequests.GroupCreateRequest diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/ProjectRestService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/ProjectRestService.scala index f2cfdd6091..2170537507 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/ProjectRestService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/ProjectRestService.scala @@ -5,11 +5,11 @@ package org.knora.webapi.slice.admin.api.service -import zio.* +import zio._ import dsp.errors.NotFoundException -import org.knora.webapi.messages.admin.responder.projectsmessages.* -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._ import org.knora.webapi.responders.admin.ProjectsResponderADM import org.knora.webapi.slice.admin.api.model.ProjectDataGetResponseADM import org.knora.webapi.slice.admin.api.model.ProjectExportInfoResponse diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/StoreRestService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/StoreRestService.scala index 3a94b8de5e..ea4a8e7432 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/StoreRestService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/StoreRestService.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.admin.api.service -import zio.* +import zio._ import dsp.errors.ForbiddenException import org.knora.webapi.config.AppConfig diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/UsersRestService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/UsersRestService.scala index 9923872c83..3920c09111 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/UsersRestService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/UsersRestService.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.admin.api.service -import zio.* +import zio._ import dsp.errors.BadRequestException import dsp.errors.ForbiddenException diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/AdminDomainModule.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/AdminDomainModule.scala index 6f8dff70e5..bb53eef673 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/AdminDomainModule.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/AdminDomainModule.scala @@ -9,12 +9,12 @@ import zio.ZLayer import org.knora.webapi.config.AppConfig import org.knora.webapi.responders.IriService -import org.knora.webapi.slice.admin.domain.service.* import org.knora.webapi.slice.admin.domain.service.GroupService import org.knora.webapi.slice.admin.domain.service.KnoraGroupService.KnoraGroupService import org.knora.webapi.slice.admin.domain.service.KnoraProjectService import org.knora.webapi.slice.admin.domain.service.PasswordService import org.knora.webapi.slice.admin.domain.service.ProjectService +import org.knora.webapi.slice.admin.domain.service._ import org.knora.webapi.slice.admin.repo.AdminRepoModule import org.knora.webapi.slice.common.repo.service.PredicateObjectMapper import org.knora.webapi.slice.ontology.domain.service.OntologyRepo diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/KnoraProject.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/KnoraProject.scala index aaf0ab293c..1071fc5daf 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/KnoraProject.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/KnoraProject.scala @@ -14,7 +14,7 @@ import dsp.valueobjects.Iri.validateAndEscapeProjectIri import dsp.valueobjects.IriErrorMessages import dsp.valueobjects.UuidUtil import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 -import org.knora.webapi.slice.admin.domain.model.KnoraProject.* +import org.knora.webapi.slice.admin.domain.model.KnoraProject._ import org.knora.webapi.slice.common.StringValueCompanion import org.knora.webapi.slice.common.Value import org.knora.webapi.slice.common.Value.BooleanValue diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/MaintenanceService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/MaintenanceService.scala index 50e4eb77ce..f27fde771d 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/MaintenanceService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/MaintenanceService.scala @@ -11,7 +11,7 @@ import zio.ZIO import zio.ZLayer import zio.stream.ZStream -import org.knora.webapi.slice.admin.api.model.MaintenanceRequests.* +import org.knora.webapi.slice.admin.api.model.MaintenanceRequests._ import org.knora.webapi.slice.admin.domain.model.KnoraProject import org.knora.webapi.slice.common.repo.service.PredicateObjectMapper import org.knora.webapi.slice.resourceinfo.domain.InternalIri diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectExportService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectExportService.scala index fa3cf7c027..78f801da27 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectExportService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectExportService.scala @@ -23,7 +23,7 @@ import zio.nio.file.Path import java.io.OutputStream import scala.collection.mutable -import org.knora.webapi.messages.twirl.queries.* +import org.knora.webapi.messages.twirl.queries._ import org.knora.webapi.messages.util.rdf.TriG import org.knora.webapi.slice.admin.AdminConstants.adminDataNamedGraph import org.knora.webapi.slice.admin.AdminConstants.permissionsDataNamedGraph diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectExportStorageService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectExportStorageService.scala index a0b3bb329b..7937fc5c38 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectExportStorageService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectExportStorageService.scala @@ -5,8 +5,8 @@ package org.knora.webapi.slice.admin.domain.service -import zio.* -import zio.nio.file.* +import zio._ +import zio.nio.file._ import org.knora.webapi.config.AppConfig import org.knora.webapi.slice.admin.domain.model.KnoraProject diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectImportService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectImportService.scala index 0de57fe9a1..3c9aa95ab6 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectImportService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectImportService.scala @@ -9,7 +9,7 @@ import org.apache.jena.query.QueryExecution import org.apache.jena.query.ResultSet import org.apache.jena.rdfconnection.RDFConnection import org.apache.jena.rdfconnection.RDFConnectionFuseki -import zio.* +import zio._ import zio.http.URL import zio.macros.accessible import zio.nio.file.Files diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectService.scala index f633fd8450..d8fc34e96f 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectService.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.admin.domain.service -import zio.* +import zio._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.admin.responder.projectsmessages.Project @@ -13,7 +13,7 @@ import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentif import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectKeywordsGetResponse import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectsKeywordsGetResponse import org.knora.webapi.slice.admin.domain.model.KnoraProject -import org.knora.webapi.slice.admin.domain.model.KnoraProject.* +import org.knora.webapi.slice.admin.domain.model.KnoraProject._ import org.knora.webapi.slice.admin.domain.model.RestrictedView import org.knora.webapi.slice.ontology.domain.service.OntologyRepo import org.knora.webapi.slice.resourceinfo.domain.InternalIri diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ZipUtility.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ZipUtility.scala index 96432f4d54..39b9fe1cfc 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ZipUtility.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ZipUtility.scala @@ -5,8 +5,8 @@ package org.knora.webapi.slice.admin.domain.service -import zio.* -import zio.nio.file.* +import zio._ +import zio.nio.file._ import java.util.zip.ZipEntry import java.util.zip.ZipInputStream diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/rdf/RdfConversions.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/rdf/RdfConversions.scala index 52fc198604..b11f5d5c05 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/rdf/RdfConversions.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/rdf/RdfConversions.scala @@ -11,7 +11,7 @@ import org.knora.webapi.slice.admin.domain.model.Email import org.knora.webapi.slice.admin.domain.model.FamilyName import org.knora.webapi.slice.admin.domain.model.GivenName import org.knora.webapi.slice.admin.domain.model.GroupIri -import org.knora.webapi.slice.admin.domain.model.KnoraProject.* +import org.knora.webapi.slice.admin.domain.model.KnoraProject._ import org.knora.webapi.slice.admin.domain.model.PasswordHash import org.knora.webapi.slice.admin.domain.model.SystemAdmin import org.knora.webapi.slice.admin.domain.model.UserStatus diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLive.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLive.scala index f5f5cb80d7..9bf4e4a581 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLive.scala @@ -5,10 +5,10 @@ package org.knora.webapi.slice.admin.repo.service -import org.eclipse.rdf4j.model.vocabulary.* import org.eclipse.rdf4j.model.vocabulary.RDF -import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.`var` as variable +import org.eclipse.rdf4j.model.vocabulary._ import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.prefix +import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.{`var` => variable} import org.eclipse.rdf4j.sparqlbuilder.core.query.ConstructQuery import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery import org.eclipse.rdf4j.sparqlbuilder.core.query.Queries @@ -23,11 +23,11 @@ import zio.stream.ZStream import org.knora.webapi.messages.OntologyConstants.KnoraAdmin import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.slice.admin.AdminConstants.adminDataNamedGraph -import org.knora.webapi.slice.admin.domain.model.* import org.knora.webapi.slice.admin.domain.model.GroupIri import org.knora.webapi.slice.admin.domain.model.GroupStatus -import org.knora.webapi.slice.admin.domain.model.KnoraGroup.Conversions.* +import org.knora.webapi.slice.admin.domain.model.KnoraGroup.Conversions._ import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri +import org.knora.webapi.slice.admin.domain.model._ import org.knora.webapi.slice.admin.domain.service.KnoraGroupRepo import org.knora.webapi.slice.admin.repo.rdf.RdfConversions.projectIriConverter import org.knora.webapi.slice.admin.repo.rdf.Vocabulary diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraProjectRepoLive.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraProjectRepoLive.scala index 17f32ac091..91f54f8379 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraProjectRepoLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraProjectRepoLive.scala @@ -6,20 +6,20 @@ package org.knora.webapi.slice.admin.repo.service import org.eclipse.rdf4j.model.vocabulary.RDF -import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.`var` as variable +import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.{`var` => variable} import org.eclipse.rdf4j.sparqlbuilder.core.query.Queries import org.eclipse.rdf4j.sparqlbuilder.graphpattern.GraphPatterns.tp import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf -import zio.* +import zio._ import dsp.errors.InconsistentRepositoryDataException -import org.knora.webapi.messages.OntologyConstants.KnoraAdmin.* +import org.knora.webapi.messages.OntologyConstants.KnoraAdmin._ import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM import org.knora.webapi.slice.admin.domain.model.KnoraProject -import org.knora.webapi.slice.admin.domain.model.KnoraProject.* +import org.knora.webapi.slice.admin.domain.model.KnoraProject._ import org.knora.webapi.slice.admin.domain.model.RestrictedView import org.knora.webapi.slice.admin.domain.service.KnoraProjectRepo -import org.knora.webapi.slice.admin.repo.rdf.RdfConversions.* +import org.knora.webapi.slice.admin.repo.rdf.RdfConversions._ import org.knora.webapi.slice.admin.repo.rdf.Vocabulary import org.knora.webapi.slice.admin.repo.service.KnoraProjectRepoLive.ProjectQueries import org.knora.webapi.slice.common.repo.rdf.Errors.RdfError diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLive.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLive.scala index e0d8ee2edb..3d23fe2565 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLive.scala @@ -5,9 +5,9 @@ package org.knora.webapi.slice.admin.repo.service -import org.eclipse.rdf4j.model.vocabulary.* -import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.`var` as variable +import org.eclipse.rdf4j.model.vocabulary._ import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.prefix +import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.{`var` => variable} import org.eclipse.rdf4j.sparqlbuilder.core.query.ConstructQuery import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery import org.eclipse.rdf4j.sparqlbuilder.core.query.Queries @@ -34,7 +34,7 @@ import org.knora.webapi.slice.admin.domain.model.UserIri import org.knora.webapi.slice.admin.domain.model.UserStatus import org.knora.webapi.slice.admin.domain.model.Username import org.knora.webapi.slice.admin.domain.service.KnoraUserRepo -import org.knora.webapi.slice.admin.repo.rdf.RdfConversions.* +import org.knora.webapi.slice.admin.repo.rdf.RdfConversions._ import org.knora.webapi.slice.admin.repo.rdf.Vocabulary import org.knora.webapi.slice.admin.repo.service.KnoraUserRepoLive.UserQueries import org.knora.webapi.slice.common.repo.rdf.RdfResource diff --git a/webapi/src/main/scala/org/knora/webapi/slice/common/api/AuthorizationRestService.scala b/webapi/src/main/scala/org/knora/webapi/slice/common/api/AuthorizationRestService.scala index 953e847b0b..f8f9ff4587 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/common/api/AuthorizationRestService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/common/api/AuthorizationRestService.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.common.api -import zio.* +import zio._ import zio.macros.accessible import dsp.errors.ForbiddenException diff --git a/webapi/src/main/scala/org/knora/webapi/slice/common/api/BaseEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/common/api/BaseEndpoints.scala index 534c1406c6..566113c097 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/common/api/BaseEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/common/api/BaseEndpoints.scala @@ -12,7 +12,7 @@ import sttp.tapir.EndpointOutput import sttp.tapir.auth import sttp.tapir.cookie import sttp.tapir.endpoint -import sttp.tapir.generic.auto.* +import sttp.tapir.generic.auto._ import sttp.tapir.json.zio.jsonBody import sttp.tapir.model.UsernamePassword import sttp.tapir.oneOf @@ -23,7 +23,7 @@ import zio.ZLayer import scala.concurrent.Future -import dsp.errors.* +import dsp.errors._ import org.knora.webapi.messages.util.KnoraSystemInstances.Users.AnonymousUser import org.knora.webapi.messages.v2.routing.authenticationmessages.CredentialsIdentifier import org.knora.webapi.messages.v2.routing.authenticationmessages.KnoraCredentialsV2.KnoraPasswordCredentialsV2 diff --git a/webapi/src/main/scala/org/knora/webapi/slice/common/api/TapirToPekkoInterpreter.scala b/webapi/src/main/scala/org/knora/webapi/slice/common/api/TapirToPekkoInterpreter.scala index f46a8077bb..623bf8e8a3 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/common/api/TapirToPekkoInterpreter.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/common/api/TapirToPekkoInterpreter.scala @@ -9,7 +9,7 @@ import org.apache.pekko.actor.ActorSystem import org.apache.pekko.http.scaladsl.server.Route import sttp.capabilities.WebSockets import sttp.capabilities.pekko.PekkoStreams -import sttp.tapir.generic.auto.* +import sttp.tapir.generic.auto._ import sttp.tapir.json.zio.jsonBody import sttp.tapir.server.ServerEndpoint import sttp.tapir.server.metrics.zio.ZioMetrics diff --git a/webapi/src/main/scala/org/knora/webapi/slice/common/repo/rdf/RdfModel.scala b/webapi/src/main/scala/org/knora/webapi/slice/common/repo/rdf/RdfModel.scala index 084cd1793d..8cea899fb3 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/common/repo/rdf/RdfModel.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/common/repo/rdf/RdfModel.scala @@ -5,14 +5,14 @@ package org.knora.webapi.slice.common.repo.rdf -import org.apache.jena.rdf.model.* +import org.apache.jena.rdf.model._ import org.apache.jena.vocabulary.RDF -import zio.* +import zio._ import java.io.StringReader -import scala.jdk.CollectionConverters.* +import scala.jdk.CollectionConverters._ -import org.knora.webapi.slice.common.repo.rdf.Errors.* +import org.knora.webapi.slice.common.repo.rdf.Errors._ import org.knora.webapi.slice.resourceinfo.domain.InternalIri object Errors { diff --git a/webapi/src/main/scala/org/knora/webapi/slice/common/repo/service/PredicateObjectMapper.scala b/webapi/src/main/scala/org/knora/webapi/slice/common/repo/service/PredicateObjectMapper.scala index 3384f11085..11528f202c 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/common/repo/service/PredicateObjectMapper.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/common/repo/service/PredicateObjectMapper.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.common.repo.service -import zio.* +import zio._ import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.IRI diff --git a/webapi/src/main/scala/org/knora/webapi/slice/common/repo/service/Repository.scala b/webapi/src/main/scala/org/knora/webapi/slice/common/repo/service/Repository.scala index 2e4aa3c7bc..edd58688ca 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/common/repo/service/Repository.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/common/repo/service/Repository.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.common.repo.service -import zio.* +import zio._ /** * Trait for generic readonly operations on a repository for a specific type. diff --git a/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/MetricsServer.scala b/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/MetricsServer.scala index 4e2d68c890..2ace40334b 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/MetricsServer.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/MetricsServer.scala @@ -11,8 +11,8 @@ import sttp.apispec.openapi.Info import sttp.apispec.openapi.OpenAPI import sttp.tapir.server.ziohttp.ZioHttpInterpreter import sttp.tapir.swagger.bundle.SwaggerInterpreter -import zio.* -import zio.http.* +import zio._ +import zio.http._ import zio.metrics.connectors.MetricsConfig import zio.metrics.connectors.prometheus import zio.metrics.jvm.DefaultJvmMetrics diff --git a/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/api/ManagementEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/api/ManagementEndpoints.scala index f902a61a90..2d06ec0cd3 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/api/ManagementEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/api/ManagementEndpoints.scala @@ -6,9 +6,9 @@ package org.knora.webapi.slice.infrastructure.api import sttp.model.StatusCode -import sttp.tapir.* import sttp.tapir.AnyEndpoint -import sttp.tapir.generic.auto.* +import sttp.tapir._ +import sttp.tapir.generic.auto._ import sttp.tapir.json.zio.jsonBody import sttp.tapir.statusCode import zio.UIO diff --git a/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/api/PrometheusApp.scala b/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/api/PrometheusApp.scala index 104dc6f611..8cce1b925b 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/api/PrometheusApp.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/infrastructure/api/PrometheusApp.scala @@ -5,8 +5,8 @@ package org.knora.webapi.slice.infrastructure.api -import zio.* -import zio.http.* +import zio._ +import zio.http._ import zio.metrics.connectors.prometheus.PrometheusPublisher /** diff --git a/webapi/src/main/scala/org/knora/webapi/slice/ontology/domain/service/CardinalityService.scala b/webapi/src/main/scala/org/knora/webapi/slice/ontology/domain/service/CardinalityService.scala index 158265a3fd..4e12e5b98c 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/ontology/domain/service/CardinalityService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/ontology/domain/service/CardinalityService.scala @@ -10,7 +10,7 @@ import zio.ZIO import zio.ZLayer import zio.macros.accessible -import org.knora.webapi.messages.* +import org.knora.webapi.messages._ import org.knora.webapi.messages.v2.responder.ontologymessages.ClassInfoContentV2 import org.knora.webapi.messages.v2.responder.ontologymessages.ReadClassInfoV2 import org.knora.webapi.slice.ontology.domain.model.Cardinality diff --git a/webapi/src/main/scala/org/knora/webapi/slice/ontology/repo/service/OntologyCache.scala b/webapi/src/main/scala/org/knora/webapi/slice/ontology/repo/service/OntologyCache.scala index 7d1500968b..5e8d15fb21 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/ontology/repo/service/OntologyCache.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/ontology/repo/service/OntologyCache.scala @@ -6,17 +6,17 @@ package org.knora.webapi.slice.ontology.repo.service import com.typesafe.scalalogging.LazyLogging -import zio.* +import zio._ import zio.macros.accessible import java.time.Instant -import dsp.errors.* +import dsp.errors._ import org.knora.webapi.ApiV2Complex import org.knora.webapi.InternalSchema import org.knora.webapi.KnoraBaseVersion import org.knora.webapi.OntologySchema -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter @@ -24,8 +24,8 @@ import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.messages.util.ErrorHandlingMap import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.messages.util.OntologyUtil -import org.knora.webapi.messages.v2.responder.ontologymessages.* -import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality.* +import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality._ +import org.knora.webapi.messages.v2.responder.ontologymessages._ import org.knora.webapi.responders.v2.ontology.OntologyHelpers import org.knora.webapi.responders.v2.ontology.OntologyHelpers.OntologyGraph import org.knora.webapi.slice.admin.domain.model.User diff --git a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/ResourceInfoEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/ResourceInfoEndpoints.scala index 454626b967..705e5fad8d 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/ResourceInfoEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/ResourceInfoEndpoints.scala @@ -5,9 +5,9 @@ package org.knora.webapi.slice.resourceinfo.api -import sttp.tapir.* -import sttp.tapir.generic.auto.* -import sttp.tapir.json.zio.* +import sttp.tapir._ +import sttp.tapir.generic.auto._ +import sttp.tapir.json.zio._ import zio.ZLayer import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.IriIdentifier diff --git a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/model/ResourceInfoDto.scala b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/model/ResourceInfoDto.scala index 3b53e123dd..5fc1b8578c 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/model/ResourceInfoDto.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/model/ResourceInfoDto.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.resourceinfo.api.model -import zio.json.* +import zio.json._ import java.time.Instant diff --git a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/service/RestResourceInfoService.scala b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/service/RestResourceInfoService.scala index 9a2fd0642e..97bc72d498 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/service/RestResourceInfoService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/service/RestResourceInfoService.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.resourceinfo.api.service -import zio.* +import zio._ import java.time.Instant @@ -13,7 +13,7 @@ import dsp.errors.BadRequestException import org.knora.webapi.IRI import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.IriIdentifier import org.knora.webapi.slice.resourceinfo.api.model.ListResponseDto -import org.knora.webapi.slice.resourceinfo.api.model.QueryParams.* +import org.knora.webapi.slice.resourceinfo.api.model.QueryParams._ import org.knora.webapi.slice.resourceinfo.api.model.ResourceInfoDto import org.knora.webapi.slice.resourceinfo.domain.IriConverter import org.knora.webapi.slice.resourceinfo.domain.ResourceInfoRepo diff --git a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/repo/ResourceInfoRepoLive.scala b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/repo/ResourceInfoRepoLive.scala index 9b27e1060f..83dab5169f 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/repo/ResourceInfoRepoLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/repo/ResourceInfoRepoLive.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.resourceinfo.repo -import zio.* +import zio._ import java.time.Instant diff --git a/webapi/src/main/scala/org/knora/webapi/slice/search/api/SearchEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/search/api/SearchEndpoints.scala index ddcf547863..3272a6b4df 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/search/api/SearchEndpoints.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/search/api/SearchEndpoints.scala @@ -11,22 +11,22 @@ import eu.timepit.refined.numeric.Greater import org.apache.pekko.http.scaladsl.server.Route import sttp.model.HeaderNames import sttp.model.MediaType -import sttp.tapir.* -import sttp.tapir.codec.refined.* +import sttp.tapir._ +import sttp.tapir.codec.refined._ import zio.Task import zio.ZIO import zio.ZLayer import dsp.valueobjects.Iri import org.knora.webapi.responders.v2.SearchResponderV2 -import org.knora.webapi.slice.admin.api.Codecs.TapirCodec.* +import org.knora.webapi.slice.admin.api.Codecs.TapirCodec._ import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.User import org.knora.webapi.slice.common.StringValueCompanion import org.knora.webapi.slice.common.Value.StringValue -import org.knora.webapi.slice.common.api.* import org.knora.webapi.slice.common.api.KnoraResponseRenderer.FormatOptions import org.knora.webapi.slice.common.api.KnoraResponseRenderer.RenderedResponse +import org.knora.webapi.slice.common.api._ import org.knora.webapi.slice.resourceinfo.domain.IriConverter import org.knora.webapi.slice.search.api.SearchEndpointsInputs.InputIri import org.knora.webapi.slice.search.api.SearchEndpointsInputs.Offset diff --git a/webapi/src/main/scala/org/knora/webapi/store/cache/CacheService.scala b/webapi/src/main/scala/org/knora/webapi/store/cache/CacheService.scala index 65714fd37c..02a9ade16e 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/cache/CacheService.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/cache/CacheService.scala @@ -5,12 +5,12 @@ package org.knora.webapi.store.cache -import zio.* -import zio.stm.* +import zio._ +import zio.stm._ import org.knora.webapi.messages.admin.responder.projectsmessages.Project 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.ProjectIdentifierADM._ import org.knora.webapi.slice.admin.domain.model.Email import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.KnoraProject.Shortcode diff --git a/webapi/src/main/scala/org/knora/webapi/store/cache/CacheServiceRequestMessageHandler.scala b/webapi/src/main/scala/org/knora/webapi/store/cache/CacheServiceRequestMessageHandler.scala index f020b14182..05beaec396 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/cache/CacheServiceRequestMessageHandler.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/cache/CacheServiceRequestMessageHandler.scala @@ -5,7 +5,7 @@ package org.knora.webapi.store.cache -import zio.* +import zio._ import zio.metrics.Metric import java.time.temporal.ChronoUnit @@ -13,7 +13,7 @@ import java.time.temporal.ChronoUnit import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay import org.knora.webapi.messages.ResponderRequest -import org.knora.webapi.messages.store.cacheservicemessages.* +import org.knora.webapi.messages.store.cacheservicemessages._ trait CacheServiceRequestMessageHandler extends MessageHandler diff --git a/webapi/src/main/scala/org/knora/webapi/store/iiif/IIIFRequestMessageHandler.scala b/webapi/src/main/scala/org/knora/webapi/store/iiif/IIIFRequestMessageHandler.scala index 3c0fc5ec72..1f189de86d 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/iiif/IIIFRequestMessageHandler.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/iiif/IIIFRequestMessageHandler.scala @@ -5,7 +5,7 @@ package org.knora.webapi.store.iiif -import zio.* +import zio._ import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay diff --git a/webapi/src/main/scala/org/knora/webapi/store/iiif/api/SipiService.scala b/webapi/src/main/scala/org/knora/webapi/store/iiif/api/SipiService.scala index da6c26adca..7e519ead12 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/iiif/api/SipiService.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/iiif/api/SipiService.scala @@ -5,12 +5,12 @@ package org.knora.webapi.store.iiif.api -import zio.* +import zio._ import zio.json.DeriveJsonDecoder import zio.json.JsonDecoder import zio.nio.file.Path -import org.knora.webapi.messages.store.sipimessages.* +import org.knora.webapi.messages.store.sipimessages._ import org.knora.webapi.messages.v2.responder.SuccessResponseV2 import org.knora.webapi.slice.admin.api.model.MaintenanceRequests.AssetId import org.knora.webapi.slice.admin.domain.model.KnoraProject.Shortcode diff --git a/webapi/src/main/scala/org/knora/webapi/store/iiif/impl/SipiServiceLive.scala b/webapi/src/main/scala/org/knora/webapi/store/iiif/impl/SipiServiceLive.scala index 6b9234cfeb..d04f28f289 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/iiif/impl/SipiServiceLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/iiif/impl/SipiServiceLive.scala @@ -13,7 +13,7 @@ import org.apache.http.HttpResponse import org.apache.http.NameValuePair import org.apache.http.client.config.RequestConfig import org.apache.http.client.entity.UrlEncodedFormEntity -import org.apache.http.client.methods.* +import org.apache.http.client.methods._ import org.apache.http.client.protocol.HttpClientContext import org.apache.http.config.SocketConfig import org.apache.http.impl.client.CloseableHttpClient @@ -22,8 +22,8 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager import org.apache.http.message.BasicHeader import org.apache.http.message.BasicNameValuePair import org.apache.http.util.EntityUtils -import spray.json.* -import zio.* +import spray.json._ +import zio._ import zio.json.DecoderOps import zio.nio.file.Path @@ -34,7 +34,7 @@ import dsp.errors.BadRequestException import dsp.errors.NotFoundException import org.knora.webapi.config.AppConfig import org.knora.webapi.config.Sipi -import org.knora.webapi.messages.store.sipimessages.* +import org.knora.webapi.messages.store.sipimessages._ import org.knora.webapi.messages.util.KnoraSystemInstances import org.knora.webapi.messages.v2.responder.SuccessResponseV2 import org.knora.webapi.routing.Jwt diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/api/TriplestoreService.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/api/TriplestoreService.scala index 3371322aa9..43448b6692 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/api/TriplestoreService.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/api/TriplestoreService.scala @@ -9,12 +9,12 @@ import org.eclipse.rdf4j.sparqlbuilder.core.query.ConstructQuery import org.eclipse.rdf4j.sparqlbuilder.core.query.InsertDataQuery import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery import play.twirl.api.TxtFormat -import zio.* +import zio._ import zio.macros.accessible import java.nio.file.Path -import org.knora.webapi.messages.store.triplestoremessages.* +import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.util.rdf.QuadFormat import org.knora.webapi.messages.util.rdf.SparqlSelectResult import org.knora.webapi.slice.common.repo.rdf.RdfModel diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceLive.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceLive.scala index 8803787f45..cd728e9271 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceLive.scala @@ -29,8 +29,8 @@ import org.apache.http.impl.client.HttpClients import org.apache.http.impl.conn.PoolingHttpClientConnectionManager import org.apache.http.message.BasicNameValuePair import org.apache.http.util.EntityUtils -import spray.json.* -import zio.* +import spray.json._ +import zio._ import zio.metrics.Metric import java.io.BufferedInputStream @@ -45,22 +45,22 @@ import java.time.temporal.ChronoUnit import java.util import scala.io.Source -import dsp.errors.* -import org.knora.webapi.* +import dsp.errors._ +import org.knora.webapi._ import org.knora.webapi.config.Triplestore import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.store.triplestoremessages.* -import org.knora.webapi.messages.store.triplestoremessages.SparqlResultProtocol.* -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.store.triplestoremessages.SparqlResultProtocol._ +import org.knora.webapi.messages.store.triplestoremessages._ +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.slice.resourceinfo.domain.InternalIri import org.knora.webapi.store.triplestore.api.TriplestoreService -import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.* +import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries._ import org.knora.webapi.store.triplestore.defaults.DefaultRdfData import org.knora.webapi.store.triplestore.domain.TriplestoreStatus import org.knora.webapi.store.triplestore.domain.TriplestoreStatus.Available import org.knora.webapi.store.triplestore.domain.TriplestoreStatus.NotInitialized import org.knora.webapi.store.triplestore.domain.TriplestoreStatus.Unavailable -import org.knora.webapi.store.triplestore.errors.* +import org.knora.webapi.store.triplestore.errors._ import org.knora.webapi.store.triplestore.upgrade.GraphsForMigration import org.knora.webapi.store.triplestore.upgrade.MigrateAllGraphs import org.knora.webapi.store.triplestore.upgrade.MigrateSpecificGraphs diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdatePlan.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdatePlan.scala index 33f265c53d..18645f537a 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdatePlan.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdatePlan.scala @@ -8,7 +8,7 @@ package org.knora.webapi.store.triplestore.upgrade import com.typesafe.scalalogging.Logger import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject -import org.knora.webapi.store.triplestore.upgrade.plugins.* +import org.knora.webapi.store.triplestore.upgrade.plugins._ /** * The plan for updating a repository to work with the current version of Knora. diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdater.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdater.scala index 35c7e51e91..4b5f461622 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdater.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdater.scala @@ -7,7 +7,7 @@ package org.knora.webapi.store.triplestore.upgrade import com.typesafe.scalalogging.Logger import org.slf4j.LoggerFactory -import zio.* +import zio._ import java.io.File import java.nio.file.Files @@ -15,8 +15,8 @@ import java.nio.file.Path import scala.reflect.io.Directory import dsp.errors.InconsistentRepositoryDataException -import org.knora.webapi.messages.store.triplestoremessages.* -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.store.triplestoremessages._ +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.store.triplestore.api.TriplestoreService import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.Select import org.knora.webapi.store.triplestore.upgrade.RepositoryUpdatePlan.PluginForKnoraBaseVersion diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/AbstractSparqlUpdatePlugin.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/AbstractSparqlUpdatePlugin.scala index f499b7d3b7..03af6b0059 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/AbstractSparqlUpdatePlugin.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/AbstractSparqlUpdatePlugin.scala @@ -11,7 +11,7 @@ import org.apache.jena.update.UpdateExecutionFactory import org.apache.jena.update.UpdateFactory import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin abstract class AbstractSparqlUpdatePlugin extends UpgradePlugin { diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307.scala index 9f3c997656..060bd806b7 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307.scala @@ -8,7 +8,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.IRI import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322.scala index 1a7bd2dab6..1e7328aec9 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322.scala @@ -8,7 +8,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import dsp.errors.InconsistentRepositoryDataException import dsp.valueobjects.UuidUtil import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367.scala index e327baab2c..449979c24d 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367.scala @@ -6,7 +6,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372.scala index 463e112fd3..03463c846a 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372.scala @@ -7,7 +7,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615.scala index bbcc527f16..e409db41e9 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615.scala @@ -5,7 +5,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746.scala index c105db67fa..903aa00e4e 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746.scala @@ -8,7 +8,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import com.typesafe.scalalogging.Logger import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921.scala index 33cce52c6e..1da20eddcd 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921.scala @@ -8,7 +8,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import com.typesafe.scalalogging.Logger import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018.scala index a432a4a820..bd3131f681 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018.scala @@ -15,7 +15,7 @@ import org.knora.webapi.messages.OntologyConstants.KnoraBase.AttachedToProject import org.knora.webapi.messages.OntologyConstants.KnoraBase.LastModificationDate import org.knora.webapi.messages.OntologyConstants.Owl.Ontology import org.knora.webapi.messages.OntologyConstants.Xsd.DateTime -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079.scala index 6577c65698..b76731260a 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079.scala @@ -8,7 +8,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import com.typesafe.scalalogging.Logger import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2081.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2081.scala index 0dd5f672c9..ed7fc78b90 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2081.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2081.scala @@ -10,7 +10,7 @@ import com.typesafe.scalalogging.Logger import java.time.Instant import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2094.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2094.scala index 5b1ea6d1be..10583af2f3 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2094.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2094.scala @@ -8,7 +8,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import com.typesafe.scalalogging.Logger import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin /** diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3110.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3110.scala index 2c7ab945d4..eca31953c9 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3110.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3110.scala @@ -6,9 +6,9 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import org.eclipse.rdf4j.model.vocabulary.RDF -import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.`var` as variable -import org.eclipse.rdf4j.sparqlbuilder.core.query.* +import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.{`var` => variable} import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery +import org.eclipse.rdf4j.sparqlbuilder.core.query._ import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf import org.knora.webapi.messages.OntologyConstants.KnoraAdmin.KnoraAdminPrefixExpansion diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3111.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3111.scala index 661be65ed8..4a651403fd 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3111.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3111.scala @@ -5,9 +5,9 @@ package org.knora.webapi.store.triplestore.upgrade.plugins -import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.`var` as variable -import org.eclipse.rdf4j.sparqlbuilder.core.query.* +import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.{`var` => variable} import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery +import org.eclipse.rdf4j.sparqlbuilder.core.query._ import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf import org.knora.webapi.slice.admin.AdminConstants diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3112.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3112.scala index 065628e8b9..2beb5cd089 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3112.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3112.scala @@ -5,9 +5,9 @@ package org.knora.webapi.store.triplestore.upgrade.plugins -import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.`var` as variable -import org.eclipse.rdf4j.sparqlbuilder.core.query.* +import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.{`var` => variable} import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery +import org.eclipse.rdf4j.sparqlbuilder.core.query._ import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf import org.knora.webapi.slice.admin.AdminConstants diff --git a/webapi/src/main/scala/org/knora/webapi/util/ActorUtil.scala b/webapi/src/main/scala/org/knora/webapi/util/ActorUtil.scala index 298df55440..39a39cdfbc 100644 --- a/webapi/src/main/scala/org/knora/webapi/util/ActorUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/util/ActorUtil.scala @@ -6,9 +6,9 @@ package org.knora.webapi.util import org.apache.pekko -import zio.* +import zio._ -import dsp.errors.* +import dsp.errors._ import org.knora.webapi.routing.UnsafeZioRun import pekko.actor.ActorRef diff --git a/webapi/src/main/scala/org/knora/webapi/util/LogAspect.scala b/webapi/src/main/scala/org/knora/webapi/util/LogAspect.scala index 40f4a38e12..54dfed590f 100644 --- a/webapi/src/main/scala/org/knora/webapi/util/LogAspect.scala +++ b/webapi/src/main/scala/org/knora/webapi/util/LogAspect.scala @@ -5,7 +5,7 @@ package org.knora.webapi.util -import zio.* +import zio._ object LogAspect { diff --git a/webapi/src/main/scala/org/knora/webapi/util/Logger.scala b/webapi/src/main/scala/org/knora/webapi/util/Logger.scala index ec41fde75a..264549323f 100644 --- a/webapi/src/main/scala/org/knora/webapi/util/Logger.scala +++ b/webapi/src/main/scala/org/knora/webapi/util/Logger.scala @@ -4,11 +4,11 @@ */ package org.knora.webapi.util -import zio.* import zio.LogLevel -import zio.logging.* +import zio._ import zio.logging.LogFilter -import zio.logging.LogFormat.* +import zio.logging.LogFormat._ +import zio.logging._ import zio.logging.slf4j.bridge.Slf4jBridge object Logger { diff --git a/webapi/src/main/scala/org/knora/webapi/util/SipiUtil.scala b/webapi/src/main/scala/org/knora/webapi/util/SipiUtil.scala index 454458a08e..c55c10b36b 100644 --- a/webapi/src/main/scala/org/knora/webapi/util/SipiUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/util/SipiUtil.scala @@ -5,7 +5,7 @@ package org.knora.webapi.util -import spray.json.* +import spray.json._ import scala.util.Failure import scala.util.Success diff --git a/webapi/src/main/scala/org/knora/webapi/util/ZScopedJavaIoStreams.scala b/webapi/src/main/scala/org/knora/webapi/util/ZScopedJavaIoStreams.scala index 2369e2df57..bcfc1cfbe4 100644 --- a/webapi/src/main/scala/org/knora/webapi/util/ZScopedJavaIoStreams.scala +++ b/webapi/src/main/scala/org/knora/webapi/util/ZScopedJavaIoStreams.scala @@ -5,9 +5,9 @@ package org.knora.webapi.util -import zio.* +import zio._ -import java.io.* +import java.io._ import java.nio.file.Files import java.nio.file.Path import java.util.zip.ZipInputStream diff --git a/webapi/src/test/scala/dsp/valueobjects/IriSpec.scala b/webapi/src/test/scala/dsp/valueobjects/IriSpec.scala index 90e1c3df92..50eb76e5f4 100644 --- a/webapi/src/test/scala/dsp/valueobjects/IriSpec.scala +++ b/webapi/src/test/scala/dsp/valueobjects/IriSpec.scala @@ -6,10 +6,10 @@ package dsp.valueobjects import zio.prelude.Validation -import zio.test.* +import zio.test._ import dsp.errors.ValidationException -import dsp.valueobjects.Iri.* +import dsp.valueobjects.Iri._ /** * This spec is used to test the [[Iri]] value objects creation. diff --git a/webapi/src/test/scala/dsp/valueobjects/LangStringSpec.scala b/webapi/src/test/scala/dsp/valueobjects/LangStringSpec.scala index 24311e052c..54b9b9be4b 100644 --- a/webapi/src/test/scala/dsp/valueobjects/LangStringSpec.scala +++ b/webapi/src/test/scala/dsp/valueobjects/LangStringSpec.scala @@ -6,7 +6,7 @@ package dsp.valueobjects import zio.prelude.Validation -import zio.test.* +import zio.test._ import dsp.errors.ValidationException diff --git a/webapi/src/test/scala/dsp/valueobjects/LanguageCodeSpec.scala b/webapi/src/test/scala/dsp/valueobjects/LanguageCodeSpec.scala index c343d2d62d..89d493541a 100644 --- a/webapi/src/test/scala/dsp/valueobjects/LanguageCodeSpec.scala +++ b/webapi/src/test/scala/dsp/valueobjects/LanguageCodeSpec.scala @@ -6,7 +6,7 @@ package dsp.valueobjects import zio.prelude.Validation -import zio.test.* +import zio.test._ import dsp.errors.ValidationException diff --git a/webapi/src/test/scala/dsp/valueobjects/RestrictedViewSpec.scala b/webapi/src/test/scala/dsp/valueobjects/RestrictedViewSpec.scala index f13e1d39c4..3047ce0b43 100644 --- a/webapi/src/test/scala/dsp/valueobjects/RestrictedViewSpec.scala +++ b/webapi/src/test/scala/dsp/valueobjects/RestrictedViewSpec.scala @@ -6,7 +6,7 @@ package dsp.valueobjects import zio.Scope -import zio.test.* +import zio.test._ import org.knora.webapi.slice.admin.domain.model.RestrictedView diff --git a/webapi/src/test/scala/dsp/valueobjects/SchemaCommandsSpec.scala b/webapi/src/test/scala/dsp/valueobjects/SchemaCommandsSpec.scala index 8cea6c46b6..dfe8fdbe53 100644 --- a/webapi/src/test/scala/dsp/valueobjects/SchemaCommandsSpec.scala +++ b/webapi/src/test/scala/dsp/valueobjects/SchemaCommandsSpec.scala @@ -5,8 +5,8 @@ package dsp.valueobjects -import zio.test.* -import zio.test.Assertion.* +import zio.test.Assertion._ +import zio.test._ import java.time.Instant diff --git a/webapi/src/test/scala/dsp/valueobjects/SchemaSpec.scala b/webapi/src/test/scala/dsp/valueobjects/SchemaSpec.scala index e3500874ff..4912e55566 100644 --- a/webapi/src/test/scala/dsp/valueobjects/SchemaSpec.scala +++ b/webapi/src/test/scala/dsp/valueobjects/SchemaSpec.scala @@ -7,7 +7,7 @@ package dsp.valueobjects import zio.NonEmptyChunk import zio.prelude.Validation -import zio.test.* +import zio.test._ import dsp.constants.SalsahGui import dsp.errors.ValidationException diff --git a/webapi/src/test/scala/dsp/valueobjects/UuidUtilSpec.scala b/webapi/src/test/scala/dsp/valueobjects/UuidUtilSpec.scala index aeb65f2a7d..5caddd2a54 100644 --- a/webapi/src/test/scala/dsp/valueobjects/UuidUtilSpec.scala +++ b/webapi/src/test/scala/dsp/valueobjects/UuidUtilSpec.scala @@ -6,7 +6,7 @@ package dsp.valueobjects import zio.Scope -import zio.test.* +import zio.test._ import java.util.UUID diff --git a/webapi/src/test/scala/org/knora/webapi/TestDataFactory.scala b/webapi/src/test/scala/org/knora/webapi/TestDataFactory.scala index 28b54cd7bc..bebc169653 100644 --- a/webapi/src/test/scala/org/knora/webapi/TestDataFactory.scala +++ b/webapi/src/test/scala/org/knora/webapi/TestDataFactory.scala @@ -9,21 +9,21 @@ import zio.Chunk import zio.NonEmptyChunk import dsp.valueobjects.LanguageCode -import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM._ import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 -import org.knora.webapi.slice.admin.domain.model.* import org.knora.webapi.slice.admin.domain.model.Email import org.knora.webapi.slice.admin.domain.model.FamilyName import org.knora.webapi.slice.admin.domain.model.GivenName import org.knora.webapi.slice.admin.domain.model.GroupIri import org.knora.webapi.slice.admin.domain.model.KnoraProject -import org.knora.webapi.slice.admin.domain.model.KnoraProject.* +import org.knora.webapi.slice.admin.domain.model.KnoraProject._ import org.knora.webapi.slice.admin.domain.model.KnoraUser import org.knora.webapi.slice.admin.domain.model.PasswordHash import org.knora.webapi.slice.admin.domain.model.SystemAdmin import org.knora.webapi.slice.admin.domain.model.UserIri import org.knora.webapi.slice.admin.domain.model.UserStatus import org.knora.webapi.slice.admin.domain.model.Username +import org.knora.webapi.slice.admin.domain.model._ /** * Helps in creating value objects for tests. diff --git a/webapi/src/test/scala/org/knora/webapi/ValuesValidatorSpec.scala b/webapi/src/test/scala/org/knora/webapi/ValuesValidatorSpec.scala index 246158b04a..91d32e7036 100644 --- a/webapi/src/test/scala/org/knora/webapi/ValuesValidatorSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/ValuesValidatorSpec.scala @@ -5,8 +5,8 @@ package org.knora.webapi -import zio.test.* -import zio.test.Assertion.* +import zio.test.Assertion._ +import zio.test._ import java.time.Instant diff --git a/webapi/src/test/scala/org/knora/webapi/core/MessageRelaySpec.scala b/webapi/src/test/scala/org/knora/webapi/core/MessageRelaySpec.scala index 5fbbea46df..88bcb4a81e 100644 --- a/webapi/src/test/scala/org/knora/webapi/core/MessageRelaySpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/core/MessageRelaySpec.scala @@ -5,11 +5,11 @@ package org.knora.webapi.core -import zio.* -import zio.test.* +import zio._ import zio.test.Assertion.anything import zio.test.Assertion.dies import zio.test.Assertion.isSubtype +import zio.test._ import org.knora.webapi.messages.ResponderRequest diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/JsonLDObjectSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/JsonLDObjectSpec.scala index c42c252f7d..02961e9c85 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/JsonLDObjectSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/JsonLDObjectSpec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.messages.util.rdf -import zio.* -import zio.test.* +import zio._ +import zio.test._ import java.util.UUID diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/ConstructTransformerSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/ConstructTransformerSpec.scala index de4e50f2ee..02ee8b88d0 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/ConstructTransformerSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/transformers/ConstructTransformerSpec.scala @@ -10,10 +10,10 @@ import zio.test.Spec import zio.test.ZIOSpecDefault import zio.test.assertTrue -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ import org.knora.webapi.slice.ontology.repo.service.OntologyCacheFake import org.knora.webapi.slice.resourceinfo.domain.IriConverter diff --git a/webapi/src/test/scala/org/knora/webapi/routing/RouteUtilZSpec.scala b/webapi/src/test/scala/org/knora/webapi/routing/RouteUtilZSpec.scala index 05d1c818ef..3f3f0e55c1 100644 --- a/webapi/src/test/scala/org/knora/webapi/routing/RouteUtilZSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/routing/RouteUtilZSpec.scala @@ -5,9 +5,9 @@ package org.knora.webapi.routing -import zio.test.* -import zio.test.Assertion.* +import zio.test.Assertion._ import zio.test.ZIOSpecDefault +import zio.test._ import zio.test.assertTrue import dsp.errors.BadRequestException diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/api/service/AuthorizationRestServiceSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/api/service/AuthorizationRestServiceSpec.scala index 0ec6a5b0a7..ed67515412 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/api/service/AuthorizationRestServiceSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/api/service/AuthorizationRestServiceSpec.scala @@ -7,8 +7,8 @@ package org.knora.webapi.slice.admin.api.service import zio.Exit import zio.ZIO -import zio.test.* import zio.test.Assertion.failsWithA +import zio.test._ import dsp.errors.ForbiddenException import org.knora.webapi.TestDataFactory diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/api/service/MaintenanceServiceSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/api/service/MaintenanceServiceSpec.scala index 7385456cdd..9c8c2295c8 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/api/service/MaintenanceServiceSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/api/service/MaintenanceServiceSpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.admin.api.service -import eu.timepit.refined.auto.* +import eu.timepit.refined.auto._ import zio.Chunk import zio.ZIO import zio.test.Spec @@ -15,7 +15,7 @@ import zio.test.assertTrue import org.knora.webapi.TestDataFactory import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.slice.admin.api.model.MaintenanceRequests.* +import org.knora.webapi.slice.admin.api.model.MaintenanceRequests._ import org.knora.webapi.slice.admin.domain.repo.KnoraProjectRepoInMemory import org.knora.webapi.slice.admin.domain.service.KnoraProjectService import org.knora.webapi.slice.admin.domain.service.MaintenanceService diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraGroupSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraGroupSpec.scala index 1ef7490671..b3847d7df7 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraGroupSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraGroupSpec.scala @@ -5,10 +5,10 @@ package dsp.valueobjects -import zio.test.* +import zio.test._ import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 -import org.knora.webapi.slice.admin.domain.model.* +import org.knora.webapi.slice.admin.domain.model._ /** * This spec is used to test the [[Group]] value objects creation. diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraProjectSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraProjectSpec.scala index d5d1153a5d..55232a8701 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraProjectSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraProjectSpec.scala @@ -6,12 +6,12 @@ package org.knora.webapi.slice.admin.domain.model import zio.Scope -import zio.test.* +import zio.test._ import scala.util.Random import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 -import org.knora.webapi.slice.admin.domain.model.KnoraProject.* +import org.knora.webapi.slice.admin.domain.model.KnoraProject._ /** * This spec is used to test the [[org.knora.webapi.slice.admin.domain.model.KnoraProject]] value objects creation. diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/ListPropertiesSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/ListPropertiesSpec.scala index 822ebb75fa..6293683771 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/ListPropertiesSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/ListPropertiesSpec.scala @@ -12,7 +12,7 @@ import zio.test.assertTrue import zio.test.check import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 -import org.knora.webapi.slice.admin.domain.model.ListProperties.* +import org.knora.webapi.slice.admin.domain.model.ListProperties._ /** * This spec is used to test the [[List]] value objects creation. diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/UserSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/UserSpec.scala index 618f675d95..dd76f8fed8 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/UserSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/UserSpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.admin.domain.model -import zio.test.* +import zio.test._ object UserSpec extends ZIOSpecDefault { private val validPassword = "pass-word" diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ProjectServiceSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ProjectServiceSpec.scala index 4928dc8cc3..3f52a43e14 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ProjectServiceSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ProjectServiceSpec.scala @@ -13,7 +13,7 @@ import zio.test.assertTrue import org.knora.webapi.messages.admin.responder.projectsmessages.Project import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.slice.admin.domain.model.KnoraProject -import org.knora.webapi.slice.admin.domain.model.KnoraProject.* +import org.knora.webapi.slice.admin.domain.model.KnoraProject._ import org.knora.webapi.slice.admin.domain.model.RestrictedView import org.knora.webapi.slice.resourceinfo.domain.IriTestConstants diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ZipUtilitySpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ZipUtilitySpec.scala index 59fc3a62d4..02ec6dd9c7 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ZipUtilitySpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ZipUtilitySpec.scala @@ -5,9 +5,9 @@ package org.knora.webapi.slice.admin.domain.service -import zio.* -import zio.nio.file.* -import zio.test.* +import zio._ +import zio.nio.file._ +import zio.test._ object ZipUtilitySpec extends ZIOSpecDefault { private val testFolderName = "test-folder" diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLiveSpec.scala index 44fa584e02..255ba49c07 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLiveSpec.scala @@ -12,7 +12,7 @@ import zio.test.Spec import zio.test.ZIOSpecDefault import zio.test.assertTrue -import org.knora.webapi.TestDataFactory.UserGroup.* +import org.knora.webapi.TestDataFactory.UserGroup._ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.slice.admin.domain.model.GroupIri import org.knora.webapi.slice.admin.domain.model.GroupName diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLiveSpec.scala index e1e89ad0e8..c64b6047ec 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLiveSpec.scala @@ -18,7 +18,7 @@ import zio.test.ZIOSpecDefault import zio.test.assertTrue import org.knora.webapi.TestDataFactory -import org.knora.webapi.TestDataFactory.User.* +import org.knora.webapi.TestDataFactory.User._ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.slice.admin.AdminConstants.adminDataNamedGraph import org.knora.webapi.slice.admin.domain.model.Email diff --git a/webapi/src/test/scala/org/knora/webapi/slice/common/repo/InMemoryCrudRepositorySpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/common/repo/InMemoryCrudRepositorySpec.scala index e1f8cb00bd..4976a61b22 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/common/repo/InMemoryCrudRepositorySpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/common/repo/InMemoryCrudRepositorySpec.scala @@ -8,8 +8,8 @@ package org.knora.webapi.slice.common.repo import zio.Ref import zio.ZIO import zio.ZLayer -import zio.test.* import zio.test.Assertion.hasSameElements +import zio.test._ final case class SomeEntity(id: Int, name: String) final case class InMemoryRepository(entities: Ref[List[SomeEntity]]) diff --git a/webapi/src/test/scala/org/knora/webapi/slice/common/repo/rdf/RdfModelSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/common/repo/rdf/RdfModelSpec.scala index 93a99d0f58..51185761f8 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/common/repo/rdf/RdfModelSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/common/repo/rdf/RdfModelSpec.scala @@ -5,11 +5,11 @@ package org.knora.webapi.slice.common.repo.rdf -import zio.* -import zio.test.* -import zio.test.Assertion.* +import zio._ +import zio.test.Assertion._ +import zio.test._ -import org.knora.webapi.slice.common.repo.rdf.Errors.* +import org.knora.webapi.slice.common.repo.rdf.Errors._ import org.knora.webapi.slice.resourceinfo.domain.InternalIri object RdfModelSpec extends ZIOSpecDefault { diff --git a/webapi/src/test/scala/org/knora/webapi/slice/common/repo/service/AbstractInMemoryCrudRepository.scala b/webapi/src/test/scala/org/knora/webapi/slice/common/repo/service/AbstractInMemoryCrudRepository.scala index 97b694cceb..ce8b42a621 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/common/repo/service/AbstractInMemoryCrudRepository.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/common/repo/service/AbstractInMemoryCrudRepository.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.common.repo.service -import zio.* +import zio._ abstract class AbstractInMemoryCrudRepository[Entity, Id](entities: Ref[List[Entity]], getId: Entity => Id) extends CrudRepository[Entity, Id] { diff --git a/webapi/src/test/scala/org/knora/webapi/slice/common/repo/service/InMemoryCrudRepositorySpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/common/repo/service/InMemoryCrudRepositorySpec.scala index 8b7f528da9..75df50ebdc 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/common/repo/service/InMemoryCrudRepositorySpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/common/repo/service/InMemoryCrudRepositorySpec.scala @@ -8,8 +8,8 @@ package org.knora.webapi.slice.common.repo.service import zio.Ref import zio.ZIO import zio.ZLayer -import zio.test.* import zio.test.Assertion.hasSameElements +import zio.test._ final case class SomeEntity(id: Int, name: String) final case class InMemoryRepository(entities: Ref[List[SomeEntity]]) diff --git a/webapi/src/test/scala/org/knora/webapi/slice/ontology/api/service/RestCardinalityServiceLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/ontology/api/service/RestCardinalityServiceLiveSpec.scala index 2b8477364a..98046ccb77 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/ontology/api/service/RestCardinalityServiceLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/ontology/api/service/RestCardinalityServiceLiveSpec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.slice.ontology.api.service -import zio.* -import zio.test.* +import zio._ +import zio.test._ import org.knora.webapi.IRI import org.knora.webapi.config.AppConfig @@ -21,8 +21,8 @@ import org.knora.webapi.slice.ontology.domain.ReadOntologyV2Builder import org.knora.webapi.slice.ontology.domain.model.Cardinality import org.knora.webapi.slice.ontology.domain.service.CardinalityService import org.knora.webapi.slice.ontology.domain.service.ChangeCardinalityCheckResult -import org.knora.webapi.slice.ontology.domain.service.ChangeCardinalityCheckResult.* import org.knora.webapi.slice.ontology.domain.service.ChangeCardinalityCheckResult.CanReplaceCardinalityCheckResult.IsInUseCheckFailure +import org.knora.webapi.slice.ontology.domain.service.ChangeCardinalityCheckResult._ import org.knora.webapi.slice.ontology.repo.service.OntologyCacheFake import org.knora.webapi.slice.ontology.repo.service.OntologyRepoLive import org.knora.webapi.slice.resourceinfo.domain.InternalIri diff --git a/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/CardinalityServiceLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/CardinalityServiceLiveSpec.scala index a968ce344f..4cf5a9b65e 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/CardinalityServiceLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/CardinalityServiceLiveSpec.scala @@ -9,24 +9,24 @@ import org.apache.jena.query.Dataset import zio.Random import zio.Ref import zio.ZLayer -import zio.test.* import zio.test.ZIOSpecDefault +import zio.test._ import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter import org.knora.webapi.slice.ontology.domain.model.Cardinality -import org.knora.webapi.slice.ontology.domain.model.Cardinality.* +import org.knora.webapi.slice.ontology.domain.model.Cardinality._ import org.knora.webapi.slice.ontology.domain.model.CardinalitySpec.Generator.cardinalitiesGen import org.knora.webapi.slice.ontology.domain.service.CardinalityService -import org.knora.webapi.slice.ontology.domain.service.ChangeCardinalityCheckResult.CanSetCardinalityCheckResult.* +import org.knora.webapi.slice.ontology.domain.service.ChangeCardinalityCheckResult.CanSetCardinalityCheckResult._ import org.knora.webapi.slice.ontology.repo.model.OntologyCacheData import org.knora.webapi.slice.ontology.repo.service.OntologyCacheFake import org.knora.webapi.slice.ontology.repo.service.OntologyRepoLive import org.knora.webapi.slice.ontology.repo.service.PredicateRepositoryLive import org.knora.webapi.slice.resourceinfo.domain.InternalIri import org.knora.webapi.slice.resourceinfo.domain.IriConverter -import org.knora.webapi.slice.resourceinfo.domain.IriTestConstants.* -import org.knora.webapi.store.triplestore.TestDatasetBuilder.* +import org.knora.webapi.slice.resourceinfo.domain.IriTestConstants._ +import org.knora.webapi.store.triplestore.TestDatasetBuilder._ import org.knora.webapi.store.triplestore.api.TriplestoreServiceInMemory object CardinalityServiceLiveSpec extends ZIOSpecDefault { diff --git a/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/model/CardinalitySpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/model/CardinalitySpec.scala index 7ded1e5b7b..79a35729cd 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/model/CardinalitySpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/model/CardinalitySpec.scala @@ -7,10 +7,10 @@ package org.knora.webapi.slice.ontology.domain.model import zio.Random import zio.Scope -import zio.test.* +import zio.test._ import org.knora.webapi.messages.v2.responder.ontologymessages.OwlCardinality -import org.knora.webapi.slice.ontology.domain.model.Cardinality.* +import org.knora.webapi.slice.ontology.domain.model.Cardinality._ import org.knora.webapi.slice.ontology.domain.model.CardinalitySpec.Generator.cardinalitiesGen object CardinalitySpec extends ZIOSpecDefault { diff --git a/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/service/PredicateRepositoryLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/service/PredicateRepositoryLiveSpec.scala index ab40fc0ebd..45f1f46be0 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/service/PredicateRepositoryLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/ontology/domain/service/PredicateRepositoryLiveSpec.scala @@ -7,8 +7,8 @@ package org.knora.webapi.slice.ontology.domain.service import org.apache.jena.query.Dataset import zio.Ref import zio.ZLayer -import zio.test.* -import zio.test.Assertion.* +import zio.test.Assertion._ +import zio.test._ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.slice.ontology.repo.service.PredicateRepositoryLive diff --git a/webapi/src/test/scala/org/knora/webapi/slice/ontology/repo/OntologyCacheFakeSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/ontology/repo/OntologyCacheFakeSpec.scala index e73dddd753..e83c68c5cd 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/ontology/repo/OntologyCacheFakeSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/ontology/repo/OntologyCacheFakeSpec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.slice.ontology.repo -import zio.test.* import zio.test.ZIOSpecDefault +import zio.test._ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.slice.ontology.repo.service.OntologyCache diff --git a/webapi/src/test/scala/org/knora/webapi/slice/ontology/repo/service/OntologyRepoLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/ontology/repo/service/OntologyRepoLiveSpec.scala index 0c4436017e..5166daef30 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/ontology/repo/service/OntologyRepoLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/ontology/repo/service/OntologyRepoLiveSpec.scala @@ -7,8 +7,8 @@ package org.knora.webapi.slice.ontology.repo.service import zio.Scope import zio.ZIO -import zio.test.* import zio.test.ZIOSpecDefault +import zio.test._ import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/api/IriConverterLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/api/IriConverterLiveSpec.scala index 8d584722ac..d77c9c269b 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/api/IriConverterLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/api/IriConverterLiveSpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.slice.resourceinfo.api -import zio.test.* +import zio.test._ import org.knora.webapi.IRI import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/api/LiveRestResourceInfoServiceSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/api/LiveRestResourceInfoServiceSpec.scala index c0009d3cf8..330b449b19 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/api/LiveRestResourceInfoServiceSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/api/LiveRestResourceInfoServiceSpec.scala @@ -7,7 +7,7 @@ package org.knora.webapi.slice.resourceinfo.api import zio.Exit import zio.ZIO -import zio.test.* +import zio.test._ import java.time.Instant.now import java.time.temporal.ChronoUnit.DAYS diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/TestDatasetBuilder.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/TestDatasetBuilder.scala index f8f53b3ca8..2468be59ac 100644 --- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/TestDatasetBuilder.scala +++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/TestDatasetBuilder.scala @@ -11,7 +11,7 @@ import org.apache.jena.query.ReadWrite import org.apache.jena.rdf.model.Model import org.apache.jena.riot.Lang import org.apache.jena.riot.RDFDataMgr -import zio.* +import zio._ import java.io.StringReader diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemory.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemory.scala index 0547b4e61b..9fbb07a274 100644 --- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemory.scala +++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemory.scala @@ -4,7 +4,7 @@ */ package org.knora.webapi.store.triplestore.api -import org.apache.jena.query.* +import org.apache.jena.query._ import org.apache.jena.rdf.model import org.apache.jena.rdf.model.Model import org.apache.jena.rdf.model.ModelFactory @@ -28,13 +28,13 @@ import java.io.InputStream import java.nio.charset.StandardCharsets import java.nio.file.Path import java.nio.file.Paths -import scala.jdk.CollectionConverters.* +import scala.jdk.CollectionConverters._ import org.knora.webapi.IRI import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.store.triplestoremessages.SparqlConstructResponse -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.slice.resourceinfo.domain.InternalIri import org.knora.webapi.store.triplestore.TestDatasetBuilder import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.Ask diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemorySpec.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemorySpec.scala index 3ea66e1813..84d8fe27cf 100644 --- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemorySpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemorySpec.scala @@ -8,19 +8,19 @@ import org.apache.jena.query.Dataset import org.apache.jena.query.ReadWrite import zio.Ref import zio.ZIO -import zio.test.* import zio.test.Assertion.hasSameElements +import zio.test._ import java.nio.file.Files import java.util.UUID -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.IriLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.IriSubjectV2 import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.store.triplestoremessages.SubjectV2 -import org.knora.webapi.messages.util.rdf.* +import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.slice.resourceinfo.domain.InternalIri import org.knora.webapi.slice.resourceinfo.domain.IriTestConstants.Biblio import org.knora.webapi.store.triplestore.TestDatasetBuilder.datasetLayerFromTurtle diff --git a/webapi/src/test/scala/org/knora/webapi/util/ZioHelperSpec.scala b/webapi/src/test/scala/org/knora/webapi/util/ZioHelperSpec.scala index 6f8f64a5b2..1ac3445022 100644 --- a/webapi/src/test/scala/org/knora/webapi/util/ZioHelperSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/util/ZioHelperSpec.scala @@ -5,8 +5,8 @@ package org.knora.webapi.util -import zio.* -import zio.test.* +import zio._ +import zio.test._ object ZioHelperSpec extends ZIOSpecDefault { diff --git a/webapi/src/test/scala/org/knora/webapi/util/search/gravsearch/GravsearchParserSpec.scala b/webapi/src/test/scala/org/knora/webapi/util/search/gravsearch/GravsearchParserSpec.scala index e779a74975..3d54b686a7 100644 --- a/webapi/src/test/scala/org/knora/webapi/util/search/gravsearch/GravsearchParserSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/util/search/gravsearch/GravsearchParserSpec.scala @@ -17,9 +17,9 @@ import zio.test.assertTrue import dsp.errors.GravsearchException import org.knora.webapi.ApiV2Complex import org.knora.webapi.ApiV2Simple -import org.knora.webapi.messages.IriConversions.* +import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.util.search.* +import org.knora.webapi.messages.util.search._ import org.knora.webapi.messages.util.search.gravsearch.GravsearchParser object GravsearchParserSpec extends ZIOSpecDefault {