refactor: simplify

Signed-off-by: Chris Laprun <metacosm@gmail.com>

Author: metacosm

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

@@ -27,21 +27,18 @@ abstract class NodeExecutor<R, P extends HasMetadata> implements Runnable {
 
   private final DependentResourceNode<R, P> dependentResourceNode;
   private final AbstractWorkflowExecutor<P> workflowExecutor;
-  private final P primary;
 
   protected NodeExecutor(
       DependentResourceNode<R, P> dependentResourceNode,
-      AbstractWorkflowExecutor<P> workflowExecutor,
-      P primary) {
+      AbstractWorkflowExecutor<P> workflowExecutor) {
     this.dependentResourceNode = dependentResourceNode;
     this.workflowExecutor = workflowExecutor;
-    this.primary = primary;
   }
 
   @Override
   public void run() {
     MDCUtils.withMDCForResource(
-        primary,
+        workflowExecutor.primary,
         () -> {
           try {
             doRun(dependentResourceNode);

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

@@ -87,7 +87,7 @@ private synchronized void handleCleanup(DependentResourceNode dependentResourceN
   private class CleanupExecutor<R> extends NodeExecutor<R, P> {
 
     private CleanupExecutor(DependentResourceNode<R, P> drn) {
-      super(drn, WorkflowCleanupExecutor.this, primary);
+      super(drn, WorkflowCleanupExecutor.this);
     }
 
     @Override

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

@@ -150,7 +150,7 @@ private boolean allDependentsDeletedAlready(DependentResourceNode<?, P> dependen
   private class NodeReconcileExecutor<R> extends NodeExecutor<R, P> {
 
     private NodeReconcileExecutor(DependentResourceNode<R, P> dependentResourceNode) {
-      super(dependentResourceNode, WorkflowReconcileExecutor.this, primary);
+      super(dependentResourceNode, WorkflowReconcileExecutor.this);
     }
 
     @Override
@@ -176,7 +176,7 @@ protected void doRun(DependentResourceNode<R, P> dependentResourceNode) {
   private class NodeDeleteExecutor<R> extends NodeExecutor<R, P> {
 
     private NodeDeleteExecutor(DependentResourceNode<R, P> dependentResourceNode) {
-      super(dependentResourceNode, WorkflowReconcileExecutor.this, primary);
+      super(dependentResourceNode, WorkflowReconcileExecutor.this);
     }
 
     @Override

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/NodeExecutorTest.java

@@ -26,7 +26,7 @@
 class NodeExecutorTest {
 
   private NodeExecutor errorThrowingNodeExecutor =
-      new NodeExecutor(null, null, null) {
+      new NodeExecutor(null, null) {
         @Override
         protected void doRun(DependentResourceNode dependentResourceNode) {
           throw new NoSuchFieldError();