Merge "Refactor instanceId as primary key in JpaAutomationComposition"

diff --cc models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationComposition.java
index 28a558c,e3c37d0..f9cc880
--- 1/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationComposition.java
--- 2/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationComposition.java
+++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationComposition.java
@@@ -88,13 -90,13 +90,13 @@@ public class JpaAutomationComposition e
      @Column
      private String description;
  
 -    @Column
 +    @Column(columnDefinition = "TINYINT DEFAULT 1")
      private Boolean primed;
  
-     @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
      @NotNull
-     private Map<@NotNull UUID, @NotNull @Valid JpaAutomationCompositionElement> elements;
-     // @formatter:on
+     @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+     @JoinColumn(name = "instanceId", foreignKey = @ForeignKey(name = "ac_element_fk"))
+     private List<@NotNull @Valid JpaAutomationCompositionElement> elements;
  
      /**
       * The Default Constructor creates a {@link JpaAutomationComposition} object with a null key.

diff --cc runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/main/rest/InstantiationController.java
Simple merge

diff --cc runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/InstantiationControllerTest.java
Simple merge