From 51cffd71cdf234ca69535df8c442d69d1a74aac6 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 10 Apr 2024 10:58:00 +0200 Subject: [PATCH] Refactoring --- .../publisher/rest/{Fishery.java => FisheryRESTAPIs.java} | 8 +++++--- .../publisher/rest/{Stock.java => StockRESTAPIs.java} | 8 +++++--- ...raceabilityUnit.java => TraceabilityUnitRESTAPIs.java} | 8 +++++--- 3 files changed, 15 insertions(+), 9 deletions(-) rename src/main/java/org/gcube/grsf/publisher/rest/{Fishery.java => FisheryRESTAPIs.java} (97%) rename src/main/java/org/gcube/grsf/publisher/rest/{Stock.java => StockRESTAPIs.java} (97%) rename src/main/java/org/gcube/grsf/publisher/rest/{TraceabilityUnit.java => TraceabilityUnitRESTAPIs.java} (97%) diff --git a/src/main/java/org/gcube/grsf/publisher/rest/Fishery.java b/src/main/java/org/gcube/grsf/publisher/rest/FisheryRESTAPIs.java similarity index 97% rename from src/main/java/org/gcube/grsf/publisher/rest/Fishery.java rename to src/main/java/org/gcube/grsf/publisher/rest/FisheryRESTAPIs.java index 6b8585b..7e23ae5 100644 --- a/src/main/java/org/gcube/grsf/publisher/rest/Fishery.java +++ b/src/main/java/org/gcube/grsf/publisher/rest/FisheryRESTAPIs.java @@ -17,19 +17,21 @@ import org.gcube.grsf.publisher.annotation.PATCH; import org.gcube.grsf.publisher.annotation.PURGE; import org.gcube.grsf.publisher.ckan.record.FisheryRecord; +import com.webcohesion.enunciate.metadata.rs.ResourceLabel; import com.webcohesion.enunciate.metadata.rs.ResponseCode; import com.webcohesion.enunciate.metadata.rs.StatusCodes; /** * @author Luca Frosini (ISTI - CNR) */ -@Path(Fishery.COLLECTION_PATH) -public class Fishery extends BaseRESTAPIs { +@Path(FisheryRESTAPIs.COLLECTION_PATH) +@ResourceLabel("Fishery APIs") +public class FisheryRESTAPIs extends BaseRESTAPIs { public static final String COLLECTION_PATH = "fishery"; public static final String GRSF_RECORD_UUID_PARAMETER = "fishery_record_id"; - public Fishery() { + public FisheryRESTAPIs() { super(COLLECTION_PATH, GRSF_RECORD_UUID_PARAMETER, FisheryRecord.class); } diff --git a/src/main/java/org/gcube/grsf/publisher/rest/Stock.java b/src/main/java/org/gcube/grsf/publisher/rest/StockRESTAPIs.java similarity index 97% rename from src/main/java/org/gcube/grsf/publisher/rest/Stock.java rename to src/main/java/org/gcube/grsf/publisher/rest/StockRESTAPIs.java index a9ecafd..49dff1d 100644 --- a/src/main/java/org/gcube/grsf/publisher/rest/Stock.java +++ b/src/main/java/org/gcube/grsf/publisher/rest/StockRESTAPIs.java @@ -17,19 +17,21 @@ import org.gcube.grsf.publisher.annotation.PATCH; import org.gcube.grsf.publisher.annotation.PURGE; import org.gcube.grsf.publisher.ckan.record.StockRecord; +import com.webcohesion.enunciate.metadata.rs.ResourceLabel; import com.webcohesion.enunciate.metadata.rs.ResponseCode; import com.webcohesion.enunciate.metadata.rs.StatusCodes; /** * @author Luca Frosini (ISTI - CNR) */ -@Path(Stock.COLLECTION_PATH) -public class Stock extends BaseRESTAPIs { +@Path(StockRESTAPIs.COLLECTION_PATH) +@ResourceLabel("Stock APIs") +public class StockRESTAPIs extends BaseRESTAPIs { public static final String COLLECTION_PATH = "stock"; public static final String RECORD_ID_PARAMETER = "stock_record_id"; - public Stock() { + public StockRESTAPIs() { super(COLLECTION_PATH, RECORD_ID_PARAMETER, StockRecord.class); } diff --git a/src/main/java/org/gcube/grsf/publisher/rest/TraceabilityUnit.java b/src/main/java/org/gcube/grsf/publisher/rest/TraceabilityUnitRESTAPIs.java similarity index 97% rename from src/main/java/org/gcube/grsf/publisher/rest/TraceabilityUnit.java rename to src/main/java/org/gcube/grsf/publisher/rest/TraceabilityUnitRESTAPIs.java index 11c72bf..6fff2c9 100644 --- a/src/main/java/org/gcube/grsf/publisher/rest/TraceabilityUnit.java +++ b/src/main/java/org/gcube/grsf/publisher/rest/TraceabilityUnitRESTAPIs.java @@ -17,19 +17,21 @@ import org.gcube.grsf.publisher.annotation.PATCH; import org.gcube.grsf.publisher.annotation.PURGE; import org.gcube.grsf.publisher.ckan.record.TraceabilityUnitRecord; +import com.webcohesion.enunciate.metadata.rs.ResourceLabel; import com.webcohesion.enunciate.metadata.rs.ResponseCode; import com.webcohesion.enunciate.metadata.rs.StatusCodes; /** * @author Luca Frosini (ISTI - CNR) */ -@Path(TraceabilityUnit.COLLECTION_PATH) -public class TraceabilityUnit extends BaseRESTAPIs{ +@Path(TraceabilityUnitRESTAPIs.COLLECTION_PATH) +@ResourceLabel("Traceability Unit APIs") +public class TraceabilityUnitRESTAPIs extends BaseRESTAPIs{ public static final String COLLECTION_PATH = "traceability-unit"; public static final String RECORD_ID_PARAMETER = "traceability_unit_record_id"; - public TraceabilityUnit() { + public TraceabilityUnitRESTAPIs() { super(COLLECTION_PATH, RECORD_ID_PARAMETER, TraceabilityUnitRecord.class); }