From 80dac1ffeb8e17f428945a2077e372c96dca719f Mon Sep 17 00:00:00 2001
From: Dylan Van Assche <dylan.vanassche@ugent.be>
Date: Tue, 2 Jul 2024 12:02:22 +0200
Subject: [PATCH 1/2] test-cases: RMLTC*-JSON: adjust to JSONPath RFC draft

Fixes https://github.com/kg-construct/rml-core/issues/122
---
 test-cases/RMLTC0000-JSON/mapping.ttl  |  4 ++--
 test-cases/RMLTC0001a-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0001b-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0002a-JSON/mapping.ttl |  6 +++---
 test-cases/RMLTC0002b-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0002e-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0002g-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0003c-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0004a-JSON/mapping.ttl |  8 ++++----
 test-cases/RMLTC0004b-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0005a-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0007a-JSON/mapping.ttl |  2 +-
 test-cases/RMLTC0007b-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0007c-JSON/mapping.ttl |  6 +++---
 test-cases/RMLTC0007d-JSON/mapping.ttl |  6 +++---
 test-cases/RMLTC0007e-JSON/mapping.ttl |  6 +++---
 test-cases/RMLTC0007f-JSON/mapping.ttl |  6 +++---
 test-cases/RMLTC0007g-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0007h-JSON/mapping.ttl |  6 +++---
 test-cases/RMLTC0008a-JSON/mapping.ttl | 10 +++++-----
 test-cases/RMLTC0008b-JSON/mapping.ttl |  8 ++++----
 test-cases/RMLTC0008c-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0009a-JSON/mapping.ttl | 12 ++++++------
 test-cases/RMLTC0009b-JSON/mapping.ttl | 12 ++++++------
 test-cases/RMLTC0010a-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0010b-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0010c-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0011b-JSON/mapping.ttl | 16 ++++++++--------
 test-cases/RMLTC0012a-JSON/mapping.ttl |  6 +++---
 test-cases/RMLTC0012b-JSON/mapping.ttl |  8 ++++----
 test-cases/RMLTC0012c-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0012d-JSON/mapping.ttl |  8 ++++----
 test-cases/RMLTC0013a-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0015a-JSON/mapping.ttl |  8 ++++----
 test-cases/RMLTC0015b-JSON/mapping.ttl |  8 ++++----
 test-cases/RMLTC0019a-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0019b-JSON/mapping.ttl |  4 ++--
 test-cases/RMLTC0020a-JSON/mapping.ttl |  2 +-
 test-cases/RMLTC0021a-JSON/mapping.ttl |  6 +++---
 39 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/test-cases/RMLTC0000-JSON/mapping.ttl b/test-cases/RMLTC0000-JSON/mapping.ttl
index 3c738425..41da352f 100644
--- a/test-cases/RMLTC0000-JSON/mapping.ttl
+++ b/test-cases/RMLTC0000-JSON/mapping.ttl
@@ -12,10 +12,10 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{Name}"
+      rml:template "http://example.com/{$.Name}"
     ] .
diff --git a/test-cases/RMLTC0001a-JSON/mapping.ttl b/test-cases/RMLTC0001a-JSON/mapping.ttl
index 5eaa9c42..0a0f009a 100644
--- a/test-cases/RMLTC0001a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0001a-JSON/mapping.ttl
@@ -12,10 +12,10 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap <http://example.com/base/#NameSubjectMap> .
 
-<http://example.com/base/#NameSubjectMap> rml:template "http://example.com/{Name}" .
+<http://example.com/base/#NameSubjectMap> rml:template "http://example.com/{$.Name}" .
diff --git a/test-cases/RMLTC0001b-JSON/mapping.ttl b/test-cases/RMLTC0001b-JSON/mapping.ttl
index 3527a427..5d0a5678 100644
--- a/test-cases/RMLTC0001b-JSON/mapping.ttl
+++ b/test-cases/RMLTC0001b-JSON/mapping.ttl
@@ -12,11 +12,11 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
-      rml:template "{Name}";
+      rml:template "{$.Name}";
       rml:termType rml:BlankNode
     ] .
