tests, improvements

Author: csviri

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

@@ -1,10 +1,7 @@
 package io.javaoperatorsdk.operator.processing;
 
 
-import io.javaoperatorsdk.operator.processing.event.DefaultEventSourceManager;
-import io.javaoperatorsdk.operator.processing.event.Event;
-import io.javaoperatorsdk.operator.processing.event.EventHandler;
-import io.javaoperatorsdk.operator.processing.event.ExecutionDescriptor;
+import io.javaoperatorsdk.operator.processing.event.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,7 +43,7 @@ public void setDefaultEventSourceManager(DefaultEventSourceManager defaultEventS
     }
 
     @Override
-    public void handleEvent(Event event) {
+    public void handleEvent(Event<? extends EventSource> event) {
         try {
             lock.lock();
             log.debug("Received event: {}", event);
@@ -63,6 +60,7 @@ private void executeBufferedEvents(String customResourceUid) {
             ExecutionScope executionScope = new ExecutionScope(
                     eventBuffer.getAndRemoveEventsForExecution(customResourceUid),
                     resourceCache.getLatestResource(customResourceUid).get());
+            log.debug("Executing events for custom resource. Scope: {}", executionScope);
             executor.execute(new ExecutionConsumer(executionScope, eventDispatcher, this));
         }
     }

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

@@ -8,42 +8,32 @@
 public class EventBuffer {
 
     private Map<String, List<Event>> events = new HashMap<>();
-    private Map<String, CustomResourceEvent> latestCustomResourceEvent = new HashMap<>();
 
     public void addEvent(Event event) {
         String uid = event.getRelatedCustomResourceUid();
-        if (event instanceof CustomResourceEvent) {
-            latestCustomResourceEvent.put(uid, (CustomResourceEvent) event);
-        } else {
-            List<Event> crEvents = events.get(uid);
-            if (crEvents == null) {
-                crEvents = new ArrayList<>(1);
-                events.put(uid, crEvents);
-            }
-            crEvents.add(event);
+        List<Event> crEvents = events.get(uid);
+        if (crEvents == null) {
+            crEvents = new ArrayList<>(1);
+            events.put(uid, crEvents);
         }
+        crEvents.add(event);
     }
 
     public boolean containsEvents(String customResourceId) {
-        return events.get(customResourceId) != null || latestCustomResourceEvent.get(customResourceId) != null;
+        return events.get(customResourceId) != null;
     }
 
     public List<Event> getAndRemoveEventsForExecution(String resourceUid) {
         List<Event> crEvents = events.remove(resourceUid);
         if (crEvents == null) {
             crEvents = Collections.emptyList();
         }
-        List<Event> result = new ArrayList<>(crEvents.size() + 1);
-        CustomResourceEvent customResourceEvent = latestCustomResourceEvent.get(resourceUid);
-        if (customResourceEvent != null) {
-            result.add(customResourceEvent);
-            latestCustomResourceEvent.remove(resourceUid);
-        }
+        List<Event> result = new ArrayList<>(crEvents);
+        crEvents.clear();
         return result;
     }
 
     public void cleanup(String resourceUid) {
         events.remove(resourceUid);
-        latestCustomResourceEvent.remove(resourceUid);
     }
 }

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

@@ -93,7 +93,11 @@ private boolean skipBecauseOfGenerations(ExecutionScope executionScope) {
             Event<?> event = executionScope.getEvents().get(0);
             if (event instanceof CustomResourceEvent) {
                 Long actualGeneration = executionScope.getCustomResource().getMetadata().getGeneration();
-                return actualGeneration <= lastGenerationProcessedSuccessfully.get(executionScope.getCustomResourceUid());
+                Long lastGeneration = lastGenerationProcessedSuccessfully.get(executionScope.getCustomResourceUid());
+                if (lastGeneration == null) {
+                    return false;
+                }
+                return actualGeneration <= lastGeneration;
             }
         }
         return false;

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

@@ -28,4 +28,13 @@ public CustomResource getCustomResource() {
     public String getCustomResourceUid() {
         return customResource.getMetadata().getUid();
     }
+
+    @Override
+    public String toString() {
+        return "ExecutionScope{" +
+                "events=" + events +
+                ", customResource uid: " + customResource.getMetadata().getUid() +
+                ", version: " + customResource.getMetadata().getResourceVersion() +
+                '}';
+    }
 }

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

@@ -29,7 +29,6 @@ public void registerCustomResourceEventSource(CustomResourceEventSource customRe
         this.customResourceEventSource.addedToEventManager();
     }
 
-    // Registration should happen from the same thread within controller
     @Override
     public <T extends EventSource> void registerEventSource(CustomResource customResource, String name, T eventSource) {
         try {

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

@@ -2,6 +2,6 @@
 
 public interface EventHandler {
 
-    void handleEvent(Event event);
+    void handleEvent(Event<? extends EventSource> event);
 
 }

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

@@ -9,7 +9,7 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
-
+// todo tests
 public class TimerEventSource extends AbstractEventSource {
 
     private Logger log = LoggerFactory.getLogger(TimerEventSource.class);

operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java

@@ -15,13 +15,14 @@
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
 
+import static io.javaoperatorsdk.operator.TestUtils.TEST_CUSTOM_RESOURCE_NAME;
+import static io.javaoperatorsdk.operator.TestUtils.testCustomResource;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
 @TestInstance(TestInstance.Lifecycle.PER_METHOD)
 public class ControllerExecutionIT {
 
-    public static final String TEST_CUSTOM_RESOURCE_NAME = "test-custom-resource";
     private IntegrationTestSupport integrationTestSupport = new IntegrationTestSupport();
 
     public void initAndCleanup(boolean controllerStatusUpdate) {
@@ -99,19 +100,6 @@ void awaitStatusUpdated(int timeout) {
                 });
     }
 
-    private TestCustomResource testCustomResource() {
-        TestCustomResource resource = new TestCustomResource();
-        resource.setMetadata(new ObjectMetaBuilder()
-                .withName(TEST_CUSTOM_RESOURCE_NAME)
-                .withNamespace(IntegrationTestSupport.TEST_NAMESPACE)
-                .build());
-        resource.getMetadata().setAnnotations(new HashMap<>());
-        resource.setKind("CustomService");
-        resource.setSpec(new TestCustomResourceSpec());
-        resource.getSpec().setConfigMapName("test-config-map");
-        resource.getSpec().setKey("test-key");
-        resource.getSpec().setValue("test-value");
-        return resource;
-    }
+
 
 }