Fixed logic that checks for job executions before editing JobStep

Signed-off-by: Alberto Codutti <alberto.codutti@eurotech.com>
eclipse · Mar 25, 2021 · 9620874 · 9620874
1 parent 7f8d9c0
commit 9620874
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/...nternal/src/main/java/org/eclipse/kapua/service/job/step/internal/JobStepServiceImpl.java b/...nternal/src/main/java/org/eclipse/kapua/service/job/step/internal/JobStepServiceImpl.java
@@ -122,7 +122,9 @@ public JobStep create(JobStepCreator jobStepCreator) throws KapuaException {
         //
         // Check Job Executions
         JobExecutionQuery jobExecutionQuery = JOB_EXECUTION_FACTORY.newQuery(jobStepCreator.getScopeId());
-        jobExecutionQuery.attributePredicate(JobExecutionAttributes.JOB_ID, jobStepCreator.getJobId());
+        jobExecutionQuery.setPredicate(
+                jobExecutionQuery.attributePredicate(JobExecutionAttributes.JOB_ID, jobStepCreator.getJobId())
+        );
 
         if (JOB_EXECUTION_SERVICE.count(jobExecutionQuery) > 0) {
             throw new CannotModifyJobStepsException(jobStepCreator.getJobId());
@@ -214,7 +216,9 @@ public JobStep update(JobStep jobStep) throws KapuaException {
         //
         // Check Job Executions
         JobExecutionQuery jobExecutionQuery = JOB_EXECUTION_FACTORY.newQuery(jobStep.getScopeId());
-        jobExecutionQuery.attributePredicate(JobExecutionAttributes.JOB_ID, jobStep.getJobId());
+        jobExecutionQuery.setPredicate(
+                jobExecutionQuery.attributePredicate(JobExecutionAttributes.JOB_ID, jobStep.getJobId())
+        );
 
         if (JOB_EXECUTION_SERVICE.count(jobExecutionQuery) > 0) {
             throw new CannotModifyJobStepsException(jobStep.getJobId());
@@ -291,7 +295,9 @@ public void delete(KapuaId scopeId, KapuaId jobStepId) throws KapuaException {
         //
         // Check Job Executions
         JobExecutionQuery jobExecutionQuery = JOB_EXECUTION_FACTORY.newQuery(scopeId);
-        jobExecutionQuery.attributePredicate(JobExecutionAttributes.JOB_ID, jobStep.getJobId());
+        jobExecutionQuery.setPredicate(
+                jobExecutionQuery.attributePredicate(JobExecutionAttributes.JOB_ID, jobStep.getJobId())
+        );
 
         if (JOB_EXECUTION_SERVICE.count(jobExecutionQuery) > 0) {
             throw new CannotModifyJobStepsException(jobStep.getJobId());