From 7a000c4a325b016afa6c26ed7318e990727ad28e Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Thu, 26 Oct 2023 09:40:11 +0200 Subject: [PATCH 1/4] use equalsIgnoreCase instead of equals --- .../cygnus/backends/arcgis/restutils/ArcgisFeatureTable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/ArcgisFeatureTable.java b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/ArcgisFeatureTable.java index 796f14e2f..1b67f6a8e 100644 --- a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/ArcgisFeatureTable.java +++ b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/ArcgisFeatureTable.java @@ -388,7 +388,7 @@ protected void splitFeatureListIfExists(List featureArray, Feature serverFeature = serverFeatures.get(i); String serverFeatureId = serverFeature.getAttributes().get(uniqueField).toString(); - if (featureId.equals(serverFeatureId)) { + if (featureId.equalsIgnoreCase(serverFeatureId)) { found = true; Integer oid = serverFeature.getObjectId(); feature.setObjectId(oid); From a1098d00d4945c3695ed6417dff970dcf0c93a2a Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Thu, 26 Oct 2023 09:41:09 +0200 Subject: [PATCH 2/4] update CNR --- CHANGES_NEXT_RELEASE | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 55f334c64..21e9b9a34 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,4 +1,5 @@ - [cygnus-common] [MongoDB] fix error about reindex when datamodel changed +- [cygnus-common] [Arcgis] check featureId ignore case - [cygnus-common] [Arcgis] check object_id ignore case (#2313) - [cygnus-common] [Arcgis] fix url quoted based on uniqueFieldType (#2311) - [cygnus-common] [SQL] Add Primary Key on Timestamp to Error Log table (#2302) From 8bcbbedb2f03abe39ba1ec9ac7e4f339f05e3f61 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Thu, 26 Oct 2023 10:15:47 +0200 Subject: [PATCH 3/4] Update CHANGES_NEXT_RELEASE --- CHANGES_NEXT_RELEASE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 21e9b9a34..1d3f67901 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,5 +1,5 @@ - [cygnus-common] [MongoDB] fix error about reindex when datamodel changed -- [cygnus-common] [Arcgis] check featureId ignore case +- [cygnus-common] [Arcgis] check featureId ignore case (#2320) - [cygnus-common] [Arcgis] check object_id ignore case (#2313) - [cygnus-common] [Arcgis] fix url quoted based on uniqueFieldType (#2311) - [cygnus-common] [SQL] Add Primary Key on Timestamp to Error Log table (#2302) From db8f42350012f5d24ef1614d3a4183f3e76fbb95 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Thu, 2 Nov 2023 16:22:35 +0100 Subject: [PATCH 4/4] hceck containsKey but both in lowerCase --- .../backends/arcgis/restutils/ArcgisFeatureTable.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/ArcgisFeatureTable.java b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/ArcgisFeatureTable.java index 1b67f6a8e..a2926b717 100644 --- a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/ArcgisFeatureTable.java +++ b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/ArcgisFeatureTable.java @@ -622,7 +622,15 @@ public int getErrorCode() { * @return */ public boolean hasAttribute(String attName) { - return arcGISFeatureTable.getTableAttributes().containsKey(attName); + // return arcGISFeatureTable.getTableAttributes().containsKey(attName); + // Check containsKey but both in lowerCase + Map map = arcGISFeatureTable.getTableAttributes(); + for (Map.Entry entry : map.entrySet()) { + if (entry.getKey().toLowerCase().equals(attName.toLowerCase())) { + return true; + } + } + return false; } /**