gCubeSystem
/
grsf-publisher-ws
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

package refactoring 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@152487 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Costantino Perciante 2017-08-04 13:04:35 +00:00
parent 7da90e6aa6
commit 159e2906d1
16 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Base.java → src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Base.java
View File

@ -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;

6
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Common.java → src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Common.java
View File

@ -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;

2
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/FisheryRecord.java → src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/FisheryRecord.java
View File

@ -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;

3
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/StockRecord.java → src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java
View File

@ -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;

2
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/DeleteProductBean.java → src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/DeleteProductBean.java
View File

@ -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;

2
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/RefersToBean.java → src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/RefersToBean.java
View File

@ -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;

2
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Resource.java → src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/Resource.java
View File

@ -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;

2
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/SimilarRecordBean.java → src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/SimilarRecordBean.java
View File

@ -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;

2
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/TimeSeriesBean.java → src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/utils/TimeSeriesBean.java
View File

@ -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;

7
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java
View File

@ -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;

7
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java
View File

@ -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;

2
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CSVHelpers.java
View File

@ -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;

17
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/CommonServiceUtils.java → src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java
View File

@ -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;

6
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/threads/ManageTimeSeriesThread.java
View File

@ -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;

6
src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JJerseyTest.java
View File

@ -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;

10
src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JTests.java
View File

@ -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;