diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Base.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Base.java similarity index 98% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Base.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Base.java index a319adc..0d80305 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Base.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Base.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input; +package org.gcube.data_catalogue.grsf_publish_ws.json.input.record; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Common.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Common.java similarity index 94% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Common.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Common.java index 96a2839..6287f47 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Common.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Common.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input; +package org.gcube.data_catalogue.grsf_publish_ws.json.input.record; import java.util.List; @@ -9,6 +9,10 @@ import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.CustomField; import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.Group; import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.Tag; import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.TimeSeries; +import org.gcube.data_catalogue.grsf_publish_ws.json.input.utils.RefersToBean; +import org.gcube.data_catalogue.grsf_publish_ws.json.input.utils.Resource; +import org.gcube.data_catalogue.grsf_publish_ws.json.input.utils.SimilarRecordBean; +import org.gcube.data_catalogue.grsf_publish_ws.json.input.utils.TimeSeriesBean; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Sources; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Status; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/FisheryRecord.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/FisheryRecord.java similarity index 98% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/FisheryRecord.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/FisheryRecord.java index 0dce992..3f9a1a9 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/FisheryRecord.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/FisheryRecord.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input; +package org.gcube.data_catalogue.grsf_publish_ws.json.input.record; import java.util.List; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/StockRecord.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java similarity index 98% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/StockRecord.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java index edbcca6..085e5b3 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/StockRecord.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input; +package org.gcube.data_catalogue.grsf_publish_ws.json.input.record; import java.util.List; @@ -10,6 +10,7 @@ import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.CustomField; import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.Group; import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.Tag; import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.TimeSeries; +import org.gcube.data_catalogue.grsf_publish_ws.json.input.utils.TimeSeriesBean; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Abundance_Level; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Fishing_Pressure; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Stock_Type; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/DeleteProductBean.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/DeleteProductBean.java similarity index 93% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/DeleteProductBean.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/DeleteProductBean.java index 7968a5e..b771781 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/DeleteProductBean.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/DeleteProductBean.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input; +package org.gcube.data_catalogue.grsf_publish_ws.json.input.utils; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/RefersToBean.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/RefersToBean.java similarity index 94% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/RefersToBean.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/RefersToBean.java index fcb58e1..a959981 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/RefersToBean.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/RefersToBean.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input; +package org.gcube.data_catalogue.grsf_publish_ws.json.input.utils; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Resource.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/Resource.java similarity index 96% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Resource.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/Resource.java index e83e576..1a55cfd 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Resource.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/Resource.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input; +package org.gcube.data_catalogue.grsf_publish_ws.json.input.utils; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/SimilarRecordBean.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/SimilarRecordBean.java similarity index 95% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/SimilarRecordBean.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/SimilarRecordBean.java index b21fae5..9b6f914 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/SimilarRecordBean.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/SimilarRecordBean.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input; +package org.gcube.data_catalogue.grsf_publish_ws.json.input.utils; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/TimeSeriesBean.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/TimeSeriesBean.java similarity index 97% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/TimeSeriesBean.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/TimeSeriesBean.java index 99c0576..695cda2 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/TimeSeriesBean.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/TimeSeriesBean.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input; +package org.gcube.data_catalogue.grsf_publish_ws.json.input.utils; import javax.validation.constraints.NotNull; 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 33f11e6..b068305 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 @@ -29,11 +29,12 @@ import org.gcube.common.authorization.library.provider.AuthorizationProvider; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.authorization.library.utils.Caller; import org.gcube.common.scope.api.ScopeProvider; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.Common; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.DeleteProductBean; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.FisheryRecord; +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.utils.DeleteProductBean; import org.gcube.data_catalogue.grsf_publish_ws.json.output.ResponseBean; import org.gcube.data_catalogue.grsf_publish_ws.json.output.ResponseCreationBean; +import org.gcube.data_catalogue.grsf_publish_ws.utils.CommonServiceUtils; import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Product_Type; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Sources; 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 13bf7c1..0f88d31 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 @@ -29,11 +29,12 @@ import org.gcube.common.authorization.library.provider.AuthorizationProvider; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.authorization.library.utils.Caller; import org.gcube.common.scope.api.ScopeProvider; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.Common; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.DeleteProductBean; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.StockRecord; +import org.gcube.data_catalogue.grsf_publish_ws.json.input.record.Common; +import org.gcube.data_catalogue.grsf_publish_ws.json.input.record.StockRecord; +import org.gcube.data_catalogue.grsf_publish_ws.json.input.utils.DeleteProductBean; import org.gcube.data_catalogue.grsf_publish_ws.json.output.ResponseBean; import org.gcube.data_catalogue.grsf_publish_ws.json.output.ResponseCreationBean; +import org.gcube.data_catalogue.grsf_publish_ws.utils.CommonServiceUtils; import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Product_Type; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Sources; 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/CSVHelpers.java index 577dc0c..b2e56da 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/CSVHelpers.java @@ -6,7 +6,7 @@ import java.io.FileOutputStream; import java.io.OutputStreamWriter; import java.util.List; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.TimeSeriesBean; +import org.gcube.data_catalogue.grsf_publish_ws.json.input.utils.TimeSeriesBean; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/CommonServiceUtils.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java similarity index 97% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/CommonServiceUtils.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java index 9d31c93..5333828 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/CommonServiceUtils.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.services; +package org.gcube.data_catalogue.grsf_publish_ws.utils; import java.beans.PropertyDescriptor; import java.lang.reflect.Field; @@ -18,15 +18,14 @@ import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.CkanResource; import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.CustomField; import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.Group; 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.Common; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.FisheryRecord; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.RefersToBean; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.Resource; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.StockRecord; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.TimeSeriesBean; +import org.gcube.data_catalogue.grsf_publish_ws.json.input.record.Base; +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.json.input.utils.RefersToBean; +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.json.output.ResponseCreationBean; -import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Product_Type; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Sources; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Status; 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 04034e3..23a2f86 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 @@ -22,9 +22,9 @@ import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalFile; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.CustomField; import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.TimeSeries; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.Common; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.FisheryRecord; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.StockRecord; +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.HelperMethods; import org.gcube.data_catalogue.grsf_publish_ws.utils.cache.CacheImpl; diff --git a/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JJerseyTest.java b/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JJerseyTest.java index faa19d6..c05262d 100644 --- a/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JJerseyTest.java +++ b/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JJerseyTest.java @@ -8,9 +8,9 @@ import javax.ws.rs.core.Application; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.FisheryRecord; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.Resource; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.StockRecord; +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.services.GrsfPublisherFisheryService; import org.gcube.data_catalogue.grsf_publish_ws.services.GrsfPublisherStockService; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Fishery_Type; 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 0a48795..ccf0e3e 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 @@ -27,11 +27,11 @@ import org.gcube.common.scope.api.ScopeProvider; import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.CustomField; import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.Group; import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.Tag; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.Common; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.FisheryRecord; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.Resource; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.StockRecord; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.TimeSeriesBean; +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.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.HelperMethods; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Abundance_Level;