[Enhancement #43] Do not replicate inherited term mapping when overri…

…ding terms in embedded context.
kbss-cvut · Feb 8, 2023 · a224325 · a224325
1 parent 7d4717a
commit a224325
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/main/java/cz/cvut/kbss/jsonld/serialization/context/EmbeddedTermMappingHolder.java b/src/main/java/cz/cvut/kbss/jsonld/serialization/context/EmbeddedTermMappingHolder.java
@@ -26,6 +26,10 @@ boolean canRegisterTermMapping(String term, JsonNode mappedNode) {
     void registerTermMapping(String term, JsonNode mappedNode) {
         Objects.requireNonNull(term);
         Objects.requireNonNull(mappedNode);
+        if (parentContext.hasTermMapping(term, mappedNode)) {
+            // Already mapped in parent
+            return;
+        }
         if (!isRoot() && !parentContext.hasTermMapping(term)) {
             parentContext.registerTermMapping(term, mappedNode);
         } else {

diff --git a/src/test/java/cz/cvut/kbss/jsonld/serialization/context/EmbeddedTermMappingHolderTest.java b/src/test/java/cz/cvut/kbss/jsonld/serialization/context/EmbeddedTermMappingHolderTest.java
@@ -6,6 +6,9 @@
 import cz.cvut.kbss.jsonld.serialization.JsonNodeFactory;
 import org.junit.jupiter.api.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasKey;
+import static org.hamcrest.Matchers.not;
 import static org.junit.jupiter.api.Assertions.*;
 
 class EmbeddedTermMappingHolderTest {
@@ -21,4 +24,13 @@ void registerTermMappingThrowsAmbiguousTermMappingExceptionWhenRootHolderAlready
                                                    JsonNodeFactory.createStringLiteralNode(term, DC.Terms.TITLE)));
     }
 
+    @Test
+    void registerTermMappingDoesNothingWhenParentContextAlreadyHasEquivalentMappingForSpecifiedTerm() {
+        final EmbeddedTermMappingHolder child = new EmbeddedTermMappingHolder(sut);
+        final String term = "name";
+        sut.registerTermMapping(term, JsonNodeFactory.createStringLiteralNode(term, RDFS.LABEL));
+        child.registerTermMapping(term, JsonNodeFactory.createStringLiteralNode(term, RDFS.LABEL));
+        assertThat(child.getMapping(), not(hasKey(term)));
+        assertTrue(child.hasTermMapping(term));
+    }
 }