Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Revert the import style to Scala 2 #3138

Merged
merged 1 commit into from
Mar 21, 2024
Merged

chore: Revert the import style to Scala 2 #3138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .scalafix.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ OrganizeImports {
importsOrder = Ascii
preset = DEFAULT
removeUnused = true
targetDialect = Scala3
targetDialect = Scala2
}

RemoveUnused {
Expand Down
10 changes: 5 additions & 5 deletions integration/src/test/scala/org/knora/sipi/SipiIT.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration/src/test/scala/org/knora/webapi/CoreSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions integration/src/test/scala/org/knora/webapi/E2ESpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

/**
Expand Down
8 changes: 4 additions & 4 deletions integration/src/test/scala/org/knora/webapi/ITKnoraLiveSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration/src/test/scala/org/knora/webapi/ITTestDataFactory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions integration/src/test/scala/org/knora/webapi/R2RSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions integration/src/test/scala/org/knora/webapi/config/AppConfigForTestContainers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions integration/src/test/scala/org/knora/webapi/config/AppConfigForTestContainersZSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration/src/test/scala/org/knora/webapi/core/ActorSystemTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 8 additions & 8 deletions integration/src/test/scala/org/knora/webapi/core/LayersTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration/src/test/scala/org/knora/webapi/core/TestStartupUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions integration/src/test/scala/org/knora/webapi/e2e/CORSSupportE2ESpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

/**
Expand Down
8 changes: 4 additions & 4 deletions integration/src/test/scala/org/knora/webapi/e2e/ExceptionHandlerR2RSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

/**
Expand Down
2 changes: 1 addition & 1 deletion integration/src/test/scala/org/knora/webapi/e2e/HealthRouteE2ESpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

/**
Expand Down
10 changes: 5 additions & 5 deletions integration/src/test/scala/org/knora/webapi/e2e/InstanceChecker.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration/src/test/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion integration/src/test/scala/org/knora/webapi/e2e/admin/AdminFilesE2ESpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions integration/src/test/scala/org/knora/webapi/e2e/admin/GroupsADME2ESpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions integration/src/test/scala/org/knora/webapi/e2e/admin/PermissionsADME2ESpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions integration/src/test/scala/org/knora/webapi/e2e/admin/ProjectsADME2ESpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions integration/src/test/scala/org/knora/webapi/e2e/admin/UsersADME2ESpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

/**
Expand Down
Loading
Loading