aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2023-02-02 14:47:15 +0000
committerliamfallon <liam.fallon@est.tech>2023-02-02 14:47:18 +0000
commite736b6a6160d24ae1e19fddb9b07d216cd895457 (patch)
tree5bd4836085a364138cc5d83095fa4c20600a8d5a
parent203a14a0c5397096f4b6918cd587248ea275e245 (diff)
Replace Eclipselink with Hibernate
Issue-ID: POLICY-4533 Change-Id: Iefaacb546812ccb660f32be012a44283c90b334a Signed-off-by: liamfallon <liam.fallon@est.tech>
-rw-r--r--models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElement.java9
-rw-r--r--models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaNodeTemplateState.java7
2 files changed, 11 insertions, 5 deletions
diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElement.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElement.java
index 4020243bb..d0dcd797f 100644
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElement.java
+++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElement.java
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.UUID;
import java.util.function.UnaryOperator;
import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
@@ -64,7 +65,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
@Data
@EqualsAndHashCode(callSuper = false)
public class JpaAutomationCompositionElement extends Validated
- implements PfAuthorative<AutomationCompositionElement>, Comparable<JpaAutomationCompositionElement> {
+ implements PfAuthorative<AutomationCompositionElement>, Comparable<JpaAutomationCompositionElement> {
@Id
@NotNull
@@ -77,8 +78,10 @@ public class JpaAutomationCompositionElement extends Validated
// @formatter:off
@VerifyKey
@NotNull
- @AttributeOverride(name = "name", column = @Column(name = "definition_name"))
- @AttributeOverride(name = "version", column = @Column(name = "definition_version"))
+ @AttributeOverrides({
+ @AttributeOverride(name = "name", column = @Column(name = "definition_name")),
+ @AttributeOverride(name = "version", column = @Column(name = "definition_version"))
+ })
private PfConceptKey definition;
@NotNull
diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaNodeTemplateState.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaNodeTemplateState.java
index 088bf2196..19d25e1b5 100644
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaNodeTemplateState.java
+++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaNodeTemplateState.java
@@ -22,6 +22,7 @@ package org.onap.policy.clamp.models.acm.persistence.concepts;
import java.util.UUID;
import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -59,8 +60,10 @@ public class JpaNodeTemplateState extends Validated implements PfAuthorative<Nod
@VerifyKey
@NotNull
- @AttributeOverride(name = "name", column = @Column(name = "nodeTemplate_name"))
- @AttributeOverride(name = "version", column = @Column(name = "nodeTemplate_version"))
+ @AttributeOverrides({
+ @AttributeOverride(name = "name", column = @Column(name = "nodeTemplate_name")),
+ @AttributeOverride(name = "version", column = @Column(name = "nodeTemplate_version"))
+ })
private PfConceptKey nodeTemplateId;
@Column