fix(core): Mark mptv2 items as inherited (#2971)

* fix(core): Mark mptv2 items as inherited spinnaker/spinnaker#4451 * fix(core): Refactor how items are marked inherited spinnaker/spinnaker#4451
spinnaker · Jun 11, 2019 · 62346e4 · 62346e4
1 parent a52578b
commit 62346e4
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/...java/com/netflix/spinnaker/orca/pipelinetemplate/v2schema/V2SchemaExecutionGenerator.java b/...java/com/netflix/spinnaker/orca/pipelinetemplate/v2schema/V2SchemaExecutionGenerator.java
@@ -76,7 +76,7 @@ private void addNotifications(
       pipeline.put(
           "notifications",
           TemplateMerge.mergeDistinct(
-              (List<HashMap<String, Object>>) template.getPipeline().get("notifications"),
+              markTemplateCollectionAsInherited(getTemplateCollection(template, "notifications")),
               configuration.getNotifications()));
     }
   }
@@ -93,7 +93,7 @@ private void addParameters(
       pipeline.put(
           "parameterConfig",
           TemplateMerge.mergeDistinct(
-              (List<HashMap<String, Object>>) template.getPipeline().get("parameterConfig"),
+              markTemplateCollectionAsInherited(getTemplateCollection(template, "parameterConfig")),
               configuration.getParameters()));
     }
   }
@@ -110,8 +110,22 @@ private void addTriggers(
       pipeline.put(
           "triggers",
           TemplateMerge.mergeDistinct(
-              (List<HashMap<String, Object>>) template.getPipeline().get("triggers"),
+              markTemplateCollectionAsInherited(getTemplateCollection(template, "triggers")),
               configuration.getTriggers()));
     }
   }
+
+  private static List<HashMap<String, Object>> markTemplateCollectionAsInherited(
+      List<HashMap<String, Object>> templateCollection) {
+    for (HashMap<String, Object> templateItem : templateCollection) {
+      templateItem.put("inherited", true);
+    }
+    return templateCollection;
+  }
+
+  private static List<HashMap<String, Object>> getTemplateCollection(
+      V2PipelineTemplate template, String key) {
+    return Optional.ofNullable((List<HashMap<String, Object>>) template.getPipeline().get(key))
+        .orElse(Collections.emptyList());
+  }
 }