dispatcher improvements, timer skeleton

Author: csviri

operator-framework/src/main/java/io/javaoperatorsdk/operator/api/DefaultContext.java

@@ -9,19 +9,13 @@
 public class DefaultContext<T extends CustomResource> implements Context<T> {
 
     private final CustomResource customResource;
-    private final RetryInfo retryInfo;
     private final List<Event> events;
 
-    public DefaultContext(CustomResource customResource, RetryInfo retryInfo, List<Event> events) {
+    public DefaultContext(CustomResource customResource, List<Event> events) {
         this.customResource = customResource;
-        this.retryInfo = retryInfo;
         this.events = events;
     }
 
-    public RetryInfo retryInfo() {
-        return retryInfo;
-    }
-
     @Override
     public EventSourceManager getEventSourceManager() {
         return null;

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

@@ -5,6 +5,8 @@
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.javaoperatorsdk.operator.api.*;
+import io.javaoperatorsdk.operator.processing.event.Event;
+import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,9 +57,7 @@ private PostExecutionControl handDispatch(ExecutionScope executionScope) {
             log.debug("Skipping event dispatching since its marked for deletion but has no default finalizer: {}", executionScope);
             return PostExecutionControl.defaultDispatch();
         }
-        // todo
-//        new RetryInfo(event.getRetryCount(), event.getRetryExecution().isLastExecution())
-        Context context = new DefaultContext(executionScope.getCustomResource(), null, executionScope.getEvents());
+        Context context = new DefaultContext(executionScope.getCustomResource(), executionScope.getEvents());
         if (markedForDeletion(resource)) {
             return handleDelete(resource, context);
         } else {
@@ -75,22 +75,31 @@ private PostExecutionControl handleCreateOrUpdate(ExecutionScope executionScope,
             updateCustomResourceWithFinalizer(resource);
             return PostExecutionControl.onlyFinalizerAdded();
         } else {
-            // todo generation awareness on rescheduled event
-            // todo test regardless generation
-
-            UpdateControl<? extends CustomResource> updateControl = controller.createOrUpdateResource(resource, context);
-            if (updateControl.isUpdateStatusSubResource()) {
-                customResourceFacade.updateStatus(updateControl.getCustomResource());
-            } else if (updateControl.isUpdateCustomResource()) {
-                updateCustomResource(updateControl.getCustomResource());
+            if (!skipBecauseOfGenerations(executionScope)) {
+                UpdateControl<? extends CustomResource> updateControl = controller.createOrUpdateResource(resource, context);
+                if (updateControl.isUpdateStatusSubResource()) {
+                    customResourceFacade.updateStatus(updateControl.getCustomResource());
+                } else if (updateControl.isUpdateCustomResource()) {
+                    updateCustomResource(updateControl.getCustomResource());
+                }
+                markLastGenerationProcessed(resource);
             }
-//          markLastGenerationProcessed(resource);
             return PostExecutionControl.defaultDispatch();
         }
     }
 
+    private boolean skipBecauseOfGenerations(ExecutionScope executionScope) {
+        if (executionScope.getEvents().size() == 1) {
+            Event<?> event = executionScope.getEvents().get(0);
+            if (event instanceof CustomResourceEvent) {
+                Long actualGeneration = executionScope.getCustomResource().getMetadata().getGeneration();
+                return actualGeneration <= lastGenerationProcessedSuccessfully.get(executionScope.getCustomResourceUid());
+            }
+        }
+        return false;
+    }
+
     private PostExecutionControl handleDelete(CustomResource resource, Context context) {
-        // todo unit test new cases
         DeleteControl deleteControl = controller.deleteResource(resource, context);
         boolean hasDefaultFinalizer = ControllerUtils.hasDefaultFinalizer(resource, resourceDefaultFinalizer);
         if (deleteControl.getRemoveFinalizer() && hasDefaultFinalizer) {

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

@@ -4,7 +4,6 @@
 import io.javaoperatorsdk.operator.processing.DefaultEventHandler;
 import io.javaoperatorsdk.operator.processing.ProcessingUtils;
 import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEventSource;
-import io.javaoperatorsdk.operator.processing.event.internal.DelayedEventSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -20,7 +19,6 @@ public class DefaultEventSourceManager implements EventSourceManager {
     private Map<String, Map<String, EventSource>> eventSources = new ConcurrentHashMap<>();
     private CustomResourceEventSource customResourceEventSource;
     private DefaultEventHandler defaultEventHandler;
-    private DelayedEventSource delayedEventSource = new DelayedEventSource();
 
     public DefaultEventSourceManager(DefaultEventHandler defaultEventHandler) {
         this.defaultEventHandler = defaultEventHandler;
@@ -103,7 +101,4 @@ public void cleanup(String customResourceUid) {
         eventSources.remove(customResourceUid);
     }
 
-    public DelayedEventSource getDelayedReprocessEventSource() {
-        return delayedEventSource;
-    }
 }

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

@@ -0,0 +1,10 @@
+package io.javaoperatorsdk.operator.processing.event.internal;
+
+import io.javaoperatorsdk.operator.processing.event.AbstractEvent;
+
+public class TimerEvent extends AbstractEvent<TimerEventSource> {
+
+    public TimerEvent(String relatedCustomResourceUid, TimerEventSource eventSource) {
+        super(relatedCustomResourceUid, eventSource);
+    }
+}

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

@@ -0,0 +1,18 @@
+package io.javaoperatorsdk.operator.processing.event.internal;
+
+import io.fabric8.kubernetes.client.CustomResource;
+import io.javaoperatorsdk.operator.processing.event.AbstractEventSource;
+
+import java.util.Timer;
+
+public class TimerEventSource extends AbstractEventSource {
+
+    private final Timer timer = new Timer();
+
+
+    public void schedule(CustomResource customResource ){
+
+    };
+
+
+}

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

@@ -3,12 +3,6 @@
 import io.fabric8.kubernetes.client.CustomResource;
 import io.javaoperatorsdk.operator.api.*;
 import io.javaoperatorsdk.operator.springboot.starter.model.TestResource;
-import io.fabric8.kubernetes.client.CustomResource;
-import io.javaoperatorsdk.operator.api.Context;
-import io.javaoperatorsdk.operator.api.Controller;
-import io.javaoperatorsdk.operator.api.ResourceController;
-import io.javaoperatorsdk.operator.api.UpdateControl;
-import io.javaoperatorsdk.operator.springboot.starter.model.TestResource;
 import org.springframework.stereotype.Component;
 
 @Component