Skip to content

Added support for JSON-LD 1.1 @json @type #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
umbreak wants to merge 3 commits into from
Closed

Added support for JSON-LD 1.1 @json @type #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a312c2b
Added support for JSON-LD 1.1 @json @type
umbreak Feb 28, 2021
d3eadc0
Added support for some parts of RFC 8785
umbreak Feb 28, 2021
330c158
Added further support to @json
umbreak Mar 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/src/main/java/com/github/jsonldjava/core/Context.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,8 @@ private void createTermDefinition(Map<String, Object> context, String term,
// least not here!)
if (JsonLdConsts.ID.equals(type) || JsonLdConsts.VOCAB.equals(type)
|| (!type.startsWith(JsonLdConsts.BLANK_NODE_PREFIX)
&& JsonLdUtils.isAbsoluteIri(type))) {
&& JsonLdUtils.isAbsoluteIri(type)) ||
options.isProcessingMode11() && JsonLdConsts.JSON.equals(type)) {
definition.put(JsonLdConsts.TYPE, type);
} else {
throw new JsonLdError(Error.INVALID_TYPE_MAPPING, type);
Expand Down
39 changes: 35 additions & 4 deletions core/src/main/java/com/github/jsonldjava/core/JsonLdApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import static com.github.jsonldjava.core.JsonLdUtils.isKeyword;
import static com.github.jsonldjava.utils.Obj.newMap;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
Expand All @@ -20,6 +21,7 @@
import java.util.Set;
import java.util.TreeMap;

import com.github.jsonldjava.utils.JsonUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -188,7 +190,9 @@ public Object compact(Context activeCtx, String activeProperty, Object element,
// 4
if (elem.containsKey(JsonLdConsts.VALUE) || elem.containsKey(JsonLdConsts.ID)) {
final Object compactedValue = activeCtx.compactValue(activeProperty, elem);
if (!(compactedValue instanceof Map || compactedValue instanceof List)) {
if (!(compactedValue instanceof Map || compactedValue instanceof List) ||
opts.isProcessingMode11() &&
JsonLdConsts.JSON.equals(activeCtx.getTypeMapping(activeProperty))) {
return compactedValue;
}
}
Expand Down Expand Up @@ -645,7 +649,8 @@ else if (JsonLdConsts.GRAPH.equals(expandedProperty)) {
}
// 7.4.6)
else if (JsonLdConsts.VALUE.equals(expandedProperty)) {
if (value != null && (value instanceof Map || value instanceof List)) {
if (value != null && (value instanceof Map || value instanceof List) &&
!opts.isProcessingMode11()) {
throw new JsonLdError(Error.INVALID_VALUE_OBJECT_VALUE,
"value of " + expandedProperty + " must be a scalar or null");
}
Expand Down Expand Up @@ -785,6 +790,12 @@ else if (frameExpansion && (JsonLdConsts.EXPLICIT.equals(expandedProperty)
// 7.4.13)
continue;
}
// 13.6 (from the Json-LD 1.1 spec)
else if (opts.isProcessingMode11() && JsonLdConsts.JSON.equals(activeCtx.getTypeMapping(key))) {
Map<String, Object> temp = newMap(JsonLdConsts.TYPE, JsonLdConsts.JSON);
temp.put(JsonLdConsts.VALUE, value);
expandedValue = temp;
}
// 7.5
else if (JsonLdConsts.LANGUAGE.equals(activeCtx.getContainer(key))
&& value instanceof Map) {
Expand Down Expand Up @@ -926,17 +937,23 @@ else if (JsonLdConsts.INDEX.equals(activeCtx.getContainer(key))
keySet.remove(JsonLdConsts.INDEX);
final boolean langremoved = keySet.remove(JsonLdConsts.LANGUAGE);
final boolean typeremoved = keySet.remove(JsonLdConsts.TYPE);
final boolean isJsonType = JsonLdConsts.JSON.equals(result.get(JsonLdConsts.TYPE));
if ((langremoved && typeremoved) || !keySet.isEmpty()) {
throw new JsonLdError(Error.INVALID_VALUE_OBJECT,
"value object has unknown keys");
}
// 8.2)
final Object rval = result.get(JsonLdConsts.VALUE);
if (rval == null) {
if (rval == null && !opts.isProcessingMode11()) {
// nothing else is possible with result if we set it to
// null, so simply return it
return null;
}
// 13.4.7.1 (from the Json-LD 1.1. spec)
if(opts.isProcessingMode11() && (rval instanceof Map || rval instanceof List) && !isJsonType) {
throw new JsonLdError(Error.INVALID_VALUE_OBJECT_VALUE,
"value of " + activeProperty + " must be a scalar or null");
}
// 8.3)
if (!(rval instanceof String) && result.containsKey(JsonLdConsts.LANGUAGE)) {
throw new JsonLdError(Error.INVALID_LANGUAGE_TAGGED_VALUE,
Expand All @@ -947,7 +964,9 @@ else if (result.containsKey(JsonLdConsts.TYPE)) {
// TODO: is this enough for "is an IRI"
if (!(result.get(JsonLdConsts.TYPE) instanceof String)
|| ((String) result.get(JsonLdConsts.TYPE)).startsWith("_:")
|| !((String) result.get(JsonLdConsts.TYPE)).contains(":")) {
|| (!((String) result.get(JsonLdConsts.TYPE)).contains(":") &&
JsonLdConsts.JSON.equals(result.get(JsonLdConsts.TYPE)) &&
!opts.isProcessingMode11())) {
throw new JsonLdError(Error.INVALID_TYPED_VALUE,
"value of @type must be an IRI");
}
Expand Down Expand Up @@ -1999,6 +2018,18 @@ public List<Object> fromRDF(final RDFDataset dataset, boolean noDuplicatesInData
nodeMap.computeIfAbsent(object.getValue(), k -> new NodeMapNode(k));
}

if (opts.isProcessingMode11() && JsonLdConsts.RDF_JSON.equals(object.getDatatype())) {
try {
final Object json = JsonUtils.fromString(object.getValue());
Map<String, Object> entries = newMap(JsonLdConsts.TYPE, JsonLdConsts.JSON);
entries.put(JsonLdConsts.VALUE, json);
JsonLdUtils.mergeValue(node, predicate, entries);
} catch (IOException e) {
throw new JsonLdError(JsonLdError.Error.INVALID_JSON_LITERAL);
}
continue;
}

// 3.5.4)
if (RDF_TYPE.equals(predicate) && (object.isIRI() || object.isBlankNode())
&& !opts.getUseRdfType() &&
Expand Down
12 changes: 12 additions & 0 deletions core/src/main/java/com/github/jsonldjava/core/JsonLdConsts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package com.github.jsonldjava.core;

import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.util.Locale;

/**
* URI Constants used in the JSON-LD parser.
*/
Expand Down Expand Up @@ -27,6 +31,7 @@ public final class JsonLdConsts {
public static final String RDF_OBJECT = RDF_SYNTAX_NS + "object";
public static final String RDF_LANGSTRING = RDF_SYNTAX_NS + "langString";
public static final String RDF_LIST = RDF_SYNTAX_NS + "List";
public static final String RDF_JSON = RDF_SYNTAX_NS + "JSON";

public static final String TEXT_TURTLE = "text/turtle";
public static final String APPLICATION_NQUADS = "application/n-quads"; // https://www.w3.org/TR/n-quads/#sec-mediatype
Expand Down Expand Up @@ -57,8 +62,15 @@ public final class JsonLdConsts {
public static final String BLANK_NODE_PREFIX = "_:";
public static final String VOCAB = "@vocab";
public static final String BASE = "@base";
public static final String JSON = "@json";
public static final String REQUIRE_ALL = "@requireAll";

public final static DecimalFormat DOUBLE_DECIMAL_FORMAT = new DecimalFormat("0.0###############E0",
DecimalFormatSymbols.getInstance(Locale.US));

public final static DecimalFormat INT_DECIMAL_FORMAT = new DecimalFormat("0",
DecimalFormatSymbols.getInstance(Locale.US));

public enum Embed {
ALWAYS, NEVER, LAST, LINK;
}
Expand Down
4 changes: 3 additions & 1 deletion core/src/main/java/com/github/jsonldjava/core/JsonLdError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,9 @@ public enum Error {

PARSE_ERROR("parse error"),

UNKNOWN_ERROR("unknown error");
UNKNOWN_ERROR("unknown error"),

INVALID_JSON_LITERAL("invalid JSON literal");

private final String error;

Expand Down
4 changes: 4 additions & 0 deletions core/src/main/java/com/github/jsonldjava/core/JsonLdOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,10 @@ public String getProcessingMode() {
return processingMode;
}

public boolean isProcessingMode11() {
return JSON_LD_1_1.equals(getProcessingMode());
}

public void setProcessingMode(String processingMode) {
this.processingMode = processingMode;
if (processingMode.equals(JSON_LD_1_1)) {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/github/jsonldjava/core/JsonLdUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ static boolean isKeyword(Object key) {
|| "@language".equals(key) || "@list".equals(key) || "@omitDefault".equals(key)
|| "@reverse".equals(key) || "@preserve".equals(key) || "@set".equals(key)
|| "@type".equals(key) || "@value".equals(key) || "@vocab".equals(key)
|| "@requireAll".equals(key);
|| "@requireAll".equals(key) || "@json".equals(key);
}

public static Boolean deepCompare(Object v1, Object v2, Boolean listOrderMatters) {
Expand Down
25 changes: 15 additions & 10 deletions core/src/main/java/com/github/jsonldjava/core/RDFDataset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.github.jsonldjava.core;

import com.github.jsonldjava.utils.JsonUtils;

import static com.github.jsonldjava.core.JsonLdConsts.RDF_FIRST;
import static com.github.jsonldjava.core.JsonLdConsts.RDF_LANGSTRING;
import static com.github.jsonldjava.core.JsonLdConsts.RDF_NIL;
Expand All @@ -10,20 +12,19 @@
import static com.github.jsonldjava.core.JsonLdConsts.XSD_DOUBLE;
import static com.github.jsonldjava.core.JsonLdConsts.XSD_INTEGER;
import static com.github.jsonldjava.core.JsonLdConsts.XSD_STRING;
import static com.github.jsonldjava.core.JsonLdConsts.RDF_JSON;
import static com.github.jsonldjava.core.JsonLdUtils.isKeyword;
import static com.github.jsonldjava.core.JsonLdUtils.isList;
import static com.github.jsonldjava.core.JsonLdUtils.isObject;
import static com.github.jsonldjava.core.JsonLdUtils.isString;
import static com.github.jsonldjava.core.JsonLdUtils.isValue;
import static com.github.jsonldjava.utils.Obj.newMap;

import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
Expand Down Expand Up @@ -645,14 +646,21 @@ else if (JsonLdUtils.isRelativeIri(property)) {
* the JSON-LD value or node object.
* @return the RDF literal or RDF resource.
*/
private Node objectToRDF(Object item) {
private Node objectToRDF(Object item) throws JsonLdError {
// convert value object to RDF
if (isValue(item)) {
final Object value = ((Map<String, Object>) item).get("@value");
final Object datatype = ((Map<String, Object>) item).get("@type");

// convert to XSD datatypes as appropriate
if (value instanceof Boolean || value instanceof Number) {
if(api.opts.isProcessingMode11() && "@json".equals(datatype)) {
try {
return new Literal(JsonUtils.toJcsString(value), RDF_JSON, null);
} catch (IOException e) {
throw new JsonLdError(JsonLdError.Error.INVALID_JSON_LITERAL);
}
}
else if (value instanceof Boolean || value instanceof Number) {
// convert to XSD datatype
if (value instanceof Boolean) {
return new Literal(value.toString(),
Expand All @@ -670,14 +678,11 @@ private Node objectToRDF(Object item) {
if (XSD_DECIMAL.equals(datatype)) {
return new Literal(value.toString(), XSD_DECIMAL, null);
}
final DecimalFormat df = new DecimalFormat("0.0###############E0");
df.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.US));
return new Literal(df.format(value),
return new Literal(JsonLdConsts.DOUBLE_DECIMAL_FORMAT.format(value),
datatype == null ? XSD_DOUBLE : (String) datatype, null);
}
} else {
final DecimalFormat df = new DecimalFormat("0");
return new Literal(df.format(value),
return new Literal(JsonLdConsts.INT_DECIMAL_FORMAT.format(value),
datatype == null ? XSD_INTEGER : (String) datatype, null);
}
} else if (((Map<String, Object>) item).containsKey("@language")) {
Expand Down
83 changes: 51 additions & 32 deletions core/src/main/java/com/github/jsonldjava/core/RDFDatasetUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,11 @@ else if (bnode != null) {
}
} else {
output.append("\"");
escape(o.getValue(), output);
if(JsonLdConsts.RDF_JSON.equals(o.getDatatype())) {
escapeJcs(o.getValue(), output);
}else {
escape(o.getValue(), output);
}
output.append("\"");
if (RDF_LANGSTRING.equals(o.getDatatype())) {
output.append("@").append(o.getLanguage());
Expand Down Expand Up @@ -192,6 +196,51 @@ public static String unescape(String str) {
return rval;
}

private static void specialCharactersEscaped(char c, StringBuilder rval) {
switch (c) {
case '\b':
rval.append("\\b");
break;
case '\n':
rval.append("\\n");
break;
case '\t':
rval.append("\\t");
break;
case '\f':
rval.append("\\f");
break;
case '\r':
rval.append("\\r");
break;
case '\"':
rval.append("\\\"");
break;
case '\\':
rval.append("\\\\");
break;
default:
rval.append(c);
break;
}
}


/**
* Escapes the given JSON Canonicalization Scheme string
*
* @param str
* The string to escape
* @param rval
* The {@link StringBuilder} to append to.
*/
public static void escapeJcs(String str, StringBuilder rval) {
for (int i = 0; i < str.length(); i++) {
final char hi = str.charAt(i);
specialCharactersEscaped(hi, rval);
}
}

/**
* Escapes the given string according to the N-Quads escape rules
*
Expand Down Expand Up @@ -221,37 +270,7 @@ public static void escape(String str, StringBuilder rval) {
final int c = (hi << 10) + lo + (0x10000 - (0xD800 << 10) - 0xDC00);
rval.append(String.format("\\U%08x", c));
} else {
switch (hi) {
case '\b':
rval.append("\\b");
break;
case '\n':
rval.append("\\n");
break;
case '\t':
rval.append("\\t");
break;
case '\f':
rval.append("\\f");
break;
case '\r':
rval.append("\\r");
break;
// case '\'':
// rval += "\\'";
// break;
case '\"':
rval.append("\\\"");
// rval += "\\u0022";
break;
case '\\':
rval.append("\\\\");
break;
default:
// just put the char as is
rval.append(hi);
break;
}
specialCharactersEscaped(hi, rval);
}
}
// return rval;
Expand Down
Loading