fix: When changing the ontologies refresh the cache completely (DEV-4362)

integration/src/test/scala/org/knora/webapi/core/LayersTest.scala

@@ -28,9 +28,7 @@ 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.OntologyCacheHelpers
-import org.knora.webapi.responders.v2.ontology.OntologyCacheHelpersLive
 import org.knora.webapi.responders.v2.ontology.OntologyTriplestoreHelpers
-import org.knora.webapi.responders.v2.ontology.OntologyTriplestoreHelpersLive
 import org.knora.webapi.routing.*
 import org.knora.webapi.slice.admin.AdminModule
 import org.knora.webapi.slice.admin.api.*
@@ -199,10 +197,10 @@ object LayersTest {
       MessageRelayLive.layer,
       OntologyApiModule.layer,
       OntologyCacheLive.layer,
-      OntologyCacheHelpersLive.layer,
+      OntologyCacheHelpers.layer,
       OntologyRepoLive.layer,
       OntologyServiceLive.layer,
-      OntologyTriplestoreHelpersLive.layer,
+      OntologyTriplestoreHelpers.layer,
       PermissionUtilADMLive.layer,
       PermissionsResponder.layer,
       PredicateObjectMapper.layer,

integration/src/test/scala/org/knora/webapi/core/TestStartupUtils.scala

@@ -31,7 +31,7 @@ trait TestStartupUtils extends LazyLogging {
       tss <- ZIO.service[TriplestoreService]
       _   <- tss.resetTripleStoreContent(rdfDataObjects).timeout(480.seconds)
       _   <- ZIO.logInfo("... loading test data done.")
-      _   <- ZIO.serviceWithZIO[OntologyCache](_.loadOntologies()).orDie
+      _   <- ZIO.serviceWithZIO[OntologyCache](_.refreshCache()).orDie
     } yield ()
 
 }

integration/src/test/scala/org/knora/webapi/responders/v2/LoadOntologiesSpec.scala

@@ -19,7 +19,7 @@ import pekko.actor.Status
 import pekko.testkit.ImplicitSender
 
 /**
- * Tests that the [[OntologyCache.loadOntologies]] method does not load invalid data into the cache.
+ * Tests that the [[OntologyCache.refreshCache]] method does not load invalid data into the cache.
  */
 class LoadOntologiesSpec extends CoreSpec with ImplicitSender {
   private val INVALID_ONTO_NAME = "http://www.knora.org/ontology/invalid"
@@ -41,7 +41,7 @@ class LoadOntologiesSpec extends CoreSpec with ImplicitSender {
     )
 
     UnsafeZioRun
-      .run(ZIO.serviceWithZIO[OntologyCache](_.loadOntologies()))
+      .run(ZIO.serviceWithZIO[OntologyCache](_.refreshCache()))
       .toEither
       .map(_ => SuccessResponseV2("OK"))
       .left

integration/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala

@@ -452,7 +452,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender {
       assert(!cachedMetadataResponse.ontologies.exists(_.ontologyIri == fooIri.get.toSmartIri))
 
       // Reload the ontologies from the triplestore and check again.
-      UnsafeZioRun.runOrThrow(ZIO.serviceWithZIO[OntologyCache](_.loadOntologies()))
+      UnsafeZioRun.runOrThrow(ZIO.serviceWithZIO[OntologyCache](_.refreshCache()))
 
       appActor ! OntologyMetadataGetByProjectRequestV2()
 
@@ -793,7 +793,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender {
 
       // Reload the ontology cache and see if we get the same result.
       UnsafeZioRun.runOrThrow(
-        ZIO.serviceWithZIO[OntologyCache](_.loadOntologies()),
+        ZIO.serviceWithZIO[OntologyCache](_.refreshCache()),
       )
 
       appActor ! PropertiesGetRequestV2(
@@ -897,7 +897,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender {
 
       // Reload the ontology cache and see if we get the same result.
       UnsafeZioRun.runOrThrow(
-        ZIO.serviceWithZIO[OntologyCache](_.loadOntologies()),
+        ZIO.serviceWithZIO[OntologyCache](_.refreshCache()),
       )
 
       appActor ! PropertiesGetRequestV2(
@@ -1994,8 +1994,8 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender {
 
       val newObjects = Seq(
         StringLiteralV2.from("has name", Some("en")),
-        StringLiteralV2.from("a nom", Some("fr")),
         StringLiteralV2.from("hat Namen", Some("de")),
+        StringLiteralV2.from("a nom", Some("fr")),
       )
 
       appActor ! ChangePropertyLabelsOrCommentsRequestV2(
@@ -2029,8 +2029,8 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender {
 
       val newObjects = Seq(
         StringLiteralV2.from("has name", Some("en")),
-        StringLiteralV2.from("a nom", Some("fr")),
         StringLiteralV2.from("hat Namen", Some("de")),
+        StringLiteralV2.from("a nom", Some("fr")),
       )
 
       appActor ! ChangePropertyLabelsOrCommentsRequestV2(
@@ -2092,11 +2092,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender {
 
       val newObjects = Seq(
         StringLiteralV2.from("The name of a Thing", Some("en")),
+        StringLiteralV2.from("Der Name eines Dinges", Some("de")),
         StringLiteralV2.from(
           "Le nom d\\'une chose",
           Some("fr"),
         ), // This is SPARQL-escaped as it would be if taken from a JSON-LD request.
-        StringLiteralV2.from("Der Name eines Dinges", Some("de")),
       )
 
       // Make an unescaped copy of the new comments, because this is how we will receive them in the API response.
@@ -2135,11 +2135,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender {
 
       val newObjects = Seq(
         StringLiteralV2.from("The name of a Thing", Some("en")),
+        StringLiteralV2.from("Der Name eines Dinges", Some("de")),
         StringLiteralV2.from(
           "Le nom d\\'une chose",
           Some("fr"),
         ), // This is SPARQL-escaped as it would be if taken from a JSON-LD request.
-        StringLiteralV2.from("Der Name eines Dinges", Some("de")),
       )
 
       // Make an unescaped copy of the new comments, because this is how we will receive them in the API response.
@@ -3736,7 +3736,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender {
 
       // Reload the ontology cache and see if we get the same result.
       UnsafeZioRun.runOrThrow(
-        ZIO.serviceWithZIO[OntologyCache](_.loadOntologies()),
+        ZIO.serviceWithZIO[OntologyCache](_.refreshCache()),
       )
 
       appActor ! linkPropGetRequest