Implement @type to be defined with @container: @set

dr0i · dr0i · commit 673dac2ef4c7 · 2018-10-26T22:53:31.000+02:00
- add test compact-104 See w3c/json-ld-syntax#34.
diff --git a/core/src/main/java/com/github/jsonldjava/core/Context.java b/core/src/main/java/com/github/jsonldjava/core/Context.java
@@ -310,7 +310,9 @@ private void createTermDefinition(Map<String, Object> context, String term,
 
         defined.put(term, false);
 
-        if (JsonLdUtils.isKeyword(term)) {
+        if ( JsonLdUtils.isKeyword(term)//
+            && !(JsonLdConsts.TYPE.equals(term)//
+                && !(context.get(term)).toString().contains(JsonLdConsts.ID)) ) {
             throw new JsonLdError(Error.KEYWORD_REDEFINITION, term);
         }
 
@@ -439,7 +441,7 @@ else if (term.indexOf(":") >= 0) {
             // 15)
         } else if (this.containsKey(JsonLdConsts.VOCAB)) {
             definition.put(JsonLdConsts.ID, this.get(JsonLdConsts.VOCAB) + term);
-        } else {
+        } else if (!JsonLdConsts.TYPE.equals(term)) {
             throw new JsonLdError(Error.INVALID_IRI_MAPPING,
                     "relative term definition without vocab mapping");
         }
@@ -454,6 +456,8 @@ else if (term.indexOf(":") >= 0) {
                         "@container must be either @list, @set, @index, or @language");
             }
             definition.put(JsonLdConsts.CONTAINER, container);
+            if (JsonLdConsts.TYPE.equals(term))
+                definition.put(JsonLdConsts.ID,"type");
         }
 
         // 17)
diff --git a/core/src/test/resources/json-ld.org/compact-0104-context.jsonld b/core/src/test/resources/json-ld.org/compact-0104-context.jsonld
@@ -0,0 +1,5 @@
+{
+  "@context": {
+    "@type": {"@container": "@set"}
+  }
+}
diff --git a/core/src/test/resources/json-ld.org/compact-0104-in.jsonld b/core/src/test/resources/json-ld.org/compact-0104-in.jsonld
@@ -0,0 +1,3 @@
+{
+  "@type": "http://example.org/type"
+}
diff --git a/core/src/test/resources/json-ld.org/compact-0104-out.jsonld b/core/src/test/resources/json-ld.org/compact-0104-out.jsonld
@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@type": {"@container": "@set"}
+  },
+  "@type": ["http://example.org/type"]
+}
diff --git a/core/src/test/resources/json-ld.org/compact-manifest.jsonld b/core/src/test/resources/json-ld.org/compact-manifest.jsonld
@@ -586,6 +586,16 @@
       "context": "compact-0072-context.jsonld",
       "expect": "compact-0072-out.jsonld"
     },
+    {
+      "@id": "#t0104",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact @type with @container: @set",
+      "purpose": "Ensures that a single @type value is represented as an array",
+      "input": "compact-0104-in.jsonld",
+      "context": "compact-0104-context.jsonld",
+      "expect": "compact-0104-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    },
     {
       "@id": "#t0105",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,9 @@ private void createTermDefinition(Map<String, Object> context, String term,`
`310`	`310`
`311`	`311`	`defined.put(term, false);`
`312`	`312`
`313`		`- if (JsonLdUtils.isKeyword(term)) {`
	`313`	`+ if ( JsonLdUtils.isKeyword(term)//`
	`314`	`+ && !(JsonLdConsts.TYPE.equals(term)//`
	`315`	`+ && !(context.get(term)).toString().contains(JsonLdConsts.ID)) ) {`
`314`	`316`	`throw new JsonLdError(Error.KEYWORD_REDEFINITION, term);`
`315`	`317`	`}`
`316`	`318`
`@@ -439,7 +441,7 @@ else if (term.indexOf(":") >= 0) {`
`439`	`441`	`// 15)`
`440`	`442`	`} else if (this.containsKey(JsonLdConsts.VOCAB)) {`
`441`	`443`	`definition.put(JsonLdConsts.ID, this.get(JsonLdConsts.VOCAB) + term);`
`442`		`- } else {`
	`444`	`+ } else if (!JsonLdConsts.TYPE.equals(term)) {`
`443`	`445`	`throw new JsonLdError(Error.INVALID_IRI_MAPPING,`
`444`	`446`	`"relative term definition without vocab mapping");`
`445`	`447`	`}`
`@@ -454,6 +456,8 @@ else if (term.indexOf(":") >= 0) {`
`454`	`456`	`"@container must be either @list, @set, @index, or @language");`
`455`	`457`	`}`
`456`	`458`	`definition.put(JsonLdConsts.CONTAINER, container);`
	`459`	`+ if (JsonLdConsts.TYPE.equals(term))`
	`460`	`+ definition.put(JsonLdConsts.ID,"type");`
`457`	`461`	`}`
`458`	`462`
`459`	`463`	`// 17)`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "@context": {
 +    "@type": {"@container": "@set"}
 +  }
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "@type": "http://example.org/type"`
	`3`	`+}`