From c2cc0fd8dbb9a9a72a8eff270ca21b8da77cb247 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Tue, 30 Jun 2020 13:01:09 -0400 Subject: Fix sonars in common due to dependency upgrades Fixed the following issues: - don't use annotation wrappers - version overridden in pom Issue-ID: POLICY-2650 Change-Id: Ia520037529861f8ace160c172ed70a5671b740d9 Signed-off-by: Jim Hahn --- .../java/org/onap/policy/common/im/jpa/ForwardProgressEntity.java | 5 ++--- .../src/main/java/org/onap/policy/common/im/jpa/ImTestEntity.java | 5 ++--- .../org/onap/policy/common/im/jpa/ResourceRegistrationEntity.java | 8 ++------ 3 files changed, 6 insertions(+), 12 deletions(-) (limited to 'integrity-monitor') 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 0e0c24c6..0242bc7e 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,7 +27,6 @@ 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; @@ -41,8 +40,8 @@ import org.onap.policy.common.im.MonitorTime; @Entity @Table(name = "ForwardProgressEntity") -@NamedQueries({@NamedQuery(name = " ForwardProgressEntity.findAll", query = "SELECT e FROM ForwardProgressEntity e "), - @NamedQuery(name = "ForwardProgressEntity.deleteAll", query = "DELETE FROM ForwardProgressEntity WHERE 1=1")}) +@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 6c710f27..884af053 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,7 +27,6 @@ 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; @@ -38,8 +37,8 @@ import org.onap.policy.common.im.MonitorTime; @Entity @Table(name = "ImTestEntity") -@NamedQueries({@NamedQuery(name = " ImTestEntity.findAll", query = "SELECT e FROM ImTestEntity e "), - @NamedQuery(name = "ImTestEntity.deleteAll", query = "DELETE FROM ImTestEntity WHERE 1=1")}) +@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 e23553fa..8f05e230 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,7 +27,6 @@ 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; @@ -41,11 +40,8 @@ import org.onap.policy.common.im.MonitorTime; @Entity @Table(name = "ResourceRegistrationEntity") -@NamedQueries({ - @NamedQuery(name = " ResourceRegistrationEntity.findAll", - query = "SELECT e FROM ResourceRegistrationEntity e "), - @NamedQuery(name = "ResourceRegistrationEntity.deleteAll", - query = "DELETE FROM ResourceRegistrationEntity WHERE 1=1")}) +@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