chore: adapt after rebase

Signed-off-by: Chris Laprun <claprun@redhat.com>
operator-framework · Nov 6, 2024 · b9481fe · b9481fe
1 parent e13cce6
commit b9481fe
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 33 deletions.
diff --git a/...r/api/reconciler/dependent/managed/DefaultManagedWorkflowAndDependentResourceContext.java b/...r/api/reconciler/dependent/managed/DefaultManagedWorkflowAndDependentResourceContext.java
@@ -11,10 +11,10 @@
 
 @SuppressWarnings("rawtypes")
 public class DefaultManagedWorkflowAndDependentResourceContext<P extends HasMetadata>
-        implements ManagedWorkflowAndDependentResourceContext {
+    implements ManagedWorkflowAndDependentResourceContext {
 
-    public static final Object RECONCILE_RESULT_KEY = new Object();
-    public static final Object CLEANUP_RESULT_KEY = new Object();
+  public static final Object RECONCILE_RESULT_KEY = new Object();
+  public static final Object CLEANUP_RESULT_KEY = new Object();
   private final ConcurrentHashMap attributes = new ConcurrentHashMap();
   private final Controller<P> controller;
   private final P primaryResource;
@@ -53,13 +53,13 @@ public <T> T getMandatory(Object key, Class<T> expectedType) {
   }
 
   @Override
-  public Optional<WorkflowReconcileResult> getWorkflowReconcileResult() {
-    return get(RECONCILE_RESULT_KEY, WorkflowReconcileResult.class);
+  public WorkflowReconcileResult getWorkflowReconcileResult() {
+    return getMandatory(RECONCILE_RESULT_KEY, WorkflowReconcileResult.class);
   }
 
   @Override
-  public Optional<WorkflowCleanupResult> getWorkflowCleanupResult() {
-    return get(CLEANUP_RESULT_KEY, WorkflowCleanupResult.class);
+  public WorkflowCleanupResult getWorkflowCleanupResult() {
+    return getMandatory(CLEANUP_RESULT_KEY, WorkflowCleanupResult.class);
   }
 
   @Override

diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/Controller.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/Controller.java
@@ -149,7 +149,7 @@ public UpdateControl<P> execute() throws Exception {
             initContextIfNeeded(resource, context);
             configuration.getWorkflowSpec().ifPresent(ws -> {
               if (!managedWorkflow.isEmpty() && !explicitWorkflowInvocation) {
-                  managedWorkflow.reconcile(resource, context);
+                managedWorkflow.reconcile(resource, context);
               }
             });
             return reconciler.reconcile(resource, context);
@@ -177,9 +177,9 @@ public String successTypeName(DeleteControl deleteControl) {
               return deleteControl.isRemoveFinalizer() ? DELETE : FINALIZER_NOT_REMOVED;
             }
 
-              @Override
-              public ResourceID resourceID() {
-                  return ResourceID.fromResource(resource);
+            @Override
+            public ResourceID resourceID() {
+              return ResourceID.fromResource(resource);
             }
 
             @Override
@@ -192,7 +192,8 @@ public DeleteControl execute() throws Exception {
               initContextIfNeeded(resource, context);
               WorkflowCleanupResult workflowCleanupResult = null;
 
-              // The cleanup is called also when explicit invocation is true, but the cleaner is not implemented
+              // The cleanup is called also when explicit invocation is true, but the cleaner is not
+              // implemented
               if (managedWorkflow.hasCleaner() || !explicitWorkflowInvocation) {
                 workflowCleanupResult = managedWorkflow.cleanup(resource, context);
               }
@@ -450,23 +451,13 @@ public EventSourceContext<P> eventSourceContext() {
 
   public void reconcileManagedWorkflow(P primary, Context<P> context) {
     if (!managedWorkflow.isEmpty()) {
-      var res = managedWorkflow.reconcile(primary, context);
-      ((DefaultManagedWorkflowAndDependentResourceContext) context
-          .managedWorkflowAndDependentResourceContext())
-          .setWorkflowExecutionResult(res);
+      managedWorkflow.reconcile(primary, context);
     }
   }
 
-  public WorkflowCleanupResult cleanupManagedWorkflow(P resource, Context<P> context) {
+  public void cleanupManagedWorkflow(P resource, Context<P> context) {
     if (managedWorkflow.hasCleaner()) {
-      var workflowCleanupResult = managedWorkflow.cleanup(resource, context);
-      ((DefaultManagedWorkflowAndDependentResourceContext) context
-          .managedWorkflowAndDependentResourceContext())
-          .setWorkflowCleanupResult(workflowCleanupResult);
-
-      return workflowCleanupResult;
-    } else {
-      return null;
+      managedWorkflow.cleanup(resource, context);
     }
   }
 

diff --git a/.../main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/DefaultWorkflow.java b/.../main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/DefaultWorkflow.java
@@ -12,9 +12,11 @@
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
-import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DefaultManagedDependentResourceContext;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
 
+import static io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DefaultManagedWorkflowAndDependentResourceContext.CLEANUP_RESULT_KEY;
+import static io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DefaultManagedWorkflowAndDependentResourceContext.RECONCILE_RESULT_KEY;
+
 /**
  * Dependents definition: so if B depends on A, the B is dependent of A.
  *
@@ -92,8 +94,7 @@ public WorkflowReconcileResult reconcile(P primary, Context<P> context) {
     WorkflowReconcileExecutor<P> workflowReconcileExecutor =
         new WorkflowReconcileExecutor<>(this, primary, context);
     var result = workflowReconcileExecutor.reconcile();
-    context.managedDependentResourceContext()
-        .put(DefaultManagedDependentResourceContext.RECONCILE_RESULT_KEY, result);
+    context.managedWorkflowAndDependentResourceContext().put(RECONCILE_RESULT_KEY, result);
     if (throwExceptionAutomatically) {
       result.throwAggregateExceptionIfErrorsPresent();
     }
@@ -105,8 +106,7 @@ public WorkflowCleanupResult cleanup(P primary, Context<P> context) {
     WorkflowCleanupExecutor<P> workflowCleanupExecutor =
         new WorkflowCleanupExecutor<>(this, primary, context);
     var result = workflowCleanupExecutor.cleanup();
-    context.managedDependentResourceContext()
-        .put(DefaultManagedDependentResourceContext.CLEANUP_RESULT_KEY, result);
+    context.managedWorkflowAndDependentResourceContext().put(CLEANUP_RESULT_KEY, result);
     if (throwExceptionAutomatically) {
       result.throwAggregateExceptionIfErrorsPresent();
     }

diff --git a/...o/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowCleanupExecutorTest.java b/...o/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowCleanupExecutorTest.java
@@ -14,7 +14,7 @@
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
-import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.ManagedDependentResourceContext;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.ManagedWorkflowAndDependentResourceContext;
 import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 
@@ -44,8 +44,8 @@ void setup() {
     when(eventSourceContextMock.getControllerConfiguration()).thenReturn(mockControllerConfig);
     when(mockControllerConfig.getConfigurationService())
         .thenReturn(mock(ConfigurationService.class));
-    when(mockContext.managedDependentResourceContext())
-        .thenReturn(mock(ManagedDependentResourceContext.class));
+    when(mockContext.managedWorkflowAndDependentResourceContext())
+        .thenReturn(mock(ManagedWorkflowAndDependentResourceContext.class));
     when(mockContext.getWorkflowExecutorService()).thenReturn(executorService);
     when(mockContext.eventSourceRetriever()).thenReturn(eventSourceRetrieverMock);
   }

diff --git a/...javaoperatorsdk/operator/processing/dependent/workflow/WorkflowReconcileExecutorTest.java b/...javaoperatorsdk/operator/processing/dependent/workflow/WorkflowReconcileExecutorTest.java
@@ -15,6 +15,7 @@
 import io.javaoperatorsdk.operator.AggregatedOperatorException;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.ManagedWorkflowAndDependentResourceContext;
 import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 
@@ -36,6 +37,8 @@ class WorkflowReconcileExecutorTest extends AbstractWorkflowExecutorTest {
   @SuppressWarnings("unchecked")
   void setup(TestInfo testInfo) {
     log.debug("==> Starting test {}", testInfo.getDisplayName());
+    when(mockContext.managedWorkflowAndDependentResourceContext())
+        .thenReturn(mock(ManagedWorkflowAndDependentResourceContext.class));
     when(mockContext.getWorkflowExecutorService()).thenReturn(executorService);
     when(mockContext.eventSourceRetriever()).thenReturn(mock(EventSourceRetriever.class));
   }