changed error message if schedule already exists in other job (#2325)

Signed-off-by: ana.albic.comtrade <Ana.Albic@comtrade.com>
eclipse · Jan 21, 2019 · d398ab2 · d398ab2
1 parent a8a3ee3
commit d398ab2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/.../api/src/main/java/org/eclipse/kapua/app/console/module/api/client/GwtKapuaErrorCode.java b/.../api/src/main/java/org/eclipse/kapua/app/console/module/api/client/GwtKapuaErrorCode.java
@@ -44,5 +44,6 @@ public enum GwtKapuaErrorCode {
     OPERATION_NOT_ALLOWED_ON_ADMIN_USER,
     RETRY_AND_CRON_BOTH_SELECTED,
     END_BEFORE_START_TIME_ERROR,
-    SAME_START_AND_DATE
+    SAME_START_AND_DATE,
+    SCHEDULE_DUPLICATE_NAME
 }
diff --git a/service/api/src/main/java/org/eclipse/kapua/KapuaDuplicateNameException.java b/service/api/src/main/java/org/eclipse/kapua/KapuaDuplicateNameException.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2016 Eurotech and/or its affiliates and others
+ * Copyright (c) 2011, 2019 Eurotech and/or its affiliates and others
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -29,4 +29,8 @@ public class KapuaDuplicateNameException extends KapuaException {
     public KapuaDuplicateNameException(String duplicatedName) {
         super(KapuaErrorCodes.DUPLICATE_NAME, duplicatedName);
     }
+
+    public KapuaDuplicateNameException() {
+        super(KapuaErrorCodes.SCHEDULE_DUPLICATE_NAME);
+    }
 }
diff --git a/service/api/src/main/java/org/eclipse/kapua/KapuaErrorCodes.java b/service/api/src/main/java/org/eclipse/kapua/KapuaErrorCodes.java
@@ -110,6 +110,8 @@ public enum KapuaErrorCodes implements KapuaErrorCode {
     /**
      * retry interval and cron expression both selected
      */
-    RETRY_AND_CRON_BOTH_SELECTED;
+    RETRY_AND_CRON_BOTH_SELECTED,
+
+    SCHEDULE_DUPLICATE_NAME;
 
 }
diff --git a/service/api/src/main/resources/kapua-service-error-messages.properties b/service/api/src/main/resources/kapua-service-error-messages.properties
@@ -12,6 +12,7 @@
 ###############################################################################
 ENTITY_NOT_FOUND=The entity of type {0} with id/name {1} was not found.
 DUPLICATE_NAME=An entity with the same name {0} already exists.
+SCHEDULE_DUPLICATE_NAME=An entity with the same value for field already exists here or in another job.
 ILLEGAL_ACCESS=The current subject is not authorized for {0}.
 ILLEGAL_ARGUMENT=An illegal value was provided for the argument {0}: {1}.
 ILLEGAL_NULL_ARGUMENT=An illegal null value was provided for the argument {0}.

diff --git a/.../src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerServiceImpl.java b/.../src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerServiceImpl.java
@@ -96,7 +96,7 @@ public Trigger create(TriggerCreator triggerCreator) throws KapuaException {
         query.setPredicate(new AttributePredicateImpl<>(TriggerAttributes.NAME, triggerCreator.getName()));
 
         if (count(query) > 0) {
-            throw new KapuaDuplicateNameException(triggerCreator.getName());
+            throw new KapuaDuplicateNameException();
         }
 
         if (triggerCreator.getRetryInterval() != null && triggerCreator.getCronScheduling() != null) {