From f205f17f349678a54defbb17a12226ffa8cda217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Mon, 27 May 2024 14:23:57 +0200 Subject: [PATCH] improve: generics for prepare event source MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../source/cache/sample/AbstractTestReconciler.java | 2 +- .../operator/api/reconciler/EventSourceUtils.java | 10 +++++----- .../operator/api/reconciler/Reconciler.java | 2 +- .../StandaloneBulkDependentReconciler.java | 2 +- .../changenamespace/ChangeNamespaceTestReconciler.java | 2 +- .../ClusterScopedCustomResourceReconciler.java | 2 +- .../complexdependent/ComplexDependentReconciler.java | 2 +- .../CreateUpdateEventFilterTestReconciler.java | 2 +- .../DependentReInitializationReconciler.java | 2 +- .../sample/dependentssa/DependentSSAReconciler.java | 2 +- .../ExternalStateDependentReconciler.java | 2 +- .../sample/externalstate/ExternalStateReconciler.java | 2 +- .../ExternalStateBulkDependentReconciler.java | 2 +- .../operator/sample/filter/FilterTestReconciler.java | 2 +- ...GenericKubernetesDependentStandaloneReconciler.java | 2 +- .../GenericKubernetesResourceHandlingReconciler.java | 2 +- .../InformerEventSourceTestCustomReconciler.java | 2 +- .../DependentGarbageCollectionTestReconciler.java | 2 +- .../MultipleDependentResourceReconciler.java | 2 +- ...leDependentResourceWithDiscriminatorReconciler.java | 2 +- ...agedDependentSameTypeNoDiscriminatorReconciler.java | 2 +- .../MultipleManagedDependentResourceReconciler.java | 2 +- ...ipleManagedExternalDependentResourceReconciler.java | 2 +- .../MultipleSecondaryEventSourceReconciler.java | 2 +- .../PerResourcePollingEventSourceTestReconciler.java | 2 +- .../primaryindexer/PrimaryIndexerTestReconciler.java | 2 +- .../sample/primarytosecondary/JobReconciler.java | 2 +- .../PrimaryToSecondaryDependentReconciler.java | 2 +- .../StandaloneDependentTestReconciler.java | 2 +- .../operator/sample/WebappReconciler.java | 2 +- .../sample/WebPageDependentsWorkflowReconciler.java | 2 +- .../operator/sample/WebPageReconciler.java | 2 +- .../sample/WebPageStandaloneDependentsReconciler.java | 2 +- 33 files changed, 37 insertions(+), 37 deletions(-) diff --git a/caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/sample/AbstractTestReconciler.java b/caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/sample/AbstractTestReconciler.java index 18cd486fb2..3c560f11c3 100644 --- a/caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/sample/AbstractTestReconciler.java +++ b/caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/sample/AbstractTestReconciler.java @@ -70,7 +70,7 @@ protected void createConfigMap(P resource, Context

context) { } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext

