From a746d9853f676ee34b59765a41b08eefed8f0c96 Mon Sep 17 00:00:00 2001
From: Xabier Laiseca <xabier.laiseca@schibsted.com>
Date: Mon, 22 Jul 2019 15:05:41 +0100
Subject: [PATCH] expected artifacts from hashmap to map

---
 .../pipelinetemplate/TemplatedPipelineRequest.java     |  6 +++---
 .../v1schema/V1SchemaExecutionGenerator.java           | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/TemplatedPipelineRequest.java b/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/TemplatedPipelineRequest.java
index 4d977eecdf0..6c1b4c88f8e 100644
--- a/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/TemplatedPipelineRequest.java
+++ b/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/TemplatedPipelineRequest.java
@@ -26,7 +26,7 @@ public class TemplatedPipelineRequest {
   String id;
   String schema;
   String type;
-  List<HashMap<String, Object>> expectedArtifacts;
+  List<Map<String, Object>> expectedArtifacts;
   Map<String, Object> trigger = new HashMap<>();
   Map<String, Object> config;
   Map<String, Object> template;
@@ -129,11 +129,11 @@ public boolean isKeepWaitingPipelines() {
     return keepWaitingPipelines;
   }
 
-  public void setExpectedArtifacts(List<HashMap<String, Object>> expectedArtifacts) {
+  public void setExpectedArtifacts(List<Map<String, Object>> expectedArtifacts) {
     this.expectedArtifacts = expectedArtifacts;
   }
 
-  public List<HashMap<String, Object>> getExpectedArtifacts() {
+  public List<Map<String, Object>> getExpectedArtifacts() {
     return this.expectedArtifacts;
   }
 }
diff --git a/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGenerator.java b/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGenerator.java
index bf56d5fb606..27ce1ed6081 100644
--- a/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGenerator.java
+++ b/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGenerator.java
@@ -160,7 +160,7 @@ private void addExpectedArtifacts(
       TemplateConfiguration configuration,
       TemplatedPipelineRequest request) {
 
-    List<HashMap<String, Object>> mergedExpectedArtifacts =
+    List<Map<String, Object>> mergedExpectedArtifacts =
         mergeExpectedArtifact(
             emptyListIfNull(configuration.getConfiguration().getExpectedArtifacts()),
             emptyListIfNull(request.getExpectedArtifacts()));
@@ -175,13 +175,13 @@ private void addExpectedArtifacts(
     pipeline.put("expectedArtifacts", mergedExpectedArtifacts);
   }
 
-  private List<HashMap<String, Object>> emptyListIfNull(List<HashMap<String, Object>> eas) {
+  private List<? extends Map<String, Object>> emptyListIfNull(List<? extends Map<String, Object>> eas) {
     return Optional.ofNullable(eas).orElse(Collections.emptyList());
   }
 
-  private List<HashMap<String, Object>> mergeExpectedArtifact(
-      List<HashMap<String, Object>> eas1, List<HashMap<String, Object>> eas2) {
-    HashMap<String, HashMap<String, Object>> mergedByName = new HashMap<>();
+  private List<Map<String, Object>> mergeExpectedArtifact(
+      List<? extends Map<String, Object>> eas1, List<? extends Map<String, Object>> eas2) {
+    HashMap<String, Map<String, Object>> mergedByName = new HashMap<>();
 
     eas1.forEach(artifact -> mergedByName.put(String.valueOf(artifact.get("id")), artifact));
     eas2.forEach(artifact -> mergedByName.put(String.valueOf(artifact.get("id")), artifact));