improve: followup PR for Informer Pools

caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/sample/AbstractTestReconciler.java

@@ -96,15 +96,14 @@ public List<EventSource<?, P>> prepareEventSources(EventSourceContext<P> context
             1); // setting max size for testing purposes
 
     var es =
-        new InformerEventSource<>(
+        new InformerEventSource<ConfigMap, P>(
             InformerEventSourceConfiguration.from(ConfigMap.class, primaryClass())
                 .withItemStore(boundedItemStore)
                 .withSecondaryToPrimaryMapper(
                     Mappers.fromOwnerReferences(
                         context.getPrimaryResourceClass(),
                         this instanceof BoundedCacheClusterScopeTestReconciler))
-                .build(),
-            context);
+                .build());
 
     return List.of(es);
   }

docs/content/en/docs/documentation/event-filters.md

@@ -84,7 +84,7 @@ public List<EventSource<?, MyCustomResource>> prepareEventSources(
           .withOnAddFilter(cm -> true)
           .build();
 
-  return List.of(new InformerEventSource<>(informerConfiguration, context));
+  return List.of(new InformerEventSource<>(informerConfiguration));
 }
 ```
 

docs/content/en/docs/documentation/eventing.md

@@ -97,7 +97,7 @@ public class WebPageReconciler implements Reconciler<WebPage> {
                 InformerEventSourceConfiguration.from(Deployment.class, WebPage.class)
                         .withLabelSelector(SELECTOR)
                         .build();
-        return List.of(new InformerEventSource<>(configuration, context));
+        return List.of(new InformerEventSource<>(configuration));
     }
 
     // omitted code

docs/content/en/docs/documentation/operations/configuration.md

@@ -84,7 +84,7 @@ public class MyReconciler implements Reconciler<TestCustomResource> {
     InformerEventSource<ConfigMap, TestCustomResource> configMapES =
         new InformerEventSource<>(InformerEventSourceConfiguration.from(ConfigMap.class, TestCustomResource.class)
             .withNamespacesInheritedFromController(context)
-            .build(), context);
+            .build());
 
     return EventSourceUtils.nameEventSources(configMapES);
   }

docs/content/en/docs/documentation/working-with-es-caches.md

@@ -85,8 +85,7 @@ public class WebPageReconciler implements Reconciler<WebPage> {
        configMapEventSource = new InformerEventSource<>(
                 InformerEventSourceConfiguration.from(ConfigMap.class, WebPage.class)
                         .withLabelSelector(SELECTOR)
-                        .build(),
-                context);
+                        .build());
 
         return List.of(configMapEventSource);
     }
@@ -200,7 +199,7 @@ With this index in place, you can retrieve the target resources very efficiently
 ```java
 
   InformerEventSource<Job,Cluster> clusterInformer =
