Skip to content

Commit 5623b28

Browse files
fsteegfsteeg
committed
Include new keywords when skipping createTermDefinition
1 parent 3a63d91 commit 5623b28

3 files changed

Lines changed: 11 additions & 27 deletions

File tree

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

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,8 @@ https://w3c.github.io/json-ld-api/tests/compact-manifest#tc023
5656
https://w3c.github.io/json-ld-api/tests/compact-manifest#tc024
5757
https://w3c.github.io/json-ld-api/tests/compact-manifest#tc025
5858
https://w3c.github.io/json-ld-api/tests/compact-manifest#tc026
59-
https://w3c.github.io/json-ld-api/tests/compact-manifest#tdi01
6059
https://w3c.github.io/json-ld-api/tests/compact-manifest#tdi02
6160
https://w3c.github.io/json-ld-api/tests/compact-manifest#tdi03
62-
https://w3c.github.io/json-ld-api/tests/compact-manifest#tdi05
63-
https://w3c.github.io/json-ld-api/tests/compact-manifest#tdi06
6461
https://w3c.github.io/json-ld-api/tests/compact-manifest#tdi07
6562
https://w3c.github.io/json-ld-api/tests/compact-manifest#te001
6663
https://w3c.github.io/json-ld-api/tests/compact-manifest#te002
@@ -230,7 +227,6 @@ https://w3c.github.io/json-ld-api/tests/expand-manifest#tdi03
230227
https://w3c.github.io/json-ld-api/tests/expand-manifest#tdi04
231228
https://w3c.github.io/json-ld-api/tests/expand-manifest#tdi05
232229
https://w3c.github.io/json-ld-api/tests/expand-manifest#tdi06
233-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tdi07
234230
https://w3c.github.io/json-ld-api/tests/expand-manifest#tdi08
235231
https://w3c.github.io/json-ld-api/tests/expand-manifest#tdi09
236232
https://w3c.github.io/json-ld-api/tests/expand-manifest#tec01
@@ -386,21 +382,15 @@ https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr08
386382
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr09
387383
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr11
388384
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr12
389-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr13
390-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr14
391-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr15
392385
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr16
393386
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr17
394387
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr18
395388
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr19
396389
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr20
397390
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr21
398391
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr22
399-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr23
400-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr24
401392
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr25
402393
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr26
403-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr27
404394
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr28
405395
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr29
406396
https://w3c.github.io/json-ld-api/tests/expand-manifest#tpr30
@@ -420,9 +410,7 @@ https://w3c.github.io/json-ld-api/tests/expand-manifest#tso03
420410
https://w3c.github.io/json-ld-api/tests/expand-manifest#tso05
421411
https://w3c.github.io/json-ld-api/tests/expand-manifest#tso06
422412
https://w3c.github.io/json-ld-api/tests/expand-manifest#tso07
423-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tso08
424413
https://w3c.github.io/json-ld-api/tests/expand-manifest#tso10
425-
https://w3c.github.io/json-ld-api/tests/expand-manifest#tso11
426414
https://w3c.github.io/json-ld-api/tests/expand-manifest#tso12
427415
https://w3c.github.io/json-ld-api/tests/expand-manifest#tso13
428416
https://w3c.github.io/json-ld-api/tests/expand-manifest#ttn01
@@ -507,11 +495,6 @@ https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tc031
507495
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tc032
508496
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tc033
509497
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tc034
510-
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tdi01
511-
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tdi02
512-
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tdi04
513-
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tdi06
514-
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tdi07
515498
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tdi08
516499
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tdi09
517500
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tdi10
@@ -711,21 +694,15 @@ https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr08
711694
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr09
712695
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr11
713696
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr12
714-
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr13
715-
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr14
716-
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr15
717697
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr16
718698
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr17
719699
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr18
720700
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr19
721701
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr20
722702
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr21
723703
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr22
724-
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr23
725-
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr24
726704
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr25
727705
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr26
728-
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr27
729706
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr28
730707
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr29
731708
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tpr30
@@ -746,9 +723,7 @@ https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tso03
746723
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tso05
747724
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tso06
748725
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tso07
749-
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tso08
750726
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tso10
751-
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tso11
752727
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tso12
753728
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tso13
754729
https://w3c.github.io/json-ld-api/tests/toRdf-manifest#ttn01

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import static com.github.jsonldjava.utils.Obj.newMap;
55

66
import java.util.ArrayList;
7+
import java.util.Arrays;
78
import java.util.Collections;
89
import java.util.Comparator;
910
import java.util.LinkedHashMap;
@@ -288,8 +289,12 @@ else if (context instanceof String) {
288289
// 3.7
289290
final Map<String, Boolean> defined = new LinkedHashMap<String, Boolean>();
290291
for (final String key : ((Map<String, Object>) context).keySet()) {
291-
if (JsonLdConsts.BASE.equals(key) || JsonLdConsts.VOCAB.equals(key)
292-
|| JsonLdConsts.LANGUAGE.equals(key) || JsonLdConsts.VERSION.equals(key)) {
292+
// jsonld 1.1: 5.13 in https://w3c.github.io/json-ld-api/#algorithm
293+
if (Arrays
294+
.asList(JsonLdConsts.BASE, JsonLdConsts.DIRECTION, JsonLdConsts.IMPORT,
295+
JsonLdConsts.LANGUAGE, JsonLdConsts.PROPAGATE,
296+
JsonLdConsts.PROTECTED, JsonLdConsts.VERSION, JsonLdConsts.VOCAB)
297+
.contains(key)) {
293298
continue;
294299
}
295300
result.createTermDefinition((Map<String, Object>) context, key, defined);

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ public final class JsonLdConsts {
5959
public static final String BASE = "@base";
6060
public static final String REQUIRE_ALL = "@requireAll";
6161
public static final String VERSION = "@version";
62+
public static final String PROTECTED = "@protected";
63+
public static final String PROPAGATE = "@propagate";
64+
public static final String IMPORT = "@import";
65+
public static final String DIRECTION = "@direction";
6266

6367
public enum Embed {
6468
ALWAYS, NEVER, LAST, LINK;

0 commit comments

Comments
 (0)