Upgrade oparent 3.2.1

Issue-ID: POLICY-4211
Change-Id: I03def43ec2f027f276674af00d749018a951a05f
Signed-off-by: pdragosh <pd1248@att.com>

5 files changed, 40 insertions, 36 deletions

diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java
index 16e555be1..2248e641c 100644
--- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java
+++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2022 AT&T Intellectual Property. 
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,9 +78,9 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> {
     @ManyToMany(cascade = CascadeType.ALL)
     @JoinTable(
             joinColumns = {@JoinColumn(name = "policyMapName", referencedColumnName = "name"),
-                    @JoinColumn(name = "policyMapVersion", referencedColumnName = "version")},
+                @JoinColumn(name = "policyMapVersion", referencedColumnName = "version")},
             inverseJoinColumns = {@JoinColumn(name = "policyName", referencedColumnName = "name"),
-                    @JoinColumn(name = "policyVersion", referencedColumnName = "version")})
+                @JoinColumn(name = "policyVersion", referencedColumnName = "version")})
     @XmlElement(required = true)
     private Map<AxArtifactKey, AxPolicy> policyMap;
     // @formatter:on
diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java
index 939d094e6..bc8b099ed 100644
--- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java
+++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2022 AT&T Intellectual Property.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -103,7 +104,7 @@ public class AxPolicy extends AxConcept {
     // @formatter:off
     @OneToMany(cascade = CascadeType.ALL)
     @JoinTable(joinColumns = {@JoinColumn(name = "parentKeyName", referencedColumnName = "name"),
-            @JoinColumn(name = "parentKeyVersion", referencedColumnName = "version")})
+        @JoinColumn(name = "parentKeyVersion", referencedColumnName = "version")})
     @XmlElement(name = "state", required = true)
     private Map<String, AxState> stateMap;
     // @formatter:on
diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java
index 80e967fdf..24a8dc16d 100644
--- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java
+++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java
@@ -3,7 +3,7 @@
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 2018 Samsung Electronics Co., Ltd.
  *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