context) { var boundedItemStore = diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/EventSourceUtils.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/EventSourceUtils.java index 4294fee405..9531599072 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/EventSourceUtils.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/EventSourceUtils.java @@ -10,16 +10,16 @@ public class EventSourceUtils { @SuppressWarnings("unchecked") - public static List dependentEventSources( - EventSourceContext eventSourceContext, DependentResource... dependentResources) { + public static

List> dependentEventSources( + EventSourceContext

eventSourceContext, DependentResource... dependentResources) { return Arrays.stream(dependentResources) .flatMap(dr -> dr.eventSource(eventSourceContext).stream()).toList(); } @SuppressWarnings("unchecked") - public static List eventSourcesFromWorkflow( - EventSourceContext context, - Workflow workflow) { + public static

List> eventSourcesFromWorkflow( + EventSourceContext

context, + Workflow

workflow) { return workflow.getDependentResourcesWithoutActivationCondition().stream() .flatMap(dr -> dr.eventSource(context).stream()).toList(); } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Reconciler.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Reconciler.java index f271652686..1545a87fe9 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Reconciler.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Reconciler.java @@ -27,7 +27,7 @@ public interface Reconciler

{ * sources * @return a list of event sources */ - default List prepareEventSources(EventSourceContext

context) { + default List> prepareEventSources(EventSourceContext

context) { return Collections.emptyList(); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/StandaloneBulkDependentReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/StandaloneBulkDependentReconciler.java index b8feb5c87e..4622fd657c 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/StandaloneBulkDependentReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/StandaloneBulkDependentReconciler.java @@ -35,7 +35,7 @@ public int getNumberOfExecutions() { } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { return List.of(dependent.initEventSource(context)); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/changenamespace/ChangeNamespaceTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/changenamespace/ChangeNamespaceTestReconciler.java index 00750b30b0..0b7559bed9 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/changenamespace/ChangeNamespaceTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/changenamespace/ChangeNamespaceTestReconciler.java @@ -20,7 +20,7 @@ public class ChangeNamespaceTestReconciler new ConcurrentHashMap<>(); @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { InformerEventSource configMapES = diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/clusterscopedresource/ClusterScopedCustomResourceReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/clusterscopedresource/ClusterScopedCustomResourceReconciler.java index ec872bd6b2..9213c9db0f 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/clusterscopedresource/ClusterScopedCustomResourceReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/clusterscopedresource/ClusterScopedCustomResourceReconciler.java @@ -53,7 +53,7 @@ private ConfigMap desired(ClusterScopedCustomResource resource) { } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { var ies = new InformerEventSource<>(InformerConfiguration.from(ConfigMap.class, context) .withSecondaryToPrimaryMapper( diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/complexdependent/ComplexDependentReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/complexdependent/ComplexDependentReconciler.java index d2259faeaf..7797329254 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/complexdependent/ComplexDependentReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/complexdependent/ComplexDependentReconciler.java @@ -51,7 +51,7 @@ public UpdateControl reconcile( } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { InformerEventSource serviceEventSource = new InformerEventSource<>(SERVICE_EVENT_SOURCE_NAME, diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java index 8567f49916..b2e0a8e6ca 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java @@ -90,7 +90,7 @@ private ConfigMap createConfigMap(CreateUpdateEventFilterTestCustomResource reso } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { InformerConfiguration informerConfiguration = InformerConfiguration.from(ConfigMap.class, context) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentreinitialization/DependentReInitializationReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentreinitialization/DependentReInitializationReconciler.java index 75d0a31f41..43b727b8cd 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentreinitialization/DependentReInitializationReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentreinitialization/DependentReInitializationReconciler.java @@ -24,7 +24,7 @@ public UpdateControl reconcile( } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { return EventSourceUtils.dependentEventSources(context, configMapDependentResource); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentssa/DependentSSAReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentssa/DependentSSAReconciler.java index ed138bb0b9..3f5dc53eee 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentssa/DependentSSAReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentssa/DependentSSAReconciler.java @@ -47,7 +47,7 @@ public int getNumberOfExecutions() { } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { return EventSourceUtils.dependentEventSources(context, ssaConfigMapDependent); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateDependentReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateDependentReconciler.java index b9c264ba63..b681d183f7 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateDependentReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateDependentReconciler.java @@ -34,7 +34,7 @@ public int getNumberOfExecutions() { } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { var configMapEventSource = new InformerEventSource<>( InformerConfiguration.from(ConfigMap.class, context).build(), context); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateReconciler.java index 4f7bb0ce5c..1560dbe68c 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateReconciler.java @@ -107,7 +107,7 @@ public int getNumberOfExecutions() { } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { configMapEventSource = new InformerEventSource<>( diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/externalstatebulkdependent/ExternalStateBulkDependentReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/externalstatebulkdependent/ExternalStateBulkDependentReconciler.java index 0da96c2e32..6e2cc9dd4b 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/externalstatebulkdependent/ExternalStateBulkDependentReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/externalstatebulkdependent/ExternalStateBulkDependentReconciler.java @@ -33,7 +33,7 @@ public int getNumberOfExecutions() { } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { var configMapEventSource = new InformerEventSource<>( InformerConfiguration.from(ConfigMap.class, context).build(), context); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/filter/FilterTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/filter/FilterTestReconciler.java index e611968766..64e22d63a8 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/filter/FilterTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/filter/FilterTestReconciler.java @@ -49,7 +49,7 @@ public int getNumberOfExecutions() { } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { InformerEventSource configMapES = diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesresource/generickubernetesdependentstandalone/GenericKubernetesDependentStandaloneReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesresource/generickubernetesdependentstandalone/GenericKubernetesDependentStandaloneReconciler.java index 0d1f5b157a..0f2543ce49 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesresource/generickubernetesdependentstandalone/GenericKubernetesDependentStandaloneReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesresource/generickubernetesdependentstandalone/GenericKubernetesDependentStandaloneReconciler.java @@ -30,7 +30,7 @@ public UpdateControl reconci } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { return List.of(dependent.eventSource(context).orElseThrow()); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesresource/generickubernetesresourcehandling/GenericKubernetesResourceHandlingReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesresource/generickubernetesresourcehandling/GenericKubernetesResourceHandlingReconciler.java index f5c66e8d30..8b0e8253c2 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesresource/generickubernetesresourcehandling/GenericKubernetesResourceHandlingReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesresource/generickubernetesresourcehandling/GenericKubernetesResourceHandlingReconciler.java @@ -65,7 +65,7 @@ GenericKubernetesResource desiredConfigMap( @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { var informerEventSource = new InformerEventSource<>(InformerConfiguration.from( diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java index 232426403d..b60f374ccb 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java @@ -32,7 +32,7 @@ public class InformerEventSourceTestCustomReconciler private final AtomicInteger numberOfExecutions = new AtomicInteger(0); @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { InformerConfiguration config = diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/kubernetesdependentgarbagecollection/DependentGarbageCollectionTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/kubernetesdependentgarbagecollection/DependentGarbageCollectionTestReconciler.java index a4162c09d2..79c050a448 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/kubernetesdependentgarbagecollection/DependentGarbageCollectionTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/kubernetesdependentgarbagecollection/DependentGarbageCollectionTestReconciler.java @@ -28,7 +28,7 @@ public DependentGarbageCollectionTestReconciler() { } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { return EventSourceUtils.dependentEventSources(context, configMapDependent); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentresource/MultipleDependentResourceReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentresource/MultipleDependentResourceReconciler.java index c61d751079..34b537f542 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentresource/MultipleDependentResourceReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentresource/MultipleDependentResourceReconciler.java @@ -33,7 +33,7 @@ public UpdateControl reconcile( } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { InformerEventSource eventSource = new InformerEventSource<>(InformerConfiguration.from(ConfigMap.class, context) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentresourcewithdiscriminator/MultipleDependentResourceWithDiscriminatorReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentresourcewithdiscriminator/MultipleDependentResourceWithDiscriminatorReconciler.java index 9e04af6d24..0454305080 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentresourcewithdiscriminator/MultipleDependentResourceWithDiscriminatorReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentresourcewithdiscriminator/MultipleDependentResourceWithDiscriminatorReconciler.java @@ -43,7 +43,7 @@ public int getNumberOfExecutions() { } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { InformerEventSource eventSource = new InformerEventSource<>(InformerConfiguration.from(ConfigMap.class, context) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledrsametypenodiscriminator/MultipleManagedDependentSameTypeNoDiscriminatorReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledrsametypenodiscriminator/MultipleManagedDependentSameTypeNoDiscriminatorReconciler.java index 6377385b6e..d41bf6535d 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledrsametypenodiscriminator/MultipleManagedDependentSameTypeNoDiscriminatorReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledrsametypenodiscriminator/MultipleManagedDependentSameTypeNoDiscriminatorReconciler.java @@ -46,7 +46,7 @@ public int getNumberOfExecutions() { } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { InformerEventSource ies = new InformerEventSource<>(CONFIG_MAP_EVENT_SOURCE, diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanageddependentsametype/MultipleManagedDependentResourceReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanageddependentsametype/MultipleManagedDependentResourceReconciler.java index 63c22436d8..847148b82c 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanageddependentsametype/MultipleManagedDependentResourceReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanageddependentsametype/MultipleManagedDependentResourceReconciler.java @@ -46,7 +46,7 @@ public int getNumberOfExecutions() { } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { InformerEventSource ies = new InformerEventSource<>(CONFIG_MAP_EVENT_SOURCE, diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanagedexternaldependenttype/MultipleManagedExternalDependentResourceReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanagedexternaldependenttype/MultipleManagedExternalDependentResourceReconciler.java index 614f3a0b59..b073eb30ef 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanagedexternaldependenttype/MultipleManagedExternalDependentResourceReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanagedexternaldependenttype/MultipleManagedExternalDependentResourceReconciler.java @@ -56,7 +56,7 @@ public int getNumberOfExecutions() { } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { final PollingEventSource.GenericResourceFetcher fetcher = () -> { diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplesecondaryeventsource/MultipleSecondaryEventSourceReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplesecondaryeventsource/MultipleSecondaryEventSourceReconciler.java index 88f97a8235..81464de887 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplesecondaryeventsource/MultipleSecondaryEventSourceReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplesecondaryeventsource/MultipleSecondaryEventSourceReconciler.java @@ -61,7 +61,7 @@ public int getNumberOfExecutions() { } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { var config = InformerConfiguration.from(ConfigMap.class, context) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/perresourceeventsource/PerResourcePollingEventSourceTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/perresourceeventsource/PerResourcePollingEventSourceTestReconciler.java index d8dde593ac..89b144da0d 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/perresourceeventsource/PerResourcePollingEventSourceTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/perresourceeventsource/PerResourcePollingEventSourceTestReconciler.java @@ -34,7 +34,7 @@ public UpdateControl reconcile( } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { PerResourcePollingEventSource eventSource = new PerResourcePollingEventSource<>(String.class, context, diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/primaryindexer/PrimaryIndexerTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/primaryindexer/PrimaryIndexerTestReconciler.java index 547c224e55..1360bb678e 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/primaryindexer/PrimaryIndexerTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/primaryindexer/PrimaryIndexerTestReconciler.java @@ -16,7 +16,7 @@ public class PrimaryIndexerTestReconciler extends AbstractPrimaryIndexerTestReconciler { @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { context.getPrimaryCache().addIndexer(CONFIG_MAP_RELATION_INDEXER, indexer); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/primarytosecondary/JobReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/primarytosecondary/JobReconciler.java index 8cd64b95db..98b82e8abd 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/primarytosecondary/JobReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/primarytosecondary/JobReconciler.java @@ -60,7 +60,7 @@ public UpdateControl reconcile( } @Override - public List prepareEventSources(EventSourceContext context) { + public List> prepareEventSources(EventSourceContext context) { context.getPrimaryCache().addIndexer(JOB_CLUSTER_INDEX, (job -> List .of(indexKey(job.getSpec().getClusterName(), job.getMetadata().getNamespace())))); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/primarytosecondaydependent/PrimaryToSecondaryDependentReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/primarytosecondaydependent/PrimaryToSecondaryDependentReconciler.java index a6cf2cef12..1e982207c0 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/primarytosecondaydependent/PrimaryToSecondaryDependentReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/primarytosecondaydependent/PrimaryToSecondaryDependentReconciler.java @@ -58,7 +58,7 @@ public int getNumberOfExecutions() { * demand for it. **/ @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext 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/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java index 5525a866f0..1a4ec0ba01 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java @@ -29,7 +29,7 @@ public StandaloneDependentTestReconciler() { } @Override - public List prepareEventSources( + public List> prepareEventSources( EventSourceContext context) { return EventSourceUtils.dependentEventSources(context, deploymentDependent); diff --git a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/WebappReconciler.java b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/WebappReconciler.java index 79194c7990..c45c28b44e 100644 --- a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/WebappReconciler.java +++ b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/WebappReconciler.java @@ -45,7 +45,7 @@ public WebappReconciler(KubernetesClient kubernetesClient) { } @Override - public List prepareEventSources(EventSourceContext context) { + public List> prepareEventSources(EventSourceContext 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/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageDependentsWorkflowReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageDependentsWorkflowReconciler.java index d8b64db9fd..16d2528bde 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageDependentsWorkflowReconciler.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageDependentsWorkflowReconciler.java @@ -48,7 +48,7 @@ public WebPageDependentsWorkflowReconciler(KubernetesClient kubernetesClient) { } @Override - public List prepareEventSources(EventSourceContext context) { + public List> prepareEventSources(EventSourceContext context) { return EventSourceUtils.dependentEventSources(context, configMapDR, deploymentDR, serviceDR, ingressDR); diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java index 68f55108db..0313ba7f58 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java @@ -39,7 +39,7 @@ public WebPageReconciler() { } @Override - public List prepareEventSources(EventSourceContext context) { + public List> prepareEventSources(EventSourceContext context) { var configMapEventSource = new InformerEventSource<>(InformerConfiguration.from(ConfigMap.class, context) .withLabelSelector(SELECTOR) diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java index 4b71f104f6..8497fc02a6 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java @@ -40,7 +40,7 @@ public WebPageStandaloneDependentsReconciler() { } @Override - public List prepareEventSources(EventSourceContext context) { + public List> prepareEventSources(EventSourceContext context) { // initializes the dependents' event sources from the given context return EventSourceUtils.eventSourcesFromWorkflow(context, workflow); }