chore: restore back to compiling state after rebase

metacosm · metacosm · commit 9c95948b7a2f · 2020-12-17T18:21:39.000+01:00
diff --git a/api/src/main/java/io/javaoperatorsdk/operator/api/DeleteControl.java b/api/src/main/java/io/javaoperatorsdk/operator/api/DeleteControl.java
@@ -1,6 +1,6 @@
 package io.javaoperatorsdk.operator.api;
 
 public enum DeleteControl {
-    DEFAULT_DELETE,
-    NO_FINALIZER_REMOVAL
+  DEFAULT_DELETE,
+  NO_FINALIZER_REMOVAL
 }
diff --git a/api/src/main/java/io/javaoperatorsdk/operator/api/EventList.java b/api/src/main/java/io/javaoperatorsdk/operator/api/EventList.java
@@ -4,17 +4,17 @@
 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--) {
       Event event = eventList.get(i);
diff --git a/operator-framework/src/main/java/io/javaoperatorsdk/operator/EventListUtils.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/EventListUtils.java
@@ -1,10 +1,9 @@
 package io.javaoperatorsdk.operator;
 
-import java.util.List;
-
 import io.fabric8.kubernetes.client.Watcher;
 import io.javaoperatorsdk.operator.api.Event;
 import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
+import java.util.List;
 
 public class EventListUtils {
 
diff --git a/operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java
@@ -14,7 +14,6 @@
 import io.fabric8.kubernetes.internal.KubernetesDeserializer;
 import io.javaoperatorsdk.operator.api.ResourceController;
 import io.javaoperatorsdk.operator.api.config.ConfigurationService;
-import io.javaoperatorsdk.operator.api.config.DefaultConfigurationService;
 import io.javaoperatorsdk.operator.processing.CustomResourceCache;
 import io.javaoperatorsdk.operator.processing.DefaultEventHandler;
 import io.javaoperatorsdk.operator.processing.EventDispatcher;
@@ -84,10 +83,7 @@ private <R extends CustomResource> void registerController(
     String finalizer = configuration.getFinalizer();
     MixedOperation client =
         k8sClient.customResources(
-            crd,
-            resClass,
-            CustomResourceList.class,
-            configuration.getDoneableClass());
+            crd, resClass, CustomResourceList.class, configuration.getDoneableClass());
     EventDispatcher eventDispatcher =
         new EventDispatcher(
             controller, finalizer, new EventDispatcher.CustomResourceFacade(client));
diff --git a/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventDispatcher.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventDispatcher.java
@@ -8,14 +8,14 @@
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.javaoperatorsdk.operator.ControllerUtils;
 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.ResourceController;
-import io.javaoperatorsdk.operator.api.UpdateControl;
 import io.javaoperatorsdk.operator.api.EventList;
 import io.javaoperatorsdk.operator.api.EventSourceManager;
+import io.javaoperatorsdk.operator.api.ResourceController;
+import io.javaoperatorsdk.operator.api.UpdateControl;
 import java.util.ArrayList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/ExecutionScope.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/ExecutionScope.java
@@ -1,7 +1,5 @@
 package io.javaoperatorsdk.operator.processing;
 
-import java.util.List;
-
 import io.fabric8.kubernetes.client.CustomResource;
 import io.javaoperatorsdk.operator.api.Event;
 import java.util.List;
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/processing/event/EventListTest.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/processing/event/EventListTest.java
@@ -1,15 +1,10 @@
 package io.javaoperatorsdk.operator.processing.event;
 
-import java.util.Arrays;
-
-import io.javaoperatorsdk.operator.api.Event;
-import io.javaoperatorsdk.operator.api.EventList;
-import io.javaoperatorsdk.operator.processing.event.internal.TimerEvent;
-import org.junit.jupiter.api.Test;
-
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.mock;
 
+import io.javaoperatorsdk.operator.api.Event;
+import io.javaoperatorsdk.operator.api.EventList;
 import io.javaoperatorsdk.operator.processing.event.internal.TimerEvent;
 import java.util.Arrays;
 import org.junit.jupiter.api.Test;
diff --git a/quarkus-extension/deployment/src/main/java/io/javaoperatorsdk/quarkus/extension/deployment/QuarkusExtensionProcessor.java b/quarkus-extension/deployment/src/main/java/io/javaoperatorsdk/quarkus/extension/deployment/QuarkusExtensionProcessor.java
@@ -95,7 +95,7 @@ private ControllerConfiguration createControllerConfiguration(
             .findFirst()
             .map(Type::asParameterizedType)
             .orElseThrow(); // shouldn't happen since we're only dealing with ResourceController
-                            // implementors already
+    // implementors already
     final var crType = rcInterface.arguments().get(0).name().toString();
 
     // create ResourceController bean
diff --git a/runtime-configuration/src/main/java/io/javaoperatorsdk/operator/config/runtime/AccumulativeMappingWriter.java b/runtime-configuration/src/main/java/io/javaoperatorsdk/operator/config/runtime/AccumulativeMappingWriter.java
@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator.processing.annotation;
+package io.javaoperatorsdk.operator.config.runtime;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/runtime-configuration/src/main/java/io/javaoperatorsdk/operator/config/runtime/AnnotationConfiguration.java b/runtime-configuration/src/main/java/io/javaoperatorsdk/operator/config/runtime/AnnotationConfiguration.java
@@ -45,12 +45,12 @@ public boolean isGenerationAware() {
 
   @Override
   public Class<R> getCustomResourceClass() {
-    return ControllerToCustomResourceMappingsProvider.getCustomResourceClass(controller);
+    return RuntimeControllerMetadata.getCustomResourceClass(controller);
   }
 
   @Override
   public Class<? extends CustomResourceDoneable<R>> getDoneableClass() {
-    return ControllerToCustomResourceMappingsProvider.getDoneableClassFor(getCustomResourceClass());
+    return RuntimeControllerMetadata.getCustomResourceDoneableClass(controller);
   }
 
   @Override
diff --git a/runtime-configuration/src/main/java/io/javaoperatorsdk/operator/config/runtime/ClassMappingProvider.java b/runtime-configuration/src/main/java/io/javaoperatorsdk/operator/config/runtime/ClassMappingProvider.java
@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator;
+package io.javaoperatorsdk.operator.config.runtime;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/runtime-configuration/src/main/java/io/javaoperatorsdk/operator/config/runtime/ControllerAnnotationProcessor.java b/runtime-configuration/src/main/java/io/javaoperatorsdk/operator/config/runtime/ControllerAnnotationProcessor.java
@@ -1,19 +1,7 @@
 package io.javaoperatorsdk.operator.config.runtime;
 
-import static io.javaoperatorsdk.operator.config.runtime.ControllerToCustomResourceMappingsProvider.CONTROLLERS_RESOURCE_PATH;
-
-import com.google.auto.service.AutoService;
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeName;
-import com.squareup.javapoet.TypeSpec;
-import io.fabric8.kubernetes.api.builder.Function;
-import io.fabric8.kubernetes.client.CustomResourceDoneable;
-import io.javaoperatorsdk.operator.api.ResourceController;
-import static io.javaoperatorsdk.operator.ControllerUtils.CONTROLLERS_RESOURCE_PATH;
-import static io.javaoperatorsdk.operator.ControllerUtils.DONEABLES_RESOURCE_PATH;
+import static io.javaoperatorsdk.operator.config.runtime.RuntimeControllerMetadata.CONTROLLERS_RESOURCE_PATH;
+import static io.javaoperatorsdk.operator.config.runtime.RuntimeControllerMetadata.DONEABLES_RESOURCE_PATH;
 
 import com.google.auto.service.AutoService;
 import com.squareup.javapoet.ClassName;
@@ -46,19 +34,6 @@
 import javax.tools.Diagnostic;
 import javax.tools.JavaFileObject;
 
-import com.google.auto.service.AutoService;
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeName;
-import com.squareup.javapoet.TypeSpec;
-import io.fabric8.kubernetes.api.builder.Function;
-import io.fabric8.kubernetes.client.CustomResourceDoneable;
-import io.javaoperatorsdk.operator.api.ResourceController;
-
-import static io.javaoperatorsdk.operator.config.runtime.ControllerToCustomResourceMappingsProvider.CONTROLLERS_RESOURCE_PATH;
-
 @SupportedAnnotationTypes("io.javaoperatorsdk.operator.api.Controller")
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
 @AutoService(Processor.class)
@@ -101,7 +76,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         annotatedElements.stream()
             .filter(element -> element.getKind().equals(ElementKind.CLASS))
             .map(e -> (TypeElement) e)
-            .forEach(this::generateDoneableClass);
+            .forEach(e -> this.generateDoneableClass(e));
       }
     } finally {
       if (roundEnv.processingOver()) {
diff --git a/runtime-configuration/src/main/java/io/javaoperatorsdk/operator/config/runtime/RuntimeControllerMetadata.java b/runtime-configuration/src/main/java/io/javaoperatorsdk/operator/config/runtime/RuntimeControllerMetadata.java
@@ -0,0 +1,53 @@
+package io.javaoperatorsdk.operator.config.runtime;
+
+import io.fabric8.kubernetes.client.CustomResource;
+import io.fabric8.kubernetes.client.CustomResourceDoneable;
+import io.javaoperatorsdk.operator.api.ResourceController;
+import java.util.Map;
+
+public class RuntimeControllerMetadata {
+
+  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 =
+        ClassMappingProvider.provide(
+            CONTROLLERS_RESOURCE_PATH, ResourceController.class, CustomResource.class);
+    resourceToDoneableMappings =
+        ClassMappingProvider.provide(
+            DONEABLES_RESOURCE_PATH, CustomResource.class, CustomResourceDoneable.class);
+  }
+
+  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;
+  }
+
+  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;
+  }
+}
diff --git a/runtime-configuration/src/test/java/io/javaoperatorsdk/operator/config/runtime/DefaultConfigurationServiceTest.java b/runtime-configuration/src/test/java/io/javaoperatorsdk/operator/config/runtime/DefaultConfigurationServiceTest.java
@@ -1,9 +1,11 @@
 package io.javaoperatorsdk.operator.config.runtime;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.CustomResourceDoneable;
 import io.javaoperatorsdk.operator.api.Context;
 import io.javaoperatorsdk.operator.api.Controller;
@@ -39,33 +41,33 @@ public void returnCustomerFinalizerNameIfSet() {
   }
 
   @Test
-    public void supportsInnerClassCustomResources() {
-        final var controller = new TestCustomFinalizerController();
-        assertDoesNotThrow(
-            () -> {
-                DefaultConfigurationService.instance().getConfigurationFor(controller).getCustomResourceDoneableClass();
-            });
-    }
-    
-    @Controller(crdName = "test.crd", finalizerName = CUSTOM_FINALIZER_NAME)
-  static class TestCustomFinalizerController implements ResourceController<TestCustomFinalizerController.InnerCustomResource> {
-        public class InnerCustomResource extends CustomResource {
-        }
+  public void supportsInnerClassCustomResources() {
+    final var controller = new TestCustomFinalizerController();
+    assertDoesNotThrow(
+        () -> {
+          DefaultConfigurationService.instance().getConfigurationFor(controller).getDoneableClass();
+        });
+  }
+
+  @Controller(crdName = "test.crd", finalizerName = CUSTOM_FINALIZER_NAME)
+  static class TestCustomFinalizerController
+      implements ResourceController<TestCustomFinalizerController.InnerCustomResource> {
+    public class InnerCustomResource extends CustomResource {}
 
     @Override
     public DeleteControl deleteResource(
         TestCustomFinalizerController.InnerCustomResource resource,
-            Context<InnerCustomResource> context) {
+        Context<InnerCustomResource> context) {
       return DeleteControl.DEFAULT_DELETE;
     }
 
     @Override
     public UpdateControl<TestCustomFinalizerController.InnerCustomResource> createOrUpdateResource(
         InnerCustomResource resource, Context<InnerCustomResource> context) {
       return null;
-    
+    }
   }
-}
+
   @Controller(
       generationAwareEventProcessing = false,
       crdName = TestCustomResourceController.CRD_NAME)
diff --git a/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java b/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java
@@ -5,8 +5,6 @@
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.Operator;
-import java.io.IOException;
-import io.javaoperatorsdk.operator.Operator;
 import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService;
 import java.io.IOException;
 import org.slf4j.Logger;
diff --git a/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java
@@ -6,7 +6,6 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.Operator;
 import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService;
-import io.javaoperatorsdk.operator.Operator;
 import java.io.IOException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java b/spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java
@@ -1,11 +1,5 @@
 package io.javaoperatorsdk.operator.springboot.starter;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.CustomResource;
@@ -18,9 +12,11 @@
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.config.RetryConfiguration;
 import io.javaoperatorsdk.operator.config.runtime.AnnotationConfiguration;
-import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
-import io.javaoperatorsdk.operator.processing.retry.Retry;
-import org.apache.commons.lang3.StringUtils;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package io.javaoperatorsdk.operator.api;`
`2`	`2`
`3`	`3`	`public enum DeleteControl {`
`4`		`- DEFAULT_DELETE,`
`5`		`- NO_FINALIZER_REMOVAL`
	`4`	`+ DEFAULT_DELETE,`
	`5`	`+ NO_FINALIZER_REMOVAL`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.javaoperatorsdk.operator.processing.annotation;`
	`1`	`+package io.javaoperatorsdk.operator.config.runtime;`
`2`	`2`
`3`	`3`	`import java.io.BufferedReader;`
`4`	`4`	`import java.io.IOException;`
Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,12 @@ public boolean isGenerationAware() {`
`45`	`45`
`46`	`46`	`@Override`
`47`	`47`	`public Class<R> getCustomResourceClass() {`
`48`		`- return ControllerToCustomResourceMappingsProvider.getCustomResourceClass(controller);`
	`48`	`+ return RuntimeControllerMetadata.getCustomResourceClass(controller);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@Override`
`52`	`52`	`public Class<? extends CustomResourceDoneable<R>> getDoneableClass() {`
`53`		`- return ControllerToCustomResourceMappingsProvider.getDoneableClassFor(getCustomResourceClass());`
	`53`	`+ return RuntimeControllerMetadata.getCustomResourceDoneableClass(controller);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Override`