refactor: simplify

Author: metacosm

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

@@ -16,35 +16,37 @@
 @SuppressWarnings("rawtypes")
 public class DefaultManagedWorkflow<P extends HasMetadata> implements ManagedWorkflow<P> {
 
-  private final Set<SpecDependentResourceNode> topLevelResources;
-  private final Set<SpecDependentResourceNode> bottomLevelResources;
+  private final Set<String> topLevelResources;
+  private final Set<String> bottomLevelResources;
   private final Set<SpecDependentResourceNode> nodes;
   private final boolean hasCleaner;
 
+  @SuppressWarnings("unchecked")
   DefaultManagedWorkflow(Set<SpecDependentResourceNode> dependentResourceSpecs,
       boolean hasCleaner) {
     this.hasCleaner = hasCleaner;
     topLevelResources = new HashSet<>(dependentResourceSpecs.size());
-    bottomLevelResources = new HashSet<>(dependentResourceSpecs);
+    bottomLevelResources =
+        dependentResourceSpecs.stream().map(SpecDependentResourceNode::getName).collect(
+            Collectors.toSet());
     nodes = dependentResourceSpecs;
     dependentResourceSpecs.forEach(drn -> {
       // add cycle detection?
       if (drn.getDependsOn().isEmpty()) {
-        topLevelResources.add(drn);
+        topLevelResources.add(drn.getName());
       } else {
-        for (SpecDependentResourceNode dependsOn : (List<SpecDependentResourceNode>) drn
-            .getDependsOn()) {
+        for (String dependsOn : (List<String>) drn.getDependsOn()) {
           bottomLevelResources.remove(dependsOn);
         }
       }
     });
   }
 
-  Set<SpecDependentResourceNode> getTopLevelResources() {
+  Set<String> getTopLevelResources() {
     return topLevelResources;
   }
 
-  Set<SpecDependentResourceNode> getBottomLevelResources() {
+  Set<String> getBottomLevelResources() {
     return bottomLevelResources;
   }
 
@@ -68,17 +70,14 @@ public Workflow<P> resolve(KubernetesClient client,
     final var map = nodes.stream()
         .map(spec -> createDRN(client, configuration, spec))
         .collect(Collectors.toMap(DependentResourceNode::getName, Function.identity()));
-    final var bottom = bottomLevelResources.stream()
-        .map(spec -> createDRN(client, configuration, spec)).collect(
-            Collectors.toSet());
-    final var top = topLevelResources.stream()
-        .map(spec -> createDRN(client, configuration, spec))
-        .collect(Collectors.toSet());
+    final var bottom = bottomLevelResources.stream().map(map::get).collect(Collectors.toSet());
+    final var top = topLevelResources.stream().map(map::get).collect(Collectors.toSet());
     return new Workflow<>(map, bottom, top,
         ExecutorServiceManager.instance().workflowExecutorService(),
         THROW_EXCEPTION_AUTOMATICALLY_DEFAULT, hasCleaner);
   }
 
+  @SuppressWarnings("unchecked")
   private DependentResourceNode createDRN(
       KubernetesClient client, ControllerConfiguration<P> configuration,
       SpecDependentResourceNode spec) {

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

@@ -14,8 +14,7 @@
 
 class SpecDependentResourceNode<R, P extends HasMetadata> {
   private final DependentResourceSpec<R, P> spec;
-  private final List<SpecDependentResourceNode> dependsOn = new LinkedList<>();
-  private final List<SpecDependentResourceNode> parents = new LinkedList<>();
+  private final List<String> dependsOn = new LinkedList<>();
 
   public SpecDependentResourceNode(DependentResourceSpec<R, P> spec) {
     this.spec = spec;
@@ -53,15 +52,10 @@ String getName() {
   }
 
   public void addDependsOnRelation(SpecDependentResourceNode node) {
-    node.parents.add(this);
-    dependsOn.add(node);
+    dependsOn.add(node.getName());
   }
 
-  public List<SpecDependentResourceNode> getDependsOn() {
+  public List<String> getDependsOn() {
     return dependsOn;
   }
-
-  public List<SpecDependentResourceNode> getParents() {
-    return parents;
-  }
 }

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

@@ -142,12 +142,8 @@ void createsWorkflow() {
 
     assertThat(workflow.nodes()).map(SpecDependentResourceNode::getName)
         .containsExactlyInAnyOrder(NAME_1, NAME_2, NAME_3, NAME_4);
-    assertThat(workflow.getTopLevelResources())
-        .map(SpecDependentResourceNode::getName)
-        .containsExactly(NAME_1);
-    assertThat(workflow.getBottomLevelResources())
-        .map(SpecDependentResourceNode::getName)
-        .containsExactly(NAME_4);
+    assertThat(workflow.getTopLevelResources()).containsExactly(NAME_1);
+    assertThat(workflow.getBottomLevelResources()).containsExactly(NAME_4);
   }
 
 }