diff --git a/test-cases/RMLTC0002a-JSON/mapping.ttl b/test-cases/RMLTC0002a-JSON/mapping.ttl
index 01e5cf26..7cee3d86 100644
--- a/test-cases/RMLTC0002a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0002a-JSON/mapping.ttl
@@ -13,16 +13,16 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "ID"
+          rml:reference "$.ID"
         ];
       rml:predicate ex:id
     ], [
       rml:objectMap [
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
       rml:class foaf:Person;
-      rml:template "http://example.com/{ID}/{Name}"
+      rml:template "http://example.com/{$.ID}/{$.Name}"
     ] .
diff --git a/test-cases/RMLTC0002b-JSON/mapping.ttl b/test-cases/RMLTC0002b-JSON/mapping.ttl
index 79061724..fb76dbc4 100644
--- a/test-cases/RMLTC0002b-JSON/mapping.ttl
+++ b/test-cases/RMLTC0002b-JSON/mapping.ttl
@@ -12,11 +12,11 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
-      rml:template "students{ID}";
+      rml:template "students{$.ID}";
       rml:termType rml:BlankNode
     ] .
diff --git a/test-cases/RMLTC0002e-JSON/mapping.ttl b/test-cases/RMLTC0002e-JSON/mapping.ttl
index d248fc23..5fff6df9 100644
--- a/test-cases/RMLTC0002e-JSON/mapping.ttl
+++ b/test-cases/RMLTC0002e-JSON/mapping.ttl
@@ -12,10 +12,10 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "IDs"
+          rml:reference "$.IDs"
         ];
       rml:predicate ex:id
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{ID}/{Name}"
+      rml:template "http://example.com/{$.ID}/{$.Name}"
     ] .
diff --git a/test-cases/RMLTC0002g-JSON/mapping.ttl b/test-cases/RMLTC0002g-JSON/mapping.ttl
index 79665fa6..f13174c8 100644
--- a/test-cases/RMLTC0002g-JSON/mapping.ttl
+++ b/test-cases/RMLTC0002g-JSON/mapping.ttl
@@ -12,10 +12,10 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "IDs"
+          rml:reference "$.IDs"
         ];
       rml:predicate ex:id
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{ID}/{Name}"
+      rml:template "http://example.com/{$.ID}/{$.Name}"
     ] .
diff --git a/test-cases/RMLTC0003c-JSON/mapping.ttl b/test-cases/RMLTC0003c-JSON/mapping.ttl
index 482bcf9c..0b42150f 100644
--- a/test-cases/RMLTC0003c-JSON/mapping.ttl
+++ b/test-cases/RMLTC0003c-JSON/mapping.ttl
@@ -12,11 +12,11 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:template "{FirstName} {LastName}";
+          rml:template "{$.FirstName} {$.LastName}";
           rml:termType rml:Literal
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
-      rml:template "http://example.com/Student{ID}"
+      rml:template "http://example.com/Student{$.ID}"
     ] .
diff --git a/test-cases/RMLTC0004a-JSON/mapping.ttl b/test-cases/RMLTC0004a-JSON/mapping.ttl
index bc212d7f..ff87cbc9 100644
--- a/test-cases/RMLTC0004a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0004a-JSON/mapping.ttl
@@ -13,13 +13,13 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "Student"
+          rml:reference "$.Student"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
       rml:class ex:Student;
-      rml:template "http://example.com/{Student}"
+      rml:template "http://example.com/{$.Student}"
     ] .
 
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
@@ -33,11 +33,11 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "Sport"
+          rml:reference "$.Sport"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
       rml:class ex:Sport;
-      rml:template "http://example.com/{Sport}"
+      rml:template "http://example.com/{$.Sport}"
     ] .
diff --git a/test-cases/RMLTC0004b-JSON/mapping.ttl b/test-cases/RMLTC0004b-JSON/mapping.ttl
index 6a0624ef..36480e52 100644
--- a/test-cases/RMLTC0004b-JSON/mapping.ttl
+++ b/test-cases/RMLTC0004b-JSON/mapping.ttl
@@ -12,11 +12,11 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{Name}";
+      rml:template "http://example.com/{$.Name}";
       rml:termType rml:Literal
     ] .
diff --git a/test-cases/RMLTC0005a-JSON/mapping.ttl b/test-cases/RMLTC0005a-JSON/mapping.ttl
index 9232cb2b..d692582e 100644
--- a/test-cases/RMLTC0005a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0005a-JSON/mapping.ttl
@@ -13,11 +13,11 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "amount"
+          rml:reference "$.amount"
         ];
       rml:predicate ex:owes
     ];
   rml:subjectMap [
       rml:class foaf:Person;
-      rml:template "http://example.com/{fname};{lname}"
+      rml:template "http://example.com/{$.fname};{$.lname}"
     ] .
