Skip to content

Commit 03b6d0d

Browse files
committed
revert: prepareEventSources should return map of EventSources
1 parent 9ad55d1 commit 03b6d0d

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ public interface EventSourceInitializer<P extends HasMetadata> {
2121
* sources
2222
* @return a map of event sources to register
2323
*/
24-
Map<String, ? extends EventSource> prepareEventSources(EventSourceContext<P> context);
24+
Map<String, EventSource> prepareEventSources(EventSourceContext<P> context);
2525

2626
}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/Controller.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public String successTypeName(UpdateControl<P> result) {
190190
public UpdateControl<P> execute() throws Exception {
191191
initContextIfNeeded(resource, context);
192192
final var exceptions = new ArrayList<Exception>(dependents.size());
193-
dependents.values().forEach((name, dependent) -> {
193+
dependents.forEach((name, dependent) -> {
194194
try {
195195
final var reconcileResult = dependent.reconcile(resource, context);
196196
context.managedDependentResourceContext().setReconcileResult(name, reconcileResult);

sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package io.javaoperatorsdk.operator.sample;
22

33
import java.util.Map;
4+
import java.util.Map.Entry;
5+
import java.util.stream.Collectors;
46

57
import org.slf4j.Logger;
68
import org.slf4j.LoggerFactory;
@@ -51,10 +53,9 @@ public WebPageStandaloneDependentsReconciler(KubernetesClient kubernetesClient)
5153
}
5254

5355
@Override
54-
public Map<String, ? extends EventSource> prepareEventSources(
55-
EventSourceContext<WebPage> context) {
56-
dependentResources.values().forEach(dr -> dr.initEventSource(context));
57-
return dependentResources;
56+
public Map<String, EventSource> prepareEventSources(EventSourceContext<WebPage> context) {
57+
return dependentResources.entrySet().stream()
58+
.collect(Collectors.toUnmodifiableMap(Entry::getKey, Entry::getValue));
5859
}
5960

6061
@Override

0 commit comments

Comments
 (0)