refactor: use DefaultResourceConfiguration for controller configuration

Author: metacosm

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

@@ -8,21 +8,17 @@
 import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceEventFilter;
 
 public class DefaultControllerConfiguration<R extends HasMetadata>
+    extends DefaultResourceConfiguration<R>
     implements ControllerConfiguration<R> {
 
   private final String associatedControllerClassName;
   private final String name;
   private final String crdName;
   private final String finalizer;
   private final boolean generationAware;
-  private final Set<String> namespaces;
-  private final boolean watchAllNamespaces;
   private final RetryConfiguration retryConfiguration;
-  private final String labelSelector;
   private final ResourceEventFilter<R> resourceEventFilter;
-  private final Class<R> resourceClass;
   private final List<DependentResource> dependents;
-  private ConfigurationService service;
 
   // NOSONAR constructor is meant to provide all information
   public DefaultControllerConfiguration(
@@ -38,23 +34,18 @@ public DefaultControllerConfiguration(
       Class<R> resourceClass,
       ConfigurationService service,
       List<DependentResource> dependents) {
+    super(labelSelector, resourceClass, namespaces);
     this.associatedControllerClassName = associatedControllerClassName;
     this.name = name;
     this.crdName = crdName;
     this.finalizer = finalizer;
     this.generationAware = generationAware;
-    this.namespaces =
-        namespaces != null ? Collections.unmodifiableSet(namespaces) : Collections.emptySet();
-    this.watchAllNamespaces = this.namespaces.isEmpty();
     this.retryConfiguration =
         retryConfiguration == null
             ? ControllerConfiguration.super.getRetryConfiguration()
             : retryConfiguration;
-    this.labelSelector = labelSelector;
     this.resourceEventFilter = resourceEventFilter;
-    this.resourceClass =
-        resourceClass == null ? ControllerConfiguration.super.getResourceClass()
-            : resourceClass;
+
     setConfigurationService(service);
     this.dependents = dependents != null ? dependents : Collections.emptyList();
   }
@@ -84,43 +75,19 @@ public String getAssociatedReconcilerClassName() {
     return associatedControllerClassName;
   }
 
-  @Override
-  public Set<String> getNamespaces() {
-    return namespaces;
-  }
-
-  @Override
-  public boolean watchAllNamespaces() {
-    return watchAllNamespaces;
-  }
-
   @Override
   public RetryConfiguration getRetryConfiguration() {
     return retryConfiguration;
   }
 
-  @Override
-  public ConfigurationService getConfigurationService() {
-    return service;
-  }
 
   @Override
   public void setConfigurationService(ConfigurationService service) {
-    if (this.service != null) {
+    if (getConfigurationService() != null) {
       throw new IllegalStateException("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> getResourceClass() {
-    return resourceClass;
+    super.setConfigurationService(service);
   }
 
   @Override

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

@@ -23,7 +23,8 @@ public DefaultResourceConfiguration(String labelSelector, Class<R> resourceClass
   public DefaultResourceConfiguration(String labelSelector, Class<R> resourceClass,
       Set<String> namespaces) {
     this.labelSelector = labelSelector;
-    this.resourceClass = resourceClass;
+    this.resourceClass = resourceClass == null ? ResourceConfiguration.super.getResourceClass()
+        : resourceClass;
     this.namespaces = namespaces != null ? namespaces : Collections.emptySet();
     this.watchAllNamespaces = this.namespaces.isEmpty();
   }