Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
@seakayone
seakayone committed Dec 20, 2022
1 parent 7068724 commit 3c1d44d
Show file tree
Hide file tree
Showing 22 changed files with 77 additions and 68 deletions.
71 changes: 28 additions & 43 deletions webapi/src/main/scala/org/knora/webapi/core/actors/RoutingActor.scala
View file
Expand Up @@ -6,7 +6,6 @@
package org.knora.webapi.core.actors

import akka.actor.Actor
import akka.actor.ActorSystem
import com.typesafe.scalalogging.Logger

import scala.concurrent.ExecutionContext
Expand Down Expand Up @@ -68,60 +67,47 @@ import org.knora.webapi.store.iiif.IIIFServiceManager
import org.knora.webapi.store.triplestore.TriplestoreServiceManager
import org.knora.webapi.util.ActorUtil

class RoutingActor(
final case class RoutingActor(
cacheServiceManager: CacheServiceManager,
iiifServiceManager: IIIFServiceManager,
triplestoreManager: TriplestoreServiceManager,
appConfig: AppConfig,
runtime: zio.Runtime[Any]
) extends Actor {

implicit val system: ActorSystem = context.system
val log: Logger = Logger(this.getClass)

/**
* The Cache Service's configuration.
*/
implicit val cacheServiceSettings: CacheServiceSettings = new CacheServiceSettings(appConfig)

/**
* Provides the default global execution context
*/
implicit val executionContext: ExecutionContext = context.dispatcher

/**
* Data used in responders.
*/
val responderData: ResponderData =
ResponderData(ActorDeps(system, self, appConfig.defaultTimeoutAsDuration), appConfig)
private val log: Logger = Logger(this.getClass)
private val actorDeps: ActorDeps = ActorDeps(context.system, self, appConfig.defaultTimeoutAsDuration)
private val cacheServiceSettings: CacheServiceSettings = new CacheServiceSettings(appConfig)
private val responderData: ResponderData = ResponderData(actorDeps, appConfig)
private implicit val executionContext: ExecutionContext = actorDeps.executionContext

// V1 responders
val ckanResponderV1: CkanResponderV1 = new CkanResponderV1(responderData)
val resourcesResponderV1: ResourcesResponderV1 = new ResourcesResponderV1(responderData)
val valuesResponderV1: ValuesResponderV1 = new ValuesResponderV1(responderData)
val standoffResponderV1: StandoffResponderV1 = new StandoffResponderV1(responderData)
val usersResponderV1: UsersResponderV1 = new UsersResponderV1(responderData)
val listsResponderV1: ListsResponderV1 = new ListsResponderV1(responderData)
val searchResponderV1: SearchResponderV1 = new SearchResponderV1(responderData)
val ontologyResponderV1: OntologyResponderV1 = new OntologyResponderV1(responderData)
val projectsResponderV1: ProjectsResponderV1 = new ProjectsResponderV1(responderData)
private val ckanResponderV1: CkanResponderV1 = new CkanResponderV1(responderData)
private val resourcesResponderV1: ResourcesResponderV1 = new ResourcesResponderV1(responderData)
private val valuesResponderV1: ValuesResponderV1 = new ValuesResponderV1(responderData)
private val standoffResponderV1: StandoffResponderV1 = new StandoffResponderV1(responderData)
private val usersResponderV1: UsersResponderV1 = new UsersResponderV1(responderData)
private val listsResponderV1: ListsResponderV1 = new ListsResponderV1(responderData)
private val searchResponderV1: SearchResponderV1 = new SearchResponderV1(responderData)
private val ontologyResponderV1: OntologyResponderV1 = new OntologyResponderV1(responderData)
private val projectsResponderV1: ProjectsResponderV1 = ProjectsResponderV1(actorDeps)

// V2 responders
val ontologiesResponderV2: OntologyResponderV2 = new OntologyResponderV2(responderData)
val searchResponderV2: SearchResponderV2 = new SearchResponderV2(responderData)
val resourcesResponderV2: ResourcesResponderV2 = new ResourcesResponderV2(responderData)
val valuesResponderV2: ValuesResponderV2 = new ValuesResponderV2(responderData)
val standoffResponderV2: StandoffResponderV2 = new StandoffResponderV2(responderData)
val listsResponderV2: ListsResponderV2 = new ListsResponderV2(responderData)
private val ontologiesResponderV2: OntologyResponderV2 = new OntologyResponderV2(responderData)
private val searchResponderV2: SearchResponderV2 = new SearchResponderV2(responderData)
private val resourcesResponderV2: ResourcesResponderV2 = new ResourcesResponderV2(responderData)
private val valuesResponderV2: ValuesResponderV2 = new ValuesResponderV2(responderData)
private val standoffResponderV2: StandoffResponderV2 = new StandoffResponderV2(responderData)
private val listsResponderV2: ListsResponderV2 = new ListsResponderV2(responderData)

// Admin responders
val groupsResponderADM: GroupsResponderADM = new GroupsResponderADM(responderData)
val listsResponderADM: ListsResponderADM = new ListsResponderADM(responderData)
val permissionsResponderADM: PermissionsResponderADM = new PermissionsResponderADM(responderData)
val projectsResponderADM: ProjectsResponderADM = new ProjectsResponderADM(responderData)
val storeResponderADM: StoresResponderADM = new StoresResponderADM(responderData)
val usersResponderADM: UsersResponderADM = new UsersResponderADM(responderData)
val sipiRouterADM: SipiResponderADM = new SipiResponderADM(responderData)
private val groupsResponderADM: GroupsResponderADM = new GroupsResponderADM(responderData)
private val listsResponderADM: ListsResponderADM = new ListsResponderADM(responderData)
private val permissionsResponderADM: PermissionsResponderADM = new PermissionsResponderADM(responderData)
private val projectsResponderADM: ProjectsResponderADM = ProjectsResponderADM(actorDeps, cacheServiceSettings)
private val storeResponderADM: StoresResponderADM = new StoresResponderADM(responderData)
private val usersResponderADM: UsersResponderADM = new UsersResponderADM(responderData)
private val sipiRouterADM: SipiResponderADM = new SipiResponderADM(responderData)

def receive: Receive = {

Expand Down Expand Up @@ -185,5 +171,4 @@ class RoutingActor(
s"RoutingActor received an unexpected message $other of type ${other.getClass.getCanonicalName}"
)
}

}
5 changes: 3 additions & 2 deletions webapi/src/main/scala/org/knora/webapi/responders/Responder.scala
View file
Expand Up @@ -12,10 +12,11 @@ import akka.http.scaladsl.util.FastFuture
import akka.util.Timeout
import com.typesafe.scalalogging.LazyLogging
import com.typesafe.scalalogging.Logger
import scala.concurrent.Future
import dsp.errors._

import scala.concurrent.ExecutionContext
import scala.concurrent.Future

import dsp.errors._
import org.knora.webapi.messages.StringFormatter

/**
Expand Down
3 changes: 2 additions & 1 deletion webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala
View file
Expand Up @@ -7,11 +7,12 @@ package org.knora.webapi.responders.admin

import akka.http.scaladsl.util.FastFuture
import akka.pattern._

import java.util.UUID
import scala.concurrent.Future

import dsp.errors._
import dsp.valueobjects.Group.GroupStatus

import org.knora.webapi._
import org.knora.webapi.messages.IriConversions._
import org.knora.webapi.messages.OntologyConstants
Expand Down
3 changes: 2 additions & 1 deletion webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponderADM.scala
View file
Expand Up @@ -7,12 +7,13 @@ package org.knora.webapi.responders.admin

import akka.http.scaladsl.util.FastFuture
import akka.pattern._

import java.util.UUID
import scala.collection.immutable.Iterable
import scala.collection.mutable.ListBuffer
import scala.concurrent.Future
import dsp.errors._

import dsp.errors._
import org.knora.webapi._
import org.knora.webapi.messages.IriConversions._
import org.knora.webapi.messages.OntologyConstants
Expand Down
12 changes: 8 additions & 4 deletions webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala
View file
Expand Up @@ -7,6 +7,7 @@ package org.knora.webapi.responders.admin

import akka.http.scaladsl.util.FastFuture
import akka.pattern._

import java.io.BufferedInputStream
import java.io.BufferedOutputStream
import java.nio.file.Files
Expand All @@ -16,8 +17,8 @@ import scala.concurrent.Future
import scala.util.Failure
import scala.util.Success
import scala.util.Try
import dsp.errors._

import dsp.errors._
import org.knora.webapi._
import org.knora.webapi.instrumentation.InstrumentationSupport
import org.knora.webapi.messages.IriConversions._
Expand All @@ -35,17 +36,20 @@ import org.knora.webapi.messages.store.cacheservicemessages.CacheServiceGetProje
import org.knora.webapi.messages.store.cacheservicemessages.CacheServicePutProjectADM
import org.knora.webapi.messages.store.triplestoremessages._
import org.knora.webapi.messages.util.KnoraSystemInstances
import org.knora.webapi.messages.util.ResponderData
import org.knora.webapi.messages.util.rdf._
import org.knora.webapi.messages.v2.responder.ontologymessages.OntologyMetadataGetByProjectRequestV2
import org.knora.webapi.messages.v2.responder.ontologymessages.ReadOntologyMetadataV2
import org.knora.webapi.responders.ActorDeps
import org.knora.webapi.responders.IriLocker
import org.knora.webapi.responders.Responder
import org.knora.webapi.store.cache.settings.CacheServiceSettings

/**
* Returns information about Knora projects.
*/
class ProjectsResponderADM(responderData: ResponderData) extends Responder(responderData.actorDeps) with InstrumentationSupport {
final case class ProjectsResponderADM(actorDeps: ActorDeps, cacheServiceSettings: CacheServiceSettings)
extends Responder(actorDeps)
with InstrumentationSupport {

// Global lock IRI used for project creation and update
private val PROJECTS_GLOBAL_LOCK_IRI = "http://rdfh.ch/projects"
Expand Down Expand Up @@ -1169,7 +1173,7 @@ class ProjectsResponderADM(responderData: ResponderData) extends Responder(respo
private def getProjectFromCacheOrTriplestore(
identifier: ProjectIdentifierADM
): Future[Option[ProjectADM]] =
if (responderData.cacheServiceSettings.cacheServiceEnabled) {
if (cacheServiceSettings.cacheServiceEnabled) {
// caching enabled
getProjectFromCache(identifier).flatMap {
case None =>
Expand Down
3 changes: 2 additions & 1 deletion webapi/src/main/scala/org/knora/webapi/responders/admin/SipiResponderADM.scala
View file
Expand Up @@ -7,11 +7,12 @@ package org.knora.webapi.responders.admin

import akka.http.scaladsl.util.FastFuture
import akka.pattern._

import scala.concurrent.Future

import dsp.errors.BadRequestException
import dsp.errors.InconsistentRepositoryDataException
import dsp.errors.NotFoundException

import org.knora.webapi.messages.SmartIri
import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM._
import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectRestrictedViewSettingsADM
Expand Down
3 changes: 2 additions & 1 deletion webapi/src/main/scala/org/knora/webapi/responders/admin/StoresResponderADM.scala
View file
Expand Up @@ -7,9 +7,10 @@ package org.knora.webapi.responders.admin

import akka.http.scaladsl.util.FastFuture
import akka.pattern._

import scala.concurrent.Future
import dsp.errors.ForbiddenException

import dsp.errors.ForbiddenException
import org.knora.webapi.messages.admin.responder.storesmessages.ResetTriplestoreContentRequestADM
import org.knora.webapi.messages.admin.responder.storesmessages.ResetTriplestoreContentResponseADM
import org.knora.webapi.messages.admin.responder.storesmessages.StoreResponderRequestADM
Expand Down
3 changes: 2 additions & 1 deletion webapi/src/main/scala/org/knora/webapi/responders/admin/UsersResponderADM.scala
View file
Expand Up @@ -8,13 +8,14 @@ package org.knora.webapi.responders.admin
import akka.http.scaladsl.util.FastFuture
import akka.pattern._
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder

import java.util.UUID
import scala.concurrent.Future

import dsp.errors.BadRequestException
import dsp.errors.InconsistentRepositoryDataException
import dsp.errors._
import dsp.valueobjects.User._

import org.knora.webapi._
import org.knora.webapi.instrumentation.InstrumentationSupport
import org.knora.webapi.messages.IriConversions._
Expand Down
1 change: 1 addition & 0 deletions webapi/src/main/scala/org/knora/webapi/responders/v1/CkanResponderV1.scala
View file
Expand Up @@ -8,6 +8,7 @@ package org.knora.webapi.responders.v1
import akka.actor.ActorRef
import akka.pattern._
import akka.util.Timeout

import java.net.URLEncoder
import scala.concurrent.Await
import scala.concurrent.Future
Expand Down
3 changes: 2 additions & 1 deletion webapi/src/main/scala/org/knora/webapi/responders/v1/ListsResponderV1.scala
View file
Expand Up @@ -6,10 +6,11 @@
package org.knora.webapi.responders.v1

import akka.pattern._

import scala.annotation.tailrec
import scala.concurrent.Future
import dsp.errors.NotFoundException

import dsp.errors.NotFoundException
import org.knora.webapi._
import org.knora.webapi.messages.store.triplestoremessages.SparqlSelectRequest
import org.knora.webapi.messages.util.ResponderData
Expand Down
3 changes: 2 additions & 1 deletion webapi/src/main/scala/org/knora/webapi/responders/v1/OntologyResponderV1.scala
View file
Expand Up @@ -6,11 +6,12 @@
package org.knora.webapi.responders.v1

import akka.pattern._

import scala.concurrent.Future

import dsp.constants.SalsahGui
import dsp.errors.InconsistentRepositoryDataException
import dsp.errors.NotFoundException

import org.knora.webapi._
import org.knora.webapi.messages.IriConversions._
import org.knora.webapi.messages.OntologyConstants
Expand Down
7 changes: 4 additions & 3 deletions webapi/src/main/scala/org/knora/webapi/responders/v1/ProjectsResponderV1.scala
View file
Expand Up @@ -7,10 +7,11 @@ package org.knora.webapi.responders.v1

import akka.http.scaladsl.util.FastFuture
import akka.pattern._

import scala.concurrent.Future

import dsp.errors.InconsistentRepositoryDataException
import dsp.errors.NotFoundException

import org.knora.webapi._
import org.knora.webapi.messages.OntologyConstants
import org.knora.webapi.messages.admin.responder.usersmessages.UserADM
Expand All @@ -19,20 +20,20 @@ import org.knora.webapi.messages.admin.responder.usersmessages.UserIdentifierADM
import org.knora.webapi.messages.admin.responder.usersmessages.UserResponseADM
import org.knora.webapi.messages.store.triplestoremessages._
import org.knora.webapi.messages.util.KnoraSystemInstances
import org.knora.webapi.messages.util.ResponderData
import org.knora.webapi.messages.util.rdf.SparqlSelectResult
import org.knora.webapi.messages.util.rdf.VariableResultsRow
import org.knora.webapi.messages.v1.responder.ontologymessages.NamedGraphV1
import org.knora.webapi.messages.v1.responder.ontologymessages.NamedGraphsGetRequestV1
import org.knora.webapi.messages.v1.responder.ontologymessages.NamedGraphsResponseV1
import org.knora.webapi.messages.v1.responder.projectmessages._
import org.knora.webapi.messages.v1.responder.usermessages._
import org.knora.webapi.responders.ActorDeps
import org.knora.webapi.responders.Responder

/**
* Returns information about Knora projects.
*/
class ProjectsResponderV1(responderData: ResponderData) extends Responder(responderData.actorDeps) {
final case class ProjectsResponderV1(actorDeps: ActorDeps) extends Responder(actorDeps) {

// Global lock IRI used for project creation and update

Expand Down
3 changes: 2 additions & 1 deletion webapi/src/main/scala/org/knora/webapi/responders/v1/ResourcesResponderV1.scala
View file
Expand Up @@ -7,16 +7,17 @@ package org.knora.webapi.responders.v1

import akka.http.scaladsl.util.FastFuture
import akka.pattern._

import java.time.Instant
import java.util.UUID
import scala.concurrent.Future
import scala.util.Failure
import scala.util.Success
import scala.util.Try

import dsp.constants.SalsahGui
import dsp.errors._
import dsp.schema.domain.Cardinality._

import org.knora.webapi._
import org.knora.webapi.messages.IriConversions._
import org.knora.webapi.messages.OntologyConstants
Expand Down
3 changes: 2 additions & 1 deletion webapi/src/main/scala/org/knora/webapi/responders/v1/SearchResponderV1.scala
View file
Expand Up @@ -6,10 +6,11 @@
package org.knora.webapi.responders.v1

import akka.pattern._

import scala.concurrent.Future

import dsp.errors.BadRequestException
import dsp.errors.InconsistentRepositoryDataException

import org.knora.webapi._
import org.knora.webapi.messages.IriConversions._
import org.knora.webapi.messages.OntologyConstants
Expand Down
3 changes: 2 additions & 1 deletion webapi/src/main/scala/org/knora/webapi/responders/v1/StandoffResponderV1.scala
View file
Expand Up @@ -6,10 +6,11 @@
package org.knora.webapi.responders.v1

import akka.pattern._

import java.util.UUID
import scala.concurrent.Future
import dsp.errors.NotFoundException

import dsp.errors.NotFoundException
import org.knora.webapi._
import org.knora.webapi.messages.IriConversions._
import org.knora.webapi.messages.StringFormatter
Expand Down
3 changes: 2 additions & 1 deletion webapi/src/main/scala/org/knora/webapi/responders/v1/UsersResponderV1.scala
View file
Expand Up @@ -7,12 +7,13 @@ package org.knora.webapi.responders.v1

import akka.http.scaladsl.util.FastFuture
import akka.pattern._

import java.util.UUID
import scala.concurrent.Future

import dsp.errors.ApplicationCacheException
import dsp.errors.ForbiddenException
import dsp.errors.NotFoundException

import org.knora.webapi._
import org.knora.webapi.messages.OntologyConstants
import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionDataGetADM
Expand Down
3 changes: 2 additions & 1 deletion webapi/src/main/scala/org/knora/webapi/responders/v1/ValuesResponderV1.scala
View file
Expand Up @@ -6,12 +6,13 @@
package org.knora.webapi.responders.v1

import akka.pattern._

import java.time.Instant
import scala.annotation.tailrec
import scala.concurrent.Future

import dsp.errors._
import dsp.schema.domain.Cardinality._

import org.knora.webapi._
import org.knora.webapi.messages.IriConversions._
import org.knora.webapi.messages.OntologyConstants
Expand Down
1 change: 1 addition & 0 deletions webapi/src/main/scala/org/knora/webapi/responders/v2/ListsResponderV2.scala
View file
Expand Up @@ -6,6 +6,7 @@
package org.knora.webapi.responders.v2

import akka.pattern._

import scala.concurrent.Future

import org.knora.webapi.IRI
Expand Down

0 comments on commit 3c1d44d

Please sign in to comment.