Some refactoring to simplify eventing.

Author: Joerg Huber

SIF3InfraREST/sif3InfraCommon/src/main/java/sif3/infra/common/env/mgr/BaseJobManager.java

@@ -128,7 +128,7 @@ public SIF3Job getJob(String jobID) throws PersistenceException
      * @see sif3.infra.common.interfaces.JobManager#saveNewJob(sif3.infra.common.model.JobType)
      */
     @Override
-    public void saveNewJob(JobType newJob, String serviceName, SIFZone zone, SIFContext context, String environmentID, String fingerprint) throws PersistenceException
+    public void saveNewJob(JobType newJob, String serviceName, SIFZone zone, SIFContext context, String environmentID, String fingerprint, boolean consumerRequested) throws PersistenceException
     {
         String jobXML = null;
         try
@@ -166,28 +166,15 @@ public void saveNewJob(JobType newJob, String serviceName, SIFZone zone, SIFCont
 
         if (addToChangeLog())
         {
-            service.createJobEvent(sif3Job, EventAction.CREATE, true);
-//            SIF3JobEvent event = new SIF3JobEvent();
-//            event.setAdapterType(getAdapterType().name());
-//            event.setContextID(context.getId());
-//            event.setZoneID(zone.getId());
-//            event.setEnvironmentID(environmentID);
-//            event.setFingerprint(fingerprint);
-//            event.setJobID(newJob.getId());
-//            event.setServiceName(serviceName);
-//            event.setEventType(JobEventType.C.name());
-//            event.setToFingerPrintOnly(true);
-//            event.setJobXML(jobXML);
-//            
-//            service.createJobEvent(event);
+            service.createJobEvent(sif3Job, EventAction.CREATE, true, consumerRequested);
         }
     }
 
     /* (non-Javadoc)
      * @see sif3.infra.common.interfaces.JobManager#removeJob(java.lang.String, sif3.common.model.SIFZone, sif3.common.model.SIFContext, java.lang.String, java.lang.String)
      */
     @Override
-    public boolean removeJob(String jobID) throws PersistenceException
+    public boolean removeJob(String jobID, boolean consumerRequested) throws PersistenceException
     {
         JobService service = getService();
         SIF3Job sif3Job = service.getJobByUUID(jobID, getAdapterType());
@@ -202,21 +189,7 @@ public boolean removeJob(String jobID) throws PersistenceException
 
         if (addToChangeLog())
         {
-            service.createJobEvent(sif3Job, EventAction.DELETE, true);
-//            
-//            SIF3JobEvent event = new SIF3JobEvent();
-//            event.setAdapterType(getAdapterType().name());
-//            event.setContextID(sif3Job.getContextID());
-//            event.setZoneID(sif3Job.getZoneID());
-//            event.setEnvironmentID(sif3Job.getEnvironmentID());
-//            event.setFingerprint(sif3Job.getFingerprint());
-//            event.setJobID(sif3Job.getJobID());
-//            event.setServiceName(sif3Job.getServiceName());
-//            event.setEventType(JobEventType.D.name());
-//            event.setToFingerPrintOnly(true);
-//            event.setJobXML(sif3Job.getJobXML());
-//            
-//            service.createJobEvent(event);
+            service.createJobEvent(sif3Job, EventAction.DELETE, true, consumerRequested);
         }
 
         return true;

SIF3InfraREST/sif3InfraCommon/src/main/java/sif3/infra/common/env/mgr/BaseProviderJobManager.java

@@ -72,7 +72,7 @@ public void updateJobState(String jobID, JobState newState) throws PersistenceEx
             {
                 jobInfo.getDBJob().setCurrentState(newState.name());
                 jobInfo.getXMLJob().setState(JobStateType.valueOf(newState.name()));
-                updateJob(jobInfo);
+                updateJob(jobInfo, false);
             }
             else if (jobInfo.isXMLValid()) // we don't have a valid XML. Cannot update state
             {
@@ -99,7 +99,7 @@ public void updatePhaseState(String jobID, String phaseName, PhaseState newState
                 if (phase != null) // add the state
                 {
                     addStateToPhase(phase, newPhaseState);
-                    updateJob(jobInfo);
+                    updateJob(jobInfo, false);
                 }
             }
             else if (jobInfo.isXMLValid()) // we don't have a valid XML. Cannot update state
@@ -139,7 +139,7 @@ public void updateJobStateAndPhaseState(String jobID, JobState newJobState, Stri
 
             if (valuesUpdated)
             {
-                updateJob(jobInfo);
+                updateJob(jobInfo, false);
             }
         }
         else if (jobInfo.isXMLValid()) // we don't have a valid XML. Cannot update state
@@ -152,7 +152,7 @@ else if (jobInfo.isXMLValid()) // we don't have a valid XML. Cannot update state
      * @see sif3.infra.common.interfaces.ProviderJobManager#updateJob(sif3.infra.common.env.types.ExtendedJobInfo)
      */
     @Override
-    public void updateJob(ExtendedJobInfo jobInfo) throws PersistenceException
+    public void updateJob(ExtendedJobInfo jobInfo, boolean consumerRequested) throws PersistenceException
     {
         JobService service = getService();
         if (jobInfo != null)
@@ -167,7 +167,7 @@ public void updateJob(ExtendedJobInfo jobInfo) throws PersistenceException
 
             if (getJobEnabled()) // Create UPDATE event.
             {   
-                service.createJobEvent(jobInfo.getDBJob(), EventAction.UPDATE, true);
+                service.createJobEvent(jobInfo.getDBJob(), EventAction.UPDATE, true, consumerRequested);
             }
         }
      }