Skip to content

Commit 6020926

Browse files
authored
improve: generics for prepare event source (#2407)
Signed-off-by: Attila Mészáros <csviri@gmail.com>
1 parent 93c3679 commit 6020926

File tree

33 files changed

+37
-37
lines changed

33 files changed

+37
-37
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ protected void createConfigMap(P resource, Context<P> context) {
7070
}
7171

7272
@Override
73-
public List<EventSource> prepareEventSources(
73+
public List<EventSource<?, P>> prepareEventSources(
7474
EventSourceContext<P> context) {
7575

7676
var boundedItemStore =

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
public class EventSourceUtils {
1111

1212
@SuppressWarnings("unchecked")
13-
public static <R extends HasMetadata> List<EventSource> dependentEventSources(
14-
EventSourceContext<R> eventSourceContext, DependentResource... dependentResources) {
13+
public static <P extends HasMetadata> List<EventSource<?, P>> dependentEventSources(
14+
EventSourceContext<P> eventSourceContext, DependentResource... dependentResources) {
1515
return Arrays.stream(dependentResources)
1616
.flatMap(dr -> dr.eventSource(eventSourceContext).stream()).toList();
1717
}
1818

1919
@SuppressWarnings("unchecked")
20-
public static <K extends HasMetadata> List<EventSource> eventSourcesFromWorkflow(
21-
EventSourceContext<K> context,
22-
Workflow<K> workflow) {
20+
public static <P extends HasMetadata> List<EventSource<?, P>> eventSourcesFromWorkflow(
21+
EventSourceContext<P> context,
22+
Workflow<P> workflow) {
2323
return workflow.getDependentResourcesWithoutActivationCondition().stream()
2424
.flatMap(dr -> dr.eventSource(context).stream()).toList();
2525
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public interface Reconciler<P extends HasMetadata> {
2727
* sources
2828
* @return a list of event sources
2929
*/
30-
default List<EventSource> prepareEventSources(EventSourceContext<P> context) {
30+
default List<EventSource<?, P>> prepareEventSources(EventSourceContext<P> context) {
3131
return Collections.emptyList();
3232
}
3333

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/StandaloneBulkDependentReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public int getNumberOfExecutions() {
3535
}
3636

3737
@Override
38-
public List<EventSource> prepareEventSources(
38+
public List<EventSource<?, BulkDependentTestCustomResource>> prepareEventSources(
3939
EventSourceContext<BulkDependentTestCustomResource> context) {
4040
return List.of(dependent.initEventSource(context));
4141
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class ChangeNamespaceTestReconciler
2020
new ConcurrentHashMap<>();
2121

2222
@Override
23-
public List<EventSource> prepareEventSources(
23+
public List<EventSource<?, ChangeNamespaceTestCustomResource>> prepareEventSources(
2424
EventSourceContext<ChangeNamespaceTestCustomResource> context) {
2525

2626
InformerEventSource<ConfigMap, ChangeNamespaceTestCustomResource> configMapES =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private ConfigMap desired(ClusterScopedCustomResource resource) {
5353
}
5454

5555
@Override
56-
public List<EventSource> prepareEventSources(
56+
public List<EventSource<?, ClusterScopedCustomResource>> prepareEventSources(
5757
EventSourceContext<ClusterScopedCustomResource> context) {
5858
var ies = new InformerEventSource<>(
5959
InformerConfiguration.from(ConfigMap.class, ClusterScopedCustomResource.class)

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/complexdependent/ComplexDependentReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public UpdateControl<ComplexDependentCustomResource> reconcile(
5151
}
5252

5353
@Override
54-
public List<EventSource> prepareEventSources(
54+
public List<EventSource<?, ComplexDependentCustomResource>> prepareEventSources(
5555
EventSourceContext<ComplexDependentCustomResource> context) {
5656
InformerEventSource<Service, ComplexDependentCustomResource> serviceEventSource =
5757
new InformerEventSource<>(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ private ConfigMap createConfigMap(CreateUpdateEventFilterTestCustomResource reso
9090
}
9191

9292
@Override
93-
public List<EventSource> prepareEventSources(
93+
public List<EventSource<?, CreateUpdateEventFilterTestCustomResource>> prepareEventSources(
9494
EventSourceContext<CreateUpdateEventFilterTestCustomResource> context) {
9595
InformerConfiguration<ConfigMap> informerConfiguration =
9696
InformerConfiguration.from(ConfigMap.class, CreateUpdateEventFilterTestCustomResource.class)

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentreinitialization/DependentReInitializationReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public UpdateControl<DependentReInitializationCustomResource> reconcile(
2424
}
2525

2626
@Override
27-
public List<EventSource> prepareEventSources(
27+
public List<EventSource<?, DependentReInitializationCustomResource>> prepareEventSources(
2828
EventSourceContext<DependentReInitializationCustomResource> context) {
2929
return EventSourceUtils.dependentEventSources(context,
3030
configMapDependentResource);

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentssa/DependentSSAReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public int getNumberOfExecutions() {
4747
}
4848

4949
@Override
50-
public List<EventSource> prepareEventSources(
50+
public List<EventSource<?, DependnetSSACustomResource>> prepareEventSources(
5151
EventSourceContext<DependnetSSACustomResource> context) {
5252
return EventSourceUtils.dependentEventSources(context,
5353
ssaConfigMapDependent);

0 commit comments

Comments
 (0)