Made 1.8 the default core context

FIWARE · Jan 10, 2025 · 9091c82 · 9091c82
1 parent 1cc913f
commit 9091c82
Show file tree

Hide file tree

Showing 228 changed files with 975 additions and 923 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -8,5 +8,6 @@
 ## New Features:
   #1707: Support for local=true in the type discovery endpoints (GET /ngsi-ld/v1/types[/{typeName}]
   #XXXX: Support for local=true in the ATTRIBUTE discovery endpoints (GET /ngsi-ld/v1/attributes}]
+  #XXXX: Made 1.8 the default core context
 
 ## Notes
diff --git a/src/app/orionld/orionld.cpp b/src/app/orionld/orionld.cpp
@@ -930,6 +930,7 @@ static char* coreContextUrlSetup(const char* version)
   else if (strcmp(version, "v1.5") == 0)    return ORIONLD_CORE_CONTEXT_URL_V1_5;
   else if (strcmp(version, "v1.6") == 0)    return ORIONLD_CORE_CONTEXT_URL_V1_6;
   else if (strcmp(version, "v1.7") == 0)    return ORIONLD_CORE_CONTEXT_URL_V1_7;
+  else if (strcmp(version, "v1.8") == 0)    return ORIONLD_CORE_CONTEXT_URL_V1_8;
 
   return NULL;
 }

