diff --git a/.classpath b/.classpath
index 13aae38..4156377 100644
--- a/.classpath
+++ b/.classpath
@@ -6,13 +6,6 @@
-
-
-
-
-
-
-
@@ -31,5 +24,12 @@
+
+
+
+
+
+
+
diff --git a/.project b/.project
index 056f58d..a1a5af1 100644
--- a/.project
+++ b/.project
@@ -16,12 +16,12 @@
- org.eclipse.m2e.core.maven2Builder
+ org.eclipse.wst.validation.validationbuilder
- org.eclipse.wst.validation.validationbuilder
+ org.eclipse.m2e.core.maven2Builder
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f595f9..3b6cf25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
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.2-SNAPSHOT] - 2021-06-03
+
+**Fixes**
+[#21560] Bug fixing property "visibility" Restricted/Public
## [v1.0.1] - 2021-05-11
diff --git a/pom.xml b/pom.xml
index 82b3ebf..8cec5ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
org.gcube.datacatalogue
catalogue-util-library
- 1.0.1
+ 1.0.2-SNAPSHOT
Ckan utility library
@@ -40,7 +40,7 @@
org.gcube.distribution
maven-portal-bom
- 3.6.2
+ 3.6.2-SNAPSHOT
pom
import
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 737fe0d..00f007d 100644
--- a/src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueImpl.java
+++ b/src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueImpl.java
@@ -241,10 +241,8 @@ public class DataCatalogueImpl implements DataCatalogue {
List licenses = ckanCaller.getLicenseList();
for (CkanLicense ckanLicense : licenses) {
-
result.add(ckanLicense.getTitle());
LOG.debug("License is " + ckanLicense.getTitle() + " and id " + ckanLicense.getId());
-
}
return result;
@@ -281,13 +279,6 @@ public class DataCatalogueImpl implements DataCatalogue {
return client.getDataset(datasetIdOrName);
}
-// String authzToken = SecurityTokenProvider.instance.get();
-// if (authzToken != null && !authzToken.isEmpty()) {
-// LOG.info("gcube-token found. Calling the gCat client");
-// String jsonDataset = gCatCaller.getDatasetForName(datasetId);
-// return MarshUnmarshCkanObject.toCkanDataset(jsonDataset, METHOD.TO_READ);
-// }
-
LOG.info("No username found. Calling Ckan Client without API-KEY");
return ckanCaller.getDataset(datasetIdOrName);
@@ -998,35 +989,15 @@ public class DataCatalogueImpl implements DataCatalogue {
String toPassOrganizationToGcat = null; //Not needed to pass this information to gCat, never.
// String ckanUsername = getUserFromApiKey(apiKey).getName();
+ LOG.debug("The visibility parameter passed is (isPublic): "+setPublic);
CkanDataset dataset = CKANConveter.toCkanDataset(ckanCaller, username, title, name, toPassOrganizationToGcat, author, authorMail,
maintainer, maintainerMail, version, description, licenseId, tags, null, customFieldsMultiple,
resources, setPublic, setSearchable);
+ LOG.debug("The isPriv property into dataset is: "+dataset.isPriv());
// trying to create by gCat
String jsonValueDataset = MarshUnmarshCkanObject.toJsonValueDataset(dataset,METHOD.TO_CREATE);
LOG.info("Serialized dataset is: " + jsonValueDataset);
- /*JSONObject jsonDataset = null;
- try {
- JSONParser parser = new JSONParser();
- jsonDataset = (JSONObject) parser.parse(jsonValueDataset);
-
-// Object jsonSpatial = jsonDataset.get("spatial");
-// if (jsonSpatial != null) {
-// ObjectMapper objectMapper = new ObjectMapper();
-// objectMapper.configure(Feature.QUOTE_FIELD_NAMES, false);
-// String spatialUnquoted = objectMapper.writeValueAsString(jsonSpatial);
-// System.out.println(spatialUnquoted);
-// jsonDataset.put("spatial", spatialUnquoted);
-// }
-
- }catch (Exception e) {
- LOG.error("Serialized dataset not parsable as JSON: ", e);
- throw new Exception("Error on reading data, refresh and try again");
- }
-
- if(jsonDataset==null)
- throw new Exception("Error on converting data");*/
-
jsonValueDataset = gCatCaller.createDataset(jsonValueDataset,socialPost);
LOG.debug("Created dataset is: " + jsonValueDataset);
diff --git a/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/CKANConveter.java b/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/CKANConveter.java
index e452311..5e79e01 100644
--- a/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/CKANConveter.java
+++ b/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/CKANConveter.java
@@ -61,10 +61,7 @@ public class CKANConveter {
Map> customFieldsMultipleValues, List resources, boolean setPublic, boolean setSearchable) {
LOG.info("Called convert data to CkanDataset");
-
- //ExtendCkanClient client = new ExtendCkanClient(CKAN_CATALOGUE_URL, apiKey);
-
- //String ckanUsername = getUserFromApiKey(apiKey).getName();
+
CkanDataset dataset = new CkanDataset();
// in order to avoid errors, the username is always converted
diff --git a/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/SwitchBoolDeserializer.java b/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/SwitchBoolDeserializer.java
new file mode 100644
index 0000000..6b13fca
--- /dev/null
+++ b/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/SwitchBoolDeserializer.java
@@ -0,0 +1,52 @@
+package org.gcube.datacatalogue.utillibrary.server.utils;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.gcube.com.fasterxml.jackson.core.JsonParser;
+import org.gcube.com.fasterxml.jackson.core.JsonProcessingException;
+import org.gcube.com.fasterxml.jackson.databind.DeserializationContext;
+import org.gcube.com.fasterxml.jackson.databind.JsonDeserializer;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class SwitchBoolDeserializer.
+ *
+ * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
+ *
+ * Jun 3, 2021
+ */
+public class SwitchBoolDeserializer extends JsonDeserializer