refactor: rename InformerConfig and associated field to Informer

Signed-off-by: Chris Laprun <[email protected]>

Author: metacosm

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

@@ -276,7 +276,7 @@ private <P extends HasMetadata> ResolvedControllerConfiguration<P> controllerCon
             : fieldManager;
 
     InformerConfigHolder<P> informerConfig = InformerConfigHolder.builder(resourceClass)
-        .initFromAnnotation(annotation != null ? annotation.informerConfig() : null, context)
+        .initFromAnnotation(annotation != null ? annotation.informer() : null, context)
         .buildForController();
 
     return new ResolvedControllerConfiguration<P>(

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfig.java renamed to operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/Informer.java

@@ -19,7 +19,7 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
-public @interface InformerConfig {
+public @interface Informer {
 
   String name() default NO_VALUE_SET;
 

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

@@ -134,7 +134,7 @@ public InformerConfigHolder<R> buildForInformerEventSource() {
     }
 
     @SuppressWarnings({"unchecked"})
-    public InformerConfigHolder<R>.Builder initFromAnnotation(InformerConfig informerConfig,
+    public InformerConfigHolder<R>.Builder initFromAnnotation(Informer informerConfig,
         String context) {
       if (informerConfig != null) {
 

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ControllerConfiguration.java

@@ -6,7 +6,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
+import io.javaoperatorsdk.operator.api.config.informer.Informer;
 import io.javaoperatorsdk.operator.processing.event.rate.LinearRateLimiter;
 import io.javaoperatorsdk.operator.processing.event.rate.RateLimiter;
 import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
@@ -21,7 +21,7 @@
 
   String name() default Constants.NO_VALUE_SET;
 
-  InformerConfig informerConfig() default @InformerConfig;
+  Informer informer() default @Informer;
 
   /**
    * Optional finalizer name, if it is not provided, one will be automatically generated. Note that

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependent.java

@@ -5,7 +5,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
+import io.javaoperatorsdk.operator.api.config.informer.Informer;
 
 
 
@@ -30,6 +30,6 @@
    */
   BooleanWithUndefined useSSA() default BooleanWithUndefined.UNDEFINED;
 
-  InformerConfig informerConfig() default @InformerConfig;
+  Informer informer() default @Informer;
 
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentConverter.java

@@ -45,7 +45,7 @@ private InformerConfigHolder<R> createInformerConfig(
 
     InformerConfigHolder<R>.Builder config = InformerConfigHolder.builder();
     if (configAnnotation != null) {
-      final var informerConfig = configAnnotation.informerConfig();
+      final var informerConfig = configAnnotation.informer();
       final var context = Utils.contextFor(controllerConfig, dependentResourceClass,
           configAnnotation.annotationType());
       config = config.initFromAnnotation(informerConfig, context);

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java

@@ -11,7 +11,7 @@
 import io.fabric8.kubernetes.client.informers.cache.BasicItemStore;
 import io.fabric8.kubernetes.client.informers.cache.Cache;
 import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceConfigurationResolver;
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
+import io.javaoperatorsdk.operator.api.config.informer.Informer;
 import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
 import io.javaoperatorsdk.operator.api.reconciler.Constants;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
@@ -304,7 +304,7 @@ public MyItemStore() {
   }
 
   @ControllerConfiguration(
-      informerConfig = @InformerConfig(namespaces = "foo", itemStore = MyItemStore.class))
+      informer = @Informer(namespaces = "foo", itemStore = MyItemStore.class))
   private static class WatchCurrentReconciler implements Reconciler<ConfigMap> {
 
     @Override
@@ -346,7 +346,7 @@ public boolean isMet(DependentResource<ConfigMap, ConfigMap> dependentResource,
   @Workflow(dependents = @Dependent(type = ReadOnlyDependent.class,
       readyPostcondition = TestCondition.class))
   @ControllerConfiguration(
-      informerConfig = @InformerConfig(namespaces = OneDepReconciler.CONFIGURED_NS))
+      informer = @Informer(namespaces = OneDepReconciler.CONFIGURED_NS))
   private static class OneDepReconciler implements Reconciler<ConfigMap> {
 
     private static final String CONFIGURED_NS = "foo";
@@ -366,7 +366,7 @@ public ReadOnlyDependent() {
   }
 
   @KubernetesDependent(
-      informerConfig = @InformerConfig(namespaces = Constants.WATCH_ALL_NAMESPACES))
+      informer = @Informer(namespaces = Constants.WATCH_ALL_NAMESPACES))
   public static class WatchAllNSDependent
       extends KubernetesDependentResource<ConfigMap, ConfigMap>
       implements GarbageCollected<ConfigMap> {
@@ -378,7 +378,7 @@ public WatchAllNSDependent() {
 
   @Workflow(dependents = @Dependent(type = OverriddenNSDependent.class))
   @ControllerConfiguration(
-      informerConfig = @InformerConfig(namespaces = OverriddenNSOnDepReconciler.CONFIGURED_NS))
+      informer = @Informer(namespaces = OverriddenNSOnDepReconciler.CONFIGURED_NS))
   public static class OverriddenNSOnDepReconciler implements Reconciler<ConfigMap> {
 
     private static final String CONFIGURED_NS = "parentNS";
@@ -389,7 +389,7 @@ public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap>
     }
   }
 
-  @KubernetesDependent(informerConfig = @InformerConfig(namespaces = OverriddenNSDependent.DEP_NS))
+  @KubernetesDependent(informer = @Informer(namespaces = OverriddenNSDependent.DEP_NS))
   public static class OverriddenNSDependent
       extends KubernetesDependentResource<ConfigMap, ConfigMap>
       implements GarbageCollected<ConfigMap> {

operator-framework/src/test/java/io/javaoperatorsdk/operator/config/BaseConfigurationServiceTest.java

@@ -19,7 +19,7 @@
 import io.javaoperatorsdk.operator.api.config.dependent.ConfigurationConverter;
 import io.javaoperatorsdk.operator.api.config.dependent.Configured;
 import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
+import io.javaoperatorsdk.operator.api.config.informer.Informer;
 import io.javaoperatorsdk.operator.api.reconciler.Constants;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
@@ -252,7 +252,7 @@ public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap>
 
   @Workflow(dependents = @Dependent(type = ReadOnlyDependent.class))
   @ControllerConfiguration(
-      informerConfig = @InformerConfig(namespaces = OneDepReconciler.CONFIGURED_NS))
+      informer = @Informer(namespaces = OneDepReconciler.CONFIGURED_NS))
   private static class OneDepReconciler implements Reconciler<ConfigMap> {
 
     private static final String CONFIGURED_NS = "foo";

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/builtinresourcecleaner/ObservedGenerationTestReconciler.java

@@ -3,10 +3,10 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import io.fabric8.kubernetes.api.model.Service;
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
+import io.javaoperatorsdk.operator.api.config.informer.Informer;
 import io.javaoperatorsdk.operator.api.reconciler.*;
 
-@ControllerConfiguration(informerConfig = @InformerConfig(labelSelector = "builtintest=true"))
+@ControllerConfiguration(informer = @Informer(labelSelector = "builtintest=true"))
 public class ObservedGenerationTestReconciler
     implements Reconciler<Service>, Cleaner<Service> {
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentfilter/DependentFilterTestReconciler.java

@@ -2,12 +2,12 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
+import io.javaoperatorsdk.operator.api.config.informer.Informer;
 import io.javaoperatorsdk.operator.api.reconciler.*;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
 
 @Workflow(dependents = {@Dependent(type = FilteredDependentConfigMap.class)})
-@ControllerConfiguration(informerConfig = @InformerConfig(onUpdateFilter = UpdateFilter.class))
+@ControllerConfiguration(informer = @Informer(onUpdateFilter = UpdateFilter.class))
 public class DependentFilterTestReconciler
     implements Reconciler<DependentFilterTestCustomResource> {