From f4096a3e9785e4a054a94604ea7626d71dad06f8 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Thu, 5 May 2022 16:04:54 +0200 Subject: [PATCH] Fixes #20760 --- CHANGELOG.md | 4 ++++ pom.xml | 6 +++--- .../plugins/thredds/ThreddsInstanceManager.java | 2 +- .../gcube/data/transfer/plugins/sis/PublishTest.java | 12 ++++-------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ee9ab9..f5905d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.data.transfer.sis-geotk-plugin +## [v1.3.1-SNAPSHOT] 2021-03-25 +Fixes [#20760](https://support.d4science.org/issues/20760) https endpoints + + ## [v1.3.0] 2021-03-25 Use of EPSG Dataset Proxy support diff --git a/pom.xml b/pom.xml index 84acf9f..51028d6 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.gcube.data.transfer sis-geotk-plugin - 1.3.0 + 1.3.1-SNAPSHOT Sis/GeoToolkit plugin Apache Sis/Geotk plugin for data-transfer-service @@ -32,14 +32,14 @@ org.gcube.distribution gcube-smartgears-bom - 2.1.0 + 2.1.1 pom import org.gcube.distribution gcube-bom - 2.0.1 + 2.0.2 pom import diff --git a/src/main/java/org/gcube/data/transfer/plugins/thredds/ThreddsInstanceManager.java b/src/main/java/org/gcube/data/transfer/plugins/thredds/ThreddsInstanceManager.java index 9f36a47..b993677 100644 --- a/src/main/java/org/gcube/data/transfer/plugins/thredds/ThreddsInstanceManager.java +++ b/src/main/java/org/gcube/data/transfer/plugins/thredds/ThreddsInstanceManager.java @@ -132,7 +132,7 @@ public class ThreddsInstanceManager { info.setHostname(currentHostname); info.setGhnId(currentGHNId); info.setLocalBasePath(threddsPersistenceLocation); - info.setInstanceBaseUrl("http://"+info.getHostname()+"/thredds"); + info.setInstanceBaseUrl("https://"+info.getHostname()+"/thredds"); String mainCatalogPath=threddsContentRoot+"/catalog.xml"; diff --git a/src/test/java/org/gcube/data/transfer/plugins/sis/PublishTest.java b/src/test/java/org/gcube/data/transfer/plugins/sis/PublishTest.java index ef5fd6f..657d7c5 100644 --- a/src/test/java/org/gcube/data/transfer/plugins/sis/PublishTest.java +++ b/src/test/java/org/gcube/data/transfer/plugins/sis/PublishTest.java @@ -20,23 +20,19 @@ import org.gcube.data.transfer.model.Destination; import org.gcube.data.transfer.model.DestinationClashPolicy; import org.gcube.data.transfer.model.PluginInvocation; import org.gcube.data.transfer.plugins.thredds.sis.SISPluginFactory; -import org.gcube.smartgears.Constants; -import org.gcube.spatial.data.clients.model.engine.Engine; -import org.gcube.spatial.data.sdi.interfaces.Metadata; -import org.gcube.spatial.data.sdi.model.faults.RemoteException; -import org.gcube.spatial.data.sdi.plugins.SDIAbstractPlugin; public class PublishTest { - public static void main(String[] args) throws MalformedURLException, RemoteException, InvalidSourceException, SourceNotSetException, FailedTransferException, InitializationException, InvalidDestinationException, DestinationNotSetException { + public static void main(String[] args) throws MalformedURLException, Exception, InvalidSourceException, SourceNotSetException, FailedTransferException, InitializationException, InvalidDestinationException, DestinationNotSetException { TokenSetter.set("/pred4s/preprod/preVRE"); - String hostname= - new URL(SDIAbstractPlugin.management().build().getConfiguration().getByEngine(Engine.TH_ENGINE).get(0).getBaseEndpoint()).getHost(); + String hostname=""; + // Not yet released sdi refactoring + // new URL(SDIAbstractPlugin.management().build().getConfiguration().getByEngine(Engine.TH_ENGINE).get(0).getBaseEndpoint()).getHost(); DataTransferClient client=DataTransferClient.getInstanceByEndpoint("https://"+hostname);