diff --git a/src/lib/orionld/context/orionldContextHashTablesFill.cpp b/src/lib/orionld/context/orionldContextHashTablesFill.cpp
@@ -56,6 +56,20 @@ bool orionldContextHashTablesFill(OrionldContext* contextP, KjNode* keyValueTree
 
   for (KjNode* kvP = keyValueTree->value.firstChildP; kvP != NULL; kvP = kvP->next)
   {
+    //
+    // Two new fields, neither String nor Object were introduced in the Core Context version 1.8
+    //
+    if (strcmp(kvP->name, "@version") == 0)
+    {
+      // FIXME: Keep the JSON-LD version ?
+      continue;
+    }
+    else if (strcmp(kvP->name, "@protected") == 0)
+    {
+      // FIXME: Keep the JSON-LD protection bool ?
+      continue;
+    }
+
     OrionldContextItem* hiP = (OrionldContextItem*) kaAlloc(&kalloc, sizeof(OrionldContextItem));
 
     hiP->name = kaStrdup(&kalloc, kvP->name);

diff --git a/src/lib/orionld/context/orionldContextItemExpand.cpp b/src/lib/orionld/context/orionldContextItemExpand.cpp
@@ -81,6 +81,9 @@ char* orionldContextItemExpand
   if (orionldCoreContextP != NULL)
     contextItemP = orionldContextItemLookup(orionldCoreContextP, shortName, NULL);
 
+  if (contextItemP != NULL)
+    LM_T(LmtExpand, ("Found '%s' in the core context (%s)", shortName, orionldCoreContextP->url));
+
   // 2. Lookup in given context (unless it's the Core Context)
   if ((contextItemP == NULL) && (contextP != orionldCoreContextP))
     contextItemP = orionldContextItemLookup(contextP, shortName, NULL);

diff --git a/src/lib/orionld/context/orionldCoreContext.h b/src/lib/orionld/context/orionldCoreContext.h
@@ -45,7 +45,8 @@ extern "C"
 #define ORIONLD_CORE_CONTEXT_URL_V1_5       (char*) "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.5.jsonld"
 #define ORIONLD_CORE_CONTEXT_URL_V1_6       (char*) "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
 #define ORIONLD_CORE_CONTEXT_URL_V1_7       (char*) "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.7.jsonld"
-#define ORIONLD_CORE_CONTEXT_URL_DEFAULT    (char*) "v1.6"
+#define ORIONLD_CORE_CONTEXT_URL_V1_8       (char*) "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
+#define ORIONLD_CORE_CONTEXT_URL_DEFAULT    (char*) "v1.8"
 
 
 

diff --git a/src/lib/orionld/legacyDriver/kjTreeToContextAttribute.cpp b/src/lib/orionld/legacyDriver/kjTreeToContextAttribute.cpp
@@ -73,8 +73,6 @@ static bool specialCompoundCheck(const char* attrName, KjNode* compoundValueP)
   KjNode*  valueNodeP = NULL;
   KjNode*  otherNodeP = NULL;
 
-  LM_W(("Attr name: '%s'", attrName));
-
   for (KjNode* nodeP = compoundValueP->value.firstChildP; nodeP != NULL; nodeP = nodeP->next)
   {
     if (nodeP->name[0] == '@')
@@ -112,7 +110,6 @@ static bool specialCompoundCheck(const char* attrName, KjNode* compoundValueP)
       if (dateTimeFromString(valueNodeP->value.s, errorString, sizeof(errorString)) < 0)
       {
         orionldError(OrionldBadRequestData, "DateTime value of @value/@type compound must be a valid ISO8601", errorString, 400);
-        LM_W(("Attr name: '%s'", attrName));
         pdAttribute(attrName);
         return false;
       }
@@ -162,7 +159,6 @@ static bool attributeValueSet(ContextAttribute* caP, KjNode* valueP)
 
   if (valueP->type == KjObject)
   {
-    LM_W(("Attr name: '%s'", caP->name.c_str()));
     if (specialCompoundCheck(caP->name.c_str(), valueP) == false)
       return false;
   }
@@ -207,8 +203,6 @@ bool kjTreeToContextAttribute(OrionldContext* contextP, KjNode* kNodeP, ContextA
   caP->name    = attributeName;
   *detailP     = (char*) "unknown error";
 
-  LM_W(("attributeName: '%s'", caP->name.c_str()));
-
   if (contextP == NULL)
     contextP = orionldCoreContextP;
 
@@ -641,7 +635,6 @@ bool kjTreeToContextAttribute(OrionldContext* contextP, KjNode* kNodeP, ContextA
     }
     else
     {
-      LM_W(("Calling attributeValueSet for attribute '%s'", caP->name.c_str()));
       if (attributeValueSet(caP, valueP) == false)
       {
         // attributeValueSet calls orionldError

diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_GET_with_keyValues.test b/test/functionalTest/cases/0000_ngsild/ngsild_GET_with_keyValues.test
@@ -190,7 +190,7 @@ HTTP/1.1 200 OK
 Content-Length: 265
 Content-Type: application/json
 Date: REGEX(.*)
-Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"
+Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)
 
 [
     {

diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_adding_attributes.test b/test/functionalTest/cases/0000_ngsild/ngsild_adding_attributes.test
@@ -24,6 +24,7 @@
 Attribute Addition
 
 --SHELL-INIT--
+dbInit orionld
 dbInit CB
 orionldStart CB
 
@@ -49,8 +50,7 @@ payload='{
   "maxCapacity": {"type": "Property","value": 50},
   "name": {"type": "Property","value": "Corner Unit"},
   "@context": [
-    "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld",
-    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+    "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld"
   ]
 }'
 orionCurl --url /ngsi-ld/v1/entities --payload "$payload" -H "Content-Type: application/ld+json" --linkHeaderFix
@@ -85,8 +85,7 @@ payload='{
     }
   },
   "@context": [
-    "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld",
-    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+    "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld"
   ]
 }'
 orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:Shelf:unit001/attrs --payload "$payload" -H "Content-Type: application/ld+json" --linkHeaderFix

diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_andreu-crash.test b/test/functionalTest/cases/0000_ngsild/ngsild_andreu-crash.test
@@ -161,7 +161,7 @@ HTTP/1.1 200 OK
 Content-Length: 305
 Content-Type: application/json
 Date: REGEX(.*)
-Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"
+Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)
 
 {
     "CPU": {

diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_avoid_decimals_in_q.test b/test/functionalTest/cases/0000_ngsild/ngsild_avoid_decimals_in_q.test
@@ -115,7 +115,7 @@ MongoDB server version: REGEX(.*)
 	"metadata" : [ ],
 	"blacklist" : false,
 	"name" : "Test subscription 01",
-	"ldContext" : "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+	"ldContext" : "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)",
 	"createdAt" : REGEX(\d+\.\d+),
 	"modifiedAt" : REGEX(\d+\.\d+),
 	"conditions" : [