From c35c19434c3fd0303e1913488a676c9d58225271 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Fri, 4 Aug 2017 13:06:11 +0000 Subject: [PATCH] minor refactoring git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@152488 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../utils/{CSVHelpers.java => CSVUtils.java} | 4 ++-- .../utils/threads/ManageTimeSeriesThread.java | 8 ++++---- .../org/gcube/data_catalogue/grsf_publish_ws/JTests.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) rename src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/{CSVHelpers.java => CSVUtils.java} (98%) diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CSVHelpers.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CSVUtils.java similarity index 98% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CSVHelpers.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CSVUtils.java index b2e56da..eea3058 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CSVHelpers.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CSVUtils.java @@ -14,9 +14,9 @@ import org.slf4j.LoggerFactory; * Convert lists to csv format helpers * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it) */ -public class CSVHelpers { +public class CSVUtils { - private static final org.slf4j.Logger logger = LoggerFactory.getLogger(CSVHelpers.class); + private static final org.slf4j.Logger logger = LoggerFactory.getLogger(CSVUtils.class); private static final String CSV_SEPARATOR = ","; private static final String UPLOAD_LOCATION_LOCAL = System.getProperty("java.io.tmpdir"); private static final String GRSF_SUB_PATH = "GRSF_TIME_SERIES"; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/threads/ManageTimeSeriesThread.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/threads/ManageTimeSeriesThread.java index 23a2f86..5e30844 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/threads/ManageTimeSeriesThread.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/threads/ManageTimeSeriesThread.java @@ -25,7 +25,7 @@ import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.TimeSeries; import org.gcube.data_catalogue.grsf_publish_ws.json.input.record.Common; import org.gcube.data_catalogue.grsf_publish_ws.json.input.record.FisheryRecord; import org.gcube.data_catalogue.grsf_publish_ws.json.input.record.StockRecord; -import org.gcube.data_catalogue.grsf_publish_ws.utils.CSVHelpers; +import org.gcube.data_catalogue.grsf_publish_ws.utils.CSVUtils; import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods; import org.gcube.data_catalogue.grsf_publish_ws.utils.cache.CacheImpl; import org.gcube.data_catalogue.grsf_publish_ws.utils.cache.CacheInterface; @@ -166,7 +166,7 @@ public class ManageTimeSeriesThread extends Thread{ char firstLetter = uuidKB.charAt(0); // the whole path of the directory is going to be... - String csvDirectoryForThisProduct = recordTypeFolderName + PATH_SEPARATOR + firstLetter + PATH_SEPARATOR + replaceIllegalChars(uuidKB, "_") + PATH_SEPARATOR + CSVHelpers.CSV_EXTENSION.replace(".", ""); + String csvDirectoryForThisProduct = recordTypeFolderName + PATH_SEPARATOR + firstLetter + PATH_SEPARATOR + replaceIllegalChars(uuidKB, "_") + PATH_SEPARATOR + CSVUtils.CSV_EXTENSION.replace(".", ""); logger.debug("The path under which the time series are going to be saved is " + csvDirectoryForThisProduct); WorkspaceFolder csvFolder = HelperMethods.createOrGetSubFoldersByPath(catalogueFolder, csvDirectoryForThisProduct); @@ -194,7 +194,7 @@ public class ManageTimeSeriesThread extends Thread{ CkanResourceBase ckanResource = null; ExternalFile createdFileOnWorkspace = null; - File csvFile = CSVHelpers.listToCSV(asList); + File csvFile = CSVUtils.listToCSV(asList); if(csvFile != null){ for (int i = 0; i < CHANCES; i++) { @@ -207,7 +207,7 @@ public class ManageTimeSeriesThread extends Thread{ if(ckanResource != null){ if(createdFileOnWorkspace == null) - createdFileOnWorkspace = HelperMethods.uploadExternalFile(csvFolder, csvFileName + "_" + customAnnotation.key() + CSVHelpers.CSV_EXTENSION, resourceToAttachOnCkanDescription, csvFile); + createdFileOnWorkspace = HelperMethods.uploadExternalFile(csvFolder, csvFileName + "_" + customAnnotation.key() + CSVUtils.CSV_EXTENSION, resourceToAttachOnCkanDescription, csvFile); if(createdFileOnWorkspace != null){ String publicUrlToSetOnCkan = createdFileOnWorkspace.getPublicLink(true); diff --git a/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JTests.java b/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JTests.java index ccf0e3e..7d490a4 100644 --- a/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JTests.java +++ b/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JTests.java @@ -32,7 +32,7 @@ import org.gcube.data_catalogue.grsf_publish_ws.json.input.record.FisheryRecord; import org.gcube.data_catalogue.grsf_publish_ws.json.input.record.StockRecord; import org.gcube.data_catalogue.grsf_publish_ws.json.input.utils.Resource; import org.gcube.data_catalogue.grsf_publish_ws.json.input.utils.TimeSeriesBean; -import org.gcube.data_catalogue.grsf_publish_ws.utils.CSVHelpers; +import org.gcube.data_catalogue.grsf_publish_ws.utils.CSVUtils; import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Abundance_Level; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Fishery_Type; @@ -233,7 +233,7 @@ public class JTests { Collections.sort(timeSeries); - File csvFile = CSVHelpers.listToCSV(timeSeries); + File csvFile = CSVUtils.listToCSV(timeSeries); // send file instance.uploadResourceFile(csvFile, datasetName, instance.getApiKeyFromUsername("costantino.perciante"), "random_name.csv", null, null, null);