diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/AnnotationBean.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/AnnotationBean.java similarity index 96% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/AnnotationBean.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/AnnotationBean.java index 5ea8e3c..f1d638e 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/AnnotationBean.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/AnnotationBean.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input.others; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED; import javax.validation.constraints.Size; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Base.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/Base.java similarity index 98% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Base.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/Base.java index 6fad4d8..6fd82e7 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Base.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/Base.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input.record; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/custom_annotations/CkanResource.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/CkanResource.java similarity index 86% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/custom_annotations/CkanResource.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/CkanResource.java index 090c968..21d77c2 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/custom_annotations/CkanResource.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/CkanResource.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.custom_annotations; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Common.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/Common.java similarity index 92% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Common.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/Common.java index 50d81b4..799a6d4 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Common.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/Common.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input.record; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED; import java.util.List; @@ -6,16 +6,6 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -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.custom_annotations.TimeSeries; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.others.AnnotationBean; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.others.RefersToBean; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.others.Resource; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.others.SimilarRecordBean; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.others.TimeSeriesBean; import org.gcube.datacatalogue.common.Constants; import org.gcube.datacatalogue.common.enums.Sources; import org.gcube.datacatalogue.common.enums.Status; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/custom_annotations/CustomField.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/CustomField.java similarity index 87% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/custom_annotations/CustomField.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/CustomField.java index 5e15a64..ca85723 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/custom_annotations/CustomField.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/CustomField.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.custom_annotations; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/FisheryRecord.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/FisheryRecord.java similarity index 94% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/FisheryRecord.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/FisheryRecord.java index 0845022..dab5a8c 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/FisheryRecord.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/FisheryRecord.java @@ -1,13 +1,10 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input.record; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED; import java.util.List; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -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.datacatalogue.common.Constants; import org.gcube.datacatalogue.common.enums.Fishery_Type; import org.gcube.datacatalogue.common.enums.Production_System_Type; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/custom_annotations/Group.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/Group.java similarity index 93% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/custom_annotations/Group.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/Group.java index 3b9a219..b13b9b7 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/custom_annotations/Group.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/Group.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.custom_annotations; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/RefersToBean.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/RefersToBean.java similarity index 94% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/RefersToBean.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/RefersToBean.java index 3d6f70b..cb02475 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/RefersToBean.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/RefersToBean.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input.others; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/Resource.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/Resource.java similarity index 96% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/Resource.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/Resource.java index 80f0a0b..08f62e2 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/Resource.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/Resource.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input.others; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED; 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/others/SimilarRecordBean.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/SimilarRecordBean.java similarity index 96% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/SimilarRecordBean.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/SimilarRecordBean.java index 35b7602..8b90c8d 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/SimilarRecordBean.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/SimilarRecordBean.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input.others; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED; import org.gcube.datacatalogue.common.Constants; import org.json.simple.JSONObject; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/StockRecord.java similarity index 95% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/StockRecord.java index 3257939..d55f618 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/StockRecord.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input.record; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED; import java.util.List; @@ -6,11 +6,6 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -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.others.TimeSeriesBean; import org.gcube.datacatalogue.common.Constants; import org.gcube.datacatalogue.common.enums.Abundance_Level; import org.gcube.datacatalogue.common.enums.Fishing_Pressure; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/custom_annotations/Tag.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/Tag.java similarity index 83% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/custom_annotations/Tag.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/Tag.java index b78346c..1a15e74 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/custom_annotations/Tag.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/Tag.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.custom_annotations; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/custom_annotations/TimeSeries.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/TimeSeries.java similarity index 90% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/custom_annotations/TimeSeries.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/TimeSeries.java index 0209312..783119e 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/custom_annotations/TimeSeries.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/TimeSeries.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.custom_annotations; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/TimeSeriesBean.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/TimeSeriesBean.java similarity index 98% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/TimeSeriesBean.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/TimeSeriesBean.java index 1332299..f22dd62 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/TimeSeriesBean.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_PORTED/TimeSeriesBean.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input.others; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED; import org.gcube.datacatalogue.common.Constants; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/ex/ApplicationException.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/ApplicationException.java similarity index 85% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/ex/ApplicationException.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/ApplicationException.java index bccc0ff..9e8aebf 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/ex/ApplicationException.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/ApplicationException.java @@ -1,11 +1,10 @@ -package org.gcube.data_catalogue.grsf_publish_ws.ex; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_UNNEEDED; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.gcube.data_catalogue.grsf_publish_ws.json.output.ResponseBean; import org.slf4j.LoggerFactory; /** diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/DeleteRecord.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/DeleteRecord.java similarity index 94% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/DeleteRecord.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/DeleteRecord.java index f315be0..0ff40a8 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/DeleteRecord.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/DeleteRecord.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input.others; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_UNNEEDED; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/output/ResponseBean.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/ResponseBean.java similarity index 94% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/output/ResponseBean.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/ResponseBean.java index 9d5741c..7f889b2 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/output/ResponseBean.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/ResponseBean.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.output; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_UNNEEDED; /** * Response bean to be used by the service. diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/output/ResponseCreationBean.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/ResponseCreationBean.java similarity index 96% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/output/ResponseCreationBean.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/ResponseCreationBean.java index 8c66521..fe8e938 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/output/ResponseCreationBean.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/ResponseCreationBean.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.output; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_UNNEEDED; import org.gcube.datacatalogue.common.Constants; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/UpdateRecordStatus.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/UpdateRecordStatus.java similarity index 94% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/UpdateRecordStatus.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/UpdateRecordStatus.java index d4fe30d..6c24a4e 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/UpdateRecordStatus.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/UpdateRecordStatus.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.json.input.others; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_UNNEEDED; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/ex/ValidationException.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/ValidationException.java similarity index 90% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/ex/ValidationException.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/ValidationException.java index f5ef904..aa4fa22 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/ex/ValidationException.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/ValidationException.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.ex; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_UNNEEDED; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; @@ -7,7 +7,6 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.gcube.data_catalogue.grsf_publish_ws.json.output.ResponseBean; import org.slf4j.LoggerFactory; /** diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/threads/WritePostCatalogueManagerThread.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/WritePostCatalogueManagerThread.java similarity index 97% rename from src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/threads/WritePostCatalogueManagerThread.java rename to src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/WritePostCatalogueManagerThread.java index 68863b0..45b4cf1 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/threads/WritePostCatalogueManagerThread.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/AAA_UNNEEDED/WritePostCatalogueManagerThread.java @@ -1,4 +1,4 @@ -package org.gcube.data_catalogue.grsf_publish_ws.utils.threads; +package org.gcube.data_catalogue.grsf_publish_ws.AAA_UNNEEDED; import java.util.List; 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 a46b977..e5c5e46 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,11 @@ 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.others.DeleteRecord; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.others.UpdateRecordStatus; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.record.FisheryRecord; -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.AAA_PORTED.FisheryRecord; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_UNNEEDED.DeleteRecord; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_UNNEEDED.ResponseBean; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_UNNEEDED.ResponseCreationBean; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_UNNEEDED.UpdateRecordStatus; import org.gcube.data_catalogue.grsf_publish_ws.utils.CommonServiceUtils; import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods; import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogue; 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 897a528..1f2d9c8 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,11 @@ 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.others.DeleteRecord; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.others.UpdateRecordStatus; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.record.StockRecord; -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.AAA_PORTED.StockRecord; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_UNNEEDED.DeleteRecord; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_UNNEEDED.ResponseBean; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_UNNEEDED.ResponseCreationBean; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_UNNEEDED.UpdateRecordStatus; import org.gcube.data_catalogue.grsf_publish_ws.utils.CommonServiceUtils; import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods; import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogue; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java index 5c46f86..52a9512 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java @@ -14,21 +14,21 @@ import java.util.concurrent.ConcurrentHashMap; import javax.servlet.ServletContext; -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.others.RefersToBean; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.others.Resource; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.others.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.output.ResponseCreationBean; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.Base; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.CkanResource; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.Common; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.CustomField; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.FisheryRecord; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.Group; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.RefersToBean; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.Resource; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.StockRecord; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.Tag; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.TimeSeriesBean; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_UNNEEDED.ResponseCreationBean; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_UNNEEDED.WritePostCatalogueManagerThread; import org.gcube.data_catalogue.grsf_publish_ws.utils.csv.ManageTimeSeriesThread; import org.gcube.data_catalogue.grsf_publish_ws.utils.threads.AssociationToGroupThread; -import org.gcube.data_catalogue.grsf_publish_ws.utils.threads.WritePostCatalogueManagerThread; import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogue; import org.gcube.datacatalogue.ckanutillibrary.shared.ResourceBean; import org.gcube.datacatalogue.ckanutillibrary.shared.RolesCkanGroupOrOrg; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/csv/CSVUtils.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/csv/CSVUtils.java index cdd309f..c2e7f35 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/csv/CSVUtils.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/csv/CSVUtils.java @@ -8,7 +8,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.others.TimeSeriesBean; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.TimeSeriesBean; import org.gcube.datacatalogue.common.Constants; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/csv/ManageTimeSeriesThread.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/csv/ManageTimeSeriesThread.java index 5d70937..abb4a71 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/csv/ManageTimeSeriesThread.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/csv/ManageTimeSeriesThread.java @@ -20,11 +20,11 @@ import org.gcube.common.homelibrary.home.workspace.exceptions.ItemNotFoundExcept import org.gcube.common.homelibrary.home.workspace.exceptions.WorkspaceFolderNotFoundException; 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.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.AAA_PORTED.Common; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.CustomField; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.FisheryRecord; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.StockRecord; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.TimeSeries; import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods; import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogue; import org.gcube.datacatalogue.common.caches.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 36074ae..2bd43e8 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.others.Resource; -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.AAA_PORTED.FisheryRecord; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.Resource; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.StockRecord; import org.gcube.data_catalogue.grsf_publish_ws.services.GrsfPublisherFisheryService; import org.gcube.data_catalogue.grsf_publish_ws.services.GrsfPublisherStockService; import org.gcube.datacatalogue.common.enums.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 00d21ca..c86f040 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 @@ -24,13 +24,13 @@ import org.gcube.common.homelibrary.home.workspace.catalogue.WorkspaceCatalogue; import org.gcube.common.homelibrary.home.workspace.exceptions.InsufficientPrivilegesException; import org.gcube.common.homelibrary.home.workspace.exceptions.ItemAlreadyExistException; 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.others.Resource; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.others.TimeSeriesBean; -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.AAA_PORTED.CustomField; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.FisheryRecord; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.Group; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.Resource; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.StockRecord; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.Tag; +import org.gcube.data_catalogue.grsf_publish_ws.AAA_PORTED.TimeSeriesBean; import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods; import org.gcube.data_catalogue.grsf_publish_ws.utils.csv.CSVUtils; import org.gcube.data_catalogue.grsf_publish_ws.utils.threads.AssociationToGroupThread;