refactor: retrieve EventHandler from EventSourceRegistry

Author: metacosm

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

@@ -52,6 +52,11 @@ private void initRetryEventSource() {
     registerEventSource(retryAndRescheduleTimerEventSource);
   }
 
+  @Override
+  public EventHandler getEventHandler() {
+    return eventProcessor;
+  }
+
   @Override
   public void start() throws OperatorException {
     eventProcessor.start();
@@ -96,7 +101,6 @@ public final void registerEventSource(EventSource eventSource)
     lock.lock();
     try {
       eventSources.put(keyFor(eventSource), eventSource);
-      eventSource.setEventHandler(eventProcessor);
       eventSource.setEventRegistry(this);
     } catch (Throwable e) {
       if (e instanceof IllegalStateException || e instanceof MissingCRDException) {

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/AbstractEventSource.java

@@ -5,7 +5,6 @@
 
 public abstract class AbstractEventSource<P extends HasMetadata> implements EventSource<P> {
 
-  private volatile EventHandler eventHandler;
   private volatile EventSourceRegistry<P> eventSourceRegistry;
   private final Class<?> resourceClass;
 
@@ -18,13 +17,8 @@ public Class<?> getResourceClass() {
     return resourceClass;
   }
 
-  @Override
-  public void setEventHandler(EventHandler eventHandler) {
-    this.eventHandler = eventHandler;
-  }
-
   protected EventHandler getEventHandler() {
-    return eventHandler;
+    return eventSourceRegistry.getEventHandler();
   }
 
   @Override

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/EventSource.java

@@ -2,13 +2,10 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.processing.LifecycleAware;
-import io.javaoperatorsdk.operator.processing.event.EventHandler;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 
 public interface EventSource<P extends HasMetadata> extends LifecycleAware {
 
-  void setEventHandler(EventHandler eventHandler);
-
   void setEventRegistry(EventSourceRegistry<P> registry);
 
   EventSourceRegistry<P> getEventRegistry();

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/EventSourceRegistry.java

@@ -4,6 +4,7 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.OperatorException;
+import io.javaoperatorsdk.operator.processing.event.EventHandler;
 
 public interface EventSourceRegistry<T extends HasMetadata> {
 
@@ -25,4 +26,6 @@ void registerEventSource(EventSource<? extends HasMetadata> eventSource)
   <R extends HasMetadata> ResourceEventSource<R, T> getResourceEventSourceFor(
       Class<R> dependentType,
       String... qualifier);
+
+  EventHandler getEventHandler();
 }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/EventSourceManagerTest.java

@@ -31,7 +31,7 @@ public void registersEventSource() {
     Set<EventSource> registeredSources = eventSourceManager.getRegisteredEventSources();
     assertThat(registeredSources).contains(eventSource);
 
-    verify(eventSource, times(1)).setEventHandler(eq(eventProcessorMock));
+    verify(eventSource, times(1)).setEventRegistry(eq(eventSourceManager));
   }
 
   @Test

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/ControllerResourceEventSourceTest.java

@@ -37,7 +37,8 @@ class ControllerResourceEventSourceTest {
 
   @BeforeEach
   public void setup() {
-    controllerResourceEventSource.setEventHandler(eventHandler);
+    when(registry.getEventHandler()).thenReturn(eventHandler);
+    controllerResourceEventSource.setEventRegistry(registry);
   }
 
   @Test

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/ResourceEventFilterTest.java

@@ -35,6 +35,7 @@ class ResourceEventFilterTest {
   @BeforeEach
   public void before() {
     this.eventHandler = mock(EventHandler.class);
+    when(registry.getEventHandler()).thenReturn(eventHandler);
   }
 
   @Test
@@ -48,7 +49,6 @@ public void eventFilteredByCustomPredicate() {
 
     var controller = new TestController(config);
     var eventSource = new ControllerResourceEventSource<>(controller, registry);
-    eventSource.setEventHandler(eventHandler);
 
     TestCustomResource cr = TestUtils.testCustomResource();
     cr.getMetadata().setFinalizers(List.of(FINALIZER));
@@ -76,7 +76,6 @@ public void eventFilteredByCustomPredicateAndGenerationAware() {
 
     var controller = new TestController(config);
     var eventSource = new ControllerResourceEventSource<>(controller, registry);
-    eventSource.setEventHandler(eventHandler);
 
     TestCustomResource cr = TestUtils.testCustomResource();
     cr.getMetadata().setFinalizers(List.of(FINALIZER));
@@ -106,7 +105,6 @@ public void observedGenerationFiltering() {
 
     var controller = new ObservedGenController(config);
     var eventSource = new ControllerResourceEventSource<>(controller, registry);
-    eventSource.setEventHandler(eventHandler);
 
     ObservedGenCustomResource cr = new ObservedGenCustomResource();
     cr.setMetadata(new ObjectMeta());
@@ -137,7 +135,6 @@ public void eventNotFilteredByCustomPredicateIfFinalizerIsRequired() {
 
     var controller = new TestController(config);
     var eventSource = new ControllerResourceEventSource<>(controller, registry);
-    eventSource.setEventHandler(eventHandler);
 
     TestCustomResource cr = TestUtils.testCustomResource();
     cr.getMetadata().setGeneration(1L);

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/TimerEventSourceTest.java

@@ -19,21 +19,26 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 class TimerEventSourceTest {
 
   public static final int INITIAL_DELAY = 50;
   public static final int PERIOD = 50;
 
   private TimerEventSource<TestCustomResource> timerEventSource;
-  private CapturingEventHandler eventHandlerMock;
+  private CapturingEventHandler eventHandler;
 
   @BeforeEach
   public void setup() {
-    eventHandlerMock = new CapturingEventHandler();
+    eventHandler = new CapturingEventHandler();
 
     timerEventSource = new TimerEventSource<>();
-    timerEventSource.setEventHandler(eventHandlerMock);
+    EventSourceRegistry registryMock = mock(EventSourceRegistry.class);
+    when(registryMock.getEventHandler()).thenReturn(eventHandler);
+
+    timerEventSource.setEventRegistry(registryMock);
     timerEventSource.start();
   }
 
@@ -43,8 +48,8 @@ public void schedulesOnce() {
 
     timerEventSource.scheduleOnce(customResource, PERIOD);
 
-    untilAsserted(() -> assertThat(eventHandlerMock.events).hasSize(1));
-    untilAsserted(PERIOD * 2, 0, () -> assertThat(eventHandlerMock.events).hasSize(1));
+    untilAsserted(() -> assertThat(eventHandler.events).hasSize(1));
+    untilAsserted(PERIOD * 2, 0, () -> assertThat(eventHandler.events).hasSize(1));
   }
 
   @Test
@@ -54,7 +59,7 @@ public void canCancelOnce() {
     timerEventSource.scheduleOnce(customResource, PERIOD);
     timerEventSource.cancelOnceSchedule(ResourceID.fromResource(customResource));
 
-    untilAsserted(() -> assertThat(eventHandlerMock.events).isEmpty());
+    untilAsserted(() -> assertThat(eventHandler.events).isEmpty());
   }
 
   @Test
@@ -64,7 +69,7 @@ public void canRescheduleOnceEvent() {
     timerEventSource.scheduleOnce(customResource, PERIOD);
     timerEventSource.scheduleOnce(customResource, 2 * PERIOD);
 
-    untilAsserted(PERIOD * 2, PERIOD, () -> assertThat(eventHandlerMock.events).hasSize(1));
+    untilAsserted(PERIOD * 2, PERIOD, () -> assertThat(eventHandler.events).hasSize(1));
   }
 
   @Test
@@ -75,7 +80,7 @@ public void deRegistersOnceEventSources() {
     timerEventSource
         .cleanupForResource(ResourceID.fromResource(customResource));
 
-    untilAsserted(() -> assertThat(eventHandlerMock.events).isEmpty());
+    untilAsserted(() -> assertThat(eventHandler.events).isEmpty());
   }
 
   @Test
@@ -92,7 +97,7 @@ public void eventNotFiredIfStopped() throws IOException {
     timerEventSource.scheduleOnce(TestUtils.testCustomResource(), PERIOD);
     timerEventSource.stop();
 
-    untilAsserted(() -> assertThat(eventHandlerMock.events).isEmpty());
+    untilAsserted(() -> assertThat(eventHandler.events).isEmpty());
   }
 
   private void untilAsserted(ThrowingRunnable assertion) {