From 89d28f84f2e7ceec6491b17f44081dd4e28b9fbb Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 21 Jan 2022 12:33:04 +0100 Subject: [PATCH] fixing bug: #22691. Moved to 1.0.3-SNAPSHOT --- .settings/org.eclipse.wst.validation.prefs | 2 ++ CHANGELOG.md | 19 ++++++++++++------- pom.xml | 2 +- .../utillibrary/db/DBCaller.java | 2 ++ .../utillibrary/server/DataCatalogueImpl.java | 3 ++- .../test/TestDataCatalogueLib.java | 2 +- 6 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 .settings/org.eclipse.wst.validation.prefs diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs new file mode 100644 index 0000000..04cad8c --- /dev/null +++ b/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,2 @@ +disabled=06target +eclipse.preferences.version=1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c5103e..1b0b4a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,25 +4,30 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [v1.0.3.SNAPSHOT] - 2022-01-21 + +**Fixes** +- [#22691] Share Link on private items does not work + ## [v1.0.2] - 2021-06-03 **Fixes** -[#21560] Bug fixing property "visibility" Restricted/Public +- [#21560] Bug fixing property "visibility" Restricted/Public ## [v1.0.1] - 2021-05-11 **Fixes** -[#21387] Harmonize the jackson version to v.2.8.11 -Moved to maven-portal-bom.3.6.2 +- [#21387] Harmonize the jackson version to v.2.8.11 +- Moved to maven-portal-bom.3.6.2 ## [v1.0.0] - 2021-02-17 **Bug Fixes** -[#21259] remove the method that validates the URL +- [#21259] remove the method that validates the URL **New Features** -[#21153] Upgrade the maven-portal-bom to 3.6.1 version -[#20828] Revisited title size and format -[#19378] First Release +- [#21153] Upgrade the maven-portal-bom to 3.6.1 version +- [#20828] Revisited title size and format +- [#19378] First Release diff --git a/pom.xml b/pom.xml index e3e6265..80020a4 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.datacatalogue catalogue-util-library - 1.0.2 + 1.0.3-SNAPSHOT Ckan utility library diff --git a/src/main/java/org/gcube/datacatalogue/utillibrary/db/DBCaller.java b/src/main/java/org/gcube/datacatalogue/utillibrary/db/DBCaller.java index d276b6b..1cfbb52 100644 --- a/src/main/java/org/gcube/datacatalogue/utillibrary/db/DBCaller.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/db/DBCaller.java @@ -249,6 +249,8 @@ public class DBCaller { PreparedStatement preparedStatement = connection.prepareStatement(query); preparedStatement.setString(1, username); preparedStatement.setString(2, state); + + LOG.debug("The query is: "+preparedStatement.toString()); ResultSet rs = preparedStatement.executeQuery(); while (rs.next()) { diff --git a/src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueImpl.java b/src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueImpl.java index 00f007d..f4b60bc 100644 --- a/src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueImpl.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueImpl.java @@ -667,6 +667,7 @@ public class DataCatalogueImpl implements DataCatalogue { // in order to avoid errors, the username is always converted String ckanUsername = CatalogueUtilMethods.fromUsernameToCKanUsername(username); + LOG.debug("username: "+username + " converted to ckanUsername: "+ckanUsername); // check in the hashmap first if (apiKeysMap.containsKey(ckanUsername)) { @@ -680,7 +681,7 @@ public class DataCatalogueImpl implements DataCatalogue { try { - String apiToReturn = dbCaller.getApiKeyFromUsername(username, State.ACTIVE.name().toLowerCase()); + String apiToReturn = dbCaller.getApiKeyFromUsername(ckanUsername, State.ACTIVE.name().toLowerCase()); // save into the hashmap if (apiToReturn != null) diff --git a/src/test/java/org/gcube/datacatalogue/utillibrary/test/TestDataCatalogueLib.java b/src/test/java/org/gcube/datacatalogue/utillibrary/test/TestDataCatalogueLib.java index 030b373..ef22471 100644 --- a/src/test/java/org/gcube/datacatalogue/utillibrary/test/TestDataCatalogueLib.java +++ b/src/test/java/org/gcube/datacatalogue/utillibrary/test/TestDataCatalogueLib.java @@ -129,7 +129,7 @@ public class TestDataCatalogueLib { public void getDataset() throws Exception{ DataCatalogueImpl instance = factory.getUtilsPerScope(scope); String username = testUser; - CkanDataset dataset = instance.getDataset("sarda-sarda", username); + CkanDataset dataset = instance.getDataset("my_first_restful_transaction_model_private", username); LOG.debug("Got dataset: " +dataset.getName() + ", with id: "+dataset.getId()); }