Merge branch 'master' into retry-experiment

# Conflicts:
#	operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java
#	operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/DefaultEventHandler.java
#	operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventBuffer.java
#	operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventDispatcher.java
#	operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/ExecutionConsumer.java
#	operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/PostExecutionControl.java
#	operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/event/DefaultEventSourceManager.java
#	operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/GenericRetry.java
#	operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/GenericRetryExecution.java
#	operator-framework/src/test/java/io/javaoperatorsdk/operator/EventDispatcherTest.java
#	operator-framework/src/test/java/io/javaoperatorsdk/operator/processing/DefaultEventHandlerTest.java
#	operator-framework/src/test/java/io/javaoperatorsdk/operator/processing/event/DefaultEventSourceManagerTest.java
#	operator-framework/src/test/java/io/javaoperatorsdk/operator/processing/retry/GenericRetryExecutionTest.java

Author: csviri

.github/workflows/pr.yml

@@ -21,6 +21,8 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.java }}
+      - name: Check code format
+        run: mvn fmt:check --file pom.xml
       - name: Run unit tests
         run: mvn -B test -P no-integration-tests --file pom.xml
       - name: Set up Minikube

operator-framework/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.javaoperatorsdk</groupId>
         <artifactId>java-operator-sdk</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -45,6 +45,17 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.auto.service</groupId>
+            <artifactId>auto-service</artifactId>
+            <version>1.0-rc7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.squareup</groupId>
+            <artifactId>javapoet</artifactId>
+            <version>1.13.0</version>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
@@ -85,19 +96,5 @@
             <version>0.19</version>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>com.google.auto.service</groupId>
-            <artifactId>auto-service</artifactId>
-            <version>1.0-rc2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.squareup</groupId>
-            <artifactId>javapoet</artifactId>
-            <version>1.13.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>

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

