From 84da10999bcfe530fa0f722f5dc3c9568ac65bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Mon, 18 Dec 2023 11:26:25 +0100 Subject: [PATCH] improve: name for dependent explicitly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../dependent/workflow/DependentResourceNode.java | 4 ++++ .../dependent/workflow/WorkflowBuilder.java | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/DependentResourceNode.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/DependentResourceNode.java index 39a9ba6fe5..4c82ee19f3 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/DependentResourceNode.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/DependentResourceNode.java @@ -19,6 +19,10 @@ public class DependentResourceNode { private Condition activationCondition; private final DependentResource dependentResource; + DependentResourceNode(String name, DependentResource dependentResource) { + this(name, null, null, null, null, dependentResource); + } + DependentResourceNode(DependentResource dependentResource) { this(getNameFor(dependentResource), null, null, null, null, dependentResource); } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowBuilder.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowBuilder.java index a7729859a8..d65e21659c 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowBuilder.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowBuilder.java @@ -21,10 +21,15 @@ public class WorkflowBuilder

{ private boolean isCleaner = false; public WorkflowBuilder

addDependentResource(DependentResource dependentResource) { - currentNode = new DependentResourceNode<>(dependentResource); + return addDependentResource(dependentResource, null); + } + + public WorkflowBuilder

addDependentResource(DependentResource dependentResource, String name) { + currentNode = name == null ? new DependentResourceNode<>(dependentResource) + : new DependentResourceNode<>(name, dependentResource); isCleaner = isCleaner || dependentResource.isDeletable(); - final var name = currentNode.getName(); - dependentResourceNodes.put(name, currentNode); + final var actualName = currentNode.getName(); + dependentResourceNodes.put(actualName, currentNode); return this; }