refactor: rename Stoppable to LifecycleAware

Author: metacosm

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

@@ -1,27 +1,26 @@
 package io.javaoperatorsdk.operator;
 
-import java.net.ConnectException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.Version;
+import io.javaoperatorsdk.operator.api.LifecycleAware;
 import io.javaoperatorsdk.operator.api.ResourceController;
-import io.javaoperatorsdk.operator.api.Stoppable;
 import io.javaoperatorsdk.operator.api.config.ConfigurationService;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.config.ExecutorServiceManager;
 import io.javaoperatorsdk.operator.processing.ConfiguredController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.ConnectException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @SuppressWarnings("rawtypes")
-public class Operator implements AutoCloseable, Stoppable {
+public class Operator implements AutoCloseable, LifecycleAware {
   private static final Logger log = LoggerFactory.getLogger(Operator.class);
   private final KubernetesClient kubernetesClient;
   private final ConfigurationService configurationService;
@@ -163,7 +162,7 @@ public <R extends CustomResource> void register(
     }
   }
 
-  private static class ControllerManager implements Stoppable {
+  private static class ControllerManager implements LifecycleAware {
     private final Map<String, ConfiguredController> controllers = new HashMap<>();
     private boolean started = false;
 

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/Stoppable.java renamed to operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/LifecycleAware.java

@@ -2,7 +2,7 @@
 
 import io.javaoperatorsdk.operator.OperatorException;
 
-public interface Stoppable {
+public interface LifecycleAware {
   void start() throws OperatorException;
 
   void stop() throws OperatorException;

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ConfiguredController.java

@@ -1,7 +1,5 @@
 package io.javaoperatorsdk.operator.processing;
 
-import java.util.Objects;
-
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
 import io.fabric8.kubernetes.client.CustomResource;
@@ -11,22 +9,29 @@
 import io.javaoperatorsdk.operator.CustomResourceUtils;
 import io.javaoperatorsdk.operator.MissingCRDException;
 import io.javaoperatorsdk.operator.OperatorException;
-import io.javaoperatorsdk.operator.api.*;
+import io.javaoperatorsdk.operator.api.Context;
+import io.javaoperatorsdk.operator.api.DeleteControl;
+import io.javaoperatorsdk.operator.api.EventSourceInitializer;
+import io.javaoperatorsdk.operator.api.LifecycleAware;
+import io.javaoperatorsdk.operator.api.ResourceController;
+import io.javaoperatorsdk.operator.api.UpdateControl;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.monitoring.Metrics.ControllerExecution;
 import io.javaoperatorsdk.operator.processing.event.DefaultEventSourceManager;
 import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
 
+import java.util.Objects;
+
 public class ConfiguredController<R extends CustomResource<?, ?>> implements ResourceController<R>,
-    Stoppable, EventSourceInitializer {
+        LifecycleAware, EventSourceInitializer {
   private final ResourceController<R> controller;
   private final ControllerConfiguration<R> configuration;
   private final KubernetesClient kubernetesClient;
   private DefaultEventSourceManager eventSourceManager;
 
   public ConfiguredController(ResourceController<R> controller,
-      ControllerConfiguration<R> configuration,
-      KubernetesClient kubernetesClient) {
+                              ControllerConfiguration<R> configuration,
+                              KubernetesClient kubernetesClient) {
     this.controller = controller;
     this.configuration = configuration;
     this.kubernetesClient = kubernetesClient;

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/DefaultEventHandler.java

@@ -1,21 +1,9 @@
 package io.javaoperatorsdk.operator.processing;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import io.fabric8.kubernetes.client.CustomResource;
 import io.javaoperatorsdk.operator.OperatorException;
+import io.javaoperatorsdk.operator.api.LifecycleAware;
 import io.javaoperatorsdk.operator.api.RetryInfo;
-import io.javaoperatorsdk.operator.api.Stoppable;
 import io.javaoperatorsdk.operator.api.config.ConfigurationService;
 import io.javaoperatorsdk.operator.api.config.ExecutorServiceManager;
 import io.javaoperatorsdk.operator.api.monitoring.Metrics;
@@ -28,6 +16,17 @@
 import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
 import io.javaoperatorsdk.operator.processing.retry.Retry;
 import io.javaoperatorsdk.operator.processing.retry.RetryExecution;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.locks.ReentrantLock;
 
 import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getName;
 import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
@@ -37,7 +36,7 @@
  * UID, while buffering events which are received during an execution.
  */
 public class DefaultEventHandler<R extends CustomResource<?, ?>>
-    implements EventHandler, Stoppable {
+        implements EventHandler, LifecycleAware {
 
   private static final Logger log = LoggerFactory.getLogger(DefaultEventHandler.class);
 

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/DefaultEventSourceManager.java

@@ -1,22 +1,24 @@
 package io.javaoperatorsdk.operator.processing.event;
 
-import java.util.*;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import io.fabric8.kubernetes.client.CustomResource;
 import io.javaoperatorsdk.operator.MissingCRDException;
 import io.javaoperatorsdk.operator.OperatorException;
-import io.javaoperatorsdk.operator.api.Stoppable;
+import io.javaoperatorsdk.operator.api.LifecycleAware;
 import io.javaoperatorsdk.operator.processing.ConfiguredController;
 import io.javaoperatorsdk.operator.processing.DefaultEventHandler;
 import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEventSource;
 import io.javaoperatorsdk.operator.processing.event.internal.TimerEventSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
 
 public class DefaultEventSourceManager<R extends CustomResource<?, ?>>
-    implements EventSourceManager<R>, Stoppable {
+        implements EventSourceManager<R>, LifecycleAware {
 
   private static final Logger log = LoggerFactory.getLogger(DefaultEventSourceManager.class);
 

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventSource.java

@@ -1,8 +1,8 @@
 package io.javaoperatorsdk.operator.processing.event;
 
-import io.javaoperatorsdk.operator.api.Stoppable;
+import io.javaoperatorsdk.operator.api.LifecycleAware;
 
-public interface EventSource extends Stoppable {
+public interface EventSource extends LifecycleAware {
 
   void setEventHandler(EventHandler eventHandler);
 
@@ -11,5 +11,6 @@ public interface EventSource extends Stoppable {
    *
    * @param customResourceUid - id of custom resource
    */
-  default void cleanupForCustomResource(CustomResourceID customResourceUid) {}
+  default void cleanupForCustomResource(CustomResourceID customResourceUid) {
+  }
 }