@@ -0,0 +1,55 @@
+package io.javaoperatorsdk.operator;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.*;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.ClassUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class ClassMappingProvider {
+  private static final Logger log = LoggerFactory.getLogger(ClassMappingProvider.class);
+
+  static <T, V> Map<T, V> provide(final String resourcePath, T key, V value) {
+    Map<T, V> result = new HashMap();
+    try {
+      final var classLoader = Thread.currentThread().getContextClassLoader();
+      final Enumeration<URL> customResourcesMetadataList = classLoader.getResources(resourcePath);
+      for (Iterator<URL> it = customResourcesMetadataList.asIterator(); it.hasNext(); ) {
+        URL url = it.next();
+
+        List<String> classNamePairs = retrieveClassNamePairs(url);
+        classNamePairs.forEach(
+            clazzPair -> {
+              try {
+                final String[] classNames = clazzPair.split(",");
+                if (classNames.length != 2) {
+                  throw new IllegalStateException(
+                      String.format(
+                          "%s is not valid Mapping metadata, defined in %s",
+                          clazzPair, url.toString()));
+                }
+
+                result.put(
+                    (T) ClassUtils.getClass(classNames[0]), (V) ClassUtils.getClass(classNames[1]));
+              } catch (ClassNotFoundException e) {
+                throw new RuntimeException(e);
+              }
+            });
+      }
+      log.debug("Loaded Controller to CustomResource mappings {}", result);
+      return result;
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private static List<String> retrieveClassNamePairs(URL url) throws IOException {
+    return new BufferedReader(new InputStreamReader(url.openStream()))
+        .lines()
+        .collect(Collectors.toList());
+  }
+}

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

@@ -4,69 +4,76 @@
 import io.fabric8.kubernetes.client.CustomResourceDoneable;
 import io.javaoperatorsdk.operator.api.Controller;
 import io.javaoperatorsdk.operator.api.ResourceController;
-import org.apache.commons.lang3.ClassUtils;
-
 import java.util.Map;
 
-
 public class ControllerUtils {
 
-    private static final String FINALIZER_NAME_SUFFIX = "/finalizer";
-    public static final String CONTROLLERS_RESOURCE_PATH = "javaoperatorsdk/controllers";
-    private static Map<Class<? extends ResourceController>, Class<? extends CustomResource>> controllerToCustomResourceMappings;
+  private static final String FINALIZER_NAME_SUFFIX = "/finalizer";
+  public static final String CONTROLLERS_RESOURCE_PATH = "javaoperatorsdk/controllers";
+  public static final String DONEABLES_RESOURCE_PATH = "javaoperatorsdk/doneables";
+  private static Map<Class<? extends ResourceController>, Class<? extends CustomResource>>
+      controllerToCustomResourceMappings;
+  private static Map<Class<? extends CustomResource>, Class<? extends CustomResourceDoneable>>
+      resourceToDoneableMappings;
 
-    static {
-        controllerToCustomResourceMappings =
-                ControllerToCustomResourceMappingsProvider
-                        .provide(CONTROLLERS_RESOURCE_PATH);
-    }
+  static {
+    controllerToCustomResourceMappings =
+        ClassMappingProvider.provide(
+            CONTROLLERS_RESOURCE_PATH, ResourceController.class, CustomResource.class);
+    resourceToDoneableMappings =
+        ClassMappingProvider.provide(
+            DONEABLES_RESOURCE_PATH, CustomResource.class, CustomResourceDoneable.class);
+  }
 
-    static String getFinalizer(ResourceController controller) {
-        final String annotationFinalizerName = getAnnotation(controller).finalizerName();
-        if (!Controller.NULL.equals(annotationFinalizerName)) {
-            return annotationFinalizerName;
-        }
-        return getAnnotation(controller).crdName() + FINALIZER_NAME_SUFFIX;
+  static String getFinalizer(ResourceController controller) {
+    final String annotationFinalizerName = getAnnotation(controller).finalizerName();
+    if (!Controller.NULL.equals(annotationFinalizerName)) {
+      return annotationFinalizerName;
     }
+    return getAnnotation(controller).crdName() + FINALIZER_NAME_SUFFIX;
+  }
 
-    static boolean getGenerationEventProcessing(ResourceController<?> controller) {
-        return getAnnotation(controller).generationAwareEventProcessing();
-    }
+  static boolean getGenerationEventProcessing(ResourceController<?> controller) {
+    return getAnnotation(controller).generationAwareEventProcessing();
+  }
 
-    static <R extends CustomResource> Class<R> getCustomResourceClass(ResourceController<R> controller) {
-        final Class<? extends CustomResource> customResourceClass = controllerToCustomResourceMappings
-                .get(controller.getClass());
-        if (customResourceClass == null) {
-            throw new IllegalArgumentException(
-                    String.format(
-                            "No custom resource has been found for controller %s",
-                            controller.getClass().getCanonicalName()
-                    )
-            );
-        }
-        return (Class<R>) customResourceClass;
+  static <R extends CustomResource> Class<R> getCustomResourceClass(
+      ResourceController<R> controller) {
+    final Class<? extends CustomResource> customResourceClass =
+        controllerToCustomResourceMappings.get(controller.getClass());
+    if (customResourceClass == null) {
+      throw new IllegalArgumentException(
+          String.format(
+              "No custom resource has been found for controller %s",
+              controller.getClass().getCanonicalName()));
     }
+    return (Class<R>) customResourceClass;
+  }
 
-    static String getCrdName(ResourceController controller) {
-        return getAnnotation(controller).crdName();
-    }
+  static String getCrdName(ResourceController controller) {
+    return getAnnotation(controller).crdName();
+  }
 
-    public static <T extends CustomResource> Class<? extends CustomResourceDoneable<T>>
-    getCustomResourceDoneableClass(ResourceController<T> controller) {
-        try {
-            final Class<T> customResourceClass = getCustomResourceClass(controller);
-            return (Class<? extends CustomResourceDoneable<T>>) ClassUtils.getClass(customResourceClass.getCanonicalName() + "Doneable");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-            return null;
-        }
+  public static <T extends CustomResource>
+      Class<? extends CustomResourceDoneable<T>> getCustomResourceDoneableClass(
+          ResourceController<T> controller) {
+    final Class<T> customResourceClass = getCustomResourceClass(controller);
+    final Class<? extends CustomResourceDoneable<T>> doneableClass =
+        (Class<? extends CustomResourceDoneable<T>>)
+            resourceToDoneableMappings.get(customResourceClass);
+    if (doneableClass == null) {
+      throw new RuntimeException(
+          String.format("No matching Doneable class found for %s", customResourceClass));
     }
+    return doneableClass;
+  }
 
-    private static Controller getAnnotation(ResourceController<?> controller) {
-        return controller.getClass().getAnnotation(Controller.class);
-    }
+  private static Controller getAnnotation(ResourceController<?> controller) {
+    return controller.getClass().getAnnotation(Controller.class);
+  }
 
-    public static boolean hasGivenFinalizer(CustomResource resource, String finalizer) {
-        return resource.getMetadata().getFinalizers() != null && resource.getMetadata().getFinalizers().contains(finalizer);
-    }
+  public static boolean hasGivenFinalizer(CustomResource resource, String finalizer) {
+    return resource.getMetadata().getFinalizers() != null
+        && resource.getMetadata().getFinalizers().contains(finalizer);
+  }
 }

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

@@ -1,21 +1,21 @@
 package io.javaoperatorsdk.operator;
 
-import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.client.Watcher;
 import io.javaoperatorsdk.operator.processing.event.Event;
 import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
-
 import java.util.List;
 
 public class EventListUtils {
 
-    public static boolean containsCustomResourceDeletedEvent(List<Event> events) {
-        return events.stream().anyMatch(e -> {
-            if (e instanceof CustomResourceEvent) {
+  public static boolean containsCustomResourceDeletedEvent(List<Event> events) {
+    return events.stream()
+        .anyMatch(
+            e -> {
+              if (e instanceof CustomResourceEvent) {
                 return ((CustomResourceEvent) e).getAction() == Watcher.Action.DELETED;
-            } else {
+              } else {
                 return false;
-            }
-        });
-    }
+              }
+            });
+  }
 }