Skip to content

Commit 665e9ce

Browse files
csviricsviri
committed
improve: workflow builder naming (#2559)
1 parent 8a3fdcd commit 665e9ce

File tree

4 files changed

+76
-76
lines changed

4 files changed

+76
-76
lines changed

Diff for: ‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowBuilder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,17 @@ public WorkflowBuilder<P> withThrowExceptionFurther(boolean throwExceptionFurthe
9393
return WorkflowBuilder.this.withThrowExceptionFurther(throwExceptionFurther);
9494
}
9595

96-
public WorkflowNodeConfigurationBuilder toDependOn(Set<DependentResource> dependentResources) {
96+
public WorkflowNodeConfigurationBuilder dependsOn(Set<DependentResource> dependentResources) {
9797
for (var dependentResource : dependentResources) {
9898
var dependsOn = getNodeByDependentResource(dependentResource);
9999
currentNode.addDependsOnRelation(dependsOn);
100100
}
101101
return this;
102102
}
103103

104-
public WorkflowNodeConfigurationBuilder toDependOn(DependentResource... dependentResources) {
104+
public WorkflowNodeConfigurationBuilder dependsOn(DependentResource... dependentResources) {
105105
if (dependentResources != null) {
106-
return toDependOn(new HashSet<>(Arrays.asList(dependentResources)));
106+
return dependsOn(new HashSet<>(Arrays.asList(dependentResources)));
107107
}
108108
return this;
109109
}

Diff for: ‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowCleanupExecutorTest.java

+23-23
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ void setup() {
5454
void cleanUpDiamondWorkflow() {
5555
var workflow = new WorkflowBuilder<TestCustomResource>()
5656
.addDependentResource(dd1)
57-
.addDependentResourceAndConfigure(dr1).toDependOn(dd1)
58-
.addDependentResourceAndConfigure(dd2).toDependOn(dd1)
59-
.addDependentResourceAndConfigure(dd3).toDependOn(dr1, dd2)
57+
.addDependentResourceAndConfigure(dr1).dependsOn(dd1)
58+
.addDependentResourceAndConfigure(dd2).dependsOn(dd1)
59+
.addDependentResourceAndConfigure(dd3).dependsOn(dr1, dd2)
6060
.build();
6161

6262
var res = workflow.cleanup(new TestCustomResource(), mockContext);
@@ -73,9 +73,9 @@ void cleanUpDiamondWorkflow() {
7373
void dontDeleteIfDependentErrored() {
7474
var workflow = new WorkflowBuilder<TestCustomResource>()
7575
.addDependentResource(dd1)
76-
.addDependentResourceAndConfigure(dd2).toDependOn(dd1)
77-
.addDependentResourceAndConfigure(dd3).toDependOn(dd2)
78-
.addDependentResourceAndConfigure(errorDD).toDependOn(dd2)
76+
.addDependentResourceAndConfigure(dd2).dependsOn(dd1)
77+
.addDependentResourceAndConfigure(dd3).dependsOn(dd2)
78+
.addDependentResourceAndConfigure(errorDD).dependsOn(dd2)
7979
.withThrowExceptionFurther(false)
8080
.build();
8181

@@ -95,7 +95,7 @@ void dontDeleteIfDependentErrored() {
9595
void cleanupConditionTrivialCase() {
9696
var workflow = new WorkflowBuilder<TestCustomResource>()
9797
.addDependentResource(dd1)
98-
.addDependentResourceAndConfigure(dd2).toDependOn(dd1)
98+
.addDependentResourceAndConfigure(dd2).dependsOn(dd1)
9999
.withDeletePostcondition(notMetCondition)
100100
.build();
101101

@@ -111,7 +111,7 @@ void cleanupConditionTrivialCase() {
111111
void cleanupConditionMet() {
112112
var workflow = new WorkflowBuilder<TestCustomResource>()
113113
.addDependentResource(dd1)
114-
.addDependentResourceAndConfigure(dd2).toDependOn(dd1).withDeletePostcondition(metCondition)
114+
.addDependentResourceAndConfigure(dd2).dependsOn(dd1).withDeletePostcondition(metCondition)
115115
.build();
116116

117117
var res = workflow.cleanup(new TestCustomResource(), mockContext);
@@ -127,10 +127,10 @@ void cleanupConditionMet() {
127127
void cleanupConditionDiamondWorkflow() {
128128
var workflow = new WorkflowBuilder<TestCustomResource>()
129129
.addDependentResource(dd1)
130-
.addDependentResourceAndConfigure(dd2).toDependOn(dd1)
131-
.addDependentResourceAndConfigure(dd3).toDependOn(dd1)
130+
.addDependentResourceAndConfigure(dd2).dependsOn(dd1)
131+
.addDependentResourceAndConfigure(dd3).dependsOn(dd1)
132132
.withDeletePostcondition(notMetCondition)
133-
.addDependentResourceAndConfigure(dd4).toDependOn(dd2, dd3)
133+
.addDependentResourceAndConfigure(dd4).dependsOn(dd2, dd3)
134134
.build();
135135

136136
var res = workflow.cleanup(new TestCustomResource(), mockContext);
@@ -164,10 +164,10 @@ void dontDeleteIfGarbageCollected() {
164164
void ifDependentActiveDependentNormallyDeleted() {
165165
var workflow = new WorkflowBuilder<TestCustomResource>()
166166
.addDependentResource(dd1)
167-
.addDependentResourceAndConfigure(dd2).toDependOn(dd1)
168-
.addDependentResourceAndConfigure(dd3).toDependOn(dd1)
167+
.addDependentResourceAndConfigure(dd2).dependsOn(dd1)
168+
.addDependentResourceAndConfigure(dd3).dependsOn(dd1)
169169
.withActivationCondition(metCondition)
170-
.addDependentResourceAndConfigure(dd4).toDependOn(dd2, dd3)
170+
.addDependentResourceAndConfigure(dd4).dependsOn(dd2, dd3)
171171
.build();
172172

173173
var res = workflow.cleanup(new TestCustomResource(), mockContext);
@@ -184,11 +184,11 @@ void ifDependentActiveDependentNormallyDeleted() {
184184
void ifDependentActiveDeletePostConditionIsChecked() {
185185
var workflow = new WorkflowBuilder<TestCustomResource>()
186186
.addDependentResource(dd1)
187-
.addDependentResourceAndConfigure(dd2).toDependOn(dd1)
188-
.addDependentResourceAndConfigure(dd3).toDependOn(dd1)
187+
.addDependentResourceAndConfigure(dd2).dependsOn(dd1)
188+
.addDependentResourceAndConfigure(dd3).dependsOn(dd1)
189189
.withDeletePostcondition(notMetCondition)
190190
.withActivationCondition(metCondition)
191-
.addDependentResourceAndConfigure(dd4).toDependOn(dd2, dd3)
191+
.addDependentResourceAndConfigure(dd4).dependsOn(dd2, dd3)
192192
.build();
193193

194194
var res = workflow.cleanup(new TestCustomResource(), mockContext);
@@ -208,10 +208,10 @@ void ifDependentActiveDeletePostConditionIsChecked() {
208208
void ifDependentInactiveDeleteIsNotCalled() {
209209
var workflow = new WorkflowBuilder<TestCustomResource>()
210210
.addDependentResource(dd1)
211-
.addDependentResourceAndConfigure(dd2).toDependOn(dd1)
212-
.addDependentResourceAndConfigure(dd3).toDependOn(dd1)
211+
.addDependentResourceAndConfigure(dd2).dependsOn(dd1)
212+
.addDependentResourceAndConfigure(dd3).dependsOn(dd1)
213213
.withActivationCondition(notMetCondition)
214-
.addDependentResourceAndConfigure(dd4).toDependOn(dd2, dd3)
214+
.addDependentResourceAndConfigure(dd4).dependsOn(dd2, dd3)
215215
.build();
216216

217217
var res = workflow.cleanup(new TestCustomResource(), mockContext);
@@ -227,11 +227,11 @@ void ifDependentInactiveDeleteIsNotCalled() {
227227
void ifDependentInactiveDeletePostConditionNotChecked() {
228228
var workflow = new WorkflowBuilder<TestCustomResource>()
229229
.addDependentResource(dd1)
230-
.addDependentResourceAndConfigure(dd2).toDependOn(dd1)
231-
.addDependentResourceAndConfigure(dd3).toDependOn(dd1)
230+
.addDependentResourceAndConfigure(dd2).dependsOn(dd1)
231+
.addDependentResourceAndConfigure(dd3).dependsOn(dd1)
232232
.withDeletePostcondition(notMetCondition)
233233
.withActivationCondition(notMetCondition)
234-
.addDependentResourceAndConfigure(dd4).toDependOn(dd2, dd3)
234+
.addDependentResourceAndConfigure(dd4).dependsOn(dd2, dd3)
235235
.build();
236236

237237
var res = workflow.cleanup(new TestCustomResource(), mockContext);

0 commit comments

Comments
 (0)