diff --git a/test-cases/RMLTC0007a-JSON/mapping.ttl b/test-cases/RMLTC0007a-JSON/mapping.ttl
index 79fd925f..ac7b148b 100644
--- a/test-cases/RMLTC0007a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0007a-JSON/mapping.ttl
@@ -16,5 +16,5 @@
       rml:predicate rdf:type
     ];
   rml:subjectMap [
-      rml:template "http://example.com/Student/{ID}/{FirstName}"
+      rml:template "http://example.com/Student/{$.ID}/{$.FirstName}"
     ] .
diff --git a/test-cases/RMLTC0007b-JSON/mapping.ttl b/test-cases/RMLTC0007b-JSON/mapping.ttl
index 2f6423e5..d9043524 100644
--- a/test-cases/RMLTC0007b-JSON/mapping.ttl
+++ b/test-cases/RMLTC0007b-JSON/mapping.ttl
@@ -17,11 +17,11 @@
       rml:predicate rdf:type
     ], [
       rml:objectMap [
-          rml:reference "FirstName"
+          rml:reference "$.FirstName"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
       rml:graph ex:PersonGraph;
-      rml:template "http://example.com/Student/{ID}/{FirstName}"
+      rml:template "http://example.com/Student/{$.ID}/{$.FirstName}"
     ] .
diff --git a/test-cases/RMLTC0007c-JSON/mapping.ttl b/test-cases/RMLTC0007c-JSON/mapping.ttl
index 4e1aee0b..65764100 100644
--- a/test-cases/RMLTC0007c-JSON/mapping.ttl
+++ b/test-cases/RMLTC0007c-JSON/mapping.ttl
@@ -13,16 +13,16 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "ID"
+          rml:reference "$.ID"
         ];
       rml:predicate ex:id
     ], [
       rml:objectMap [
-          rml:reference "FirstName"
+          rml:reference "$.FirstName"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
       rml:class ex:Student, foaf:Person;
-      rml:template "http://example.com/Student/{ID}/{FirstName}"
+      rml:template "http://example.com/Student/{$.ID}/{$.FirstName}"
     ] .
diff --git a/test-cases/RMLTC0007d-JSON/mapping.ttl b/test-cases/RMLTC0007d-JSON/mapping.ttl
index 86eff9fe..fe8e475a 100644
--- a/test-cases/RMLTC0007d-JSON/mapping.ttl
+++ b/test-cases/RMLTC0007d-JSON/mapping.ttl
@@ -20,15 +20,15 @@
       rml:predicate rdf:type
     ], [
       rml:objectMap [
-          rml:reference "ID"
+          rml:reference "$.ID"
         ];
       rml:predicate ex:id
     ], [
       rml:objectMap [
-          rml:reference "FirstName"
+          rml:reference "$.FirstName"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
-      rml:template "http://example.com/Student/{ID}/{FirstName}"
+      rml:template "http://example.com/Student/{$.ID}/{$.FirstName}"
     ] .
diff --git a/test-cases/RMLTC0007e-JSON/mapping.ttl b/test-cases/RMLTC0007e-JSON/mapping.ttl
index 44b814a3..19e307c7 100644
--- a/test-cases/RMLTC0007e-JSON/mapping.ttl
+++ b/test-cases/RMLTC0007e-JSON/mapping.ttl
@@ -13,17 +13,17 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "ID"
+          rml:reference "$.ID"
         ];
       rml:predicate ex:id
     ], [
       rml:objectMap [
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
       rml:class foaf:Person;
       rml:graph ex:PersonGraph;
-      rml:template "http://example.com/Student/{ID}/{Name}"
+      rml:template "http://example.com/Student/{$.ID}/{$.Name}"
     ] .
diff --git a/test-cases/RMLTC0007f-JSON/mapping.ttl b/test-cases/RMLTC0007f-JSON/mapping.ttl
index 838a06b0..8dd905cf 100644
--- a/test-cases/RMLTC0007f-JSON/mapping.ttl
+++ b/test-cases/RMLTC0007f-JSON/mapping.ttl
@@ -17,16 +17,16 @@
       rml:predicate rdf:type
     ], [
       rml:objectMap [
-          rml:reference "ID"
+          rml:reference "$.ID"
         ];
       rml:predicate ex:id
     ], [
       rml:objectMap [
-          rml:reference "FirstName"
+          rml:reference "$.FirstName"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
       rml:graph ex:PersonGraph;
-      rml:template "http://example.com/Student/{ID}/{FirstName}"
+      rml:template "http://example.com/Student/{$.ID}/{$.FirstName}"
     ] .
diff --git a/test-cases/RMLTC0007g-JSON/mapping.ttl b/test-cases/RMLTC0007g-JSON/mapping.ttl
index 3d6fb710..bfacef74 100644
--- a/test-cases/RMLTC0007g-JSON/mapping.ttl
+++ b/test-cases/RMLTC0007g-JSON/mapping.ttl
@@ -12,11 +12,11 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "FirstName"
+          rml:reference "$.FirstName"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
       rml:graph rml:defaultGraph;
-      rml:template "http://example.com/Student/{ID}/{FirstName}"
+      rml:template "http://example.com/Student/{$.ID}/{$.FirstName}"
     ] .
