* Event becomes non generic

* EventList class introduced for convenient helper methods

Author: adam-sandor

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

@@ -2,6 +2,7 @@
 
 import io.fabric8.kubernetes.client.CustomResource;
 import io.javaoperatorsdk.operator.processing.event.Event;
+import io.javaoperatorsdk.operator.processing.event.EventList;
 import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
 
 import java.util.List;
@@ -10,6 +11,6 @@ public interface Context<T extends CustomResource> {
 
     EventSourceManager getEventSourceManager();
 
-    List<Event> getEvents();
+    EventList getEvents();
 
 }

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

@@ -2,16 +2,17 @@
 
 import io.fabric8.kubernetes.client.CustomResource;
 import io.javaoperatorsdk.operator.processing.event.Event;
+import io.javaoperatorsdk.operator.processing.event.EventList;
 import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
 
 import java.util.List;
 
 public class DefaultContext<T extends CustomResource> implements Context<T> {
 
-    private final List<Event> events;
+    private final EventList events;
     private final EventSourceManager eventSourceManager;
 
-    public DefaultContext(EventSourceManager eventSourceManager, List<Event> events) {
+    public DefaultContext(EventSourceManager eventSourceManager, EventList events) {
         this.events = events;
         this.eventSourceManager = eventSourceManager;
     }
@@ -22,7 +23,7 @@ public EventSourceManager getEventSourceManager() {
     }
 
     @Override
-    public List<Event> getEvents() {
+    public EventList getEvents() {
         return events;
     }
 

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

@@ -51,7 +51,7 @@ public void setDefaultEventSourceManager(DefaultEventSourceManager defaultEventS
     }
 
     @Override
-    public void handleEvent(Event<? extends EventSource> event) {
+    public void handleEvent(Event event) {
         try {
             lock.lock();
             log.debug("Received event: {}", event);

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

@@ -6,6 +6,7 @@
 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.EventList;
 import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
 import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
 import org.slf4j.Logger;
@@ -68,7 +69,7 @@ private PostExecutionControl handDispatch(ExecutionScope executionScope) {
             log.debug("Skipping event dispatching since its marked for deletion but has no finalizer: {}", executionScope);
             return PostExecutionControl.defaultDispatch();
         }
-        Context context = new DefaultContext(eventSourceManager, executionScope.getEvents());
+        Context context = new DefaultContext(eventSourceManager, new EventList(executionScope.getEvents()));
         if (markedForDeletion(resource)) {
             return handleDelete(resource, context);
         } else {
@@ -109,7 +110,7 @@ private boolean skipBecauseOfGenerations(ExecutionScope executionScope) {
             return false;
         }
         if (executionScope.getEvents().size() == 1) {
-            Event<?> event = executionScope.getEvents().get(0);
+            Event event = executionScope.getEvents().get(0);
             if (event instanceof CustomResourceEvent) {
                 Long actualGeneration = executionScope.getCustomResource().getMetadata().getGeneration();
                 Long lastGeneration = lastGenerationProcessedSuccessfully.get(executionScope.getCustomResourceUid());

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

@@ -1,12 +1,12 @@
 package io.javaoperatorsdk.operator.processing.event;
 
-public abstract class AbstractEvent<T extends EventSource> implements Event<T> {
+public abstract class AbstractEvent implements Event{
 
     private final String relatedCustomResourceUid;
 
-    private final T eventSource;
+    private final EventSource eventSource;
 
-    public AbstractEvent(String relatedCustomResourceUid, T eventSource) {
+    public AbstractEvent(String relatedCustomResourceUid, EventSource eventSource) {
         this.relatedCustomResourceUid = relatedCustomResourceUid;
         this.eventSource = eventSource;
     }
@@ -17,7 +17,7 @@ public String getRelatedCustomResourceUid() {
     }
 
     @Override
-    public T getEventSource() {
+    public EventSource getEventSource() {
         return eventSource;
     }
 

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

@@ -1,8 +1,8 @@
 package io.javaoperatorsdk.operator.processing.event;
 
-public interface Event<T extends EventSource> {
+public interface Event {
 
     String getRelatedCustomResourceUid();
 
-    T getEventSource();
+    EventSource getEventSource();
 }

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

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

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

@@ -0,0 +1,36 @@
+package io.javaoperatorsdk.operator.processing.event;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class EventList {
+
+    private final List<Event> eventList;
+
+    public EventList(List<Event> eventList) {
+        this.eventList = eventList;
+    }
+
+    List<Event> getEventList() {
+        return eventList;
+    }
+
+    public <T extends Event> Optional<T> getLatestOfType(Class<T> eventType) {
+        ListIterator<Event> iterator = eventList.listIterator(eventList.size() - 1);
+        while (iterator.hasPrevious()) {
+            Event event = iterator.previous();
+            if (event.getClass().isAssignableFrom(eventType)) {
+                return Optional.of((T)event);
+            }
+        }
+
+        List<Event> eventsOfType = eventList.stream()
+                .filter(event -> event.getClass().isAssignableFrom(eventType))
+                .collect(Collectors.toList());
+        if (eventsOfType.size() > 0) {
+            return Optional.of((T) eventsOfType.get(eventsOfType.size() - 1));
+        } else {
+            return Optional.empty();
+        }
+    }
+}

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

@@ -5,7 +5,7 @@
 import io.javaoperatorsdk.operator.processing.KubernetesResourceUtils;
 import io.javaoperatorsdk.operator.processing.event.AbstractEvent;
 
-public class CustomResourceEvent extends AbstractEvent<CustomResourceEventSource> {
+public class CustomResourceEvent extends AbstractEvent {
 
     private final Watcher.Action action;
     private final CustomResource customResource;

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

@@ -2,7 +2,7 @@
 
 import io.javaoperatorsdk.operator.processing.event.AbstractEvent;
 
-public class TimerEvent extends AbstractEvent<TimerEventSource> {
+public class TimerEvent extends AbstractEvent {
 
     public TimerEvent(String relatedCustomResourceUid, TimerEventSource eventSource) {
         super(relatedCustomResourceUid, eventSource);