Merge pull request #31 from ModelDriven/feature/ST5AS-74

ST5AS-74 Temporarily inline JSON-LD @context by default.
Systems-Modeling · Jul 28, 2020 · cb3ea22 · cb3ea22
2 parents 81bc211 + 27532e4
commit cb3ea22
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/controllers/ElementController.java b/app/controllers/ElementController.java
@@ -38,6 +38,10 @@ public class ElementController extends Controller {
     @Inject
     private Environment environment;
 
+    private static final boolean INLINE_JSON_LD_CONTEXT_DEFAULT = true;
+    private static final boolean INLINE_JSON_LD_CONTEXT = Optional.ofNullable(System.getenv("INLINE_JSON_LD_CONTEXT"))
+            .map(Boolean::parseBoolean).orElse(INLINE_JSON_LD_CONTEXT_DEFAULT);
+
     public Result byId(String id) {
         UUID uuid = UUID.fromString(id);
         Optional<Element> element = elementService.getById(uuid);
@@ -95,7 +99,7 @@ static JsonLdMofObjectAdornment adornMofObject(MofObject mof, Http.Request reque
         return new JsonLdMofObjectAdornment(mof, metamodelProvider, environment,
                 String.format("http://%s", request.host()),
                 String.format("/projects/%s/commits/%s/elements/", projectId, commitId),
-                false
+                INLINE_JSON_LD_CONTEXT
         );
     }
 

diff --git a/app/jackson/JsonLdMofObjectAdornment.java b/app/jackson/JsonLdMofObjectAdornment.java
@@ -40,7 +40,7 @@ public JsonLdMofObjectAdornment(MofObject mof, MetamodelProvider metamodelProvid
             if (!(cachedContext instanceof ObjectNode)) {
                 throw new IllegalStateException("context expected to be an ObjectNode");
             }
-            contextObjectNode.setAll((ObjectNode) cachedContext);
+            contextObjectNode.setAll((ObjectNode) cachedContext.get("@context"));
         }
         else {
             contextObjectNode.put("@import", URI.create(host).resolve(String.format("/jsonld/%s.jsonld", type)).toString());