From 04e0d90e091decc2db52bfd7454ea9d8d914ea9c Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 12 Dec 2018 14:43:39 +0000 Subject: [PATCH] loadCatalogueEndPoints fixing git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-transfer/uri-resolver@174817 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../CkanCatalogueConfigurationsReader.java | 2 +- .../resolver/dataminer/DataMinerRequest.java | 31 ------------------- 2 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 src/main/java/org/gcube/datatransfer/resolver/dataminer/DataMinerRequest.java diff --git a/src/main/java/org/gcube/datatransfer/resolver/catalogue/resource/CkanCatalogueConfigurationsReader.java b/src/main/java/org/gcube/datatransfer/resolver/catalogue/resource/CkanCatalogueConfigurationsReader.java index 5433640..090329f 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/catalogue/resource/CkanCatalogueConfigurationsReader.java +++ b/src/main/java/org/gcube/datatransfer/resolver/catalogue/resource/CkanCatalogueConfigurationsReader.java @@ -72,7 +72,7 @@ public class CkanCatalogueConfigurationsReader { //It returns the string "catalogue" String prefixToPublicCtlg = getRelativeURLToCatalogue(); //Replacing for example "ckan-bb" with "catalogue-bb" - String publicCatalogueName = extractCatalogueName(privatePortletURL, prefixToPublicCtlg); + String publicCatalogueName = extractCatalogueName(catalogueImpl.getCatalogueUrl(), prefixToPublicCtlg); links.setPublicPortletURL(publicURL+"/"+publicCatalogueName); }catch(Exception e){ logger.warn("Erron on generating public catalogue URL from private URL: "+privatePortletURL, e); diff --git a/src/main/java/org/gcube/datatransfer/resolver/dataminer/DataMinerRequest.java b/src/main/java/org/gcube/datatransfer/resolver/dataminer/DataMinerRequest.java deleted file mode 100644 index d917d20..0000000 --- a/src/main/java/org/gcube/datatransfer/resolver/dataminer/DataMinerRequest.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * - */ -package org.gcube.datatransfer.resolver.dataminer; - -import java.util.Map; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; - - -/** - * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * Nov 26, 2018 - */ -@AllArgsConstructor -@Getter -@Setter -@NoArgsConstructor -@ToString -public class DataMinerRequest { - - //private String scope; - private String operatorId; - private Map parameters; - -}