From dec8bf5652610c4da46cac17e0d0955cdd6abd1e Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Mon, 8 Apr 2019 09:49:49 +0000 Subject: [PATCH] Upgraded to 2.9.0 Implemented Task #16471 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/ckan-util-library@178894 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/changelog.xml | 69 +++++++++++++------ pom.xml | 2 +- .../server/DataCatalogueImpl.java | 17 ++--- 3 files changed, 57 insertions(+), 31 deletions(-) diff --git a/distro/changelog.xml b/distro/changelog.xml index 526754d..f14926d 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,49 +1,73 @@ - + + [Task #16471] Migrate to new Catalogue Resolver + + Added title on updated of records refs #16395 - + Fixed Bug on social post publishing - + Patched method DataCatalogueImpl#getPortletURL - - Added the possibility to deny social post on catalogue-ws #12514 + + Added the possibility to deny social post on catalogue-ws + #12514 - - Enhance timeout in requests to CKAN in ckan-util-library #12050 + + Enhance timeout in requests to CKAN in ckan-util-library + #12050 - Code cleanup - Portlet url is built on the fly (#11294) - Minor fix for delegates Added support for statistics (requires solrj) Added method for retrieving main landing pages - - Added title on updated of records refs #16395 + Added delegate roles method Added search methods for datasets - Minor fixes - Mime type fix for resources - Pom fixes Moved to java 8 @@ -51,25 +75,29 @@ any) - Some minor changes - Added method to delete/purge group Project structure and so packages are changed (gwt-widget like structure) - Product creation methods improved Added method to get the group list Added methods to manage groups Added method to patch product/resource - Added support for datasets's relationships (create, delete, retrieve methods) @@ -84,7 +112,8 @@ to a group - First Release diff --git a/pom.xml b/pom.xml index c0b027a..396dee0 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.data-catalogue ckan-util-library - 2.8.2-SNAPSHOT + 2.9.0-SNAPSHOT jar CKan utility library diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueImpl.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueImpl.java index 3fc3b4e..15d0f1b 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueImpl.java +++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueImpl.java @@ -24,10 +24,6 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import net.htmlparser.jericho.Renderer; -import net.htmlparser.jericho.Segment; -import net.htmlparser.jericho.Source; - import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.impl.HttpSolrServer; import org.apache.solr.client.solrj.response.FacetField; @@ -73,6 +69,9 @@ import eu.trentorise.opendata.jackan.model.CkanPair; import eu.trentorise.opendata.jackan.model.CkanResource; import eu.trentorise.opendata.jackan.model.CkanTag; import eu.trentorise.opendata.jackan.model.CkanUser; +import net.htmlparser.jericho.Renderer; +import net.htmlparser.jericho.Segment; +import net.htmlparser.jericho.Source; /** * This is the Ckan Utils implementation class. @@ -1062,7 +1061,7 @@ public class DataCatalogueImpl implements DataCatalogue{ if(dataset != null){ if(getUriResolverUrl() != null) - url = getUrlForProduct(CONTEXT, EntityContext.PRODUCT, name, false); + url = getUrlForProduct(CONTEXT, EntityContext.PRODUCT, name); if(url == null || url.isEmpty()) url = getPortletUrl() + "?" + URLEncoder.encode("path=/dataset/" + name, "UTF-8"); @@ -1092,7 +1091,7 @@ public class DataCatalogueImpl implements DataCatalogue{ if(dataset != null){ if(getUriResolverUrl() != null) - url = getUrlForProduct(CONTEXT, EntityContext.PRODUCT, name, true); + url = getUrlForProduct(CONTEXT, EntityContext.PRODUCT, name); if(url == null || url.isEmpty()) url = getPortletUrl() + "?" + URLEncoder.encode("path=/dataset/" + name, "UTF-8"); @@ -1100,7 +1099,7 @@ public class DataCatalogueImpl implements DataCatalogue{ } }catch(Exception e){ logger.error("Error while retrieving dataset with id/name=" + datasetIdOrName, e); - } + } //requestEntity.put("clear_url", Boolean.toString(unencrypted)); return url; } @@ -1109,9 +1108,8 @@ public class DataCatalogueImpl implements DataCatalogue{ * @param context * @param entityContext * @param entityName - * @return the url for the product */ - private String getUrlForProduct(String context, EntityContext entityContext, String entityName, boolean unencrypted){ + private String getUrlForProduct(String context, EntityContext entityContext, String entityName){ String toReturn = null; @@ -1123,7 +1121,6 @@ public class DataCatalogueImpl implements DataCatalogue{ requestEntity.put("gcube_scope", context); requestEntity.put("entity_context", entityContext.toString()); requestEntity.put("entity_name", entityName); - requestEntity.put("clear_url", Boolean.toString(unencrypted)); StringEntity params = new StringEntity(requestEntity.toJSONString(), ContentType.APPLICATION_JSON); httpPostRequest.setEntity(params);