cleanup

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

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

@@ -127,7 +127,7 @@ private void logEventSourceEvent(EventSource eventSource, String event) {
   private <R> Void startEventSource(EventSource<R, P> eventSource) {
     try {
       logEventSourceEvent(eventSource, "Starting");
-      eventSource.start(false);
+      eventSource.start();
       logEventSourceEvent(eventSource, "Started");
     } catch (MissingCRDException e) {
       throw e; // leave untouched
@@ -249,9 +249,7 @@ public <R> EventSource<R, P> dynamicallyRegisterEventSource(EventSource<R, P> ev
         registerEventSource(eventSource);
       }
     }
-    // The start itself is blocking thus blocking only the threads which are attempt to start the
-    // actual event source. Think of this as a form of lock striping.
-    eventSource.start(true);
+    eventSource.start();
     return eventSource;
   }
 

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

@@ -19,9 +19,9 @@
 import java.util.Set;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.OperatorException;
 import io.javaoperatorsdk.operator.health.EventSourceHealthIndicator;
 import io.javaoperatorsdk.operator.health.Status;
+import io.javaoperatorsdk.operator.processing.LifecycleAware;
 import io.javaoperatorsdk.operator.processing.event.EventHandler;
 import io.javaoperatorsdk.operator.processing.event.source.filter.GenericFilter;
 import io.javaoperatorsdk.operator.processing.event.source.filter.OnAddFilter;
@@ -37,7 +37,8 @@
  * @param <P> the primary resource type which reconciler needs to be triggered when events occur on
  *     resources of type R
  */
-public interface EventSource<R, P extends HasMetadata> extends EventSourceHealthIndicator {
+public interface EventSource<R, P extends HasMetadata>
+    extends LifecycleAware, EventSourceHealthIndicator {
 
   static String generateName(EventSource<?, ?> eventSource) {
     return eventSource.getClass().getName() + "@" + Integer.toHexString(eventSource.hashCode());
@@ -118,22 +119,4 @@ default Optional<R> getSecondaryResource(P primary) {
   default Status getStatus() {
     return Status.UNKNOWN;
   }
-
-  /**
-   * Start the event source. Normally, should synchronously populate caches, before the method
-   * returns.
-   *
-   * @since 5.6.0
-   * @param dynamicRegistration true if event source registered dynamically, false otherwise
-   */
-  default void start(boolean dynamicRegistration) {
-    start();
-  }
-
-  /** Only for backwards compatible purposes. Use {@link #start(boolean)}. */
-  @Deprecated(forRemoval = true)
-  void start() throws OperatorException;
-
-  /** Strop the event source */
-  void stop() throws OperatorException;
 }

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

@@ -167,11 +167,11 @@ protected void handleEvent(
   }
 
   @Override
-  public synchronized void start(boolean dynamicRegistration) {
+  public synchronized void start() {
     if (isRunning()) {
       return;
     }
-    super.start(dynamicRegistration);
+    super.start();
     // this makes sure that on first reconciliation all resources are
     // present on the index
     manager().list().forEach(r -> primaryToSecondaryIndex.onAddOrUpdate(r, null));

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

@@ -156,7 +156,7 @@ protected abstract void handleEvent(
       Set<ResourceID> relatedPrimaryIDs);
 
   @Override
-  public synchronized void start(boolean dynamicRegistration) {
+  public synchronized void start() {
     if (isRunning()) {
       return;
     }
@@ -173,11 +173,6 @@ public synchronized void start(boolean dynamicRegistration) {
     super.start();
   }
 
-  @Override
-  public void start() throws OperatorException {
-    start(false);
-  }
-
   @Override
   public synchronized void stop() {
     if (!isRunning()) {

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

@@ -96,8 +96,8 @@ public void startCascadesToEventSources() {
 
     eventSourceManager.start();
 
-    verify(eventSource, times(1)).start(false);
-    verify(eventSource2, times(1)).start(false);
+    verify(eventSource, times(1)).start();
+    verify(eventSource2, times(1)).start();
   }
 
   @Test

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

@@ -65,7 +65,7 @@ public void setUpSource(
     source.setEventHandler(eventHandler);
 
     if (start) {
-      source.start(false);
+      source.start();
     }
   }
 }