From 40413be914a838f240829f39d792425872f8f798 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Thu, 1 Dec 2016 18:25:30 +0000 Subject: [PATCH] minor fix when reading from the path the type of source git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135191 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../grsf_publish_ws/services/GrsfPublisherFisheryService.java | 2 +- .../grsf_publish_ws/services/GrsfPublisherStockService.java | 2 +- .../data_catalogue/grsf_publish_ws/utils/HelperMethods.java | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java index 2b13388..c91f3c2 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java @@ -112,7 +112,7 @@ public class GrsfPublisherFisheryService { try{ // Cast the source to the accepted ones - Sources sourceInPath = Sources.valueOf(source); + Sources sourceInPath = Sources.onDeserialize(source); if(sourceInPath == null) throw new Exception("The specified source in the path is unknown"); diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java index 519963b..c038bbb 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java @@ -108,7 +108,7 @@ public class GrsfPublisherStockService { try{ // Cast the source to the accepted ones - Sources sourceInPath = Sources.valueOf(source); + Sources sourceInPath = Sources.onDeserialize(source); if(sourceInPath == null) throw new Exception("The specified source in the path is unknown"); diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java index 6e15df3..4996557 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java @@ -12,8 +12,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.servlet.ServletContext; - import org.gcube.common.homelibrary.home.exceptions.InternalErrorException; import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder; import org.gcube.common.homelibrary.home.workspace.WorkspaceItem; @@ -27,7 +25,6 @@ import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.Tag; import org.gcube.data_catalogue.grsf_publish_ws.json.input.Base; import org.gcube.data_catalogue.grsf_publish_ws.json.input.Resource; import org.gcube.data_catalogue.grsf_publish_ws.json.input.TimeSeriesBean; -import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Status; import org.gcube.datacatalogue.ckanutillibrary.DataCatalogue; import org.gcube.datacatalogue.ckanutillibrary.DataCatalogueFactory; import org.gcube.datacatalogue.ckanutillibrary.DataCatalogueImpl;