Skip to content

Commit df8cddd

Browse files
committed
refactor: clean up WorkflowReconcileResult
1 parent b6f8bb7 commit df8cddd

File tree

2 files changed

+26
-39
lines changed

2 files changed

+26
-39
lines changed

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -282,17 +282,16 @@ private boolean hasErroredParent(
282282
}
283283

284284
private WorkflowReconcileResult createReconcileResult() {
285-
WorkflowReconcileResult workflowReconcileResult = new WorkflowReconcileResult();
286-
workflowReconcileResult.setErroredDependents(exceptionsDuringExecution
287-
.entrySet().stream()
288-
.collect(Collectors.toMap(e -> e.getKey().getDependentResource(), Map.Entry::getValue)));
289-
workflowReconcileResult.setNotReadyDependents(notReady.stream()
290-
.map(DependentResourceNode::getDependentResource)
291-
.collect(Collectors.toList()));
292-
workflowReconcileResult.setReconciledDependents(reconciled.stream()
293-
.map(DependentResourceNode::getDependentResource).collect(Collectors.toList()));
294-
workflowReconcileResult.setReconcileResults(reconcileResults);
295-
return workflowReconcileResult;
285+
return new WorkflowReconcileResult(
286+
reconciled.stream()
287+
.map(DependentResourceNode::getDependentResource).collect(Collectors.toList()),
288+
notReady.stream()
289+
.map(DependentResourceNode::getDependentResource)
290+
.collect(Collectors.toList()),
291+
exceptionsDuringExecution
292+
.entrySet().stream()
293+
.collect(Collectors.toMap(e -> e.getKey().getDependentResource(), Map.Entry::getValue)),
294+
reconcileResults);
296295
}
297296

298297
}

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

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,51 +11,38 @@
1111
@SuppressWarnings("rawtypes")
1212
public class WorkflowReconcileResult {
1313

14-
private List<DependentResource> reconciledDependents;
15-
private List<DependentResource> notReadyDependents;
16-
private Map<DependentResource, Exception> erroredDependents;
17-
private Map<DependentResource, ReconcileResult> reconcileResults;
14+
private final List<DependentResource> reconciledDependents;
15+
private final List<DependentResource> notReadyDependents;
16+
private final Map<DependentResource, Exception> erroredDependents;
17+
private final Map<DependentResource, ReconcileResult> reconcileResults;
18+
19+
public WorkflowReconcileResult(List<DependentResource> reconciledDependents,
20+
List<DependentResource> notReadyDependents,
21+
Map<DependentResource, Exception> erroredDependents,
22+
Map<DependentResource, ReconcileResult> reconcileResults) {
23+
this.reconciledDependents = reconciledDependents;
24+
this.notReadyDependents = notReadyDependents;
25+
this.erroredDependents = erroredDependents;
26+
this.reconcileResults = reconcileResults;
27+
}
1828

1929
public Map<DependentResource, Exception> getErroredDependents() {
2030
return erroredDependents;
2131
}
2232

23-
public WorkflowReconcileResult setErroredDependents(
24-
Map<DependentResource, Exception> erroredDependents) {
25-
this.erroredDependents = erroredDependents;
26-
return this;
27-
}
28-
2933
public List<DependentResource> getReconciledDependents() {
3034
return reconciledDependents;
3135
}
3236

33-
public WorkflowReconcileResult setReconciledDependents(
34-
List<DependentResource> reconciledDependents) {
35-
this.reconciledDependents = reconciledDependents;
36-
return this;
37-
}
38-
3937
public List<DependentResource> getNotReadyDependents() {
4038
return notReadyDependents;
4139
}
4240

43-
public WorkflowReconcileResult setNotReadyDependents(
44-
List<DependentResource> notReadyDependents) {
45-
this.notReadyDependents = notReadyDependents;
46-
return this;
47-
}
48-
41+
@SuppressWarnings("unused")
4942
public Map<DependentResource, ReconcileResult> getReconcileResults() {
5043
return reconcileResults;
5144
}
5245

53-
public WorkflowReconcileResult setReconcileResults(
54-
Map<DependentResource, ReconcileResult> reconcileResults) {
55-
this.reconcileResults = reconcileResults;
56-
return this;
57-
}
58-
5946
public void throwAggregateExceptionIfErrorsPresent() {
6047
if (!erroredDependents.isEmpty()) {
6148
throw createFinalException();
@@ -79,6 +66,7 @@ public boolean erroredDependentsExists() {
7966
return !erroredDependents.isEmpty();
8067
}
8168

69+
@SuppressWarnings("unused")
8270
public boolean erroredDependentsExist() {
8371
return !erroredDependents.isEmpty();
8472
}

0 commit comments

Comments
 (0)