refactor: ziofy ValuesResponderV2 (DEV-1757) (#2536)

dasch-swiss · Mar 20, 2023 · ca6f97a · ca6f97a
1 parent 042f806
commit ca6f97a
Show file tree

Hide file tree

Showing 5 changed files with 631 additions and 696 deletions.
diff --git a/webapi/src/it/scala/org/knora/webapi/core/LayersTest.scala b/webapi/src/it/scala/org/knora/webapi/core/LayersTest.scala
@@ -92,6 +92,8 @@ import org.knora.webapi.responders.v2.ResourcesResponderV2
 import org.knora.webapi.responders.v2.ResourcesResponderV2Live
 import org.knora.webapi.slice.ontology.domain.service.OntologyRepo
 import org.knora.webapi.slice.ontology.repo.service.OntologyCacheLive
+import org.knora.webapi.responders.v2.ValuesResponderV2
+import org.knora.webapi.responders.v2.ValuesResponderV2Live
 object LayersTest {
 
   /**
@@ -152,6 +154,7 @@ object LayersTest {
     with UsersResponderV1
     with ValueUtilV1
     with ValuesResponderV1
+    with ValuesResponderV2
 
   private val commonLayersForAllIntegrationTests =
     ZLayer.makeSome[CommonR0, CommonR](
@@ -206,7 +209,8 @@ object LayersTest {
       UsersResponderADMLive.layer,
       UsersResponderV1Live.layer,
       ValueUtilV1Live.layer,
-      ValuesResponderV1Live.layer
+      ValuesResponderV1Live.layer,
+      ValuesResponderV2Live.layer
     )
 
   private val fusekiAndSipiTestcontainers =

diff --git a/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala b/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala
@@ -66,6 +66,8 @@ import org.knora.webapi.responders.v2.ResourcesResponderV2
 import org.knora.webapi.responders.v2.ResourcesResponderV2Live
 import org.knora.webapi.responders.v2.StandoffResponderV2
 import org.knora.webapi.responders.v2.StandoffResponderV2Live
+import org.knora.webapi.responders.v2.ValuesResponderV2
+import org.knora.webapi.responders.v2.ValuesResponderV2Live
 import org.knora.webapi.responders.v2.ontology.CardinalityHandler
 import org.knora.webapi.responders.v2.ontology.CardinalityHandlerLive
 import org.knora.webapi.responders.v2.ontology.OntologyHelpers
@@ -154,6 +156,7 @@ object LayersLive {
       with UsersResponderADM
       with UsersResponderV1
       with ValuesResponderV1
+      with ValuesResponderV2
       with ValueUtilV1
 
   /**
@@ -221,6 +224,7 @@ object LayersLive {
       UsersResponderADMLive.layer,
       UsersResponderV1Live.layer,
       ValuesResponderV1Live.layer,
+      ValuesResponderV2Live.layer,
       ValueUtilV1Live.layer
     )
 }
diff --git a/webapi/src/main/scala/org/knora/webapi/core/actors/RoutingActor.scala b/webapi/src/main/scala/org/knora/webapi/core/actors/RoutingActor.scala
@@ -20,7 +20,6 @@ import org.knora.webapi.messages.util.ResponderData
 import org.knora.webapi.messages.util.ValueUtilV1
 import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2
 import org.knora.webapi.messages.v2.responder.searchmessages.SearchResponderRequestV2
-import org.knora.webapi.messages.v2.responder.valuemessages.ValuesResponderRequestV2
 import org.knora.webapi.responders.ActorDeps
 import org.knora.webapi.responders.v2._
 import org.knora.webapi.responders.v2.ontology.CardinalityHandler
@@ -53,7 +52,6 @@ final case class RoutingActor(
   private implicit val executionContext: ExecutionContext = actorDeps.executionContext
 
   // V2 responders
-  private val valuesResponderV2: ValuesResponderV2 = new ValuesResponderV2(responderData, runtime)
   private val searchResponderV2: SearchResponderV2 = new SearchResponderV2(responderData, runtime)
 
   def receive: Receive = {
@@ -63,8 +61,6 @@ final case class RoutingActor(
     // V2 request messages
     case searchResponderRequestV2: SearchResponderRequestV2 =>
       ActorUtil.future2Message(sender(), searchResponderV2.receive(searchResponderRequestV2), log)
-    case valuesResponderRequestV2: ValuesResponderRequestV2 =>
-      ActorUtil.future2Message(sender(), valuesResponderV2.receive(valuesResponderRequestV2), log)
 
     case other =>
       throw UnexpectedMessageException(

diff --git a/...src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala b/...src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala
@@ -22,6 +22,7 @@ import dsp.errors.NotImplementedException
 import dsp.valueobjects.IriErrorMessages
 import org.knora.webapi._
 import org.knora.webapi.config.AppConfig
+import org.knora.webapi.core.RelayedMessage
 import org.knora.webapi.messages.IriConversions._
 import org.knora.webapi.messages.OntologyConstants
 import org.knora.webapi.messages.ResponderRequest.KnoraRequestV2
@@ -45,7 +46,7 @@ import org.knora.webapi.util._
 /**
  * A tagging trait for requests handled by [[org.knora.webapi.responders.v2.ValuesResponderV2]].
  */
-sealed trait ValuesResponderRequestV2 extends KnoraRequestV2
+sealed trait ValuesResponderRequestV2 extends KnoraRequestV2 with RelayedMessage
 
 /**
  * Requests the creation of a value.