From: Liam Fallon <liam.fallon@est.tech>
Date: Tue, 20 Dec 2022 09:55:45 +0000 (+0000)
Subject: Merge "Refactor instanceId as primary key in JpaAutomationComposition"
X-Git-Tag: 6.4.1~53
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e70bf5c909a4d5abcbc7adcbb4aa120c2e045660;p=policy%2Fclamp.git

Merge "Refactor instanceId as primary key in JpaAutomationComposition"
---

e70bf5c909a4d5abcbc7adcbb4aa120c2e045660
diff --cc models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationComposition.java
index 28a558cc1,e3c37d012..f9cc880d0
--- a/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.