feat: make AbstractControllerConfiguration directly usable

Obviously, it should be renamed to something else since it's not
abstract anymore but doing so would break backwards compatibility so
best left for some later time.

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/AbstractControllerConfiguration.java

@@ -5,7 +5,7 @@
 
 import io.fabric8.kubernetes.client.CustomResource;
 
-public abstract class AbstractControllerConfiguration<R extends CustomResource<?, ?>>
+public class AbstractControllerConfiguration<R extends CustomResource<?, ?>>
     implements ControllerConfiguration<R> {
 
   private final String associatedControllerClassName;
@@ -17,6 +17,7 @@ public abstract class AbstractControllerConfiguration<R extends CustomResource<?
   private final boolean watchAllNamespaces;
   private final RetryConfiguration retryConfiguration;
   private final String labelSelector;
+  private Class<R> customResourceClass;
   private ConfigurationService service;
 
   public AbstractControllerConfiguration(
@@ -27,7 +28,9 @@ public AbstractControllerConfiguration(
       boolean generationAware,
       Set<String> namespaces,
       RetryConfiguration retryConfiguration,
-      String labelSelector) {
+      String labelSelector,
+      Class<R> customResourceClass,
+      ConfigurationService service) {
     this.associatedControllerClassName = associatedControllerClassName;
     this.name = name;
     this.crdName = crdName;
@@ -41,11 +44,15 @@ public AbstractControllerConfiguration(
             ? ControllerConfiguration.super.getRetryConfiguration()
             : retryConfiguration;
     this.labelSelector = labelSelector;
+    this.customResourceClass =
+        customResourceClass == null ? ControllerConfiguration.super.getCustomResourceClass()
+            : customResourceClass;
+    setConfigurationService(service);
   }
 
   /**
    * @deprecated use
-   *             {@link #AbstractControllerConfiguration(String, String, String, String, boolean, Set, RetryConfiguration, String)}
+   *             {@link #AbstractControllerConfiguration(String, String, String, String, boolean, Set, RetryConfiguration, String, Class, ConfigurationService)}
    *             instead
    */
   @Deprecated
@@ -58,7 +65,7 @@ public AbstractControllerConfiguration(
       Set<String> namespaces,
       RetryConfiguration retryConfiguration) {
     this(associatedControllerClassName, name, crdName, finalizer, generationAware, namespaces,
-        retryConfiguration, null);
+        retryConfiguration, null, null, null);
   }
 
   @Override
@@ -108,11 +115,20 @@ public ConfigurationService getConfigurationService() {
 
   @Override
   public void setConfigurationService(ConfigurationService service) {
+    if (this.service != null) {
+      throw new RuntimeException("A ConfigurationService is already associated with '" + name
+          + "' ControllerConfiguration. Cannot change it once set!");
+    }
     this.service = service;
   }
 
   @Override
   public String getLabelSelector() {
     return labelSelector;
   }
+
+  @Override
+  public Class<R> getCustomResourceClass() {
+    return customResourceClass;
+  }
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverrider.java

@@ -74,17 +74,9 @@ public ControllerConfiguration<R> build() {
         generationAware,
         namespaces,
         retry,
-        labelSelector) {
-      @Override
-      public Class<R> getCustomResourceClass() {
-        return original.getCustomResourceClass();
-      }
-
-      @Override
-      public ConfigurationService getConfigurationService() {
-        return original.getConfigurationService();
-      }
-    };
+        labelSelector,
+        original.getCustomResourceClass(),
+        original.getConfigurationService());
   }
 
   public static <R extends CustomResource<?, ?>> ControllerConfigurationOverrider<R> override(

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceEventSourceTest.java

@@ -115,12 +115,12 @@ public MixedOperation<TestCustomResource, KubernetesResourceList<TestCustomResou
   private static class TestConfiguration extends
       AbstractControllerConfiguration<TestCustomResource> {
 
-    final ConfigurationService service = mock(ConfigurationService.class);
-
     public TestConfiguration(boolean generationAware) {
-      super(null, null, null, FINALIZER, generationAware, null, null, null);
-      when(service.getObjectMapper()).thenReturn(ConfigurationService.OBJECT_MAPPER);
-      setConfigurationService(service);
+      super(null, null, null, FINALIZER, generationAware, null, null, null,
+          TestCustomResource.class,
+          mock(ConfigurationService.class));
+      when(getConfigurationService().getObjectMapper())
+          .thenReturn(ConfigurationService.OBJECT_MAPPER);
     }
   }
 }