chore: fixes document cache usage + test

eclipse-edc · Jun 5, 2024 · 7e399f3 · 7e399f3
1 parent 564d627
commit 7e399f3
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/core/common/lib/json-ld-lib/src/main/java/org/eclipse/edc/jsonld/TitaniumJsonLd.java b/core/common/lib/json-ld-lib/src/main/java/org/eclipse/edc/jsonld/TitaniumJsonLd.java
@@ -196,8 +196,12 @@ public Document loadDocument(URI url, DocumentLoaderOptions options) throws Json
                     .map(uriCache::get)
                     .orElse(url);
 
-            return Optional.ofNullable(documentCache.get(uri))
-                    .orElse(loader.loadDocument(uri, options));
+            var document = documentCache.get(uri);
+            if (document != null) {
+                return document;
+            } else {
+                return loader.loadDocument(uri, options);
+            }
         }
 
         public void register(String contextUrl, URI uri) {

diff --git a/core/common/lib/json-ld-lib/src/test/java/org/eclipse/edc/jsonld/TitaniumJsonLdTest.java b/core/common/lib/json-ld-lib/src/test/java/org/eclipse/edc/jsonld/TitaniumJsonLdTest.java
@@ -28,6 +28,7 @@
 import org.mockserver.integration.ClientAndServer;
 import org.mockserver.model.HttpRequest;
 import org.mockserver.model.HttpResponse;
+import org.mockserver.verify.VerificationTimes;
 
 import java.net.URI;
 
@@ -285,6 +286,26 @@ void documentResolution_shouldCallHttpEndpoint_whenContextIsNotRegistered_andHtt
                     .extracting(it -> it.getString(JsonLdKeywords.VALUE))
                     .isEqualTo("value");
         });
+
+    }
+
+
+    @Test
+    void documentResolution_shouldCallHttpEndpointOnlyOnce_whenContextIsNotRegistered_andHttpIsEnabled() {
+        server.when(HttpRequest.request()).respond(HttpResponse.response(TestUtils.getResourceFileContentAsString("test-context.jsonld")));
+        var contextUrl = "http://localhost:" + port;
+        var jsonObject = createObjectBuilder()
+                .add(JsonLdKeywords.CONTEXT, contextUrl)
+                .add("test:key", "value")
+                .build();
+        var service = httpEnabledService();
+        service.registerCachedDocument("http//any.other/url", URI.create("http://localhost:" + server.getLocalPort()));
+
+        AbstractResultAssert.assertThat(service.expand(jsonObject)).isSucceeded();
+        AbstractResultAssert.assertThat(service.expand(jsonObject)).isSucceeded();
+
+        server.verify(HttpRequest.request().withMethod("GET"), VerificationTimes.exactly(1));
+
     }
 
     private JsonLd httpEnabledService() {