diff --git a/test-cases/RMLTC0007h-JSON/mapping.ttl b/test-cases/RMLTC0007h-JSON/mapping.ttl
index b85c1fc5..a119e460 100644
--- a/test-cases/RMLTC0007h-JSON/mapping.ttl
+++ b/test-cases/RMLTC0007h-JSON/mapping.ttl
@@ -12,14 +12,14 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
       rml:graphMap [
-          rml:reference "Name";
+          rml:reference "$.Name";
           rml:termType rml:Literal
         ];
-      rml:template "http://example.com/Student/{ID}/{FirstName}"
+      rml:template "http://example.com/Student/{$.ID}/{$.FirstName}"
     ] .
diff --git a/test-cases/RMLTC0008a-JSON/mapping.ttl b/test-cases/RMLTC0008a-JSON/mapping.ttl
index 235fc633..c12600ca 100644
--- a/test-cases/RMLTC0008a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0008a-JSON/mapping.ttl
@@ -17,23 +17,23 @@
       rml:predicate rdf:type
     ], [
       rml:objectMap [
-          rml:reference "ID"
+          rml:reference "$.ID"
         ];
       rml:predicate ex:id
     ], [
       rml:objectMap [
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate foaf:name
     ], [
       rml:objectMap [
-          rml:reference "Sport"
+          rml:reference "$.Sport"
         ];
       rml:predicate ex:Sport
     ];
   rml:subjectMap [
       rml:graphMap [
-          rml:template "http://example.com/graph/Student/{ID}/{Name}"
+          rml:template "http://example.com/graph/Student/{$.ID}/{$.Name}"
         ];
-      rml:template "http://example.com/Student/{ID}/{Name}"
+      rml:template "http://example.com/Student/{$.ID}/{$.Name}"
     ] .
diff --git a/test-cases/RMLTC0008b-JSON/mapping.ttl b/test-cases/RMLTC0008b-JSON/mapping.ttl
index 81ebfe7d..9aba67e8 100644
--- a/test-cases/RMLTC0008b-JSON/mapping.ttl
+++ b/test-cases/RMLTC0008b-JSON/mapping.ttl
@@ -21,17 +21,17 @@
       rml:predicate rdf:type
     ], [
       rml:objectMap [
-          rml:reference "ID"
+          rml:reference "$.ID"
         ];
       rml:predicate ex:id
     ], [
       rml:objectMap [
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
-      rml:template "http://example.com/Student/{ID}/{Name}"
+      rml:template "http://example.com/Student/{$.ID}/{$.Name}"
     ] .
 
 <http://example.com/base/RefObjectMap1> a rml:RefObjectMap;
@@ -51,5 +51,5 @@
       rml:predicate rdf:type
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{Sport}"
+      rml:template "http://example.com/{$.Sport}"
     ] .
diff --git a/test-cases/RMLTC0008c-JSON/mapping.ttl b/test-cases/RMLTC0008c-JSON/mapping.ttl
index 3fa6f387..a610a24c 100644
--- a/test-cases/RMLTC0008c-JSON/mapping.ttl
+++ b/test-cases/RMLTC0008c-JSON/mapping.ttl
@@ -13,10 +13,10 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate ex:name, foaf:name
     ];
   rml:subjectMap [
-      rml:template "http://example.com/Student/{ID}/{Name}"
+      rml:template "http://example.com/Student/{$.ID}/{$.Name}"
     ] .
