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

- add test compact-105

See w3c/json-ld-syntax#34.

Author: dr0i

core/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>jsonld-java-parent</artifactId>
 		<groupId>com.github.jsonld-java</groupId>
-		<version>0.12.2-SNAPSHOT</version>
+		<version>0.12.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jsonld-java</artifactId>

core/src/main/java/com/github/jsonldjava/core/Context.java

@@ -1044,13 +1044,15 @@ private String selectTerm(String iri, List<String> containers, String typeLangua
      *
      * @param property
      *            The Property to get a container mapping for.
-     * @return The container mapping
+     * @return The container mapping if any, else null
      */
     public String getContainer(String property) {
+        if (property==null) return null;
         if (JsonLdConsts.GRAPH.equals(property)) {
             return JsonLdConsts.SET;
         }
-        if (JsonLdUtils.isKeyword(property)) {
+        if (!property.equals(JsonLdConsts.TYPE)
+            && JsonLdUtils.isKeyword(property)) {
             return property;
         }
         final Map<String, Object> td = (Map<String, Object>) termDefinitions.get(property);

core/src/main/java/com/github/jsonldjava/core/JsonLdApi.java

@@ -202,12 +202,13 @@ public Object compact(Context activeCtx, String activeProperty, Object element,
             Collections.sort(keys);
             for (final String expandedProperty : keys) {
                 final Object expandedValue = elem.get(expandedProperty);
-
                 // 7.1)
                 if (JsonLdConsts.ID.equals(expandedProperty)
                         || JsonLdConsts.TYPE.equals(expandedProperty)) {
+                    // 7.1.3)
+                    final String alias = activeCtx.compactIri(expandedProperty, true);
                     Object compactedValue;
-
+                    
                     // 7.1.1)
                     if (expandedValue instanceof String) {
                         compactedValue = activeCtx.compactIri((String) expandedValue,
@@ -221,15 +222,15 @@ public Object compact(Context activeCtx, String activeProperty, Object element,
                             types.add(activeCtx.compactIri(expandedType, true));
                         }
                         // 7.1.2.3)
-                        if (types.size() == 1) {
+                        if ( types.size() == 1 
+                            // see w3c/json-ld-syntax#74
+                            && ! (activeCtx.getContainer(alias) != null 
+                            && activeCtx.getContainer(alias).equals(JsonLdConsts.SET)) ) {
                             compactedValue = types.get(0);
                         } else {
                             compactedValue = types;
                         }
                     }
-
-                    // 7.1.3)
-                    final String alias = activeCtx.compactIri(expandedProperty, true);
                     // 7.1.4)
                     result.put(alias, compactedValue);
                     continue;

core/src/test/resources/json-ld.org/compact-0105-context.jsonld

@@ -0,0 +1,5 @@
+{
+  "@context": {
+    "type": {"@id": "@type", "@container": "@set"}
+  }
+}

core/src/test/resources/json-ld.org/compact-0105-in.jsonld

@@ -0,0 +1,3 @@
+{
+  "@type": "http://example.org/type"
+}

core/src/test/resources/json-ld.org/compact-0105-out.jsonld

@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "type": {"@id": "@type", "@container": "@set"}
+  },
+  "type": ["http://example.org/type"]
+}

core/src/test/resources/json-ld.org/compact-manifest.jsonld

@@ -585,6 +585,16 @@
       "input": "compact-0072-in.jsonld",
       "context": "compact-0072-context.jsonld",
       "expect": "compact-0072-out.jsonld"
+    },
+    {
+      "@id": "#t0105",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact @type with @container: @set using an alias of @type",
+      "purpose": "Ensures that a single @type value is represented as an array",
+      "input": "compact-0105-in.jsonld",
+      "context": "compact-0105-context.jsonld",
+      "expect": "compact-0105-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
     }
   ]
 }

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.github.jsonld-java</groupId>
 	<artifactId>jsonld-java-parent</artifactId>
-	<version>0.12.2-SNAPSHOT</version>
+	<version>0.12.3-SNAPSHOT</version>
 	<name>JSONLD Java :: Parent</name>
 	<description>Json-LD Java Parent POM</description>
 	<packaging>pom</packaging>