fix: restore to compiling state after rebase

Author: metacosm

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

@@ -1,6 +1,7 @@
 package io.javaoperatorsdk.operator.api;
 
 import io.fabric8.kubernetes.client.CustomResource;
+import java.util.Optional;
 
 public class DefaultContext<T extends CustomResource> implements Context<T> {
 

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

@@ -16,6 +16,7 @@
 import io.javaoperatorsdk.operator.processing.EventDispatcher;
 import io.javaoperatorsdk.operator.processing.event.DefaultEventSourceManager;
 import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEventSource;
+import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
 import io.javaoperatorsdk.operator.processing.retry.Retry;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -40,10 +41,9 @@ public Operator(KubernetesClient k8sClient, ConfigurationService configurationSe
   public <R extends CustomResource> void register(ResourceController<R> controller)
       throws OperatorException {
     final var configuration = configurationService.getConfigurationFor(controller);
-    //        final var retry =
-    // GenericRetry.fromConfiguration(configuration.getRetryConfiguration());
+    final var retry = GenericRetry.fromConfiguration(configuration.getRetryConfiguration());
     final var targetNamespaces = configuration.getNamespaces().toArray(new String[] {});
-    registerController(controller, configuration.watchAllNamespaces(), targetNamespaces);
+    registerController(controller, configuration.watchAllNamespaces(), retry, targetNamespaces);
   }
 
   public <R extends CustomResource> void registerControllerForAllNamespaces(
@@ -61,6 +61,7 @@ public <R extends CustomResource> void registerController(
       throws OperatorException {
     registerController(controller, false, retry, targetNamespaces);
   }
+
   public <R extends CustomResource> void registerController(
       ResourceController<R> controller, String... targetNamespaces) throws OperatorException {
     registerController(controller, false, null, targetNamespaces);

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

@@ -7,8 +7,13 @@
 import io.fabric8.kubernetes.client.CustomResource;
 import io.javaoperatorsdk.operator.api.Event;
 import io.javaoperatorsdk.operator.api.EventHandler;
+import io.javaoperatorsdk.operator.api.RetryInfo;
 import io.javaoperatorsdk.operator.processing.event.DefaultEventSourceManager;
+import io.javaoperatorsdk.operator.processing.retry.Retry;
+import io.javaoperatorsdk.operator.processing.retry.RetryExecution;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ScheduledThreadPoolExecutor;

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

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

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

@@ -13,9 +13,11 @@
 
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.Watcher;
+import io.javaoperatorsdk.operator.api.Context;
 import io.javaoperatorsdk.operator.api.DeleteControl;
 import io.javaoperatorsdk.operator.api.Event;
 import io.javaoperatorsdk.operator.api.ResourceController;
+import io.javaoperatorsdk.operator.api.RetryInfo;
 import io.javaoperatorsdk.operator.api.UpdateControl;
 import io.javaoperatorsdk.operator.processing.EventDispatcher;
 import io.javaoperatorsdk.operator.processing.ExecutionScope;

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

@@ -17,6 +17,7 @@
 import io.fabric8.kubernetes.client.utils.Serialization;
 import io.javaoperatorsdk.operator.api.ResourceController;
 import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService;
+import io.javaoperatorsdk.operator.processing.retry.Retry;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResourceSpec;
 import java.io.IOException;

runtime-configuration/src/main/java/io/javaoperatorsdk/operator/config/runtime/ControllerAnnotationProcessor.java

@@ -100,32 +100,38 @@ private TypeParameterResolver initializeResolver(ProcessingEnvironment processin
   }
 
   private void generateDoneableClass(TypeElement controllerClassSymbol) {
-        try {
-            final TypeMirror resourceType = findResourceType(controllerClassSymbol);
+    try {
+      final TypeMirror resourceType = findResourceType(controllerClassSymbol);
       if (resourceType == null) {
         controllersResourceWriter.add(
             controllerClassSymbol.getQualifiedName().toString(),
             CustomResource.class.getCanonicalName());
         return;
       }
 
-            if (resourceType == null) {
-                System.out.println("No defined a resource type for '" + controllerClassSymbol.getQualifiedName() + "': ignoring!");
-                return;
-            }
+      if (resourceType == null) {
+        System.out.println(
+            "No defined a resource type for '"
+                + controllerClassSymbol.getQualifiedName()
+                + "': ignoring!");
+        return;
+      }
 
-            TypeElement customerResourceTypeElement =
-          processingEnv.getElementUtils()
-                .getTypeElement(resourceType.toString());
+      TypeElement customerResourceTypeElement =
+          processingEnv.getElementUtils().getTypeElement(resourceType.toString());
 
-            final String doneableClassName = customerResourceTypeElement.getSimpleName() + "Doneable";
-            final String destinationClassFileName = customerResourceTypeElement.getQualifiedName() + "Doneable";
-            final TypeName customResourceType = TypeName.get(resourceType);
+      final String doneableClassName = customerResourceTypeElement.getSimpleName() + "Doneable";
+      final String destinationClassFileName =
+          customerResourceTypeElement.getQualifiedName() + "Doneable";
+      final TypeName customResourceType = TypeName.get(resourceType);
 
-            if (!generatedDoneableClassFiles.add(destinationClassFileName)) {
-                processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE,
-                    String.format(
-                        "%s already exists! adding the mapping to the %s",
+      if (!generatedDoneableClassFiles.add(destinationClassFileName)) {
+        processingEnv
+            .getMessager()
+            .printMessage(
+                Diagnostic.Kind.NOTE,
+                String.format(
+                    "%s already exists! adding the mapping to the %s",
                     destinationClassFileName, CONTROLLERS_RESOURCE_PATH));
         controllersResourceWriter.add(
             controllerClassSymbol.getQualifiedName().toString(), customResourceType.toString());
@@ -167,10 +173,11 @@ private void generateDoneableClass(TypeElement controllerClassSymbol) {
       ioException.printStackTrace();
     }
   }
-    private TypeMirror findResourceType(TypeElement controllerClassSymbol) {
+
+  private TypeMirror findResourceType(TypeElement controllerClassSymbol) {
     try {
 
-            return typeParameterResolver.resolve(
+      return typeParameterResolver.resolve(
           processingEnv.getTypeUtils(), (DeclaredType) controllerClassSymbol.asType());
     } catch (Exception e) {
       e.printStackTrace();

runtime-configuration/src/main/java/io/javaoperatorsdk/operator/config/runtime/TypeParameterResolver.java

@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator.processing.annotation;
+package io.javaoperatorsdk.operator.config.runtime;
 
 import static javax.lang.model.type.TypeKind.DECLARED;
 import static javax.lang.model.type.TypeKind.TYPEVAR;