Skip to content

Commit 73c6ead

Browse files
authored
improve: name for dependent explicitly (#2165)
Signed-off-by: Attila Mészáros <csviri@gmail.com>
1 parent 361a711 commit 73c6ead

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ public class DependentResourceNode<R, P extends HasMetadata> {
1919
private Condition<R, P> activationCondition;
2020
private final DependentResource<R, P> dependentResource;
2121

22+
DependentResourceNode(String name, DependentResource<R, P> dependentResource) {
23+
this(name, null, null, null, null, dependentResource);
24+
}
25+
2226
DependentResourceNode(DependentResource<R, P> dependentResource) {
2327
this(getNameFor(dependentResource), null, null, null, null, dependentResource);
2428
}

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,15 @@ public class WorkflowBuilder<P extends HasMetadata> {
2121
private boolean isCleaner = false;
2222

2323
public WorkflowBuilder<P> addDependentResource(DependentResource dependentResource) {
24-
currentNode = new DependentResourceNode<>(dependentResource);
24+
return addDependentResource(dependentResource, null);
25+
}
26+
27+
public WorkflowBuilder<P> addDependentResource(DependentResource dependentResource, String name) {
28+
currentNode = name == null ? new DependentResourceNode<>(dependentResource)
29+
: new DependentResourceNode<>(name, dependentResource);
2530
isCleaner = isCleaner || dependentResource.isDeletable();
26-
final var name = currentNode.getName();
27-
dependentResourceNodes.put(name, currentNode);
31+
final var actualName = currentNode.getName();
32+
dependentResourceNodes.put(actualName, currentNode);
2833
return this;
2934
}
3035

0 commit comments

Comments
 (0)