diff --git a/test-cases/RMLTC0009a-JSON/mapping.ttl b/test-cases/RMLTC0009a-JSON/mapping.ttl
index 906ab93e..596bd136 100644
--- a/test-cases/RMLTC0009a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0009a-JSON/mapping.ttl
@@ -13,21 +13,21 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate foaf:name
     ], [
       rml:objectMap [ a rml:RefObjectMap;
           rml:joinCondition [
-              rml:child "Sport";
-              rml:parent "ID"
+              rml:child "$.Sport";
+              rml:parent "$.ID"
             ];
           rml:parentTriplesMap <http://example.com/base/TriplesMap2>
         ];
       rml:predicate <http://example.com/ontology/practises>
     ];
   rml:subjectMap [
-      rml:template "http://example.com/resource/student_{ID}"
+      rml:template "http://example.com/resource/student_{$.ID}"
     ] .
 
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
@@ -41,10 +41,10 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate rdfs:label
     ];
   rml:subjectMap [
-      rml:template "http://example.com/resource/sport_{ID}"
+      rml:template "http://example.com/resource/sport_{$.ID}"
     ] .
diff --git a/test-cases/RMLTC0009b-JSON/mapping.ttl b/test-cases/RMLTC0009b-JSON/mapping.ttl
index 026676d6..4a12b17f 100644
--- a/test-cases/RMLTC0009b-JSON/mapping.ttl
+++ b/test-cases/RMLTC0009b-JSON/mapping.ttl
@@ -14,15 +14,15 @@
   rml:predicateObjectMap [
       rml:graph <http://example.com/graph/students>;
       rml:objectMap [
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate foaf:name
     ], [
       rml:graph <http://example.com/graph/practise>;
       rml:objectMap [ a rml:RefObjectMap;
           rml:joinCondition [
-              rml:child "Sport";
-              rml:parent "ID"
+              rml:child "$.Sport";
+              rml:parent "$.ID"
             ];
           rml:parentTriplesMap <http://example.com/base/TriplesMap2>
         ];
@@ -31,7 +31,7 @@
   rml:subjectMap [
       rml:class <http://example.com/ontology/Student>;
       rml:graph <http://example.com/graph/students>;
-      rml:template "http://example.com/resource/student_{ID}"
+      rml:template "http://example.com/resource/student_{$.ID}"
     ] .
 
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
@@ -45,12 +45,12 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate rdfs:label
     ];
   rml:subjectMap [
       rml:class <http://example.com/ontology/Sport>;
       rml:graph <http://example.com/graph/sports>;
-      rml:template "http://example.com/resource/sport_{ID}"
+      rml:template "http://example.com/resource/sport_{$.ID}"
     ] .
diff --git a/test-cases/RMLTC0010a-JSON/mapping.ttl b/test-cases/RMLTC0010a-JSON/mapping.ttl
index 68e3dd35..3449d381 100644
--- a/test-cases/RMLTC0010a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0010a-JSON/mapping.ttl
@@ -12,10 +12,10 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate ex:name
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{$.['Country Code']}"
+      rml:template "http://example.com/{$.$.['Country Code']}"
     ] .
diff --git a/test-cases/RMLTC0010b-JSON/mapping.ttl b/test-cases/RMLTC0010b-JSON/mapping.ttl
index 60f6394e..bd885dff 100644
--- a/test-cases/RMLTC0010b-JSON/mapping.ttl
+++ b/test-cases/RMLTC0010b-JSON/mapping.ttl
@@ -12,10 +12,10 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate ex:name
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{$.['Country Code']}/{Name}"
+      rml:template "http://example.com/{$.$.['Country Code']}/{$.Name}"
     ] .
diff --git a/test-cases/RMLTC0010c-JSON/mapping.ttl b/test-cases/RMLTC0010c-JSON/mapping.ttl
index 67e61d6e..2bb8e8ac 100644
--- a/test-cases/RMLTC0010c-JSON/mapping.ttl
+++ b/test-cases/RMLTC0010c-JSON/mapping.ttl
@@ -13,10 +13,10 @@
   rml:predicateObjectMap [
       rml:predicate ex:code;
       rml:objectMap [
-          rml:template "\\{\\{\\{ {$.['ISO 3166']} \\}\\}\\}";
+          rml:template "\\{$.\\{$.\\{$. {$.$.['ISO 3166']} \\}\\}\\}";
           rml:termType rml:Literal
         ]
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{$.['Country Code']}/{Name}"
+      rml:template "http://example.com/{$.$.['Country Code']}/{$.Name}"
     ] .
