Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
fix(triplestore-connector): stack crashes on invalid search (DEV-1154) (
#2140) * clean up application.conf * add additional actors that handle "regular" requests (i.e. non-startup etc) * add some nice-to-have logs * improve cause handling * improve response checking in triplestore connector * allow statuscode 204 response from triplestore * allow entire statuscode 2xx category * refactor: triplestore errors * refactor: triplestore errors * refactor: iiif errors Co-authored-by: Ivan Subotic <400790+subotic@users.noreply.github.com>
- Loading branch information
1 parent
624de47
commit e5426dc
Showing
28 changed files
with
690 additions
and
595 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
webapi/src/main/scala/org/knora/webapi/app/ApplicationRouterActor.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
package org.knora.webapi.app | ||
|
||
import akka.actor.Actor | ||
import org.knora.webapi.messages.ResponderRequest | ||
import com.typesafe.scalalogging.Logger | ||
import org.knora.webapi.responders.ResponderManager | ||
import org.knora.webapi.util.ActorUtil | ||
import scala.concurrent.ExecutionContext | ||
import org.knora.webapi.messages.store.cacheservicemessages.CacheServiceRequest | ||
import org.knora.webapi.messages.store.sipimessages.IIIFRequest | ||
import org.knora.webapi.messages.store.triplestoremessages.TriplestoreRequest | ||
import org.knora.webapi.store.iiif.IIIFServiceManager | ||
import org.knora.webapi.store.triplestore.TriplestoreServiceManager | ||
import org.knora.webapi.store.cache.CacheServiceManager | ||
import org.knora.webapi.config.AppConfig | ||
|
||
class ApplicationRouterActor( | ||
responderManager: ResponderManager, | ||
cacheServiceManager: CacheServiceManager, | ||
iiifServiceManager: IIIFServiceManager, | ||
triplestoreManager: TriplestoreServiceManager, | ||
appConfig: AppConfig | ||
) extends Actor { | ||
val log: Logger = Logger(this.getClass()) | ||
implicit val ec: ExecutionContext = context.dispatcher | ||
def receive: Receive = { | ||
case msg: ResponderRequest.KnoraRequestV1 => ActorUtil.future2Message(sender(), responderManager.receive(msg), log) | ||
case msg: ResponderRequest.KnoraRequestV2 => ActorUtil.future2Message(sender(), responderManager.receive(msg), log) | ||
case msg: ResponderRequest.KnoraRequestADM => ActorUtil.future2Message(sender(), responderManager.receive(msg), log) | ||
case msg: CacheServiceRequest => ActorUtil.zio2Message(sender(), cacheServiceManager.receive(msg), appConfig, log) | ||
case msg: IIIFRequest => ActorUtil.zio2Message(sender(), iiifServiceManager.receive(msg), appConfig, log) | ||
case msg: TriplestoreRequest => ActorUtil.zio2Message(sender(), triplestoreManager.receive(msg), appConfig, log) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.