Formatting

dasch-swiss · Dec 2, 2022 · d445876 · d445876
1 parent 877a2b4
commit d445876
Show file tree

Hide file tree

Showing 18 changed files with 136 additions and 70 deletions.
diff --git a/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala b/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala
@@ -2,6 +2,7 @@ package org.knora.webapi.core
 
 import zio.ULayer
 import zio.ZLayer
+
 import org.knora.webapi.auth.JWTService
 import org.knora.webapi.config.AppConfig
 import org.knora.webapi.routing.ApiRoutes

diff --git a/webapi/src/main/scala/org/knora/webapi/routing/ApiRoutes.scala b/webapi/src/main/scala/org/knora/webapi/routing/ApiRoutes.scala
@@ -9,16 +9,18 @@ import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.Route
 import ch.megard.akka.http.cors.scaladsl.CorsDirectives
 import ch.megard.akka.http.cors.scaladsl.settings.CorsSettings
+import zio._
+
 import org.knora.webapi.config.AppConfig
 import org.knora.webapi.core
-import org.knora.webapi.core.{ActorSystem, AppRouter}
+import org.knora.webapi.core.ActorSystem
+import org.knora.webapi.core.AppRouter
 import org.knora.webapi.http.directives.DSPApiDirectives
 import org.knora.webapi.http.version.ServerVersion
 import org.knora.webapi.routing.admin._
 import org.knora.webapi.routing.v1._
 import org.knora.webapi.routing.v2._
 import org.knora.webapi.slice.resourceinfo.api.RestResourceInfoService