diff --git a/test-cases/RMLTC0011b-JSON/mapping.ttl b/test-cases/RMLTC0011b-JSON/mapping.ttl
index 17da3046..29ba8387 100644
--- a/test-cases/RMLTC0011b-JSON/mapping.ttl
+++ b/test-cases/RMLTC0011b-JSON/mapping.ttl
@@ -12,12 +12,12 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:template "http://example.com/sport/{ID_Sport}"
+          rml:template "http://example.com/sport/{$.ID_Sport}"
         ];
       rml:predicate ex:plays
     ];
   rml:subjectMap [
-      rml:template "http://example.com/student/{ID_Student}"
+      rml:template "http://example.com/student/{$.ID_Student}"
     ] .
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
@@ -31,17 +31,17 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "FirstName"
+          rml:reference "$.FirstName"
         ];
       rml:predicate ex:firstName
     ], [
       rml:objectMap [
-          rml:reference "LastName"
+          rml:reference "$.LastName"
         ];
       rml:predicate ex:lastName
     ];
   rml:subjectMap [
-      rml:template "http://example.com/student/{ID}"
+      rml:template "http://example.com/student/{$.ID}"
     ] .
 
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
@@ -55,15 +55,15 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "Description"
+          rml:reference "$.Description"
         ];
       rml:predicate ex:description
     ], [
       rml:objectMap [
-          rml:reference "ID"
+          rml:reference "$.ID"
         ];
       rml:predicate ex:id
     ];
   rml:subjectMap [
-      rml:template "http://example.com/sport/{ID}"
+      rml:template "http://example.com/sport/{$.ID}"
     ] .
diff --git a/test-cases/RMLTC0012a-JSON/mapping.ttl b/test-cases/RMLTC0012a-JSON/mapping.ttl
index 3db1ba6f..7caeb4cf 100644
--- a/test-cases/RMLTC0012a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0012a-JSON/mapping.ttl
@@ -13,17 +13,17 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:template "{fname} {lname}";
+          rml:template "{$.fname} {$.lname}";
           rml:termType rml:Literal
         ];
       rml:predicate foaf:name
     ], [
       rml:objectMap [
-          rml:reference "amount"
+          rml:reference "$.amount"
         ];
       rml:predicate ex:amount
     ];
   rml:subjectMap [
-      rml:template "{fname}{lname}{amount}";
+      rml:template "{$.fname}{$.lname}{$.amount}";
       rml:termType rml:BlankNode
     ] .
diff --git a/test-cases/RMLTC0012b-JSON/mapping.ttl b/test-cases/RMLTC0012b-JSON/mapping.ttl
index c0cf0407..82aa3b30 100644
--- a/test-cases/RMLTC0012b-JSON/mapping.ttl
+++ b/test-cases/RMLTC0012b-JSON/mapping.ttl
@@ -13,13 +13,13 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:template "{fname} {lname}";
+          rml:template "{$.fname} {$.lname}";
           rml:termType rml:Literal
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
-      rml:template "{fname}{lname}";
+      rml:template "{$.fname}{$.lname}";
       rml:termType rml:BlankNode
     ] .
 
@@ -34,11 +34,11 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "city"
+          rml:reference "$.city"
         ];
       rml:predicate ex:city
     ];
   rml:subjectMap [
-      rml:template "{fname}{lname}";
+      rml:template "{$.fname}{$.lname}";
       rml:termType rml:BlankNode
     ] .
diff --git a/test-cases/RMLTC0012c-JSON/mapping.ttl b/test-cases/RMLTC0012c-JSON/mapping.ttl
index 56cd3473..c458a4aa 100644
--- a/test-cases/RMLTC0012c-JSON/mapping.ttl
+++ b/test-cases/RMLTC0012c-JSON/mapping.ttl
@@ -13,13 +13,13 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:template "{fname} {lname}";
+          rml:template "{$.fname} {$.lname}";
           rml:termType rml:Literal
         ];
       rml:predicate foaf:name
     ], [
       rml:objectMap [
-          rml:reference "amount"
+          rml:reference "$.amount"
         ];
       rml:predicate ex:amount
     ] .
