improvements on post execution control

Author: csviri

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/DefaultEventHandler.java

@@ -86,8 +86,6 @@ void eventProcessingFinished(ExecutionScope executionScope, PostExecutionControl
             lock.lock();
             log.debug("Event processing finished. Scope: {}", executionScope);
             unsetUnderExecution(executionScope.getCustomResourceUid());
-            defaultEventSourceManager.controllerExecuted(
-                    new ExecutionDescriptor(executionScope, postExecutionControl, LocalDateTime.now()));
             if (containsCustomResourceDeletedEvent(executionScope.getEvents())) {
                 cleanupAfterDeletedEvent(executionScope.getCustomResourceUid());
             } else {

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/PostExecutionControl.java

@@ -1,22 +1,36 @@
 package io.javaoperatorsdk.operator.processing;
 
+import io.javaoperatorsdk.operator.api.UpdateControl;
+
+import java.util.Optional;
+
 public final class PostExecutionControl {
 
     private final boolean onlyFinalizerHandled;
 
-    private PostExecutionControl(boolean onlyFinalizerHandled) {
+    private final UpdateControl updateControl;
+
+    private PostExecutionControl(boolean onlyFinalizerHandled, UpdateControl updateControl) {
         this.onlyFinalizerHandled = onlyFinalizerHandled;
+        this.updateControl = updateControl;
     }
 
     public static PostExecutionControl onlyFinalizerAdded() {
-        return new PostExecutionControl(true);
+        return new PostExecutionControl(true,null);
     }
 
     public static PostExecutionControl defaultDispatch() {
-        return new PostExecutionControl(false);
+        return new PostExecutionControl(false,null);
+    }
+    public static PostExecutionControl dispatchWithUpdateControl(UpdateControl updateControl) {
+        return new PostExecutionControl(false,updateControl);
     }
 
     public boolean isOnlyFinalizerHandled() {
         return onlyFinalizerHandled;
     }
+
+    public Optional<UpdateControl> getUpdateControl() {
+        return Optional.ofNullable(updateControl);
+    }
 }

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/event/DefaultEventSourceManager.java

@@ -65,11 +65,6 @@ public Map<String, EventSource> getRegisteredEventSources() {
         return Collections.unmodifiableMap(eventSources);
     }
 
-    public void controllerExecuted(ExecutionDescriptor executionDescriptor) {
-        String uid = executionDescriptor.getExecutionScope().getCustomResourceUid();
-        Map<String, EventSource> sources = getRegisteredEventSources();
-    }
-
     public void cleanup(String customResourceUid) {
         getRegisteredEventSources().keySet().forEach(k -> deRegisterCustomResourceFromEventSource(k,customResourceUid));
         eventSources.remove(customResourceUid);

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceEvent.java

@@ -10,24 +10,13 @@ public class CustomResourceEvent extends AbstractEvent<CustomResourceEventSource
     private final Watcher.Action action;
     private final CustomResource customResource;
 
-    private int retryCount = -1;
-    private boolean processRegardlessOfGeneration = false;
-
     public CustomResourceEvent(Watcher.Action action, CustomResource resource,
                                CustomResourceEventSource customResourceEventSource) {
         super(KubernetesResourceUtils.getUID(resource), customResourceEventSource);
         this.action = action;
         this.customResource = resource;
     }
 
-    public boolean isProcessRegardlessOfGeneration() {
-        return processRegardlessOfGeneration;
-    }
-
-    public void setProcessRegardlessOfGeneration(boolean processRegardlessOfGeneration) {
-        this.processRegardlessOfGeneration = processRegardlessOfGeneration;
-    }
-
     public Watcher.Action getAction() {
         return action;
     }
@@ -44,12 +33,7 @@ public String toString() {
                 ", apiVersion=" + getCustomResource().getApiVersion() + " ,resourceVersion=" + getCustomResource().getMetadata().getResourceVersion() +
                 ", markedForDeletion: " + (getCustomResource().getMetadata().getDeletionTimestamp() != null
                 && !getCustomResource().getMetadata().getDeletionTimestamp().isEmpty()) +
-                " ], retriesIndex=" + retryCount +
-                '}';
-    }
-
-    public int getRetryCount() {
-        return retryCount;
+                " ]}";
     }
 
     public CustomResource getCustomResource() {