From 68a3ba2c76aa4d09ea7ec6e0c417ba7c5ebdf985 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Wed, 1 Jul 2020 10:36:31 -0400 Subject: Fix build breakage in policy-common When the commit for https://gerrit.onap.org/r/c/policy/parent/+/109705 was applied, it broke the changes to common to fix new sonar issues. Backed out some of those changes. Issue-ID: POLICY-2650 Change-Id: Id498392ff798e49c281296575223298c0b6e5143 Signed-off-by: Jim Hahn --- .../java/org/onap/policy/common/ia/jpa/IntegrityAuditEntity.java | 6 ++++-- .../java/org/onap/policy/common/im/jpa/ForwardProgressEntity.java | 6 ++++-- .../src/main/java/org/onap/policy/common/im/jpa/ImTestEntity.java | 5 +++-- .../org/onap/policy/common/im/jpa/ResourceRegistrationEntity.java | 7 +++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/integrity-audit/src/main/java/org/onap/policy/common/ia/jpa/IntegrityAuditEntity.java b/integrity-audit/src/main/java/org/onap/policy/common/ia/jpa/IntegrityAuditEntity.java index 31c0bcd9..2b2b806a 100644 --- a/integrity-audit/src/main/java/org/onap/policy/common/ia/jpa/IntegrityAuditEntity.java +++ b/integrity-audit/src/main/java/org/onap/policy/common/ia/jpa/IntegrityAuditEntity.java @@ -29,6 +29,7 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; @@ -42,8 +43,9 @@ import org.onap.policy.common.ia.AuditorTime; @Entity @Table(name = "IntegrityAuditEntity") -@NamedQuery(name = " IntegrityAuditEntity.findAll", query = "SELECT e FROM IntegrityAuditEntity e ") -@NamedQuery(name = "IntegrityAuditEntity.deleteAll", query = "DELETE FROM IntegrityAuditEntity WHERE 1=1") +@NamedQueries({@NamedQuery(name = " IntegrityAuditEntity.findAll", query = "SELECT e FROM IntegrityAuditEntity e "), + @NamedQuery(name = "IntegrityAuditEntity.deleteAll", + query = "DELETE FROM IntegrityAuditEntity WHERE 1=1")}) public class IntegrityAuditEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ForwardProgressEntity.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ForwardProgressEntity.java index 0242bc7e..aa3524f0 100644 --- a/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ForwardProgressEntity.java +++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ForwardProgressEntity.java @@ -27,6 +27,7 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; @@ -40,8 +41,9 @@ import org.onap.policy.common.im.MonitorTime; @Entity @Table(name = "ForwardProgressEntity") -@NamedQuery(name = " ForwardProgressEntity.findAll", query = "SELECT e FROM ForwardProgressEntity e ") -@NamedQuery(name = "ForwardProgressEntity.deleteAll", query = "DELETE FROM ForwardProgressEntity WHERE 1=1") +@NamedQueries({@NamedQuery(name = " ForwardProgressEntity.findAll", query = "SELECT e FROM ForwardProgressEntity e "), + @NamedQuery(name = "ForwardProgressEntity.deleteAll", + query = "DELETE FROM ForwardProgressEntity WHERE 1=1")}) // @SequenceGenerator(name="seqForwardProgress", initialValue=1, allocationSize=1) public class ForwardProgressEntity implements Serializable { diff --git a/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ImTestEntity.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ImTestEntity.java index 884af053..1eaf3a6f 100644 --- a/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ImTestEntity.java +++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ImTestEntity.java @@ -27,6 +27,7 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; @@ -37,8 +38,8 @@ import org.onap.policy.common.im.MonitorTime; @Entity @Table(name = "ImTestEntity") -@NamedQuery(name = " ImTestEntity.findAll", query = "SELECT e FROM ImTestEntity e ") -@NamedQuery(name = "ImTestEntity.deleteAll", query = "DELETE FROM ImTestEntity WHERE 1=1") +@NamedQueries({@NamedQuery(name = " ImTestEntity.findAll", query = "SELECT e FROM ImTestEntity e "), + @NamedQuery(name = "ImTestEntity.deleteAll", query = "DELETE FROM ImTestEntity WHERE 1=1")}) // @SequenceGenerator(name="seqImTest", initialValue=1, allocationSize=1) public class ImTestEntity implements Serializable { diff --git a/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ResourceRegistrationEntity.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ResourceRegistrationEntity.java index 8f05e230..d73100f7 100644 --- a/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ResourceRegistrationEntity.java +++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ResourceRegistrationEntity.java @@ -27,6 +27,7 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; @@ -40,8 +41,10 @@ import org.onap.policy.common.im.MonitorTime; @Entity @Table(name = "ResourceRegistrationEntity") -@NamedQuery(name = " ResourceRegistrationEntity.findAll", query = "SELECT e FROM ResourceRegistrationEntity e ") -@NamedQuery(name = "ResourceRegistrationEntity.deleteAll", query = "DELETE FROM ResourceRegistrationEntity WHERE 1=1") +@NamedQueries({@NamedQuery(name = " ResourceRegistrationEntity.findAll", + query = "SELECT e FROM ResourceRegistrationEntity e "), + @NamedQuery(name = "ResourceRegistrationEntity.deleteAll", + query = "DELETE FROM ResourceRegistrationEntity WHERE 1=1")}) // @SequenceGenerator(name="seqResourceRegistration", initialValue=1, allocationSize=1) public class ResourceRegistrationEntity implements Serializable { -- cgit 1.2.3-korg