Skip to content

Commit 117498b

Browse files
committed
chore: allow entity (LER) or RelationshipDetails (legacy) key for relationships details
1 parent 8335671 commit 117498b

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

nifi-ngsild-postgresql-processors/src/main/java/egm/io/nifi/processors/ngsild/utils/NgsiLdUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ private static Attribute parseNgsiLdAttribute(String key, JSONObject value, bool
134134
if (("Property".equals(attrType) && "unitCode".equals(keyOne))) {
135135
if (value.get(keyOne) instanceof String)
136136
subAttributes.add(new Attribute(keyOne.toLowerCase(), "Property", "", "", "", "", value.getString(keyOne), false, null));
137-
} else if ("RelationshipDetails".contains(keyOne)) {
137+
} else if ("entity".contains(keyOne) || "RelationshipDetails".contains(keyOne)) {
138138
JSONObject relation = value.getJSONObject(keyOne);
139139
relation.remove("id");
140140
relation.remove("type");

nifi-ngsild-postgresql-processors/src/test/resources/entity-notification.jsonld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"type": "Relationship",
1212
"createdAt": "2023-04-19T17:59:50.467619709Z",
1313
"object": "urn:ngsi-ld:Dataset:8848eb33fdff7304cb21b0a372679ea76423c52f3cd5d5fdf0ace6ed86810da4",
14-
"RelationshipDetails": {
14+
"entity": {
1515
"id": "urn:ngsi-ld:Dataset:8848eb33fdff7304cb21b0a372679ea76423c52f3cd5d5fdf0ace6ed86810da4",
1616
"type": "Dataset",
1717
"description": {

nifi-ngsild-postgresql-processors/src/test/resources/entity-temporal.jsonld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"servesDataset": {
1414
"type": "Relationship",
1515
"object": "urn:ngsi-ld:Dataset:MicrobiologieDREAL",
16-
"RelationshipDetails": {
16+
"entity": {
1717
"id": "urn:ngsi-ld:Dataset:MicrobiologieDREAL",
1818
"type": "Dataset",
1919
"description": {

nifi-ngsild-postgresql-processors/src/test/resources/temporalEntities.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"hasRel": {
66
"type": "Relationship",
77
"object": "urn:ngsi-ld:RelationTest:Test03",
8-
"RelationshipDetails": {
8+
"entity": {
99
"id": "urn:ngsi-ld:RelationTest:Test03",
1010
"type": "RelationTest",
1111
"country": [
@@ -23,7 +23,7 @@
2323
"hasRelation": {
2424
"type": "Relationship",
2525
"object": "urn:ngsi-ld:RelationTest:Test02",
26-
"RelationshipDetails": {
26+
"entity": {
2727
"id": "urn:ngsi-ld:RelationTest:Test02",
2828
"type": "RelationTest",
2929
"country": {
@@ -89,7 +89,7 @@
8989
"hasRel": {
9090
"type": "Relationship",
9191
"object": "urn:ngsi-ld:RelationTest:Test04",
92-
"RelationshipDetails": {
92+
"entity": {
9393
"id": "urn:ngsi-ld:RelationTest:Test04",
9494
"type": "RelationTest",
9595
"country": [
@@ -107,7 +107,7 @@
107107
"hasRelation": {
108108
"type": "Relationship",
109109
"object": "urn:ngsi-ld:RelationTest:Test01",
110-
"RelationshipDetails": {
110+
"entity": {
111111
"id": "urn:ngsi-ld:RelationTest:Test01",
112112
"type": "RelationTest",
113113
"country": {

0 commit comments

Comments
 (0)