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

Fix/ckan check resource view list #2151

Merged
merged 7 commits into from
Apr 25, 2022
Merged

Fix/ckan check resource view list #2151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4365e69
check result as valid if empty
AlvaroVega Apr 8, 2022
43853d8
check result as valid if empty
AlvaroVega Apr 8, 2022
246896a
fix typo in CNR
AlvaroVega Apr 8, 2022
03ba25e
fix typo in CNR
AlvaroVega Apr 8, 2022
5ce18ac
Update CHANGES_NEXT_RELEASE
AlvaroVega Apr 18, 2022
e063680
Update CHANGES_NEXT_RELEASE
AlvaroVega Apr 19, 2022
bbcb892
Merge branch 'master' into fix/ckan_check_resource_view_list
AlvaroVega Apr 22, 2022
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 +1,2 @@
- [cygnus-common][CKANBackendImpl] allow empty result as resource_view_list (#2150)
- [cygnus-ngsi] Upgrade Dockerfile base image from centos8.4.2105 to Debian 11.2-slim
5 changes: 3 additions & 2 deletions cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/ckan/CKANBackendImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,9 @@ private boolean existsView(String resId) throws CygnusRuntimeError, CygnusPersis

// check the status
if (res.getStatusCode() == 200) {
LOGGER.debug("Successful view listing (resourceId=" + resId + ")");
return (((JSONArray) res.getJsonObject().get("result")).size() > 0);
boolean isResultList = ((JSONArray) res.getJsonObject().get("result")).size() >= 0;
LOGGER.debug("View listing (resourceId=" + resId + "): checking if there is a result list is: " + isResultList + ")");
return isResultList;
} else {
throw new CygnusPersistenceError("Could not check if the view exists (resId=" + resId
+ ", statusCode=" + res.getStatusCode() + ")");
Expand Down