Skip to content

Commit 4aee39b

Browse files
committed
fix: getDependentResourcesByName should return dependent resources
1 parent 65894e5 commit 4aee39b

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,7 @@ public void initAndRegisterEventSources(EventSourceContext<P> context) {
229229
final var dependentResourcesByName = managedWorkflow.getDependentResourcesByName();
230230
final var size = dependentResourcesByName.size();
231231
if (size > 0) {
232-
dependentResourcesByName.forEach((key, value) -> {
233-
final var dependentResource = value.getDependentResource();
232+
dependentResourcesByName.forEach((key, dependentResource) -> {
234233
if (dependentResource instanceof EventSourceProvider) {
235234
final var provider = (EventSourceProvider) dependentResource;
236235
final var source = provider.initEventSource(context);

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/Workflow.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.javaoperatorsdk.operator.processing.dependent.workflow;
22

33
import java.util.Collections;
4+
import java.util.HashMap;
45
import java.util.HashSet;
56
import java.util.List;
67
import java.util.Map;
@@ -72,6 +73,7 @@ public class Workflow<P extends HasMetadata> {
7273
this.dependentResourceNodes = dependentResourceNodes;
7374
}
7475

76+
@SuppressWarnings("unchecked")
7577
private Map<String, DependentResourceNode> toMap(
7678
Set<DependentResourceNode> dependentResourceNodes) {
7779
return dependentResourceNodes.stream()
@@ -145,7 +147,10 @@ public boolean isEmpty() {
145147
return dependentResourceNodes.isEmpty();
146148
}
147149

148-
public Map<String, DependentResourceNode> getDependentResourcesByName() {
149-
return dependentResourceNodes;
150+
public Map<String, DependentResource> getDependentResourcesByName() {
151+
final var resources = new HashMap<String, DependentResource>(dependentResourceNodes.size());
152+
dependentResourceNodes
153+
.forEach((name, node) -> resources.put(name, node.getDependentResource()));
154+
return resources;
150155
}
151156
}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/externalstatebulkdependent/ExternalStateBulkDependentReconciler.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,24 @@
55

66
import io.fabric8.kubernetes.api.model.ConfigMap;
77
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
8-
import io.javaoperatorsdk.operator.api.reconciler.*;
8+
import io.javaoperatorsdk.operator.api.reconciler.Context;
9+
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
10+
import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
11+
import io.javaoperatorsdk.operator.api.reconciler.EventSourceInitializer;
12+
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
13+
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
914
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
1015
import io.javaoperatorsdk.operator.processing.event.source.EventSource;
1116
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
1217
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
1318

1419
@ControllerConfiguration(
15-
dependents = @Dependent(
16-
type = BulkDependentResourceExternalWithState.class))
20+
dependents = @Dependent(type = BulkDependentResourceExternalWithState.class))
1721
public class ExternalStateBulkDependentReconciler
1822
implements Reconciler<ExternalStateBulkDependentCustomResource>,
1923
EventSourceInitializer<ExternalStateBulkDependentCustomResource>,
2024
TestExecutionInfoProvider {
2125

22-
public static final String ID_KEY = "id";
2326
private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
2427

2528
@Override

0 commit comments

Comments
 (0)