From b6977d2f7ce64ece732ac1a1a0525dac972d7ccf Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Wed, 17 Feb 2021 15:23:38 -0500
Subject: Fix sonars in apex-pdp

Addressed the following issues:
- initialize mocks before use
- use parameterized queries
- Random() is not secure
- provide parameterized type for generics
- unused imports
- constructor visibility
- use compute() instead of containsKey()/put()
- make final fields static
- rename constants to all upper case
- no assert() in Thread.run() methods
- nested try
- nested if/else
- too many break/continue
- use try-with-resources
- repeatable annotations
- overlapping characters in reg ex
- hashcode is not sufficient in compareTo()
- need equals() with compareTo()
- make class an interface
- use parameterized test
- multiple calls in assert()
- log or re-throw
- use different type of lambda
- use parameterized logging
- use StringBuilder instead of concatenation
- use StandardCharsets.UTF_8

Issue-ID: POLICY-2906
Change-Id: I2cf8c885e3e22c2c6cbe6403a34906928afad022
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 .../policy/apex/model/eventmodel/concepts/AxEventModel.java    | 10 +++++-----
 .../onap/policy/apex/model/eventmodel/concepts/AxField.java    |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'model/event-model')

diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java
index f4938dcea..511d4f3d0 100644
--- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java
+++ b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +26,6 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -64,14 +64,14 @@ public class AxEventModel extends AxModel {
 
     // @formatter:off
     @OneToOne(cascade = CascadeType.ALL)
-    @JoinColumns({ @JoinColumn(name = "schemasName", referencedColumnName = "name"),
-            @JoinColumn(name = "schemasVersion", referencedColumnName = "version") })
+    @JoinColumn(name = "schemasName", referencedColumnName = "name")
+    @JoinColumn(name = "schemasVersion", referencedColumnName = "version")
     @XmlElement(name = "schemas", required = true)
     private AxContextSchemas schemas;
 
     @OneToOne(cascade = CascadeType.ALL)
-    @JoinColumns({ @JoinColumn(name = "eventsName", referencedColumnName = "name"),
-            @JoinColumn(name = "eventsVersion", referencedColumnName = "version") })
+    @JoinColumn(name = "eventsName", referencedColumnName = "name")
+    @JoinColumn(name = "eventsVersion", referencedColumnName = "version")
     @XmlElement(name = "events", required = true)
     private AxEvents events;
     // @formatter:on
diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java
index a1d6a8ba1..654a83ced 100644
--- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java
+++ b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +24,6 @@ package org.onap.policy.apex.model.eventmodel.concepts;
 
 import java.util.List;
 import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
 import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.EmbeddedId;
@@ -83,8 +83,8 @@ public class AxField extends AxConcept {
 
     // @formatter:off
     @Embedded
-    @AttributeOverrides({ @AttributeOverride(name = "name", column = @Column(name = "fieldSchemaName")),
-            @AttributeOverride(name = "version", column = @Column(name = "fieldSchemaVersion")) })
+    @AttributeOverride(name = "name", column = @Column(name = "fieldSchemaName"))
+    @AttributeOverride(name = "version", column = @Column(name = "fieldSchemaVersion"))
     @Column(name = "fieldSchemaKey")
     @XmlElement(required = true)
     private AxArtifactKey fieldSchemaKey;
-- 
cgit 1.2.3-korg