-          new InformerEventSource(
+          new InformerEventSource<>(
         InformerEventSourceConfiguration.from(Cluster.class, Job.class)
             .withSecondaryToPrimaryMapper(
                 cluster ->
@@ -214,7 +213,7 @@ With this index in place, you can retrieve the target resources very efficiently
                         .stream()
                         .map(ResourceID::fromResource)
                         .collect(Collectors.toSet()))
-            .withNamespacesInheritedFromController().build(), context);
+            .withNamespacesInheritedFromController().build());
 ```
 
 ## Read-cache-after-write consistency and event filtering

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

@@ -30,7 +30,6 @@
 import io.javaoperatorsdk.operator.api.monitoring.Metrics;
 import io.javaoperatorsdk.operator.api.reconciler.Experimental;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResourceFactory;
-import io.javaoperatorsdk.operator.processing.event.source.informer.pool.AbstractInformerPool;
 import io.javaoperatorsdk.operator.processing.event.source.informer.pool.InformerPool;
 
 @SuppressWarnings({"unused", "UnusedReturnValue"})
@@ -184,13 +183,13 @@ public ConfigurationServiceOverrider withCloneSecondaryResourcesWhenGettingFromC
    * Overrides the informer pool strategy used to create/share the informers backing the event
    * sources. When not set, the default (informer-sharing) pool is used.
    *
-   * <p>Custom strategies extend {@link AbstractInformerPool}, which already takes care of creating
-   * and starting the informers.
+   * <p>Custom strategies implement {@link InformerPool}, which already takes care of creating and
+   * starting the informers.
    */
   @Experimental(
       "Only the configuration API around informer pooling could still change in a"
           + " non-backwards-compatible way, the pooling itself is prod ready.")
-  public ConfigurationServiceOverrider withInformerPool(AbstractInformerPool informerPool) {
+  public ConfigurationServiceOverrider withInformerPool(InformerPool informerPool) {
     this.informerPool = informerPool;
     return this;
   }

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

@@ -76,7 +76,10 @@ default boolean followControllerNamespaceChanges() {
 
   <P extends HasMetadata> PrimaryToSecondaryMapper<P> getPrimaryToSecondaryMapper();
 
-  // todo deprecate
+  /**
+   * @deprecated use {@link InformerConfiguration#getResourceGroupVersionKind()}
+   */
+  @Deprecated(forRemoval = true)
   Optional<GroupVersionKind> getGroupVersionKind();
 
   default String name() {

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

@@ -220,7 +220,7 @@ protected InformerEventSource<R, P> createEventSource(EventSourceContext<P> cont
       configBuilder.updateFrom(kubernetesDependentResourceConfig.informerConfig());
     }
 
-    var es = new InformerEventSource<>(configBuilder.build(), context);
+    var es = new InformerEventSource<R, P>(configBuilder.build());
     setEventSource(es);
     return eventSource().orElseThrow();
   }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java

@@ -53,9 +53,8 @@ public class InformerEventSource<R extends HasMetadata, P extends HasMetadata>
   private final PrimaryToSecondaryMapper<P> primaryToSecondaryMapper;
 
   /**
-   * @deprecated use {@link InformerEventSource(InformerEventSourceConfiguration)}
+   * @deprecated use {@link #InformerEventSource(InformerEventSourceConfiguration)}
    */
-  // todo migrate sample, separate PR?
   @Deprecated(forRemoval = true)
   public InformerEventSource(
       InformerEventSourceConfiguration<R> configuration, EventSourceContext<P> context) {

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/changenamespace/ChangeNamespaceTestReconciler.java

@@ -42,8 +42,7 @@ public List<EventSource<?, ChangeNamespaceTestCustomResource>> prepareEventSourc
         new InformerEventSource<>(
             InformerEventSourceConfiguration.from(
                     ConfigMap.class, ChangeNamespaceTestCustomResource.class)
-                .build(),
-            context);
+                .build());
 
     return List.of(configMapES);
   }

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/clusterscopedresource/ClusterScopedCustomResourceReconciler.java

@@ -79,14 +79,13 @@ private ConfigMap desired(ClusterScopedCustomResource resource) {
   public List<EventSource<?, ClusterScopedCustomResource>> prepareEventSources(
       EventSourceContext<ClusterScopedCustomResource> context) {
     var ies =
-        new InformerEventSource<>(
+        new InformerEventSource<ConfigMap, ClusterScopedCustomResource>(
             InformerEventSourceConfiguration.from(
                     ConfigMap.class, ClusterScopedCustomResource.class)
                 .withSecondaryToPrimaryMapper(
                     Mappers.fromOwnerReferences(context.getPrimaryResourceClass(), true))
                 .withLabelSelector(TEST_LABEL_KEY + "=" + TEST_LABEL_VALUE)
-                .build(),
-            context);
+                .build());
     return List.of(ies);
   }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java

@@ -102,7 +102,9 @@ public List<EventSource<?, CreateUpdateEventFilterTestCustomResource>> prepareEv
             .withComparableResourceVersion(comparableResourceVersion)
             .build();
 
-    final var informerEventSource = new InformerEventSource<>(informerConfiguration, context);
+    final var informerEventSource =
+        new InformerEventSource<ConfigMap, CreateUpdateEventFilterTestCustomResource>(
+            informerConfiguration);
     this.configMapDR.setEventSource(informerEventSource);
 
     return List.of(informerEventSource);

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/dynamicgenericeventsourceregistration/DynamicGenericEventSourceRegistrationReconciler.java

@@ -45,10 +45,8 @@ public UpdateControl<DynamicGenericEventSourceRegistrationCustomResource> reconc
 
     context
         .eventSourceRetriever()
-        .dynamicallyRegisterEventSource(genericInformerFor(ConfigMap.class, context));
-    context
-        .eventSourceRetriever()
-        .dynamicallyRegisterEventSource(genericInformerFor(Secret.class, context));
+        .dynamicallyRegisterEventSource(genericInformerFor(ConfigMap.class));
+    context.eventSourceRetriever().dynamicallyRegisterEventSource(genericInformerFor(Secret.class));
 
     context.getClient().resource(secret(primary)).createOr(NonDeletingOperation::update);
     context.getClient().resource(configMap(primary)).createOr(NonDeletingOperation::update);
@@ -89,17 +87,14 @@ private ConfigMap configMap(DynamicGenericEventSourceRegistrationCustomResource
 
   private InformerEventSource<
           GenericKubernetesResource, DynamicGenericEventSourceRegistrationCustomResource>
-      genericInformerFor(
-          Class<? extends HasMetadata> clazz,
-          Context<DynamicGenericEventSourceRegistrationCustomResource> context) {
+      genericInformerFor(Class<? extends HasMetadata> clazz) {
 
     return new InformerEventSource<>(
         InformerEventSourceConfiguration.from(
                 GroupVersionKind.gvkFor(clazz),
                 DynamicGenericEventSourceRegistrationCustomResource.class)
             .withName(clazz.getSimpleName())
-            .build(),
-        context.eventSourceRetriever().eventSourceContextForDynamicRegistration());
+            .build());
   }
 
   public int getNumberOfExecutions() {

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/onallevent/ExpectationReconciler.java

@@ -103,8 +103,7 @@ public List<EventSource<?, ExpectationCustomResource>> prepareEventSources(
     return List.of(
         new InformerEventSource<>(
             InformerEventSourceConfiguration.from(Deployment.class, ExpectationCustomResource.class)
-                .build(),
-            context));
+                .build()));
   }
 
   private static void createDeployment(

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/periodicclean/PeriodicCleanerExpectationReconciler.java

@@ -128,8 +128,7 @@ public List<EventSource<?, PeriodicCleanerExpectationCustomResource>> prepareEve
         new InformerEventSource<>(
             InformerEventSourceConfiguration.from(
                     Deployment.class, PeriodicCleanerExpectationCustomResource.class)
-                .build(),
-            context));
+                .build()));
   }
 
   private static void createDeployment(

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/fieldselector/FieldSelectorTestReconciler.java

@@ -72,8 +72,7 @@ public List<EventSource<?, Secret>> prepareEventSources(EventSourceContext<Secre
                 .withNamespacesInheritedFromController()
                 .withFieldSelector(
                     new FieldSelectorBuilder().withField("type", OTHER_SECRET_TYPE).build())
-                .build(),
-            context);
+                .build());
 
     return List.of(dependentSecretEventSource);
   }

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/filter/FilterTestReconciler.java

@@ -80,7 +80,7 @@ public List<EventSource<?, FilterTestCustomResource>> prepareEventSources(
                     !newCM.getData().get(CM_VALUE_KEY).equals(CONFIG_MAP_FILTER_VALUE))
             .build();
     InformerEventSource<ConfigMap, FilterTestCustomResource> configMapES =
-        new InformerEventSource<>(informerConfiguration, context);
+        new InformerEventSource<>(informerConfiguration);
 
     return List.of(configMapES);
   }

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/generickubernetesresourcehandling/GenericKubernetesResourceHandlingReconciler.java

@@ -66,12 +66,12 @@ public List<EventSource<?, GenericKubernetesResourceHandlingCustomResource>> pre
       EventSourceContext<GenericKubernetesResourceHandlingCustomResource> context) {
 
     var informerEventSource =
-        new InformerEventSource<>(
+        new InformerEventSource<
+            GenericKubernetesResource, GenericKubernetesResourceHandlingCustomResource>(
             InformerEventSourceConfiguration.from(
                     new GroupVersionKind("", VERSION, KIND),
                     GenericKubernetesResourceHandlingCustomResource.class)
-                .build(),
-            context);
+                .build());
 
     return List.of(informerEventSource);
   }

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informereventsource/InformerEventSourceTestCustomReconciler.java

@@ -61,7 +61,7 @@ public List<EventSource<?, InformerEventSourceTestCustomResource>> prepareEventS
                     InformerEventSourceTestCustomResource.class))
             .build();
 
-    return List.of(new InformerEventSource<>(config, context));
+    return List.of(new InformerEventSource<>(config));
   }
 
   @Override

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/basic/SharedInformerReconciler1.java

@@ -45,7 +45,7 @@ public List<EventSource<?, SharedInformerCustomResource1>> prepareEventSources(
     var config =
         InformerEventSourceConfiguration.from(ConfigMap.class, SharedInformerCustomResource1.class)
             .build();
-    return List.of(new InformerEventSource<>(config, context));
+    return List.of(new InformerEventSource<>(config));
   }
 
   @Override

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/basic/SharedInformerReconciler2.java

@@ -44,7 +44,7 @@ public List<EventSource<?, SharedInformerCustomResource2>> prepareEventSources(
     var config =
         InformerEventSourceConfiguration.from(ConfigMap.class, SharedInformerCustomResource2.class)
             .build();
-    return List.of(new InformerEventSource<>(config, context));
+    return List.of(new InformerEventSource<>(config));
   }
 
   @Override

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/deregister/DeregisterReconciler.java

@@ -45,7 +45,7 @@ public UpdateControl<DeregisterPrimaryCustomResource> reconcile(
     numberOfExecutions.incrementAndGet();
 
     if (primary.getSpec() != null && primary.getSpec().isRegisterEventSource()) {
-      context.eventSourceRetriever().dynamicallyRegisterEventSource(watchedEventSource(context));
+      context.eventSourceRetriever().dynamicallyRegisterEventSource(watchedEventSource());
     } else {
       context.eventSourceRetriever().dynamicallyDeRegisterEventSource(WATCHED_EVENT_SOURCE_NAME);
     }
@@ -54,7 +54,7 @@ public UpdateControl<DeregisterPrimaryCustomResource> reconcile(
   }
 
   private InformerEventSource<DeregisterWatchedCustomResource, DeregisterPrimaryCustomResource>
-      watchedEventSource(Context<DeregisterPrimaryCustomResource> context) {
+      watchedEventSource() {
     var config =
         InformerEventSourceConfiguration.from(
                 DeregisterWatchedCustomResource.class, DeregisterPrimaryCustomResource.class)
@@ -63,8 +63,7 @@ public UpdateControl<DeregisterPrimaryCustomResource> reconcile(
                 (DeregisterWatchedCustomResource watched) ->
                     Set.of(new ResourceID("ignored", watched.getMetadata().getNamespace())))
             .build();
-    return new InformerEventSource<>(
-        config, context.eventSourceRetriever().eventSourceContextForDynamicRegistration());
+    return new InformerEventSource<>(config);
   }
 
   public int getNumberOfExecutions() {

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/dynamic/DynamicSharedInformerReconciler.java

@@ -53,15 +53,13 @@ public UpdateControl<DynamicSharedInformerPrimaryCustomResource2> reconcile(
       DynamicSharedInformerPrimaryCustomResource2 resource,
       Context<DynamicSharedInformerPrimaryCustomResource2> context) {
     numberOfExecutions.incrementAndGet();
-    context
-        .eventSourceRetriever()
-        .dynamicallyRegisterEventSource(thirdResourceEventSource(context));
+    context.eventSourceRetriever().dynamicallyRegisterEventSource(thirdResourceEventSource());
     return UpdateControl.noUpdate();
   }
 
   private InformerEventSource<
           DynamicSharedInformerThirdCustomResource, DynamicSharedInformerPrimaryCustomResource2>
-      thirdResourceEventSource(Context<DynamicSharedInformerPrimaryCustomResource2> context) {
+      thirdResourceEventSource() {
     var config =
         InformerEventSourceConfiguration.from(
                 DynamicSharedInformerThirdCustomResource.class,
@@ -71,8 +69,7 @@ public UpdateControl<DynamicSharedInformerPrimaryCustomResource2> reconcile(
                 (DynamicSharedInformerThirdCustomResource third) ->
                     Set.of(new ResourceID(PRIMARY_NAME, third.getMetadata().getNamespace())))
             .build();
-    return new InformerEventSource<>(
-        config, context.eventSourceRetriever().eventSourceContextForDynamicRegistration());
+    return new InformerEventSource<>(config);
   }
 
   public int getNumberOfExecutions() {

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/dynamic/StaticSharedInformerReconciler.java

@@ -56,7 +56,7 @@ public List<EventSource<?, DynamicSharedInformerPrimaryCustomResource1>> prepare
                 (DynamicSharedInformerThirdCustomResource third) ->
                     Set.of(new ResourceID(PRIMARY_NAME, third.getMetadata().getNamespace())))
             .build();
-    return List.of(new InformerEventSource<>(config, context));
+    return List.of(new InformerEventSource<>(config));
   }
 
   @Override

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerremotecluster/InformerRemoteClusterReconciler.java

@@ -70,7 +70,7 @@ public List<EventSource<?, InformerRemoteClusterCustomResource>> prepareEventSou
       EventSourceContext<InformerRemoteClusterCustomResource> context) {
 
     var es =
-        new InformerEventSource<>(
+        new InformerEventSource<ConfigMap, InformerRemoteClusterCustomResource>(
             InformerEventSourceConfiguration.from(
                     ConfigMap.class, InformerRemoteClusterCustomResource.class)
                 // owner references do not work cross cluster, using
@@ -80,8 +80,7 @@ public List<EventSource<?, InformerRemoteClusterCustomResource>> prepareEventSou
                 // setting remote client for informer
                 .withKubernetesClient(remoteClient)
                 .withWatchAllNamespaces()
-                .build(),
-            context);
+                .build());
 
     return List.of(es);
   }

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/latestdistinct/LatestDistinctTestReconciler.java

@@ -126,9 +126,7 @@ public List<EventSource<?, LatestDistinctTestResource>> prepareEventSources(
                             cm.getMetadata().getNamespace())))
             .build();
 
-    return List.of(
-        new InformerEventSource<>(configEs1, context),
-        new InformerEventSource<>(configEs2, context));
+    return List.of(new InformerEventSource<>(configEs1), new InformerEventSource<>(configEs2));
   }
 
   @Override

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/multiplesecondaryeventsource/MultipleSecondaryEventSourceReconciler.java

@@ -87,7 +87,7 @@ public List<EventSource<?, MultipleSecondaryEventSourceCustomResource>> prepareE
                 })
             .build();
     InformerEventSource<ConfigMap, MultipleSecondaryEventSourceCustomResource>
-        configMapEventSource = new InformerEventSource<>(config, context);
+        configMapEventSource = new InformerEventSource<>(config);
     return List.of(configMapEventSource);
   }