From 91cd1fa50e20320f3191426e30dc6725a4c55e5c Mon Sep 17 00:00:00 2001
From: Mike Hodge <hodgem@wustl.edu>
Date: Fri, 22 Apr 2016 16:37:16 -0500
Subject: [PATCH] Move WorkflowStatusEvent to xdat
---
.../event/entities/WorkflowStatusEvent.java | 151 ------------------
.../event/listeners/AutoRunEmailHandler.java | 2 +-
.../listeners/DicomToNiftiEmailHandler.java | 2 +-
.../listeners/PipelineEmailHandlerAbst.java | 2 +-
.../WorkflowStatusEventHandlerAbst.java | 2 +-
.../actions/AutomationBasedImporter.java | 2 +-
6 files changed, 5 insertions(+), 156 deletions(-)
delete mode 100644 src/main/java/org/nrg/xnat/event/entities/WorkflowStatusEvent.java
diff --git a/src/main/java/org/nrg/xnat/event/entities/WorkflowStatusEvent.java b/src/main/java/org/nrg/xnat/event/entities/WorkflowStatusEvent.java
deleted file mode 100644
index 8a56381e..00000000
--- a/src/main/java/org/nrg/xnat/event/entities/WorkflowStatusEvent.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package org.nrg.xnat.event.entities;
-
-import java.util.Map;
-
-import org.nrg.xdat.om.WrkWorkflowdata;
-import org.nrg.xft.event.AutomationEventImplementerI;
-import org.nrg.xft.event.Filterable;
-import org.nrg.xft.event.StructuredEvent;
-import org.nrg.xft.event.EventClass;
-import org.nrg.xft.event.entities.AutomationCompletionEvent;
-import org.nrg.xft.event.persist.PersistentWorkflowI;
-import org.nrg.xft.security.UserI;
-import org.python.google.common.collect.Maps;
-
-/**
- * The Class WorkflowStatusEvent.
- */
-@EventClass(displayName = "Workflow Status Event")
-public class WorkflowStatusEvent extends StructuredEvent implements AutomationEventImplementerI {
-
- /** The Constant serialVersionUID. */
- private static final long serialVersionUID = 7465778737330635218L;
-
- /** The workflow. */
- PersistentWorkflowI workflow;
-
- /** The status. */
- private String status;
-
- /** The justification. */
- private String justification;
-
- /** The automationCompletionEvent. */
- private AutomationCompletionEvent automationCompletionEvent;
-
- private Map<String,Object> parameterMap = Maps.newHashMap();
-
- /**
- * Instantiates a new workflow status event.
- */
- public WorkflowStatusEvent() {
- super();
- }
-
- /**
- * Instantiates a new workflow status event. u
- *
- * @param workflow the workflow
- */
- public WorkflowStatusEvent(PersistentWorkflowI workflow) {
- this();
- this.workflow = workflow;
- this.setEventId(workflow.getPipelineName());
- this.setSrcEventClass(this.getClass().getName());
- final String project = workflow.getExternalid();
- this.setExternalId(project);
- this.setEntityId(workflow.getId());
- this.setEntityType(workflow.getDataType());
- this.setStatus(workflow.getStatus());
- this.setJustification(workflow.getJustification());
- final Map<String,String> eventSpecificMap = Maps.newHashMap();
- eventSpecificMap.put("status", status);
- eventSpecificMap.put("justification", justification);
- this.setEventSpecificFieldsAsMap(eventSpecificMap);
- final WrkWorkflowdata wrkflow = (workflow instanceof WrkWorkflowdata) ? (WrkWorkflowdata)workflow : null;
- if (wrkflow!=null) {
- UserI user = (wrkflow.getUser()!=null) ? wrkflow.getUser() : wrkflow.getInsertUser();
- this.setUserId(user.getID());
- }
- }
-
- /**
- * Gets the workflow.
- *
- * @return the workflow
- */
- //@Transient
- public PersistentWorkflowI getWorkflow() {
- return workflow;
- }
-
- /**
- * Sets the status.
- *
- * @param status the new status
- */
- public void setStatus(String status) {
- this.status = status;
- }
-
- /**
- * Gets the status.
- *
- * @return the status
- */
- @Filterable(initialValues = { "Complete", "Failed" }, includeValuesFromDatabase = false)
- public String getStatus() {
- return status;
- }
-
- /**
- * Sets the justification.
- *
- * @param justification the new justification
- */
- public void setJustification(String justification) {
- this.justification = justification;
- }
-
- /**
- * Gets the justification.
- *
- * @return the justification
- */
- public String getJustification() {
- return justification;
- }
-
- /* (non-Javadoc)
- * @see org.nrg.xft.event.AutomationEventImplementerI#setAutomationCompletionEvent(org.nrg.xft.event.entities.AutomationCompletionEvent)
- */
- @Override
- public void setAutomationCompletionEvent(AutomationCompletionEvent automationCompletionEvent) {
- this.automationCompletionEvent = automationCompletionEvent;
- }
-
- /* (non-Javadoc)
- * @see org.nrg.xft.event.AutomationEventImplementerI#getAutomationCompletionEvent()
- */
- @Override
- //@Transient
- public AutomationCompletionEvent getAutomationCompletionEvent() {
- return automationCompletionEvent;
- }
-
- @Override
- public Map<String, Object> getParameterMap() {
- return this.parameterMap;
- }
-
- @Override
- public void setParameterMap(Map<String, Object> parameterMap) {
- this.parameterMap = parameterMap;
- }
-
- @Override
- public void addParameterToParameterMap(String parameter, Object value) {
- this.parameterMap.put(parameter, value);
- }
-
-}
diff --git a/src/main/java/org/nrg/xnat/event/listeners/AutoRunEmailHandler.java b/src/main/java/org/nrg/xnat/event/listeners/AutoRunEmailHandler.java
index ca4c48b9..d853c63a 100644
--- a/src/main/java/org/nrg/xnat/event/listeners/AutoRunEmailHandler.java
+++ b/src/main/java/org/nrg/xnat/event/listeners/AutoRunEmailHandler.java
@@ -7,8 +7,8 @@ import reactor.bus.EventBus;
import reactor.fn.Consumer;
import org.nrg.xdat.om.WrkWorkflowdata;
+import org.nrg.xft.event.entities.WorkflowStatusEvent;
import org.nrg.xft.event.persist.PersistentWorkflowUtils;
-import org.nrg.xnat.event.entities.WorkflowStatusEvent;
import org.springframework.stereotype.Service;
import static reactor.bus.selector.Selectors.R;
diff --git a/src/main/java/org/nrg/xnat/event/listeners/DicomToNiftiEmailHandler.java b/src/main/java/org/nrg/xnat/event/listeners/DicomToNiftiEmailHandler.java
index a2c41276..1e9de916 100644
--- a/src/main/java/org/nrg/xnat/event/listeners/DicomToNiftiEmailHandler.java
+++ b/src/main/java/org/nrg/xnat/event/listeners/DicomToNiftiEmailHandler.java
@@ -8,8 +8,8 @@ import reactor.fn.Consumer;
import org.apache.log4j.Logger;
import org.nrg.xdat.om.WrkWorkflowdata;
+import org.nrg.xft.event.entities.WorkflowStatusEvent;
import org.nrg.xft.event.persist.PersistentWorkflowUtils;
-import org.nrg.xnat.event.entities.WorkflowStatusEvent;
import org.springframework.stereotype.Service;
import static reactor.bus.selector.Selectors.R;
diff --git a/src/main/java/org/nrg/xnat/event/listeners/PipelineEmailHandlerAbst.java b/src/main/java/org/nrg/xnat/event/listeners/PipelineEmailHandlerAbst.java
index 6468c88d..ecc8b48d 100644
--- a/src/main/java/org/nrg/xnat/event/listeners/PipelineEmailHandlerAbst.java
+++ b/src/main/java/org/nrg/xnat/event/listeners/PipelineEmailHandlerAbst.java
@@ -18,7 +18,7 @@ import org.nrg.xdat.om.XnatSubjectassessordata;
import org.nrg.xdat.schema.SchemaElement;
import org.nrg.xdat.turbine.utils.TurbineUtils;
import org.nrg.xft.db.PoolDBUtils;
-import org.nrg.xnat.event.entities.WorkflowStatusEvent;
+import org.nrg.xft.event.entities.WorkflowStatusEvent;
import org.nrg.xnat.notifications.NotifyProjectPipelineListeners;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/nrg/xnat/event/listeners/WorkflowStatusEventHandlerAbst.java b/src/main/java/org/nrg/xnat/event/listeners/WorkflowStatusEventHandlerAbst.java
index f74e60e0..bef5985a 100644
--- a/src/main/java/org/nrg/xnat/event/listeners/WorkflowStatusEventHandlerAbst.java
+++ b/src/main/java/org/nrg/xnat/event/listeners/WorkflowStatusEventHandlerAbst.java
@@ -12,8 +12,8 @@ package org.nrg.xnat.event.listeners;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
+import org.nrg.xft.event.entities.WorkflowStatusEvent;
import org.nrg.xft.event.persist.PersistentWorkflowUtils;
-import org.nrg.xnat.event.entities.WorkflowStatusEvent;
/**
* @author Tim Olsen <tim@deck5consulting.com>
diff --git a/src/main/java/org/nrg/xnat/restlet/actions/AutomationBasedImporter.java b/src/main/java/org/nrg/xnat/restlet/actions/AutomationBasedImporter.java
index ee9700a2..929f86ed 100644
--- a/src/main/java/org/nrg/xnat/restlet/actions/AutomationBasedImporter.java
+++ b/src/main/java/org/nrg/xnat/restlet/actions/AutomationBasedImporter.java
@@ -52,7 +52,6 @@ import org.nrg.xdat.XDAT;
import org.nrg.xdat.om.XnatExperimentdata;
import org.nrg.xdat.om.XnatProjectdata;
import org.nrg.xdat.om.XnatSubjectdata;
-import org.nrg.xnat.event.entities.WorkflowStatusEvent;
import org.nrg.xnat.event.listeners.AutomationCompletionEventListener;
import org.nrg.xnat.restlet.actions.importer.ImporterHandler;
import org.nrg.xnat.restlet.actions.importer.ImporterHandlerA;
@@ -70,6 +69,7 @@ import org.nrg.xft.event.EventUtils.TYPE;
import org.nrg.xft.event.XftEventService;
import org.nrg.xft.event.Filterable;
import org.nrg.xft.event.entities.AutomationCompletionEvent;
+import org.nrg.xft.event.entities.WorkflowStatusEvent;
import org.nrg.xft.event.persist.PersistentWorkflowI;
import org.nrg.xft.event.persist.PersistentWorkflowUtils;
import org.nrg.xft.event.persist.PersistentWorkflowUtils.EventRequirementAbsent;
--
GitLab