supplier for registering event sources

Author: csviri

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

@@ -10,6 +10,7 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Supplier;
 
 public class DefaultEventSourceManager implements EventSourceManager {
 
@@ -51,13 +52,14 @@ public <T extends EventSource> void registerEventSource(CustomResource customRes
     }
 
     @Override
-    public <T extends EventSource> T registerEventSourceIfNotRegistered(CustomResource customResource, String name, T eventSource) {
+    public <T extends EventSource> T registerEventSourceIfNotRegistered(CustomResource customResource, String name, Supplier<T> eventSourceSupplier) {
         try {
             lock.lock();
             if (eventSources.get(ProcessingUtils.getUID(customResource)) == null ||
                     eventSources.get(ProcessingUtils.getUID(customResource)).get(name) == null) {
+                EventSource eventSource = eventSourceSupplier.get();
                 registerEventSource(customResource, name, eventSource);
-                return eventSource;
+                return (T) eventSource;
             }
             return (T) eventSources.get(ProcessingUtils.getUID(customResource)).get(name);
         } finally {

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

@@ -5,12 +5,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 public interface EventSourceManager {
 
     <T extends EventSource> void registerEventSource(CustomResource customResource, String name, T eventSource);
 
-    <T extends EventSource> T registerEventSourceIfNotRegistered(CustomResource customResource, String name, T eventSource);
+    <T extends EventSource> T registerEventSourceIfNotRegistered(CustomResource customResource, String name, Supplier<T> eventSource);
 
     Optional<EventSource> deRegisterEventSource(String customResourceUid, String name);
 

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

@@ -53,8 +53,8 @@ public void registersEventSourceOnlyIfNotRegistered() {
         EventSource eventSource = mock(EventSource.class);
         EventSource eventSource2 = mock(EventSource.class);
 
-        defaultEventSourceManager.registerEventSourceIfNotRegistered(customResource, CUSTOM_EVENT_SOURCE_NAME, eventSource);
-        defaultEventSourceManager.registerEventSourceIfNotRegistered(customResource, CUSTOM_EVENT_SOURCE_NAME, eventSource2);
+        defaultEventSourceManager.registerEventSourceIfNotRegistered(customResource, CUSTOM_EVENT_SOURCE_NAME, () -> eventSource);
+        defaultEventSourceManager.registerEventSourceIfNotRegistered(customResource, CUSTOM_EVENT_SOURCE_NAME, () -> eventSource2);
 
         Map<String, EventSource> registeredEventSources = defaultEventSourceManager
                 .getRegisteredEventSources(getUID(customResource));
@@ -65,7 +65,7 @@ public void registersEventSourceOnlyIfNotRegistered() {
     public void deRegistersEventSources() {
         CustomResource customResource = TestUtils.testCustomResource();
         EventSource eventSource = mock(EventSource.class);
-        defaultEventSourceManager.registerEventSourceIfNotRegistered(customResource, CUSTOM_EVENT_SOURCE_NAME, eventSource);
+        defaultEventSourceManager.registerEventSourceIfNotRegistered(customResource, CUSTOM_EVENT_SOURCE_NAME, () -> eventSource);
 
         defaultEventSourceManager.deRegisterEventSource(getUID(customResource), CUSTOM_EVENT_SOURCE_NAME);