Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enum.toString to equals compare #2312

Merged
merged 3 commits into from
Oct 10, 2023
Merged

enum.toString to equals compare #2312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
829e39b
enum.toString to equals compare
AlvaroVega Oct 10, 2023
f7d3916
update CNR
AlvaroVega Oct 10, 2023
4558be0
log method and body in arcgis request
AlvaroVega Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES_NEXT_RELEASE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
- [cygnus-common] [Arcgis] fix url quoted based on uniqueFieldType (#2311)
- [cygnus-common] [SQL] Add Primary Key on Timestamp to Error Log table (#2302)
- [cygnus-common] Upgrade gson dependency from 2.6.2 to 2.10.1
- [cygnus-common] Upgrade mysql-java-connector dependency from 8.0.28 to 8.0.33
Expand Down
6 changes: 3 additions & 3 deletions ...src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/ArcgisFeatureTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,9 @@ protected String getUniqueFieldList(List<Feature> featureArray, String uniqueFie
// Checks if field exists in table, an retrieves it's type
if (hasAttribute(uniqueField)) {
String uniqueFieldType = getAttributeType(uniqueField);
quoted = GisAttributeType.DATE.equals(uniqueFieldType)
|| GisAttributeType.STRING.equals(uniqueFieldType);

quoted = GisAttributeType.DATE.toString().equalsIgnoreCase(uniqueFieldType)
|| GisAttributeType.STRING.toString().equalsIgnoreCase(uniqueFieldType);
LOGGER.debug("uniqueField: " + uniqueField + " uniqueFieldType " + uniqueFieldType + " in table");
// Make the list
for (Feature feature : featureArray) {
if (feature.getAttributes().containsKey(uniqueField)) {
Expand Down
4 changes: 3 additions & 1 deletion cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/RestApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,9 @@ public static HttpResponse requestHTTP(String urlToRead, Map<String, String> par

try {
String strUrl = fullUrl(urlToRead, params);
LOGGER.debug("requesting HTTP: " + strUrl);
LOGGER.debug("requesting HTTP: " + strUrl +
"---METHOD: " + httpMethod.toString() +
"---BODY: " + body);

// Create a trust manager that does not validate certificate chains
TrustManager[] trustAllCerts = new TrustManager[] {new X509TrustManager() {
Expand Down
Loading