-import zio._
 
 trait ApiRoutes {
   val routes: Route

diff --git a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV2.scala
@@ -15,7 +15,11 @@ import com.typesafe.scalalogging.Logger
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
+import scala.util.Failure
+import scala.util.Success
+import scala.util.Try
 import scala.util.control.Exception.catching
+
 import dsp.errors.BadRequestException
 import dsp.errors.UnexpectedMessageException
 import org.knora.webapi._
@@ -31,8 +35,6 @@ import org.knora.webapi.messages.util.rdf.RdfModel
 import org.knora.webapi.messages.v2.responder.KnoraResponseV2
 import org.knora.webapi.messages.v2.responder.resourcemessages.ResourceTEIGetResponseV2
 
-import scala.util.{Failure, Success, Try}
-
 /**
  * Handles message formatting, content negotiation, and simple interactions with responders, on behalf of Knora routes.
  */

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
@@ -6,29 +6,46 @@
 package org.knora.webapi.routing.v2
 
 import akka.http.scaladsl.model.ContentTypes.`application/json`
-import akka.http.scaladsl.model.StatusCodes.{InternalServerError, OK}
-import akka.http.scaladsl.model.{HttpEntity, HttpResponse}
+import akka.http.scaladsl.model.HttpEntity
+import akka.http.scaladsl.model.HttpResponse
+import akka.http.scaladsl.model.StatusCodes.InternalServerError
+import akka.http.scaladsl.model.StatusCodes.OK
 import akka.http.scaladsl.server.Directives._
-import akka.http.scaladsl.server.{PathMatcher, RequestContext, Route}
+import akka.http.scaladsl.server.PathMatcher
+import akka.http.scaladsl.server.RequestContext
+import akka.http.scaladsl.server.Route
+import zio.Exit
+import zio.Exit.Failure
+import zio.Exit.Success
+import zio.Runtime
+import zio.Unsafe
+import zio.ZIO
+import zio.json._
+
+import java.time.Instant
+import java.util.UUID
+import scala.concurrent.Future
+
 import dsp.errors.BadRequestException
 import org.knora.webapi._
 import org.knora.webapi.messages.IriConversions._
-import org.knora.webapi.messages.util.rdf.{JsonLDDocument, JsonLDUtil}
+import org.knora.webapi.messages.SmartIri
+import org.knora.webapi.messages.StringFormatter
+import org.knora.webapi.messages.util.rdf.JsonLDDocument
+import org.knora.webapi.messages.util.rdf.JsonLDUtil
 import org.knora.webapi.messages.v2.responder.resourcemessages._
 import org.knora.webapi.messages.v2.responder.searchmessages.SearchResourcesByProjectAndClassRequestV2
 import org.knora.webapi.messages.v2.responder.valuemessages._
-import org.knora.webapi.messages.{SmartIri, StringFormatter}
+import org.knora.webapi.routing.Authenticator
+import org.knora.webapi.routing.KnoraRoute
+import org.knora.webapi.routing.KnoraRouteData
+import org.knora.webapi.routing.RouteUtilV2
 import org.knora.webapi.routing.RouteUtilV2.getRequiredProjectFromHeader
-import org.knora.webapi.routing.{Authenticator, KnoraRoute, KnoraRouteData, RouteUtilV2}
 import org.knora.webapi.slice.resourceinfo.api.RestResourceInfoService
-import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.{ASC, Order, OrderBy, lastModificationDate}
-import zio.Exit.{Failure, Success}
-import zio.json._
-import zio.{Exit, Runtime, Unsafe, ZIO}
-
-import java.time.Instant
-import java.util.UUID
-import scala.concurrent.Future
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.ASC
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.Order
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.OrderBy
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.lastModificationDate
 
 /**
  * Provides a routing function for API v2 routes that deal with resources.

diff --git a/.../src/main/scala/org/knora/webapi/slice/resourceinfo/api/LiveRestResourceInfoService.scala b/.../src/main/scala/org/knora/webapi/slice/resourceinfo/api/LiveRestResourceInfoService.scala
@@ -1,9 +1,13 @@
 package org.knora.webapi.slice.resourceinfo.api
 
+import zio.UIO
+import zio.ZIO
+import zio.ZLayer
+
 import org.knora.webapi.IRI
 import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo
-import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.{Order, OrderBy}
-import zio.{UIO, ZIO, ZLayer}
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.Order
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.OrderBy
 
 final case class LiveRestResourceInfoService(repo: ResourceInfoRepo) extends RestResourceInfoService {
   override def findByProjectAndResourceClass(

diff --git a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/ResourceInfoDto.scala b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/ResourceInfoDto.scala
@@ -1,11 +1,12 @@
 package org.knora.webapi.slice.resourceinfo.api
 
-import org.knora.webapi.IRI
-import org.knora.webapi.slice.resourceinfo.repo.ResourceInfo
 import zio.json._
 
 import java.time.Instant
 
+import org.knora.webapi.IRI
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfo
+
 final case class ListResponseDto private (resources: List[ResourceInfoDto], count: Int)
 object ListResponseDto {
   val empty: ListResponseDto = ListResponseDto(List.empty, 0)

diff --git a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/RestResourceInfoService.scala b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/api/RestResourceInfoService.scala
@@ -1,8 +1,13 @@
 package org.knora.webapi.slice.resourceinfo.api
 
+import zio.UIO
+import zio.ZIO
+
 import org.knora.webapi.IRI
-import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.{ASC, Order, OrderBy, lastModificationDate}
-import zio.{UIO, ZIO}
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.ASC
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.Order
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.OrderBy
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.lastModificationDate
 
 trait RestResourceInfoService {
   def findByProjectAndResourceClass(

diff --git a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/repo/LiveResourceInfoRepo.scala b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/repo/LiveResourceInfoRepo.scala
@@ -1,14 +1,19 @@
 package org.knora.webapi.slice.resourceinfo.repo
 
+import zio.UIO
+import zio.ZIO
+import zio.ZLayer
+
+import java.time.Instant
+
 import org.knora.webapi.IRI
 import org.knora.webapi.messages.twirl.queries.sparql.v2.txt.resourcesByCreationDate
-import org.knora.webapi.messages.util.rdf.{SparqlSelectResult, VariableResultsRow}
+import org.knora.webapi.messages.util.rdf.SparqlSelectResult
+import org.knora.webapi.messages.util.rdf.VariableResultsRow
 import org.knora.webapi.slice.resourceinfo.repo
-import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.{Order, OrderBy}
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.Order
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.OrderBy
 import org.knora.webapi.store.triplestore.api.TriplestoreService
-import zio.{UIO, ZIO, ZLayer}
-
-import java.time.Instant
 
 final case class LiveResourceInfoRepo(ts: TriplestoreService) extends ResourceInfoRepo {
 

diff --git a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/repo/ResourceInfo.scala b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/repo/ResourceInfo.scala
@@ -1,9 +1,9 @@
 package org.knora.webapi.slice.resourceinfo.repo
 
-import org.knora.webapi.IRI
-
 import java.time.Instant
 
+import org.knora.webapi.IRI
+
 case class ResourceInfo(
   iri: IRI,
   creationDate: Instant,

diff --git a/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/repo/ResourceInfoRepo.scala b/webapi/src/main/scala/org/knora/webapi/slice/resourceinfo/repo/ResourceInfoRepo.scala
@@ -1,8 +1,11 @@
 package org.knora.webapi.slice.resourceinfo.repo
 
+import zio.UIO
+import zio.ZIO
+
 import org.knora.webapi.IRI
-import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.{Order, OrderBy}
-import zio.{UIO, ZIO}
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.Order
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.OrderBy
 
 trait ResourceInfoRepo {
 

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
@@ -1,6 +1,7 @@
 package org.knora.webapi.store.triplestore.upgrade
 
 import com.typesafe.scalalogging.Logger
+
 import org.knora.webapi.store.triplestore.upgrade.plugins._
 
 /**

diff --git a/...c/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2288.scala b/...c/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2288.scala
@@ -1,11 +1,14 @@
 package org.knora.webapi.store.triplestore.upgrade.plugins
 
 import com.typesafe.scalalogging.Logger
-import org.knora.webapi.messages.util.rdf.{RdfFeatureFactory, RdfModel, Statement}
-import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin
 
 import scala.concurrent.duration.DurationLong
 
+import org.knora.webapi.messages.util.rdf.RdfFeatureFactory
+import org.knora.webapi.messages.util.rdf.RdfModel
+import org.knora.webapi.messages.util.rdf.Statement
+import org.knora.webapi.store.triplestore.upgrade.UpgradePlugin
+
 class UpgradePluginPR2288(log: Logger) extends UpgradePlugin {
   private val nodeFactory = RdfFeatureFactory.getRdfNodeFactory()
 

diff --git a/webapi/src/test/scala/org/knora/webapi/core/LayersTest.scala b/webapi/src/test/scala/org/knora/webapi/core/LayersTest.scala
@@ -1,6 +1,7 @@
 package org.knora.webapi.core
 
 import zio.ZLayer
+
 import org.knora.webapi.auth.JWTService
 import org.knora.webapi.config.AppConfigForTestContainers
 import org.knora.webapi.routing.ApiRoutes

diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/ResourcesV1R2RSpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v1/ResourcesV1R2RSpec.scala
@@ -10,33 +10,45 @@ import akka.http.scaladsl.model._
 import akka.http.scaladsl.model.headers.BasicHttpCredentials
 import akka.http.scaladsl.testkit.RouteTestTimeout
 import akka.pattern._
-import dsp.errors.{AssertionException, InvalidApiJsonException, NotFoundException}
+import org.scalatest.Assertion
+import org.xmlunit.builder.DiffBuilder
+import org.xmlunit.builder.Input
+import org.xmlunit.diff.Diff
+import spray.json._
+
+import java.io.ByteArrayInputStream
+import java.net.URLEncoder
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import scala.concurrent.Await
+import scala.concurrent.ExecutionContextExecutor
+import scala.concurrent.Future
+import scala.concurrent.duration._
+import scala.util.Random
+import scala.xml.Node
+import scala.xml.NodeSeq
+import scala.xml.XML
+
+import dsp.errors.AssertionException
+import dsp.errors.InvalidApiJsonException
+import dsp.errors.NotFoundException
 import org.knora.webapi._
 import org.knora.webapi.http.directives.DSPApiDirectives
 import org.knora.webapi.messages.OntologyConstants
 import org.knora.webapi.messages.store.triplestoremessages._
-import org.knora.webapi.messages.util.rdf.{SparqlSelectResult, VariableResultsRow}
+import org.knora.webapi.messages.util.rdf.SparqlSelectResult
+import org.knora.webapi.messages.util.rdf.VariableResultsRow
 import org.knora.webapi.messages.v1.responder.resourcemessages.PropsGetForRegionV1
 import org.knora.webapi.messages.v1.responder.resourcemessages.ResourceV1JsonProtocol._
-import org.knora.webapi.routing.v1.{ResourcesRouteV1, ValuesRouteV1}
+import org.knora.webapi.routing.v1.ResourcesRouteV1
+import org.knora.webapi.routing.v1.ValuesRouteV1
 import org.knora.webapi.routing.v2.ResourcesRouteV2
 import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM._
 import org.knora.webapi.sharedtestdata.SharedTestDataADM
 import org.knora.webapi.sharedtestdata.SharedTestDataADM._
 import org.knora.webapi.store.triplestore.errors.TriplestoreResponseException
-import org.knora.webapi.util.{AkkaHttpUtils, MutableTestIri}
-import org.scalatest.Assertion
-import org.xmlunit.builder.{DiffBuilder, Input}
-import org.xmlunit.diff.Diff
-import spray.json._
-
-import java.io.ByteArrayInputStream
-import java.net.URLEncoder
-import java.util.zip.{ZipEntry, ZipInputStream}
-import scala.concurrent.{Await, ExecutionContextExecutor, Future}
-import scala.concurrent.duration._
-import scala.util.Random
-import scala.xml.{Node, NodeSeq, XML}
+import org.knora.webapi.util.AkkaHttpUtils
+import org.knora.webapi.util.MutableTestIri
 
 /**
  * End-to-end test specification for the resources endpoint.

diff --git a/.../test/scala/org/knora/webapi/slice/resourceinfo/api/LiveRestResourceInfoServiceSpec.scala b/.../test/scala/org/knora/webapi/slice/resourceinfo/api/LiveRestResourceInfoServiceSpec.scala
@@ -1,14 +1,18 @@
 package org.knora.webapi.slice.resourceinfo.api
 
-import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.{DESC, creationDate}
-import org.knora.webapi.slice.resourceinfo.repo.TestResourceInfoRepo.{knownProjectIRI, knownResourceClass}
-import org.knora.webapi.slice.resourceinfo.repo.{ResourceInfo, TestResourceInfoRepo}
 import zio.test._
 
 import java.time.Instant.now
 import java.time.temporal.ChronoUnit.DAYS
 import java.util.UUID.randomUUID
 
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfo
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.DESC
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.creationDate
+import org.knora.webapi.slice.resourceinfo.repo.TestResourceInfoRepo
+import org.knora.webapi.slice.resourceinfo.repo.TestResourceInfoRepo.knownProjectIRI
+import org.knora.webapi.slice.resourceinfo.repo.TestResourceInfoRepo.knownResourceClass
+
 object LiveRestResourceInfoServiceSpec extends ZIOSpecDefault {
   override def spec =
     suite("LiveRestResourceInfoServiceSpec")(

diff --git a/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/repo/TestResourceInfoRepo.scala b/webapi/src/test/scala/org/knora/webapi/slice/resourceinfo/repo/TestResourceInfoRepo.scala
@@ -1,15 +1,18 @@
 package org.knora.webapi.slice.resourceinfo.repo
 
+import zio.Ref
+import zio.UIO
+import zio.ULayer
+import zio.ZIO
+import zio.ZLayer
+
 import org.knora.webapi.IRI
-import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.{
-  ASC,
-  creationDate,
-  DESC,
-  lastModificationDate,
-  Order,
-  OrderBy
-}
-import zio.{Ref, UIO, ULayer, ZIO, ZLayer}
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.ASC
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.DESC
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.Order
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.OrderBy
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.creationDate
+import org.knora.webapi.slice.resourceinfo.repo.ResourceInfoRepo.lastModificationDate
 
 final case class TestResourceInfoRepo(entitiesRef: Ref[Map[(IRI, IRI), List[ResourceInfo]]]) extends ResourceInfoRepo {
 

diff --git a/...st/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2288Spec.scala b/...st/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2288Spec.scala
@@ -1,14 +1,15 @@
 package org.knora.webapi.store.triplestore.upgrade.plugins
 
 import com.typesafe.scalalogging.LazyLogging
+
 import org.knora.webapi.messages.util.rdf._
 
 class UpgradePluginPR2288Spec extends UpgradePluginSpec with LazyLogging {
 
   val plugin = new UpgradePluginPR2288(log)
 
-  val nf = RdfFeatureFactory.getRdfNodeFactory()
-  val lastModDateIri = nf.makeIriNode("http://www.knora.org/ontology/knora-base#lastModificationDate")
+  val nf              = RdfFeatureFactory.getRdfNodeFactory()
+  val lastModDateIri  = nf.makeIriNode("http://www.knora.org/ontology/knora-base#lastModificationDate")
   val thingWithoutIri = nf.makeIriNode("http://rdfh.ch/0001/thing-without-mod-date")
   val thingWithoutValue =
     nf.makeDatatypeLiteral("2020-01-01T10:00:00.673298Z", "http://www.w3.org/2001/XMLSchema#dateTime")
@@ -36,7 +37,7 @@ class UpgradePluginPR2288Spec extends UpgradePluginSpec with LazyLogging {
   "Upgrade plugin PR2288" should {
     "add a statement if creationDate is given but no lastModificationDate" in {
       val model: RdfModel = stringToModel(modelStr)
-      val sizeBefore = model.size
+      val sizeBefore      = model.size
 
       plugin.transform(model)