diff --git a/test-cases/RMLTC0012d-JSON/mapping.ttl b/test-cases/RMLTC0012d-JSON/mapping.ttl
index 442cb705..a8baa088 100644
--- a/test-cases/RMLTC0012d-JSON/mapping.ttl
+++ b/test-cases/RMLTC0012d-JSON/mapping.ttl
@@ -13,20 +13,20 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:template "{fname} {lname}";
+          rml:template "{$.fname} {$.lname}";
           rml:termType rml:Literal
         ];
       rml:predicate foaf:name
     ], [
       rml:objectMap [
-          rml:reference "amount"
+          rml:reference "$.amount"
         ];
       rml:predicate ex:amount
     ];
   rml:subjectMap [
-      rml:template "{fname}_{lname}_{amount}";
+      rml:template "{$.fname}_{$.lname}_{$.amount}";
       rml:termType rml:BlankNode
     ], [
-      rml:template "{amount}_{fname}_{lname}";
+      rml:template "{$.amount}_{$.fname}_{$.lname}";
       rml:termType rml:BlankNode
     ] .
diff --git a/test-cases/RMLTC0013a-JSON/mapping.ttl b/test-cases/RMLTC0013a-JSON/mapping.ttl
index 92a69509..c1bd8ddc 100644
--- a/test-cases/RMLTC0013a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0013a-JSON/mapping.ttl
@@ -12,10 +12,10 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "DateOfBirth"
+          rml:reference "$.DateOfBirth"
         ];
       rml:predicate ex:BirthDay
     ];
   rml:subjectMap [
-      rml:template "http://example.com/Person/{ID}/{Name}/{DateOfBirth}"
+      rml:template "http://example.com/Person/{$.ID}/{$.Name}/{$.DateOfBirth}"
     ] .
diff --git a/test-cases/RMLTC0015a-JSON/mapping.ttl b/test-cases/RMLTC0015a-JSON/mapping.ttl
index a9e90bfb..4c3a5035 100644
--- a/test-cases/RMLTC0015a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0015a-JSON/mapping.ttl
@@ -13,12 +13,12 @@
   rml:predicateObjectMap [
       rml:objectMap [
           rml:language "en";
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate rdfs:label
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{Code}"
+      rml:template "http://example.com/{$.Code}"
     ] .
 
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
@@ -33,10 +33,10 @@
   rml:predicateObjectMap [
       rml:objectMap [
           rml:language "es";
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate rdfs:label
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{Code}"
+      rml:template "http://example.com/{$.Code}"
     ] .
diff --git a/test-cases/RMLTC0015b-JSON/mapping.ttl b/test-cases/RMLTC0015b-JSON/mapping.ttl
index 168ef9d5..6f485f7d 100644
--- a/test-cases/RMLTC0015b-JSON/mapping.ttl
+++ b/test-cases/RMLTC0015b-JSON/mapping.ttl
@@ -13,12 +13,12 @@
   rml:predicateObjectMap [
       rml:objectMap [
           rml:language "a-english";
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate rdfs:label
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{Code}"
+      rml:template "http://example.com/{$.Code}"
     ] .
 
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
@@ -33,10 +33,10 @@
   rml:predicateObjectMap [
       rml:objectMap [
           rml:language "a-spanish";
-          rml:reference "Name"
+          rml:reference "$.Name"
         ];
       rml:predicate rdfs:label
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{Code}"
+      rml:template "http://example.com/{$.Code}"
     ] .
diff --git a/test-cases/RMLTC0019a-JSON/mapping.ttl b/test-cases/RMLTC0019a-JSON/mapping.ttl
index 63a7b5f9..2870ff6e 100644
--- a/test-cases/RMLTC0019a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0019a-JSON/mapping.ttl
@@ -12,10 +12,10 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "FirstName"
+          rml:reference "$.FirstName"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
-      rml:reference "FirstName"
+      rml:reference "$.FirstName"
     ] .
diff --git a/test-cases/RMLTC0019b-JSON/mapping.ttl b/test-cases/RMLTC0019b-JSON/mapping.ttl
index 63a7b5f9..2870ff6e 100644
--- a/test-cases/RMLTC0019b-JSON/mapping.ttl
+++ b/test-cases/RMLTC0019b-JSON/mapping.ttl
@@ -12,10 +12,10 @@
     ];
   rml:predicateObjectMap [
       rml:objectMap [
-          rml:reference "FirstName"
+          rml:reference "$.FirstName"
         ];
       rml:predicate foaf:name
     ];
   rml:subjectMap [
-      rml:reference "FirstName"
+      rml:reference "$.FirstName"
     ] .
diff --git a/test-cases/RMLTC0020a-JSON/mapping.ttl b/test-cases/RMLTC0020a-JSON/mapping.ttl
index e3268b17..0d2892f8 100644
--- a/test-cases/RMLTC0020a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0020a-JSON/mapping.ttl
@@ -16,6 +16,6 @@
       rml:predicate rdf:type
     ];
   rml:subjectMap [
-      rml:template "{Name}";
+      rml:template "{$.Name}";
       rml:termType rml:IRI
     ] .
