diff --git a/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/ProcessEngine.java b/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/ProcessEngine.java index aaaee02..a291826 100644 --- a/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/ProcessEngine.java +++ b/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/ProcessEngine.java @@ -40,7 +40,6 @@ import eu.dnetlib.wfs.repository.WfHistoryJobRepository; import eu.dnetlib.wfs.repository.WfRunningJobRepository; import eu.dnetlib.wfs.utils.EmailSender; import eu.dnetlib.wfs.utils.GraphUtils; -import eu.dnetlib.wfs.utils.ProcessCallback; import jakarta.annotation.PostConstruct; import jakarta.transaction.Transactional; @@ -159,21 +158,19 @@ public class ProcessEngine { final Optional job = this.jobRepository.findById(processId); if (job.isPresent() && (job.get().getStatus() == JobStatus.accepted) && job.get().getWfExecutor().equals(executor)) { - startWorkflowJob(job.get(), null); + startWorkflowJob(job.get()); } } @Transactional - public void startWorkflowJob(final WfRunningJob job, final ProcessCallback callback) { + public void startWorkflowJob(final WfRunningJob job) { final WorkflowProcess process = new WorkflowProcess(job); try { GraphUtils.checkValidity(job.getGraph(), this.validNodeTypes); - process.setCallback(callback); - this.processRegistry.registerProcess(process); job.setStatus(JobStatus.running); diff --git a/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/WorkflowProcess.java b/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/WorkflowProcess.java index dccd91e..eca7293 100644 --- a/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/WorkflowProcess.java +++ b/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/WorkflowProcess.java @@ -10,7 +10,6 @@ import org.apache.commons.lang3.math.NumberUtils; import eu.dnetlib.domain.wfs.jobs.JobStatus; import eu.dnetlib.domain.wfs.jobs.WfRunningJob; -import eu.dnetlib.wfs.utils.ProcessCallback; /** * Created by michele on 19/11/15. @@ -25,8 +24,6 @@ public class WorkflowProcess implements Comparable { private final String id; private final WfRunningJob jobDetails; - - private ProcessCallback callback; private List envs = new CopyOnWriteArrayList<>(); private final Map> pausedJoinNodeEnvs = new HashMap<>(); @@ -110,22 +107,6 @@ public class WorkflowProcess implements Comparable { setError(err); } - if (this.callback != null) { - if (err != null) { - this.callback.onFail(this, err); - } else { - this.callback.onSuccess(this); - } - } - - } - - public ProcessCallback getCallback() { - return this.callback; - } - - public void setCallback(final ProcessCallback callback) { - this.callback = callback; } public void setEnvs(final List envs) { diff --git a/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/utils/ProcessCallback.java b/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/utils/ProcessCallback.java deleted file mode 100644 index 64be3b9..0000000 --- a/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/utils/ProcessCallback.java +++ /dev/null @@ -1,8 +0,0 @@ -package eu.dnetlib.wfs.utils; - -import eu.dnetlib.utils.DnetCallback; -import eu.dnetlib.wfs.procs.WorkflowProcess; - -public interface ProcessCallback extends DnetCallback { - -}