From 8f8c0bbdd2395a2ed41d476454da7242299ff9d8 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Fri, 14 Oct 2016 13:20:10 +0000 Subject: [PATCH] minor fix git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133202 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../grsf_publish_ws/services/GrsfPublisherFisheryService.java | 2 +- .../grsf_publish_ws/services/GrsfPublisherStockService.java | 4 ++-- .../data_catalogue/grsf_publish_ws/utils/groups/Type.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 14b1ee1..1188054 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 @@ -163,7 +163,7 @@ public class GrsfPublisherFisheryService { logger.debug("A product with name " + futureName + " already exists"); responseBean.setId(null); - status = Status.BAD_REQUEST; + status = Status.CONFLICT; throw new Exception("Sorry but a product with such name already exists!"); }else{ 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 3380faf..22603ac 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 @@ -155,7 +155,7 @@ public class GrsfPublisherStockService { logger.debug("A product with name " + futureName + " already exists"); responseBean.setId(null); - status = Status.BAD_REQUEST; + status = Status.CONFLICT; throw new Exception("Sorry but a product with such name already exists!"); }else{ @@ -221,7 +221,7 @@ public class GrsfPublisherStockService { tags, customFields, resources, - setPublic); // TODO + setPublic); if(id != null){ diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Type.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Type.java index 475c725..4146492 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Type.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Type.java @@ -12,7 +12,7 @@ public enum Type { Assessment_Unit("Assessment Unit"),// for stock Resource("Resource"), // for stock - Fishing_Activity("Fishing Activity"), // for fishery + Fishery_Activity("Fishery Activity"), // for fishery Fishing_Description("Fishing Description"); // for fishery private String subGroupNameOrig;