refactor: make WorkflowSpec an interface (#2300)

Signed-off-by: Chris Laprun <[email protected]>
Signed-off-by: Attila Mészáros <[email protected]>

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/BaseConfigurationService.java

@@ -7,7 +7,6 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -168,8 +167,18 @@ protected <P extends HasMetadata> ControllerConfiguration<P> configFor(Reconcile
     final var workflowAnnotation = reconciler.getClass().getAnnotation(
         io.javaoperatorsdk.operator.api.reconciler.Workflow.class);
     if (workflowAnnotation != null) {
-      List<DependentResourceSpec> specs = dependentResources(workflowAnnotation, config);
-      WorkflowSpec workflowSpec = new WorkflowSpec(specs, workflowAnnotation.explicitInvocation());
+      final var specs = dependentResources(workflowAnnotation, config);
+      WorkflowSpec workflowSpec = new WorkflowSpec() {
+        @Override
+        public List<DependentResourceSpec> getDependentResourceSpecs() {
+          return specs;
+        }
+
+        @Override
+        public boolean isExplicitInvocation() {
+          return workflowAnnotation.explicitInvocation();
+        }
+      };
       config.setWorkflowSpec(workflowSpec);
     }
 
@@ -212,7 +221,7 @@ private static List<DependentResourceSpec> dependentResources(
           eventSourceName);
       specsMap.put(dependentName, spec);
     }
-    return specsMap.values().stream().collect(Collectors.toUnmodifiableList());
+    return specsMap.values().stream().toList();
   }
 
   protected boolean createIfNeeded() {

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/workflow/WorkflowSpec.java

@@ -4,23 +4,10 @@
 
 import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
 
-public class WorkflowSpec {
+public interface WorkflowSpec {
 
   @SuppressWarnings("rawtypes")
-  private final List<DependentResourceSpec> dependentResourceSpecs;
-  private final boolean explicitInvocation;
+  List<DependentResourceSpec> getDependentResourceSpecs();
 
-  public WorkflowSpec(List<DependentResourceSpec> dependentResourceSpecs,
-      boolean explicitInvocation) {
-    this.dependentResourceSpecs = dependentResourceSpecs;
-    this.explicitInvocation = explicitInvocation;
-  }
-
-  public List<DependentResourceSpec> getDependentResourceSpecs() {
-    return dependentResourceSpecs;
-  }
-
-  public boolean isExplicitInvocation() {
-    return explicitInvocation;
-  }
+  boolean isExplicitInvocation();
 }

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

@@ -39,9 +39,7 @@ public void checkForNameDuplication(List<DependentResourceSpec> dependentResourc
     }
   }
 
-  public <P extends HasMetadata> ManagedWorkflow<P> createWorkflow(
-      WorkflowSpec workflowSpec) {
-
+  public <P extends HasMetadata> ManagedWorkflow<P> createWorkflow(WorkflowSpec workflowSpec) {
     return createAsDefault(workflowSpec.getDependentResourceSpecs());
   }
 

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

@@ -62,9 +62,18 @@ void isCleanerIfHasDeleter() {
   @SuppressWarnings("unchecked")
   ManagedWorkflow managedWorkflow(DependentResourceSpec... specs) {
     final var configuration = mock(ControllerConfiguration.class);
-    final var specList = List.of(specs);
 
-    var ws = new WorkflowSpec(specList, false);
+    var ws = new WorkflowSpec() {
+      @Override
+      public List<DependentResourceSpec> getDependentResourceSpecs() {
+        return List.of(specs);
+      }
+
+      @Override
+      public boolean isExplicitInvocation() {
+        return false;
+      }
+    };
     when(configuration.getWorkflowSpec()).thenReturn(Optional.of(ws));
 
     return new BaseConfigurationService().getWorkflowFactory()