improve: generics for prepare event source

Signed-off-by: Attila Mészáros <csviri@gmail.com>
operator-framework · May 27, 2024 · e7fbbe6 · e7fbbe6
1 parent 5337e79
commit e7fbbe6
Show file tree

Hide file tree

Showing 33 changed files with 37 additions and 37 deletions.
diff --git a/...javaoperatorsdk/operator/processing/event/source/cache/sample/AbstractTestReconciler.java b/...javaoperatorsdk/operator/processing/event/source/cache/sample/AbstractTestReconciler.java
@@ -70,7 +70,7 @@ protected void createConfigMap(P resource, Context<P> context) {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, P>> prepareEventSources(
       EventSourceContext<P> context) {
 
     var boundedItemStore =

diff --git a/...ework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/EventSourceUtils.java b/...ework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/EventSourceUtils.java
@@ -10,16 +10,16 @@
 public class EventSourceUtils {
 
   @SuppressWarnings("unchecked")
-  public static <R extends HasMetadata> List<EventSource> dependentEventSources(
-      EventSourceContext<R> eventSourceContext, DependentResource... dependentResources) {
+  public static <P extends HasMetadata> List<EventSource<?, P>> dependentEventSources(
+      EventSourceContext<P> eventSourceContext, DependentResource... dependentResources) {
     return Arrays.stream(dependentResources)
         .flatMap(dr -> dr.eventSource(eventSourceContext).stream()).toList();
   }
 
   @SuppressWarnings("unchecked")
-  public static <K extends HasMetadata> List<EventSource> eventSourcesFromWorkflow(
-      EventSourceContext<K> context,
-      Workflow<K> workflow) {
+  public static <P extends HasMetadata> List<EventSource<?, P>> eventSourcesFromWorkflow(
+      EventSourceContext<P> context,
+      Workflow<P> workflow) {
     return workflow.getDependentResourcesWithoutActivationCondition().stream()
         .flatMap(dr -> dr.eventSource(context).stream()).toList();
   }

diff --git a/...r-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Reconciler.java b/...r-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Reconciler.java
@@ -27,7 +27,7 @@ public interface Reconciler<P extends HasMetadata> {
    *        sources
    * @return a list of event sources
    */
-  default List<EventSource> prepareEventSources(EventSourceContext<P> context) {
+  default List<EventSource<?, P>> prepareEventSources(EventSourceContext<P> context) {
     return Collections.emptyList();
   }
 

diff --git a/...a/io/javaoperatorsdk/operator/sample/bulkdependent/StandaloneBulkDependentReconciler.java b/...a/io/javaoperatorsdk/operator/sample/bulkdependent/StandaloneBulkDependentReconciler.java
@@ -35,7 +35,7 @@ public int getNumberOfExecutions() {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, BulkDependentTestCustomResource>> prepareEventSources(
       EventSourceContext<BulkDependentTestCustomResource> context) {
     return List.of(dependent.initEventSource(context));
   }

diff --git a/...ava/io/javaoperatorsdk/operator/sample/changenamespace/ChangeNamespaceTestReconciler.java b/...ava/io/javaoperatorsdk/operator/sample/changenamespace/ChangeNamespaceTestReconciler.java
@@ -20,7 +20,7 @@ public class ChangeNamespaceTestReconciler
       new ConcurrentHashMap<>();
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, ChangeNamespaceTestCustomResource>> prepareEventSources(
       EventSourceContext<ChangeNamespaceTestCustomResource> context) {
 
     InformerEventSource<ConfigMap, ChangeNamespaceTestCustomResource> configMapES =

diff --git a/...ratorsdk/operator/sample/clusterscopedresource/ClusterScopedCustomResourceReconciler.java b/...ratorsdk/operator/sample/clusterscopedresource/ClusterScopedCustomResourceReconciler.java
@@ -53,7 +53,7 @@ private ConfigMap desired(ClusterScopedCustomResource resource) {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, ClusterScopedCustomResource>> prepareEventSources(
       EventSourceContext<ClusterScopedCustomResource> context) {
     var ies = new InformerEventSource<>(InformerConfiguration.from(ConfigMap.class, context)
         .withSecondaryToPrimaryMapper(

diff --git a/.../java/io/javaoperatorsdk/operator/sample/complexdependent/ComplexDependentReconciler.java b/.../java/io/javaoperatorsdk/operator/sample/complexdependent/ComplexDependentReconciler.java
@@ -51,7 +51,7 @@ public UpdateControl<ComplexDependentCustomResource> reconcile(
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, ComplexDependentCustomResource>> prepareEventSources(
       EventSourceContext<ComplexDependentCustomResource> context) {
     InformerEventSource<Service, ComplexDependentCustomResource> serviceEventSource =
         new InformerEventSource<>(SERVICE_EVENT_SOURCE_NAME,

diff --git a/...torsdk/operator/sample/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java b/...torsdk/operator/sample/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java
@@ -90,7 +90,7 @@ private ConfigMap createConfigMap(CreateUpdateEventFilterTestCustomResource reso
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, CreateUpdateEventFilterTestCustomResource>> prepareEventSources(
       EventSourceContext<CreateUpdateEventFilterTestCustomResource> context) {
     InformerConfiguration<ConfigMap> informerConfiguration =
         InformerConfiguration.from(ConfigMap.class, context)

diff --git a/...torsdk/operator/sample/dependentreinitialization/DependentReInitializationReconciler.java b/...torsdk/operator/sample/dependentreinitialization/DependentReInitializationReconciler.java
@@ -24,7 +24,7 @@ public UpdateControl<DependentReInitializationCustomResource> reconcile(
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, DependentReInitializationCustomResource>> prepareEventSources(
       EventSourceContext<DependentReInitializationCustomResource> context) {
     return EventSourceUtils.dependentEventSources(context,
         configMapDependentResource);

diff --git a/...src/test/java/io/javaoperatorsdk/operator/sample/dependentssa/DependentSSAReconciler.java b/...src/test/java/io/javaoperatorsdk/operator/sample/dependentssa/DependentSSAReconciler.java
@@ -47,7 +47,7 @@ public int getNumberOfExecutions() {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, DependnetSSACustomResource>> prepareEventSources(
       EventSourceContext<DependnetSSACustomResource> context) {
     return EventSourceUtils.dependentEventSources(context,
         ssaConfigMapDependent);

diff --git a/...va/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateDependentReconciler.java b/...va/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateDependentReconciler.java
@@ -34,7 +34,7 @@ public int getNumberOfExecutions() {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, ExternalStateCustomResource>> prepareEventSources(
       EventSourceContext<ExternalStateCustomResource> context) {
     var configMapEventSource = new InformerEventSource<>(
         InformerConfiguration.from(ConfigMap.class, context).build(), context);

diff --git a/...c/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateReconciler.java b/...c/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateReconciler.java
@@ -107,7 +107,7 @@ public int getNumberOfExecutions() {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, ExternalStateCustomResource>> prepareEventSources(
       EventSourceContext<ExternalStateCustomResource> context) {
 
     configMapEventSource = new InformerEventSource<>(

diff --git a/...sample/externalstate/externalstatebulkdependent/ExternalStateBulkDependentReconciler.java b/...sample/externalstate/externalstatebulkdependent/ExternalStateBulkDependentReconciler.java
@@ -33,7 +33,7 @@ public int getNumberOfExecutions() {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, ExternalStateBulkDependentCustomResource>> prepareEventSources(
       EventSourceContext<ExternalStateBulkDependentCustomResource> context) {
     var configMapEventSource = new InformerEventSource<>(
         InformerConfiguration.from(ConfigMap.class, context).build(), context);

diff --git a/...amework/src/test/java/io/javaoperatorsdk/operator/sample/filter/FilterTestReconciler.java b/...amework/src/test/java/io/javaoperatorsdk/operator/sample/filter/FilterTestReconciler.java
@@ -49,7 +49,7 @@ public int getNumberOfExecutions() {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, FilterTestCustomResource>> prepareEventSources(
       EventSourceContext<FilterTestCustomResource> context) {
 
     InformerEventSource<ConfigMap, FilterTestCustomResource> configMapES =

diff --git a/.../generickubernetesdependentstandalone/GenericKubernetesDependentStandaloneReconciler.java b/.../generickubernetesdependentstandalone/GenericKubernetesDependentStandaloneReconciler.java
@@ -30,7 +30,7 @@ public UpdateControl<GenericKubernetesDependentStandaloneCustomResource> reconci
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, GenericKubernetesDependentStandaloneCustomResource>> prepareEventSources(
       EventSourceContext<GenericKubernetesDependentStandaloneCustomResource> context) {
     return List.of(dependent.eventSource(context).orElseThrow());
   }

diff --git a/...source/generickubernetesresourcehandling/GenericKubernetesResourceHandlingReconciler.java b/...source/generickubernetesresourcehandling/GenericKubernetesResourceHandlingReconciler.java
@@ -65,7 +65,7 @@ GenericKubernetesResource desiredConfigMap(
 
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, GenericKubernetesResourceHandlingCustomResource>> prepareEventSources(
       EventSourceContext<GenericKubernetesResourceHandlingCustomResource> context) {
 
     var informerEventSource = new InformerEventSource<>(InformerConfiguration.from(

diff --git a/...ratorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java b/...ratorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java
@@ -32,7 +32,7 @@ public class InformerEventSourceTestCustomReconciler
   private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, InformerEventSourceTestCustomResource>> prepareEventSources(
       EventSourceContext<InformerEventSourceTestCustomResource> context) {
 
     InformerConfiguration<ConfigMap> config =

diff --git a/...sample/kubernetesdependentgarbagecollection/DependentGarbageCollectionTestReconciler.java b/...sample/kubernetesdependentgarbagecollection/DependentGarbageCollectionTestReconciler.java
@@ -29,7 +29,7 @@ public DependentGarbageCollectionTestReconciler() {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, DependentGarbageCollectionTestCustomResource>> prepareEventSources(
       EventSourceContext<DependentGarbageCollectionTestCustomResource> context) {
     return EventSourceUtils.dependentEventSources(context, configMapDependent);
   }

diff --git a/...torsdk/operator/sample/multipledependentresource/MultipleDependentResourceReconciler.java b/...torsdk/operator/sample/multipledependentresource/MultipleDependentResourceReconciler.java
@@ -33,7 +33,7 @@ public UpdateControl<MultipleDependentResourceCustomResource> reconcile(
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, MultipleDependentResourceCustomResource>> prepareEventSources(
       EventSourceContext<MultipleDependentResourceCustomResource> context) {
     InformerEventSource<ConfigMap, MultipleDependentResourceCustomResource> eventSource =
         new InformerEventSource<>(InformerConfiguration.from(ConfigMap.class, context)

diff --git a/...endentresourcewithdiscriminator/MultipleDependentResourceWithDiscriminatorReconciler.java b/...endentresourcewithdiscriminator/MultipleDependentResourceWithDiscriminatorReconciler.java
@@ -43,7 +43,7 @@ public int getNumberOfExecutions() {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, MultipleDependentResourceCustomResourceWithDiscriminator>> prepareEventSources(
       EventSourceContext<MultipleDependentResourceCustomResourceWithDiscriminator> context) {
     InformerEventSource<ConfigMap, MultipleDependentResourceCustomResourceWithDiscriminator> eventSource =
         new InformerEventSource<>(InformerConfiguration.from(ConfigMap.class, context)

diff --git a/...edrsametypenodiscriminator/MultipleManagedDependentSameTypeNoDiscriminatorReconciler.java b/...edrsametypenodiscriminator/MultipleManagedDependentSameTypeNoDiscriminatorReconciler.java
@@ -46,7 +46,7 @@ public int getNumberOfExecutions() {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, MultipleManagedDependentNoDiscriminatorCustomResource>> prepareEventSources(
       EventSourceContext<MultipleManagedDependentNoDiscriminatorCustomResource> context) {
     InformerEventSource<ConfigMap, MultipleManagedDependentNoDiscriminatorCustomResource> ies =
         new InformerEventSource<>(CONFIG_MAP_EVENT_SOURCE,

diff --git a/...r/sample/multiplemanageddependentsametype/MultipleManagedDependentResourceReconciler.java b/...r/sample/multiplemanageddependentsametype/MultipleManagedDependentResourceReconciler.java
@@ -46,7 +46,7 @@ public int getNumberOfExecutions() {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, MultipleManagedDependentResourceCustomResource>> prepareEventSources(
       EventSourceContext<MultipleManagedDependentResourceCustomResource> context) {
     InformerEventSource<ConfigMap, MultipleManagedDependentResourceCustomResource> ies =
         new InformerEventSource<>(CONFIG_MAP_EVENT_SOURCE,

diff --git a/...tiplemanagedexternaldependenttype/MultipleManagedExternalDependentResourceReconciler.java b/...tiplemanagedexternaldependenttype/MultipleManagedExternalDependentResourceReconciler.java
@@ -56,7 +56,7 @@ public int getNumberOfExecutions() {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, MultipleManagedExternalDependentResourceCustomResource>> prepareEventSources(
       EventSourceContext<MultipleManagedExternalDependentResourceCustomResource> context) {
 
     final PollingEventSource.GenericResourceFetcher<ExternalResource> fetcher = () -> {

diff --git a/.../operator/sample/multiplesecondaryeventsource/MultipleSecondaryEventSourceReconciler.java b/.../operator/sample/multiplesecondaryeventsource/MultipleSecondaryEventSourceReconciler.java
@@ -61,7 +61,7 @@ public int getNumberOfExecutions() {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, MultipleSecondaryEventSourceCustomResource>> prepareEventSources(
       EventSourceContext<MultipleSecondaryEventSourceCustomResource> context) {
 
     var config = InformerConfiguration.from(ConfigMap.class, context)

diff --git a/...k/operator/sample/perresourceeventsource/PerResourcePollingEventSourceTestReconciler.java b/...k/operator/sample/perresourceeventsource/PerResourcePollingEventSourceTestReconciler.java
@@ -34,7 +34,7 @@ public UpdateControl<PerResourceEventSourceCustomResource> reconcile(
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, PerResourceEventSourceCustomResource>> prepareEventSources(
       EventSourceContext<PerResourceEventSourceCustomResource> context) {
     PerResourcePollingEventSource<String, PerResourceEventSourceCustomResource> eventSource =
         new PerResourcePollingEventSource<>(String.class, context,

diff --git a/.../java/io/javaoperatorsdk/operator/sample/primaryindexer/PrimaryIndexerTestReconciler.java b/.../java/io/javaoperatorsdk/operator/sample/primaryindexer/PrimaryIndexerTestReconciler.java
@@ -16,7 +16,7 @@ public class PrimaryIndexerTestReconciler
     extends AbstractPrimaryIndexerTestReconciler {
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, PrimaryIndexerTestCustomResource>> prepareEventSources(
       EventSourceContext<PrimaryIndexerTestCustomResource> context) {
 
     context.getPrimaryCache().addIndexer(CONFIG_MAP_RELATION_INDEXER, indexer);

diff --git a/...rk/src/test/java/io/javaoperatorsdk/operator/sample/primarytosecondary/JobReconciler.java b/...rk/src/test/java/io/javaoperatorsdk/operator/sample/primarytosecondary/JobReconciler.java
@@ -60,7 +60,7 @@ public UpdateControl<Job> reconcile(
   }
 
   @Override
-  public List<EventSource> prepareEventSources(EventSourceContext<Job> context) {
+  public List<EventSource<?, Job>> prepareEventSources(EventSourceContext<Job> context) {
     context.getPrimaryCache().addIndexer(JOB_CLUSTER_INDEX, (job -> List
         .of(indexKey(job.getSpec().getClusterName(), job.getMetadata().getNamespace()))));
 

diff --git a/...sdk/operator/sample/primarytosecondaydependent/PrimaryToSecondaryDependentReconciler.java b/...sdk/operator/sample/primarytosecondaydependent/PrimaryToSecondaryDependentReconciler.java
@@ -58,7 +58,7 @@ public int getNumberOfExecutions() {
    * demand for it.
    **/
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, PrimaryToSecondaryDependentCustomResource>> prepareEventSources(
       EventSourceContext<PrimaryToSecondaryDependentCustomResource> context) {
     // there is no owner reference in the config map, but we still want to trigger reconciliation if
     // the config map changes. So first we add an index which custom resource references the config

diff --git a/...avaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java b/...avaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java
@@ -31,7 +31,7 @@ public StandaloneDependentTestReconciler() {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(
+  public List<EventSource<?, StandaloneDependentTestCustomResource>> prepareEventSources(
       EventSourceContext<StandaloneDependentTestCustomResource> context) {
     return EventSourceUtils.dependentEventSources(context,
         deploymentDependent);

diff --git a/...rs/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/WebappReconciler.java b/...rs/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/WebappReconciler.java
@@ -45,7 +45,7 @@ public WebappReconciler(KubernetesClient kubernetesClient) {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(EventSourceContext<Webapp> context) {
+  public List<EventSource<?, Webapp>> prepareEventSources(EventSourceContext<Webapp> context) {
     /*
      * To create an event to a related WebApp resource and trigger the reconciliation we need to
      * find which WebApp this Tomcat custom resource is related to. To find the related

diff --git a/...src/main/java/io/javaoperatorsdk/operator/sample/WebPageDependentsWorkflowReconciler.java b/...src/main/java/io/javaoperatorsdk/operator/sample/WebPageDependentsWorkflowReconciler.java
@@ -48,7 +48,7 @@ public WebPageDependentsWorkflowReconciler(KubernetesClient kubernetesClient) {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(EventSourceContext<WebPage> context) {
+  public List<EventSource<?, WebPage>> prepareEventSources(EventSourceContext<WebPage> context) {
     return EventSourceUtils.dependentEventSources(context, configMapDR,
         deploymentDR, serviceDR,
         ingressDR);

diff --git a/...operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java b/...operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java
@@ -39,7 +39,7 @@ public WebPageReconciler() {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(EventSourceContext<WebPage> context) {
+  public List<EventSource<?, WebPage>> prepareEventSources(EventSourceContext<WebPage> context) {
     var configMapEventSource =
         new InformerEventSource<>(InformerConfiguration.from(ConfigMap.class, context)
             .withLabelSelector(SELECTOR)

diff --git a/...c/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java b/...c/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java
@@ -41,7 +41,7 @@ public WebPageStandaloneDependentsReconciler() {
   }
 
   @Override
-  public List<EventSource> prepareEventSources(EventSourceContext<WebPage> context) {
+  public List<EventSource<?, WebPage>> prepareEventSources(EventSourceContext<WebPage> context) {
     // initializes the dependents' event sources from the given context
     return EventSourceUtils.eventSourcesFromWorkflow(context, workflow);
   }