- *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+ *  Modifications Copyright (C) 2021-2022 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.
@@ -127,7 +127,7 @@ import org.onap.policy.common.utils.validation.Assertions;
 @XmlRootElement(name = "apexState", namespace = "http://www.onap.org/policy/apex-pdp")
 @XmlType(name = "AxState", namespace = "http://www.onap.org/policy/apex-pdp", propOrder =
     { "key", "trigger", "stateOutputs", "contextAlbumReferenceSet", "taskSelectionLogic", "stateFinalizerLogicMap",
-                    "defaultTask", "taskReferenceMap" })
+        "defaultTask", "taskReferenceMap" })
 
 public class AxState extends AxConcept {
     private static final String DOES_NOT_EQUAL_STATE_KEY = " does not equal state key";
@@ -149,34 +149,34 @@ public class AxState extends AxConcept {
     @ManyToMany(cascade = CascadeType.ALL)
     @JoinTable(
             joinColumns = {@JoinColumn(name = "soParentKeyName", referencedColumnName = "parentKeyName"),
-                    @JoinColumn(name = "soParentKeyVersion", referencedColumnName = "parentKeyVersion"),
-                    @JoinColumn(name = "soParentLocalName", referencedColumnName = "parentLocalName"),
-                    @JoinColumn(name = "soLocalName", referencedColumnName = "localName")},
+                @JoinColumn(name = "soParentKeyVersion", referencedColumnName = "parentKeyVersion"),
+                @JoinColumn(name = "soParentLocalName", referencedColumnName = "parentLocalName"),
+                @JoinColumn(name = "soLocalName", referencedColumnName = "localName")},
             inverseJoinColumns = {@JoinColumn(name = "stateParentKeyName", referencedColumnName = "parentKeyName"),
-                    @JoinColumn(name = "stateParentKeyVersion", referencedColumnName = "parentKeyVersion"),
-                    @JoinColumn(name = "stateParentLocalName", referencedColumnName = "parentLocalName"),
-                    @JoinColumn(name = "stateLocalName", referencedColumnName = "localName")})
+                @JoinColumn(name = "stateParentKeyVersion", referencedColumnName = "parentKeyVersion"),
+                @JoinColumn(name = "stateParentLocalName", referencedColumnName = "parentLocalName"),
+                @JoinColumn(name = "stateLocalName", referencedColumnName = "localName")})
     @XmlElement(name = "stateOutputs", required = true)
     private Map<String, AxStateOutput> stateOutputs;
 
     @ElementCollection
     @CollectionTable(joinColumns = {@JoinColumn(name = "stateParentKeyName", referencedColumnName = "parentKeyName"),
-            @JoinColumn(name = "stateParentKeyVersion", referencedColumnName = "parentKeyVersion"),
-            @JoinColumn(name = "stateParentLocalName", referencedColumnName = "parentLocalName"),
-            @JoinColumn(name = "stateLocalName", referencedColumnName = "localName")})
+        @JoinColumn(name = "stateParentKeyVersion", referencedColumnName = "parentKeyVersion"),
+        @JoinColumn(name = "stateParentLocalName", referencedColumnName = "parentLocalName"),
+        @JoinColumn(name = "stateLocalName", referencedColumnName = "localName")})
     @XmlElement(name = "contextAlbumReference")
     private Set<AxArtifactKey> contextAlbumReferenceSet;
 
     @OneToOne
     @JoinTable(name = "STATE_TSL_JT",
             joinColumns = {
-                    @JoinColumn(name = "tslParentKeyName", referencedColumnName = "parentKeyName", updatable = false,
+                @JoinColumn(name = "tslParentKeyName", referencedColumnName = "parentKeyName", updatable = false,
                             insertable = false),
-                    @JoinColumn(name = "tslParentKeyVersion", referencedColumnName = "parentKeyVersion",
+                @JoinColumn(name = "tslParentKeyVersion", referencedColumnName = "parentKeyVersion",
                             updatable = false, insertable = false),
-                    @JoinColumn(name = "tslParentLocalName ", referencedColumnName = "parentLocalName",
+                @JoinColumn(name = "tslParentLocalName ", referencedColumnName = "parentLocalName",
                             updatable = false, insertable = false),
-                    @JoinColumn(name = "tslLocalName", referencedColumnName = "localName", updatable = false,
+                @JoinColumn(name = "tslLocalName", referencedColumnName = "localName", updatable = false,
                             insertable = false)})
     @XmlElement(required = true)
     private AxTaskSelectionLogic taskSelectionLogic;
@@ -184,13 +184,13 @@ public class AxState extends AxConcept {
     @ManyToMany(cascade = CascadeType.ALL)
     @JoinTable(
             joinColumns = {@JoinColumn(name = "sflParentKeyName", referencedColumnName = "parentKeyName"),
-                    @JoinColumn(name = "sflParentKeyVersion", referencedColumnName = "parentKeyVersion"),
-                    @JoinColumn(name = "sflParentLocalName", referencedColumnName = "parentLocalName"),
-                    @JoinColumn(name = "sflLocalName", referencedColumnName = "localName")},
+                @JoinColumn(name = "sflParentKeyVersion", referencedColumnName = "parentKeyVersion"),
+                @JoinColumn(name = "sflParentLocalName", referencedColumnName = "parentLocalName"),
+                @JoinColumn(name = "sflLocalName", referencedColumnName = "localName")},
             inverseJoinColumns = {@JoinColumn(name = "stateParentKeyName", referencedColumnName = "parentKeyName"),
-                    @JoinColumn(name = "stateParentKeyVersion", referencedColumnName = "parentKeyVersion"),
-                    @JoinColumn(name = "stateParentLocalName", referencedColumnName = "parentLocalName"),
-                    @JoinColumn(name = "stateLocalName", referencedColumnName = "localName")})
+                @JoinColumn(name = "stateParentKeyVersion", referencedColumnName = "parentKeyVersion"),
+                @JoinColumn(name = "stateParentLocalName", referencedColumnName = "parentLocalName"),
+                @JoinColumn(name = "stateLocalName", referencedColumnName = "localName")})
     @XmlElement(name = "stateFinalizerLogicMap", required = true)
     private Map<String, AxStateFinalizerLogic> stateFinalizerLogicMap;
 
@@ -204,13 +204,13 @@ public class AxState extends AxConcept {
     @ManyToMany(cascade = CascadeType.ALL)
     @JoinTable(
             joinColumns = {@JoinColumn(name = "trmParentKeyName", referencedColumnName = "parentKeyName"),
-                    @JoinColumn(name = "trmParentKeyVersion", referencedColumnName = "parentKeyVersion"),
-                    @JoinColumn(name = "trmParentLocalName", referencedColumnName = "parentLocalName"),
-                    @JoinColumn(name = "trmLocalName", referencedColumnName = "localName")},
+                @JoinColumn(name = "trmParentKeyVersion", referencedColumnName = "parentKeyVersion"),
+                @JoinColumn(name = "trmParentLocalName", referencedColumnName = "parentLocalName"),
+                @JoinColumn(name = "trmLocalName", referencedColumnName = "localName")},
             inverseJoinColumns = {@JoinColumn(name = "stateParentKeyName", referencedColumnName = "parentKeyName"),
-                    @JoinColumn(name = "stateParentKeyVersion", referencedColumnName = "parentKeyVersion"),
-                    @JoinColumn(name = "stateParentLocalName", referencedColumnName = "parentLocalName"),
-                    @JoinColumn(name = "stateLocalName", referencedColumnName = "localName")})
+                @JoinColumn(name = "stateParentKeyVersion", referencedColumnName = "parentKeyVersion"),
+                @JoinColumn(name = "stateParentLocalName", referencedColumnName = "parentLocalName"),
+                @JoinColumn(name = "stateLocalName", referencedColumnName = "localName")})
     @XmlElement(name = "taskReferences", required = true)
     private Map<AxArtifactKey, AxStateTaskReference> taskReferenceMap;
     // @formatter:on
