gCubeSystem
/
catalogue-util-library
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing bug: #22691. Moved to 1.0.3-SNAPSHOT

This commit is contained in:
Francesco Mangiacrapa 2022-01-21 12:33:04 +01:00
parent 2426bd16bd
commit 89d28f84f2
6 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.settings/org.eclipse.wst.validation.prefs Normal file
View File

@ -0,0 +1,2 @@
disabled=06target
eclipse.preferences.version=1

19
CHANGELOG.md
View File

@ -4,25 +4,30 @@
All notable changes to this project will be documented in this file. 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). 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 ## [v1.0.2] - 2021-06-03
**Fixes** **Fixes**
[#21560] Bug fixing property "visibility" Restricted/Public - [#21560] Bug fixing property "visibility" Restricted/Public
## [v1.0.1] - 2021-05-11 ## [v1.0.1] - 2021-05-11
**Fixes** **Fixes**
[#21387] Harmonize the jackson version to v.2.8.11 - [#21387] Harmonize the jackson version to v.2.8.11
Moved to maven-portal-bom.3.6.2 - Moved to maven-portal-bom.3.6.2
## [v1.0.0] - 2021-02-17 ## [v1.0.0] - 2021-02-17
**Bug Fixes** **Bug Fixes**
[#21259] remove the method that validates the URL - [#21259] remove the method that validates the URL
**New Features** **New Features**
[#21153] Upgrade the maven-portal-bom to 3.6.1 version - [#21153] Upgrade the maven-portal-bom to 3.6.1 version
[#20828] Revisited title size and format - [#20828] Revisited title size and format
[#19378] First Release - [#19378] First Release

2
pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.gcube.datacatalogue</groupId> <groupId>org.gcube.datacatalogue</groupId>
<artifactId>catalogue-util-library</artifactId> <artifactId>catalogue-util-library</artifactId>
<version>1.0.2</version> <version>1.0.3-SNAPSHOT</version>
<name>Ckan utility library</name> <name>Ckan utility library</name>
<description> <description>

2
src/main/java/org/gcube/datacatalogue/utillibrary/db/DBCaller.java
View File

@ -249,6 +249,8 @@ public class DBCaller {
PreparedStatement preparedStatement = connection.prepareStatement(query); PreparedStatement preparedStatement = connection.prepareStatement(query);
preparedStatement.setString(1, username); preparedStatement.setString(1, username);
preparedStatement.setString(2, state); preparedStatement.setString(2, state);
LOG.debug("The query is: "+preparedStatement.toString());
ResultSet rs = preparedStatement.executeQuery(); ResultSet rs = preparedStatement.executeQuery();
while (rs.next()) { while (rs.next()) {

3
src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueImpl.java
View File

@ -667,6 +667,7 @@ public class DataCatalogueImpl implements DataCatalogue {
// in order to avoid errors, the username is always converted // in order to avoid errors, the username is always converted
String ckanUsername = CatalogueUtilMethods.fromUsernameToCKanUsername(username); String ckanUsername = CatalogueUtilMethods.fromUsernameToCKanUsername(username);
LOG.debug("username: "+username + " converted to ckanUsername: "+ckanUsername);
// check in the hashmap first // check in the hashmap first
if (apiKeysMap.containsKey(ckanUsername)) { if (apiKeysMap.containsKey(ckanUsername)) {
@ -680,7 +681,7 @@ public class DataCatalogueImpl implements DataCatalogue {
try { try {
String apiToReturn = dbCaller.getApiKeyFromUsername(username, State.ACTIVE.name().toLowerCase()); String apiToReturn = dbCaller.getApiKeyFromUsername(ckanUsername, State.ACTIVE.name().toLowerCase());
// save into the hashmap // save into the hashmap
if (apiToReturn != null) if (apiToReturn != null)

2
src/test/java/org/gcube/datacatalogue/utillibrary/test/TestDataCatalogueLib.java
View File

@ -129,7 +129,7 @@ public class TestDataCatalogueLib {
public void getDataset() throws Exception{ public void getDataset() throws Exception{
DataCatalogueImpl instance = factory.getUtilsPerScope(scope); DataCatalogueImpl instance = factory.getUtilsPerScope(scope);
String username = testUser; 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()); LOG.debug("Got dataset: " +dataset.getName() + ", with id: "+dataset.getId());
} }