diff --git a/test-cases/RMLTC0021a-JSON/mapping.ttl b/test-cases/RMLTC0021a-JSON/mapping.ttl
index 0603e541..f7a7d85a 100644
--- a/test-cases/RMLTC0021a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0021a-JSON/mapping.ttl
@@ -5,8 +5,8 @@
 
 <http://example.com/base/RefObjectMap1> a rml:RefObjectMap;
   rml:joinCondition [
-      rml:child "Sport";
-      rml:parent "Sport"
+      rml:child "$.Sport";
+      rml:parent "$.Sport"
     ];
   rml:parentTriplesMap <http://example.com/base/TriplesMap1> .
 
@@ -24,5 +24,5 @@
       rml:predicate ex:sameSportAs
     ];
   rml:subjectMap [
-      rml:template "http://example.com/Student/{ID}/{Name}"
+      rml:template "http://example.com/Student/{$.ID}/{$.Name}"
     ] .

From 3d8c5263753a5dc4587882228e9f782455f514e0 Mon Sep 17 00:00:00 2001
From: Pano Maria <pano.maria@gmail.com>
Date: Wed, 3 Jul 2024 06:03:30 +0200
Subject: [PATCH 2/2] fix jsonpath expressions

---
 test-cases/RMLTC0010a-JSON/mapping.ttl | 2 +-
 test-cases/RMLTC0010b-JSON/mapping.ttl | 2 +-
 test-cases/RMLTC0010c-JSON/mapping.ttl | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test-cases/RMLTC0010a-JSON/mapping.ttl b/test-cases/RMLTC0010a-JSON/mapping.ttl
index 3449d381..370edb7c 100644
--- a/test-cases/RMLTC0010a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0010a-JSON/mapping.ttl
@@ -17,5 +17,5 @@
       rml:predicate ex:name
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{$.$.['Country Code']}"
+      rml:template "http://example.com/{$.['Country Code']}"
     ] .
diff --git a/test-cases/RMLTC0010b-JSON/mapping.ttl b/test-cases/RMLTC0010b-JSON/mapping.ttl
index bd885dff..1f9f4db6 100644
--- a/test-cases/RMLTC0010b-JSON/mapping.ttl
+++ b/test-cases/RMLTC0010b-JSON/mapping.ttl
@@ -17,5 +17,5 @@
       rml:predicate ex:name
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{$.$.['Country Code']}/{$.Name}"
+      rml:template "http://example.com/{$.['Country Code']}/{$.Name}"
     ] .
diff --git a/test-cases/RMLTC0010c-JSON/mapping.ttl b/test-cases/RMLTC0010c-JSON/mapping.ttl
index 2bb8e8ac..fb1afc8d 100644
--- a/test-cases/RMLTC0010c-JSON/mapping.ttl
+++ b/test-cases/RMLTC0010c-JSON/mapping.ttl
@@ -13,10 +13,10 @@
   rml:predicateObjectMap [
       rml:predicate ex:code;
       rml:objectMap [
-          rml:template "\\{$.\\{$.\\{$. {$.$.['ISO 3166']} \\}\\}\\}";
+          rml:template "\\{\\{\\{ {$.['ISO 3166']} \\}\\}\\}";
           rml:termType rml:Literal
         ]
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{$.$.['Country Code']}/{$.Name}"
+      rml:template "http://example.com/{$.['Country Code']}/{$.Name}"
     ] .