fix: more re-organization and fixes after rebase

Author: metacosm

api/src/main/java/io/javaoperatorsdk/operator/api/Context.java

@@ -1,11 +1,6 @@
 package io.javaoperatorsdk.operator.api;
 
 import io.fabric8.kubernetes.client.CustomResource;
-import io.javaoperatorsdk.operator.processing.event.Event;
-import io.javaoperatorsdk.operator.processing.event.EventList;
-import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
-
-import java.util.List;
 
 public interface Context<T extends CustomResource> {
 

api/src/main/java/io/javaoperatorsdk/operator/api/DefaultContext.java

@@ -1,11 +1,6 @@
 package io.javaoperatorsdk.operator.api;
 
 import io.fabric8.kubernetes.client.CustomResource;
-import io.javaoperatorsdk.operator.processing.event.Event;
-import io.javaoperatorsdk.operator.processing.event.EventList;
-import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
-
-import java.util.List;
 
 public class DefaultContext<T extends CustomResource> implements Context<T> {
 

operator-framework/src/main/java/io/javaoperatorsdk/operator/api/DeleteControl.java renamed to api/src/main/java/io/javaoperatorsdk/operator/api/DeleteControl.java

@@ -1,8 +1,8 @@
 package io.javaoperatorsdk.operator.api;
 
 public enum DeleteControl {
-
+    
     DEFAULT_DELETE,
     NO_FINALIZER_REMOVAL
-
+    
 }

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/event/Event.java renamed to api/src/main/java/io/javaoperatorsdk/operator/api/Event.java

@@ -1,8 +1,8 @@
-package io.javaoperatorsdk.operator.processing.event;
+package io.javaoperatorsdk.operator.api;
 
 public interface Event {
-
+    
     String getRelatedCustomResourceUid();
-
+    
     EventSource getEventSource();
 }

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/event/EventHandler.java renamed to api/src/main/java/io/javaoperatorsdk/operator/api/EventHandler.java

@@ -1,7 +1,7 @@
-package io.javaoperatorsdk.operator.processing.event;
+package io.javaoperatorsdk.operator.api;
 
 public interface EventHandler {
-
+    
     void handleEvent(Event event);
-
+    
 }

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/event/EventList.java renamed to api/src/main/java/io/javaoperatorsdk/operator/api/EventList.java

@@ -1,22 +1,22 @@
-package io.javaoperatorsdk.operator.processing.event;
+package io.javaoperatorsdk.operator.api;
 
 import java.util.List;
 import java.util.Optional;
 
 public class EventList {
-
+    
     private final List<Event> eventList;
-
+    
     public EventList(List<Event> eventList) {
         this.eventList = eventList;
     }
-
+    
     public List<Event> getList() {
         return eventList;
     }
-
+    
     public <T extends Event> Optional<T> getLatestOfType(Class<T> eventType) {
-        for (int i = eventList.size() - 1; i >= 0; i--){
+        for (int i = eventList.size() - 1; i >= 0; i--) {
             Event event = eventList.get(i);
             if (event.getClass().isAssignableFrom(eventType)) {
                 return (Optional<T>) Optional.of(event);

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/event/EventSource.java renamed to api/src/main/java/io/javaoperatorsdk/operator/api/EventSource.java

@@ -1,9 +1,9 @@
-package io.javaoperatorsdk.operator.processing.event;
+package io.javaoperatorsdk.operator.api;
 
 public interface EventSource {
-
+    
     void setEventHandler(EventHandler eventHandler);
-
+    
     void eventSourceDeRegisteredForResource(String customResourceUid);
-
+    
 }

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

@@ -1,18 +1,14 @@
-package io.javaoperatorsdk.operator.processing.event;
+package io.javaoperatorsdk.operator.api;
 
-import io.fabric8.kubernetes.client.CustomResource;
-
-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(String name, T eventSource);
-
+    
     Optional<EventSource> deRegisterCustomResourceFromEventSource(String name, String customResourceUid);
-
+    
     Map<String, EventSource> getRegisteredEventSources();
-
+    
 }

api/src/main/java/io/javaoperatorsdk/operator/api/ResourceController.java

@@ -3,7 +3,6 @@
 import java.util.Locale;
 
 import io.fabric8.kubernetes.client.CustomResource;
-import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
 
 public interface ResourceController<R extends CustomResource> {
 

operator-framework/pom.xml

@@ -83,6 +83,12 @@
             <version>4.0.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.testing.compile</groupId>
+            <artifactId>compile-testing</artifactId>
+            <version>0.19</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>io.javaoperatorsdk</groupId>

operator-framework/src/main/java/io/javaoperatorsdk/operator/EventListUtils.java

@@ -1,12 +1,11 @@
 package io.javaoperatorsdk.operator;
 
-import io.fabric8.kubernetes.api.model.HasMetadata;
+import java.util.List;
+
 import io.fabric8.kubernetes.client.Watcher;
-import io.javaoperatorsdk.operator.processing.event.Event;
+import io.javaoperatorsdk.operator.api.Event;
 import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
 
-import java.util.List;
-
 public class EventListUtils {
 
     public static boolean containsCustomResourceDeletedEvent(List<Event> events) {

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/DefaultEventHandler.java

@@ -1,20 +1,19 @@
 package io.javaoperatorsdk.operator.processing;
 
 
-import io.fabric8.kubernetes.client.CustomResource;
-import io.javaoperatorsdk.operator.processing.event.DefaultEventSourceManager;
-import io.javaoperatorsdk.operator.processing.event.Event;
-import io.javaoperatorsdk.operator.processing.event.EventHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.locks.ReentrantLock;
-import java.util.function.Predicate;
+
+import io.fabric8.kubernetes.client.CustomResource;
+import io.javaoperatorsdk.operator.api.Event;
+import io.javaoperatorsdk.operator.api.EventHandler;
+import io.javaoperatorsdk.operator.processing.event.DefaultEventSourceManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static io.javaoperatorsdk.operator.EventListUtils.containsCustomResourceDeletedEvent;
 import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventBuffer.java

@@ -1,9 +1,12 @@
 package io.javaoperatorsdk.operator.processing;
 
-import io.javaoperatorsdk.operator.processing.event.Event;
-import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
-import java.util.*;
+import io.javaoperatorsdk.operator.api.Event;
 
 class EventBuffer {
 

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventDispatcher.java

@@ -1,31 +1,25 @@
 package io.javaoperatorsdk.operator.processing;
 
 import java.util.ArrayList;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.javaoperatorsdk.operator.api.Context;
 import io.javaoperatorsdk.operator.api.ControllerUtils;
 import io.javaoperatorsdk.operator.api.DefaultContext;
+import io.javaoperatorsdk.operator.api.DeleteControl;
+import io.javaoperatorsdk.operator.api.EventList;
+import io.javaoperatorsdk.operator.api.EventSourceManager;
 import io.javaoperatorsdk.operator.api.ResourceController;
-import io.javaoperatorsdk.operator.api.RetryInfo;
 import io.javaoperatorsdk.operator.api.UpdateControl;
-import io.javaoperatorsdk.operator.processing.event.Event;
-import io.javaoperatorsdk.operator.processing.event.EventList;
-import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
-import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 import static io.javaoperatorsdk.operator.EventListUtils.containsCustomResourceDeletedEvent;
-import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.*;
+import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
+import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
+import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.markedForDeletion;
 
 /**
  * Dispatches events to the Controller and handles Finalizers for a single type of Custom Resource.

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/ExecutionScope.java

@@ -1,17 +1,17 @@
 package io.javaoperatorsdk.operator.processing;
 
 
-import io.fabric8.kubernetes.client.CustomResource;
-import io.javaoperatorsdk.operator.processing.event.Event;
-
 import java.util.List;
 
-public class ExecutionScope {
+import io.fabric8.kubernetes.client.CustomResource;
+import io.javaoperatorsdk.operator.api.Event;
 
+public class ExecutionScope {
+    
     private List<Event> events;
     // the latest custom resource from cache
     private CustomResource customResource;
-
+    
     public ExecutionScope(List<Event> list, CustomResource customResource) {
         this.events = list;
         this.customResource = customResource;

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

@@ -1,11 +1,14 @@
 package io.javaoperatorsdk.operator.processing.event;
 
-public abstract class AbstractEvent implements Event{
+import io.javaoperatorsdk.operator.api.Event;
+import io.javaoperatorsdk.operator.api.EventSource;
 
+public abstract class AbstractEvent implements Event {
+    
     private final String relatedCustomResourceUid;
-
+    
     private final EventSource eventSource;
-
+    
     public AbstractEvent(String relatedCustomResourceUid, EventSource eventSource) {
         this.relatedCustomResourceUid = relatedCustomResourceUid;
         this.eventSource = eventSource;

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

@@ -1,6 +1,7 @@
 package io.javaoperatorsdk.operator.processing.event;
 
-import io.fabric8.kubernetes.client.CustomResource;
+import io.javaoperatorsdk.operator.api.EventHandler;
+import io.javaoperatorsdk.operator.api.EventSource;
 
 public abstract class AbstractEventSource implements EventSource {
 

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

@@ -1,15 +1,18 @@
 package io.javaoperatorsdk.operator.processing.event;
 
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantLock;
+
+import io.javaoperatorsdk.operator.api.EventSource;
+import io.javaoperatorsdk.operator.api.EventSourceManager;
 import io.javaoperatorsdk.operator.processing.DefaultEventHandler;
 import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEventSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.function.Supplier;
-
 public class DefaultEventSourceManager implements EventSourceManager {
 
     private static final Logger log = LoggerFactory.getLogger(DefaultEventSourceManager.class);

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

@@ -1,21 +1,23 @@
 package io.javaoperatorsdk.operator.processing.event.internal;
 
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.Watcher;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.internal.CustomResourceOperationsImpl;
-import io.javaoperatorsdk.operator.ControllerUtils;
+import io.javaoperatorsdk.operator.api.ControllerUtils;
 import io.javaoperatorsdk.operator.processing.CustomResourceCache;
 import io.javaoperatorsdk.operator.processing.KubernetesResourceUtils;
 import io.javaoperatorsdk.operator.processing.event.AbstractEventSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.*;
+import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
+import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
+import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.markedForDeletion;
 import static java.net.HttpURLConnection.HTTP_GONE;
 
 /**

operator-framework/src/test/java/io/javaoperatorsdk/operator/EventDispatcherTest.java

@@ -1,27 +1,32 @@
 package io.javaoperatorsdk.operator;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.Watcher;
 import io.javaoperatorsdk.operator.api.DeleteControl;
+import io.javaoperatorsdk.operator.api.Event;
 import io.javaoperatorsdk.operator.api.ResourceController;
 import io.javaoperatorsdk.operator.api.UpdateControl;
 import io.javaoperatorsdk.operator.processing.EventDispatcher;
 import io.javaoperatorsdk.operator.processing.ExecutionScope;
-import io.javaoperatorsdk.operator.processing.event.Event;
 import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
-import io.javaoperatorsdk.operator.processing.event.internal.TimerEvent;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatchers;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.argThat;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 class EventDispatcherTest {