Skip to content

Commit e316b1c

Browse files
fsteegfsteeg
committed
Support JSON literals
1 parent d953a4f commit e316b1c

File tree

7 files changed

+74
-46
lines changed

7 files changed

+74
-46
lines changed

‎core/reports/json-ld-api-tests-skip‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,10 @@ https://w3c.github.io/json-ld-api/tests/compact-manifest#tin02
7878
https://w3c.github.io/json-ld-api/tests/compact-manifest#tin03
7979
https://w3c.github.io/json-ld-api/tests/compact-manifest#tin04
8080
https://w3c.github.io/json-ld-api/tests/compact-manifest#tin05
81-
https://w3c.github.io/json-ld-api/tests/compact-manifest#tjs01
82-
https://w3c.github.io/json-ld-api/tests/compact-manifest#tjs02
83-
https://w3c.github.io/json-ld-api/tests/compact-manifest#tjs03
84-
https://w3c.github.io/json-ld-api/tests/compact-manifest#tjs04
85-
https://w3c.github.io/json-ld-api/tests/compact-manifest#tjs05
8681
https://w3c.github.io/json-ld-api/tests/compact-manifest#tjs06
8782
https://w3c.github.io/json-ld-api/tests/compact-manifest#tjs07
8883
https://w3c.github.io/json-ld-api/tests/compact-manifest#tjs08
8984
https://w3c.github.io/json-ld-api/tests/compact-manifest#tjs09
90-
https://w3c.github.io/json-ld-api/tests/compact-manifest#tjs10
9185
https://w3c.github.io/json-ld-api/tests/compact-manifest#tjs11
9286
https://w3c.github.io/json-ld-api/tests/compact-manifest#tli01
9387
https://w3c.github.io/json-ld-api/tests/compact-manifest#tli02
@@ -300,27 +294,10 @@ https://w3c.github.io/json-ld-api/tests/expand-manifest#tin06
300294
https://w3c.github.io/json-ld-api/tests/expand-manifest#tin07
301295
https://w3c.github.io/json-ld-api/tests/expand-manifest#tin08
302296
https://w3c.github.io/json-ld-api/tests/expand-manifest#tin09
303-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs01
304-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs02
305-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs03
306-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs04
307-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs05
308-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs06
309-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs07
310-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs08
311-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs09
312-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs10
313-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs11
314-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs12
315-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs13
316-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs14
317297
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs15
318298
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs16
319-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs17
320-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs18
321299
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs19
322300
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs20
323-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs21
324301
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs22
325302
https://w3c.github.io/json-ld-api/tests/expand-manifest#tjs23
326303
https://w3c.github.io/json-ld-api/tests/expand-manifest#tl001
@@ -432,17 +409,8 @@ https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tdi05
432409
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tdi06
433410
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tdi11
434411
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tdi12
435-
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tjs01
436-
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tjs02
437-
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tjs03
438-
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tjs04
439-
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tjs05
440-
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tjs06
441-
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tjs07
442412
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tjs08
443413
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tjs09
444-
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tjs10
445-
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tjs11
446414
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tli01
447415
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tli02
448416
https://w3c.github.io/json-ld-api/tests/fromRdf-manifest#tli03
@@ -618,10 +586,7 @@ https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tjs02
618586
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tjs03
619587
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tjs04
620588
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tjs05
621-
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tjs06
622-
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tjs07
623589
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tjs08
624-
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tjs09
625590
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tjs10
626591
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tjs11
627592
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tjs12

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -384,9 +384,14 @@ private void createTermDefinition(Map<String, Object> context, String term,
384384
}
385385
throw new JsonLdError(Error.INVALID_TYPE_MAPPING, type, error);
386386
}
387+
// jsonld 1.1: 13.3 in https://w3c.github.io/json-ld-api/#algorithm-0
388+
if (JsonLdOptions.JSON_LD_1_0.equals(options.getProcessingMode())
389+
&& (JsonLdConsts.NONE.equals(type) || JsonLdConsts.JSON.equals(type))) {
390+
throw new JsonLdError(Error.INVALID_TYPE_MAPPING, type);
391+
}
387392
// TODO: fix check for absoluteIri (blank nodes shouldn't count, at
388393
// least not here!)
389-
if (JsonLdConsts.ID.equals(type) || JsonLdConsts.VOCAB.equals(type)
394+
if (JsonLdConsts.ID.equals(type) || JsonLdConsts.VOCAB.equals(type) || JsonLdConsts.JSON.equals(type)
390395
|| (!type.startsWith(JsonLdConsts.BLANK_NODE_PREFIX)
391396
&& JsonLdUtils.isAbsoluteIri(type))) {
392397
definition.put(JsonLdConsts.TYPE, type);
@@ -522,8 +527,7 @@ private String selectContainer(final List<?> allContainers) {
522527
return (String) supportedContainer.orElse(null);
523528
}
524529

525-
// jsonld 1.1: 22.1 in
526-
// https://w3c.github.io/json-ld-api/#create-term-definition
530+
// jsonld 1.1: 22.1 in https://w3c.github.io/json-ld-api/#create-term-definition
527531
private List<?> checkValidContainerEntry(final Object containerObject) {
528532
List<?> container = (List<?>) (containerObject instanceof List ? containerObject
529533
: Arrays.asList(containerObject));
@@ -607,8 +611,6 @@ String expandIri(String value, boolean relative, boolean vocab, Map<String, Obje
607611
// 6)
608612
else if (relative) {
609613
return JsonLdUrl.resolve((String) this.get(JsonLdConsts.BASE), value);
610-
} else if (context != null && JsonLdUtils.isRelativeIri(value)) {
611-
throw new JsonLdError(Error.INVALID_IRI_MAPPING, "not an absolute IRI: " + value);
612614
}
613615
// 7)
614616
return value;

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

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,12 @@ public Object compact(Context activeCtx, String activeProperty, Object element,
188188
// 4
189189
if (elem.containsKey(JsonLdConsts.VALUE) || elem.containsKey(JsonLdConsts.ID)) {
190190
final Object compactedValue = activeCtx.compactValue(activeProperty, elem);
191-
if (!(compactedValue instanceof Map || compactedValue instanceof List)) {
191+
boolean isScalar = !(compactedValue instanceof Map || compactedValue instanceof List);
192+
// jsonld 1.1: 7 in https://w3c.github.io/json-ld-api/#algorithm-6
193+
boolean isJson = activeCtx.getTermDefinition(activeProperty) != null
194+
&& JsonLdConsts.JSON.equals(
195+
activeCtx.getTermDefinition(activeProperty).get(JsonLdConsts.TYPE));
196+
if (isScalar || isJson) {
192197
return compactedValue;
193198
}
194199
}
@@ -580,6 +585,8 @@ else if (element instanceof Map) {
580585
throw new JsonLdError(Error.COLLIDING_KEYWORDS,
581586
expandedProperty + " already exists in result");
582587
}
588+
// jsonld 1.1: 12 in https://w3c.github.io/json-ld-api/#algorithm-3
589+
Object inputType = elem.get(JsonLdConsts.TYPE);
583590
// 7.4.3)
584591
if (JsonLdConsts.ID.equals(expandedProperty)) {
585592
if (value instanceof String) {
@@ -645,6 +652,13 @@ else if (JsonLdConsts.GRAPH.equals(expandedProperty)) {
645652
}
646653
// 7.4.6)
647654
else if (JsonLdConsts.VALUE.equals(expandedProperty)) {
655+
// jsonld 1.1: 13.4.7.1 in https://w3c.github.io/json-ld-api/#algorithm-3
656+
if(JsonLdConsts.JSON.equals(inputType)) {
657+
expandedValue = value;
658+
if(opts.getProcessingMode().equals(JsonLdOptions.JSON_LD_1_0)) {
659+
throw new JsonLdError(Error.INVALID_VALUE_OBJECT_VALUE, value);
660+
}
661+
}
648662
if (value != null && (value instanceof Map || value instanceof List)) {
649663
throw new JsonLdError(Error.INVALID_VALUE_OBJECT_VALUE,
650664
"value of " + expandedProperty + " must be a scalar or null");
@@ -780,13 +794,26 @@ else if (frameExpansion && (JsonLdConsts.EXPLICIT.equals(expandedProperty)
780794
}
781795
// 7.4.12)
782796
if (expandedValue != null) {
797+
/* jsonld 1.1: 13.4.16 in https://w3c.github.io/json-ld-api/#algorithm-3
798+
if (!(expandedValue == null && JsonLdConsts.VALUE.equals(expandedProperty)
799+
&& (inputType == null || JsonLdConsts.JSON.equals(inputType)))) { */
783800
result.put(expandedProperty, expandedValue);
784801
}
785802
// 7.4.13)
786803
continue;
787804
}
805+
// jsonld 1.1: 13.5 in https://w3c.github.io/json-ld-api/#algorithm-3
806+
String containerMapping = activeCtx.getContainer(key);
807+
// jsonld 1.1: 13.6 in https://w3c.github.io/json-ld-api/#algorithm-3
808+
if (activeCtx.getTermDefinition(key) != null
809+
&& JsonLdConsts.JSON.equals(activeCtx.getTermDefinition(key).get(JsonLdConsts.TYPE))) {
810+
Map<String, Object> newMap = newMap();
811+
newMap.put(JsonLdConsts.VALUE, value);
812+
newMap.put(JsonLdConsts.TYPE, JsonLdConsts.JSON);
813+
expandedValue = newMap;
814+
}
788815
// 7.5
789-
else if (JsonLdConsts.LANGUAGE.equals(activeCtx.getContainer(key))
816+
else if (JsonLdConsts.LANGUAGE.equals(containerMapping)
790817
&& value instanceof Map) {
791818
// 7.5.1)
792819
expandedValue = new ArrayList<Object>();
@@ -937,8 +964,11 @@ else if (JsonLdConsts.INDEX.equals(activeCtx.getContainer(key))
937964
// null, so simply return it
938965
return null;
939966
}
967+
else if (result.getOrDefault(JsonLdConsts.TYPE,"").equals(JsonLdConsts.JSON)) {
968+
// jsonld 1.1: 14.3 in https://w3c.github.io/json-ld-api/#algorithm-3
969+
}
940970
// 8.3)
941-
if (!(rval instanceof String) && result.containsKey(JsonLdConsts.LANGUAGE)) {
971+
else if (!(rval instanceof String) && result.containsKey(JsonLdConsts.LANGUAGE)) {
942972
throw new JsonLdError(Error.INVALID_LANGUAGE_TAGGED_VALUE,
943973
"when @language is used, @value must be a string");
944974
}

‎core/src/main/java/com/github/jsonldjava/core/JsonLdConsts.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public final class JsonLdConsts {
2727
public static final String RDF_OBJECT = RDF_SYNTAX_NS + "object";
2828
public static final String RDF_LANGSTRING = RDF_SYNTAX_NS + "langString";
2929
public static final String RDF_LIST = RDF_SYNTAX_NS + "List";
30+
public static final String RDF_JSON = RDF_SYNTAX_NS + "JSON";
3031

3132
public static final String TEXT_TURTLE = "text/turtle";
3233
public static final String APPLICATION_NQUADS = "application/n-quads"; // https://www.w3.org/TR/n-quads/#sec-mediatype
@@ -63,6 +64,7 @@ public final class JsonLdConsts {
6364
public static final String PROPAGATE = "@propagate";
6465
public static final String IMPORT = "@import";
6566
public static final String DIRECTION = "@direction";
67+
public static final String JSON = "@json";
6668

6769
public enum Embed {
6870
ALWAYS, NEVER, LAST, LINK;

‎core/src/main/java/com/github/jsonldjava/core/JsonLdError.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ public enum Error {
117117

118118
PARSE_ERROR("parse error"),
119119

120+
INVALID_JSON_LITERAL("invalid JSON literal"),
121+
120122
UNKNOWN_ERROR("unknown error");
121123

122124
private final String error;

‎core/src/main/java/com/github/jsonldjava/core/JsonLdUtils.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ static boolean isKeyword(Object key) {
3232
|| "@language".equals(key) || "@list".equals(key) || "@omitDefault".equals(key)
3333
|| "@reverse".equals(key) || "@preserve".equals(key) || "@set".equals(key)
3434
|| "@type".equals(key) || "@value".equals(key) || "@vocab".equals(key)
35-
|| "@requireAll".equals(key);
35+
|| "@requireAll".equals(key) || "@version".equals(key)|| "@protected".equals(key)
36+
|| "@propagate".equals(key)|| "@import".equals(key)|| "@direction".equals(key)
37+
|| "@json".equals(key);
3638
}
3739

3840
public static Boolean deepCompare(Object v1, Object v2, Boolean listOrderMatters) {

‎core/src/main/java/com/github/jsonldjava/core/RDFDataset.java‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import static com.github.jsonldjava.core.JsonLdConsts.RDF_NIL;
66
import static com.github.jsonldjava.core.JsonLdConsts.RDF_REST;
77
import static com.github.jsonldjava.core.JsonLdConsts.RDF_TYPE;
8+
import static com.github.jsonldjava.core.JsonLdConsts.RDF_JSON;
89
import static com.github.jsonldjava.core.JsonLdConsts.XSD_BOOLEAN;
910
import static com.github.jsonldjava.core.JsonLdConsts.XSD_DECIMAL;
1011
import static com.github.jsonldjava.core.JsonLdConsts.XSD_DOUBLE;
@@ -17,6 +18,7 @@
1718
import static com.github.jsonldjava.core.JsonLdUtils.isValue;
1819
import static com.github.jsonldjava.utils.Obj.newMap;
1920

21+
import java.io.IOException;
2022
import java.text.DecimalFormat;
2123
import java.text.DecimalFormatSymbols;
2224
import java.util.ArrayList;
@@ -28,6 +30,8 @@
2830
import java.util.Set;
2931
import java.util.regex.Pattern;
3032

33+
import com.github.jsonldjava.utils.JsonUtils;
34+
3135
/**
3236
* Starting to migrate away from using plain java Maps as the internal RDF
3337
* dataset store. Currently each item just wraps a Map based on the old format
@@ -240,7 +244,18 @@ Map<String, Object> toObject(Boolean useNativeTypes) throws JsonLdError {
240244
else {
241245
rval.put("@type", type);
242246
}
243-
} else if (!XSD_STRING.equals(type)) {
247+
}
248+
// jsonld 1.1: 2.5 in https://w3c.github.io/json-ld-api/#algorithm-16
249+
else if(RDF_JSON.equals(type)) {
250+
rval.put("@type", "@json");
251+
try {
252+
rval.put("@value", JsonUtils.fromString(value));
253+
} catch (IOException e) {
254+
e.printStackTrace();
255+
throw new JsonLdError(JsonLdError.Error.INVALID_JSON_LITERAL, value, e);
256+
}
257+
}
258+
else if (!XSD_STRING.equals(type)) {
244259
rval.put("@type", type);
245260
}
246261
}
@@ -684,7 +699,17 @@ private Node objectToRDF(Object item) {
684699
return new Literal((String) value,
685700
datatype == null ? RDF_LANGSTRING : (String) datatype,
686701
(String) ((Map<String, Object>) item).get("@language"));
687-
} else {
702+
}
703+
// jsonld 1.1: 8 in https://w3c.github.io/json-ld-api/#algorithm-13
704+
else if(JsonLdConsts.JSON.equals(datatype)) {
705+
try {
706+
return new Literal(JsonUtils.toString(value), RDF_JSON, null);
707+
} catch (IOException e) {
708+
e.printStackTrace();
709+
return null;
710+
}
711+
}
712+
else {
688713
return new Literal((String) value,
689714
datatype == null ? XSD_STRING : (String) datatype, null);
690715
}

0 commit comments

Comments
 (0)