fix: controller event source initialized first (#1237)

Author: csviri

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

@@ -16,6 +16,7 @@
 
 class EventSources<R extends HasMetadata> implements Iterable<NamedEventSource> {
 
+  private static final String CONTROLLER_EVENT_SOURCE_KEY = "0";
   private final ConcurrentNavigableMap<String, Map<String, EventSource>> sources =
       new ConcurrentSkipListMap<>();
   private final TimerEventSource<R> retryAndRescheduleTimerEventSource = new TimerEventSource<>();
@@ -80,6 +81,9 @@ private Class<?> getResourceType(EventSource source) {
   }
 
   private String keyFor(EventSource source) {
+    if (source instanceof ControllerResourceEventSource) {
+      return CONTROLLER_EVENT_SOURCE_KEY;
+    }
     return keyFor(getResourceType(source));
   }
 

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

@@ -76,17 +76,14 @@ void retrievingEventSourceForClassShouldWork() {
 
     // manager is initialized with a controller configured to handle HasMetadata
     EventSourceManager manager = initManager();
-    EventSource source = manager.getResourceEventSourceFor(HasMetadata.class);
-    assertThat(source).isInstanceOf(ControllerResourceEventSource.class);
-
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> manager.getResourceEventSourceFor(HasMetadata.class, "unknown_name"));
 
     CachingEventSource eventSource = mock(CachingEventSource.class);
     when(eventSource.resourceType()).thenReturn(String.class);
     manager.registerEventSource(eventSource);
 
-    source = manager.getResourceEventSourceFor(String.class);
+    var source = manager.getResourceEventSourceFor(String.class);
     assertThat(source).isNotNull();
     assertEquals(eventSource, source);
   }