fmt

dasch-swiss · Dec 27, 2023 · 98ccfc3 · 98ccfc3
1 parent b3967d0
commit 98ccfc3
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 158 deletions.
diff --git a/index.html b/index.html
diff --git a/integration/src/test/scala/org/knora/sipi/SipiIT.scala b/integration/src/test/scala/org/knora/sipi/SipiIT.scala
@@ -11,20 +11,25 @@ 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 org.knora.sipi.MockDspApiServer.verify._
-import org.knora.webapi.config.AppConfig
-import org.knora.webapi.messages.admin.responder.KnoraResponseADM
-import org.knora.webapi.messages.admin.responder.sipimessages._
-import org.knora.webapi.messages.util.KnoraSystemInstances.Users.SystemUser
-import org.knora.webapi.routing.{JwtService, JwtServiceLive}
-import org.knora.webapi.testcontainers.{SharedVolumes, SipiTestContainer}
 import zio._
 import zio.http._
 import zio.json.DecoderOps
 import zio.json.ast.Json
 import zio.test._
 
-import scala.util.{Failure, Success, Try}
+import scala.util.Failure
+import scala.util.Success
+import scala.util.Try
+
+import org.knora.sipi.MockDspApiServer.verify._
+import org.knora.webapi.config.AppConfig
+import org.knora.webapi.messages.admin.responder.KnoraResponseADM
+import org.knora.webapi.messages.admin.responder.sipimessages._
+import org.knora.webapi.messages.util.KnoraSystemInstances.Users.SystemUser
+import org.knora.webapi.routing.JwtService
+import org.knora.webapi.routing.JwtServiceLive
+import org.knora.webapi.testcontainers.SharedVolumes
+import org.knora.webapi.testcontainers.SipiTestContainer
 
 object SipiIT extends ZIOSpecDefault {
 

diff --git a/integration/src/test/scala/org/knora/webapi/ITKnoraLiveSpec.scala b/integration/src/test/scala/org/knora/webapi/ITKnoraLiveSpec.scala
@@ -5,32 +5,38 @@
 
 package org.knora.webapi
 
-import com.typesafe.scalalogging.{LazyLogging, Logger}
+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.testkit.TestKitBase
-import org.knora.webapi.config.AppConfig
-import org.knora.webapi.core.LayersTest.DefaultTestEnvironmentWithSipi
-import org.knora.webapi.core.{AppRouter, AppServer, TestStartupUtils}
-import org.knora.webapi.messages.store.sipimessages._
-import org.knora.webapi.messages.store.triplestoremessages.{RdfDataObject, TriplestoreJsonProtocol}
-import org.knora.webapi.messages.util.rdf.{JsonLDDocument, JsonLDUtil}
-import org.knora.webapi.routing.UnsafeZioRun
-import org.knora.webapi.testcontainers.SharedVolumes
-import org.knora.webapi.testservices.{FileToUpload, TestClientService}
-import org.knora.webapi.util.LogAspect
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import spray.json._
 import zio._
-import zio.nio.file.{Files, Path}
 
-import java.nio.file.StandardCopyOption
 import java.util.concurrent.TimeUnit
+import scala.concurrent.Await
+import scala.concurrent.ExecutionContext
+import scala.concurrent.Future
 import scala.concurrent.duration.FiniteDuration
-import scala.concurrent.{Await, ExecutionContext, Future}
+
+import org.knora.webapi.config.AppConfig
+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.triplestoremessages.RdfDataObject
+import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol
+import org.knora.webapi.messages.util.rdf.JsonLDDocument
+import org.knora.webapi.messages.util.rdf.JsonLDUtil
+import org.knora.webapi.routing.UnsafeZioRun
+import org.knora.webapi.testservices.FileToUpload
+import org.knora.webapi.testservices.TestClientService
+import org.knora.webapi.util.LogAspect
 
 /**
  * This class can be used in End-to-End testing. It starts the DSP stack and
@@ -75,7 +81,6 @@ abstract class ITKnoraLiveSpec
     config <- ZIO.service[AppConfig]
   } yield (router, config)
 
-
   /**
    * Create router and config by unsafe running them.
    */

diff --git a/integration/src/test/scala/org/knora/webapi/config/AppConfigForTestContainersZSpec.scala b/integration/src/test/scala/org/knora/webapi/config/AppConfigForTestContainersZSpec.scala
@@ -5,10 +5,13 @@
 
 package org.knora.webapi.config
 
-import org.knora.webapi.testcontainers.{FusekiTestContainer, SharedVolumes, SipiTestContainer}
 import zio._
 import zio.test._
 
+import org.knora.webapi.testcontainers.FusekiTestContainer
+import org.knora.webapi.testcontainers.SharedVolumes
+import org.knora.webapi.testcontainers.SipiTestContainer
+
 object AppConfigForTestContainersZSpec extends ZIOSpecDefault {
 
   def spec: Spec[Scope, Nothing] = suite("AppConfigForTestContainersSpec")(

diff --git a/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala b/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala
@@ -6,45 +6,65 @@
 package org.knora.webapi.core
 
 import org.apache.pekko
+import zio._
+
 import org.knora.webapi.config.AppConfig.AppConfigurations
 import org.knora.webapi.config.AppConfigForTestContainers
 import org.knora.webapi.messages.StringFormatter
 import org.knora.webapi.messages.util._
 import org.knora.webapi.messages.util.search.QueryTraverser
 import org.knora.webapi.messages.util.search.gravsearch.prequery.InferenceOptimizationService
-import org.knora.webapi.messages.util.search.gravsearch.transformers.{ConstructTransformer, OntologyInferencer}
+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.types.GravsearchTypeInspectionRunner
-import org.knora.webapi.messages.util.standoff.{StandoffTagUtilV2, StandoffTagUtilV2Live}
+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.v2.ontology.{CardinalityHandler, CardinalityHandlerLive, OntologyHelpers, OntologyHelpersLive}
+import org.knora.webapi.responders.v2.ontology.CardinalityHandler
+import org.knora.webapi.responders.v2.ontology.CardinalityHandlerLive
+import org.knora.webapi.responders.v2.ontology.OntologyHelpers
+import org.knora.webapi.responders.v2.ontology.OntologyHelpersLive
 import org.knora.webapi.routing._
 import org.knora.webapi.slice.admin.api._
-import org.knora.webapi.slice.admin.api.service.{MaintenanceRestService, ProjectADMRestService, ProjectsADMRestServiceLive, UsersADMRestServiceLive}
+import org.knora.webapi.slice.admin.api.service.MaintenanceRestService
+import org.knora.webapi.slice.admin.api.service.ProjectADMRestService
+import org.knora.webapi.slice.admin.api.service.ProjectsADMRestServiceLive
+import org.knora.webapi.slice.admin.api.service.UsersADMRestServiceLive
 import org.knora.webapi.slice.admin.domain.service._
 import org.knora.webapi.slice.admin.repo.service.KnoraProjectRepoLive
 import org.knora.webapi.slice.common.api._
 import org.knora.webapi.slice.common.repo.service.PredicateObjectMapper
-import org.knora.webapi.slice.ontology.api.service.{RestCardinalityService, RestCardinalityServiceLive}
-import org.knora.webapi.slice.ontology.domain.service.{CardinalityService, OntologyRepo}
-import org.knora.webapi.slice.ontology.repo.service.{OntologyCache, OntologyCacheLive, OntologyRepoLive, PredicateRepositoryLive}
+import org.knora.webapi.slice.ontology.api.service.RestCardinalityService
+import org.knora.webapi.slice.ontology.api.service.RestCardinalityServiceLive
+import org.knora.webapi.slice.ontology.domain.service.CardinalityService
+import org.knora.webapi.slice.ontology.domain.service.OntologyRepo
+import org.knora.webapi.slice.ontology.repo.service.OntologyCache
+import org.knora.webapi.slice.ontology.repo.service.OntologyCacheLive
+import org.knora.webapi.slice.ontology.repo.service.OntologyRepoLive
+import org.knora.webapi.slice.ontology.repo.service.PredicateRepositoryLive
 import org.knora.webapi.slice.resourceinfo.ResourceInfoLayers
 import org.knora.webapi.slice.resourceinfo.api.service.RestResourceInfoService
 import org.knora.webapi.slice.resourceinfo.domain.IriConverter
 import org.knora.webapi.slice.search.api.SearchApiRoutes
+import org.knora.webapi.store.cache.CacheServiceRequestMessageHandler
+import org.knora.webapi.store.cache.CacheServiceRequestMessageHandlerLive
 import org.knora.webapi.store.cache.api.CacheService
 import org.knora.webapi.store.cache.impl.CacheServiceInMemImpl
-import org.knora.webapi.store.cache.{CacheServiceRequestMessageHandler, CacheServiceRequestMessageHandlerLive}
+import org.knora.webapi.store.iiif.IIIFRequestMessageHandler
+import org.knora.webapi.store.iiif.IIIFRequestMessageHandlerLive
 import org.knora.webapi.store.iiif.api.SipiService
-import org.knora.webapi.store.iiif.impl.{SipiServiceLive, SipiServiceMock}
-import org.knora.webapi.store.iiif.{IIIFRequestMessageHandler, IIIFRequestMessageHandlerLive}
+import org.knora.webapi.store.iiif.impl.SipiServiceLive
+import org.knora.webapi.store.iiif.impl.SipiServiceMock
 import org.knora.webapi.store.triplestore.api.TriplestoreService
 import org.knora.webapi.store.triplestore.impl.TriplestoreServiceLive
 import org.knora.webapi.store.triplestore.upgrade.RepositoryUpdater
-import org.knora.webapi.testcontainers.{DspIngestTestContainer, FusekiTestContainer, SharedVolumes, SipiTestContainer}
+import org.knora.webapi.testcontainers.DspIngestTestContainer
+import org.knora.webapi.testcontainers.FusekiTestContainer
+import org.knora.webapi.testcontainers.SharedVolumes
+import org.knora.webapi.testcontainers.SipiTestContainer
 import org.knora.webapi.testservices.TestClientService
-import zio._
 
 object LayersTest {
 

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
@@ -8,11 +8,16 @@ package org.knora.webapi.it.v2
 import org.apache.pekko.http.scaladsl.model._
 import org.apache.pekko.http.scaladsl.model.headers.BasicHttpCredentials
 import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal
+import zio.ZIO
+import zio.nio.file.Files
+import zio.nio.file.Path
 
 import java.net.URLEncoder
-import java.nio.file.{Paths, StandardCopyOption}
+import java.nio.file.Paths
+import java.nio.file.StandardCopyOption
 import scala.concurrent.Await
 import scala.concurrent.duration._
+
 import dsp.errors.AssertionException
 import dsp.errors.BadRequestException
 import dsp.valueobjects.Iri
@@ -31,8 +36,6 @@ import org.knora.webapi.sharedtestdata.SharedTestDataADM
 import org.knora.webapi.testcontainers.SharedVolumes
 import org.knora.webapi.testservices.FileToUpload
 import org.knora.webapi.util.MutableTestIri
-import zio.ZIO
-import zio.nio.file.{Files, Path}
 
 /**
  * Tests interaction between Knora and Sipi using Knora API v2.

diff --git a/integration/src/test/scala/org/knora/webapi/testcontainers/DspIngestTestContainer.scala b/integration/src/test/scala/org/knora/webapi/testcontainers/DspIngestTestContainer.scala
@@ -1,11 +1,16 @@
 package org.knora.webapi.testcontainers
 
-import org.knora.webapi.slice.admin.domain.model.KnoraProject.Shortcode
-import org.knora.webapi.testcontainers.TestContainerOps.StartableOps
-import org.testcontainers.containers.{BindMode, GenericContainer}
+import org.testcontainers.containers.BindMode
+import org.testcontainers.containers.GenericContainer
 import org.testcontainers.utility.MountableFile
+import zio.Task
+import zio.URLayer
+import zio.ZIO
+import zio.ZLayer
 import zio.nio.file.Path
-import zio.{Task, URLayer, ZIO, ZLayer}
+
+import org.knora.webapi.slice.admin.domain.model.KnoraProject.Shortcode
+import org.knora.webapi.testcontainers.TestContainerOps.StartableOps
 
 final class DspIngestTestContainer extends GenericContainer[DspIngestTestContainer](s"daschswiss/dsp-ingest:latest") {
 

diff --git a/integration/src/test/scala/org/knora/webapi/testcontainers/SharedVolumes.scala b/integration/src/test/scala/org/knora/webapi/testcontainers/SharedVolumes.scala
@@ -1,7 +1,8 @@
 package org.knora.webapi.testcontainers
 
+import zio.ULayer
+import zio.ZLayer
 import zio.nio.file.Files
-import zio.{ULayer, ZLayer}
 
 object SharedVolumes {
 

diff --git a/integration/src/test/scala/org/knora/webapi/testcontainers/SipiTestContainer.scala b/integration/src/test/scala/org/knora/webapi/testcontainers/SipiTestContainer.scala
@@ -5,17 +5,25 @@
 
 package org.knora.webapi.testcontainers
 
-import org.knora.webapi.http.version.BuildInfo
-import org.knora.webapi.testcontainers.TestContainerOps.StartableOps
-import org.testcontainers.containers.{BindMode, GenericContainer}
+import org.testcontainers.containers.BindMode
+import org.testcontainers.containers.GenericContainer
 import org.testcontainers.utility.MountableFile
+import zio.Task
+import zio.URIO
+import zio.URLayer
+import zio.ZIO
+import zio.ZLayer
+import zio.http
 import zio.http.URL
 import zio.nio.file.Path
-import zio.{Task, URIO, URLayer, ZIO, ZLayer, http}
 
-import java.net.{Inet6Address, InetAddress}
+import java.net.Inet6Address
+import java.net.InetAddress
 import java.nio.file.Paths
 
+import org.knora.webapi.http.version.BuildInfo
+import org.knora.webapi.testcontainers.TestContainerOps.StartableOps
+
 final class SipiTestContainer
     extends GenericContainer[SipiTestContainer](s"daschswiss/knora-sipi:${BuildInfo.version}") {