@@ -937,7 +937,7 @@ public class AxState extends AxConcept {
     /**
      * Compare the object fields on this state to another state.
      *
-     * @param the other state to compare with
+     * @param other the other state to compare with
      * @return the result of the comparison
      */
     private int compareObjectFields(final AxState other) {
diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java
index 20df8d872..887e3d3d2 100644
--- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java
+++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2022 AT&T Intellectual Property.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -117,7 +118,7 @@ public class AxTask extends AxConcept {
     // @formatter:off
     @ElementCollection
     @CollectionTable(joinColumns = {@JoinColumn(name = "contextAlbumName", referencedColumnName = "name"),
-            @JoinColumn(name = "contextAlbumVersion", referencedColumnName = "version")})
+        @JoinColumn(name = "contextAlbumVersion", referencedColumnName = "version")})
     @XmlElement(name = "contextAlbumReference")
     private Set<AxArtifactKey> contextAlbumReferenceSet;
     // @formatter:on
@@ -483,7 +484,7 @@ public class AxTask extends AxConcept {
     /**
      * Validate a field.
      *
-     * @param key the key of the field to validate
+     * @param fieldKey the key of the field to validate
      * @param field the field to validate
      * @param direction The direction of the field
      * @param result The validation result to append to
@@ -533,7 +534,7 @@ public class AxTask extends AxConcept {
     /**
      * Validate a context album reference entry.
      *
-     * @param taskParameterEntry the context album reference entry to validate
+     * @param contextAlbumReference the context album reference entry to validate
      * @param result The validation result to append to
      * @return The result of the validation
      */
diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java
index 7986cb658..948c54e74 100644
--- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java
+++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2022 AT&T Intellectual Property.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,9 +76,9 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> {
     @ManyToMany(cascade = CascadeType.ALL)
     @JoinTable(
             joinColumns = {@JoinColumn(name = "taskMapName", referencedColumnName = "name"),
-                    @JoinColumn(name = "taskMapVersion", referencedColumnName = "version")},
+                @JoinColumn(name = "taskMapVersion", referencedColumnName = "version")},
             inverseJoinColumns = {@JoinColumn(name = "taskName", referencedColumnName = "name"),
-                    @JoinColumn(name = "taskVersion", referencedColumnName = "version")})
+                @JoinColumn(name = "taskVersion", referencedColumnName = "version")})
     @XmlElement(required = true)
     private Map<AxArtifactKey, AxTask> taskMap;
     // @formatter:on