fix: event source holder not an event source (operator-framework#1102)

csviri · web-flow · commit fcdcb0444967 · 2022-03-30T08:59:32.000+02:00
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractEventSourceHolderDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractEventSourceHolderDependentResource.java
@@ -1,34 +1,22 @@
 package io.javaoperatorsdk.operator.processing.dependent;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.OperatorException;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.EventSourceProvider;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.RecentOperationCacheFiller;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.RecentOperationEventFilter;
-import io.javaoperatorsdk.operator.processing.event.EventHandler;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 import io.javaoperatorsdk.operator.processing.event.source.EventSource;
 import io.javaoperatorsdk.operator.processing.event.source.ResourceEventSource;
 
 public abstract class AbstractEventSourceHolderDependentResource<R, P extends HasMetadata, T extends ResourceEventSource<R, P>>
     extends AbstractDependentResource<R, P>
-    implements ResourceEventSource<R, P>, EventSourceProvider<P> {
+    implements EventSourceProvider<P> {
   private T eventSource;
   private boolean isFilteringEventSource;
   private boolean isCacheFillerEventSource;
 
-  @Override
-  public void start() throws OperatorException {
-    eventSource.start();
-  }
-
-  @Override
-  public void stop() throws OperatorException {
-    eventSource.stop();
-  }
-
   public EventSource initEventSource(EventSourceContext<P> context) {
     // some sub-classes (e.g. KubernetesDependentResource) can have their event source created
     // before this method is called in the managed case, so only create the event source if it
@@ -41,7 +29,7 @@ public EventSource initEventSource(EventSourceContext<P> context) {
     // already been set before this method is called
     isFilteringEventSource = eventSource instanceof RecentOperationEventFilter;
     isCacheFillerEventSource = eventSource instanceof RecentOperationCacheFiller;
-    return this;
+    return eventSource;
   }
 
   protected abstract T createEventSource(EventSourceContext<P> context);
@@ -50,11 +38,6 @@ protected void setEventSource(T eventSource) {
     this.eventSource = eventSource;
   }
 
-  @Override
-  public void setEventHandler(EventHandler handler) {
-    eventSource.setEventHandler(handler);
-  }
-
   protected T eventSource() {
     return eventSource;
   }
