Upgrade oparent 3.2.1

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

diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java
index 2619d2e..bc9ae83 100644 (file)
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
  *  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.
@@ -73,9 +73,9 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey
     @ManyToMany(cascade = CascadeType.ALL)
     @JoinTable(
             joinColumns = { @JoinColumn(name = "keyInfoMapName", referencedColumnName = "name"),
-                    @JoinColumn(name = "keyInfoMapVersion", referencedColumnName = "version"), },
+                @JoinColumn(name = "keyInfoMapVersion", referencedColumnName = "version"), },
             inverseJoinColumns = { @JoinColumn(name = "keyInfoName", referencedColumnName = "name"),
-                    @JoinColumn(name = "keyInfoVersion", referencedColumnName = "version") })
+                @JoinColumn(name = "keyInfoVersion", referencedColumnName = "version") })
     private Map<AxArtifactKey, AxKeyInfo> keyInfoMap;
     // @formatter:on
 

diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java
index da6fb49..907706a 100644 (file)
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java
@@ -2,7 +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.
+ *  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.
@@ -279,7 +279,7 @@ public class AxModel extends AxConcept {
     /**
      * Check for consistent usage of a reference key in the model.
      *
-     * @param artifactKey The reference key to check
+     * @param referenceKey The reference key to check
      * @param referenceKeySet The set of reference keys encountered so far, this key is appended to the set
      * @param result The validation result to append to
      * @return the result of the validation

diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java
index 4b9d647..b44635e 100644 (file)
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 2019 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.
@@ -54,7 +55,7 @@ import org.onap.policy.common.utils.validation.Assertions;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlRootElement(name = "apexReferenceKey", namespace = "http://www.onap.org/policy/apex-pdp")
 @XmlType(name = "AxReferenceKey", namespace = "http://www.onap.org/policy/apex-pdp", propOrder = { "parentKeyName",
-                "parentKeyVersion", "parentLocalName", "localName" })
+    "parentKeyVersion", "parentLocalName", "localName" })
 
 public class AxReferenceKey extends AxKey {
     private static final String PARENT_KEY_NAME = "parentKeyName";

diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java
index 99e5300..b3c5a62 100644 (file)
--- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java
+++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.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,7 +78,7 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter<
     // @formatter:off
     @OneToMany(cascade = CascadeType.ALL)
     @JoinTable(joinColumns = {@JoinColumn(name = "contextName", referencedColumnName = "name"),
-            @JoinColumn(name = "contextVersion", referencedColumnName = "version")})
+        @JoinColumn(name = "contextVersion", referencedColumnName = "version")})
     @XmlElement(name = "albums", required = true)
     private Map<AxArtifactKey, AxContextAlbum> albums;
     // @formatter:on

diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java
index 8c4110b..a130565 100644 (file)
--- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java
+++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.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 AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon
     @ManyToMany(cascade = CascadeType.ALL)
     @JoinTable(
             joinColumns = {@JoinColumn(name = "contextSchemasName", referencedColumnName = "name"),
-                    @JoinColumn(name = "contextSchemasVersion", referencedColumnName = "version")},
+                @JoinColumn(name = "contextSchemasVersion", referencedColumnName = "version")},
             inverseJoinColumns = {@JoinColumn(name = "contextSchemaName", referencedColumnName = "name"),
-                    @JoinColumn(name = "contextSchemaVersion", referencedColumnName = "version")})
+                @JoinColumn(name = "contextSchemaVersion", referencedColumnName = "version")})
     @XmlElement(name = "schemas", required = true)
     private Map<AxArtifactKey, AxContextSchema> schemas;
     // @formatter:on

diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java
index 8c3f294..7d5e803 100644 (file)
--- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java
+++ b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.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 AxEvents extends AxConcept implements AxConceptGetter<AxEvent> {
     @ManyToMany(cascade = CascadeType.ALL)
     @JoinTable(
             joinColumns = { @JoinColumn(name = "eventMapName", referencedColumnName = "name"),
-                    @JoinColumn(name = "eventMapVersion", referencedColumnName = "version") },
+                @JoinColumn(name = "eventMapVersion", referencedColumnName = "version") },
             inverseJoinColumns = { @JoinColumn(name = "eventName", referencedColumnName = "name"),
-                    @JoinColumn(name = "eventVersion", referencedColumnName = "version") })
+                @JoinColumn(name = "eventVersion", referencedColumnName = "version") })
     @XmlElement(required = true)
     private Map<AxArtifactKey, AxEvent> eventMap;
     // @formatter:on

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 16e555b..2248e64 100644 (file)
--- 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 939d094..bc8b099 100644 (file)
--- 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 80e967f..24a8dc1 100644 (file)
--- 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 20df8d8..887e3d3 100644 (file)
--- 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 7986cb6..948c54e 100644 (file)
--- 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

diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java
index 06d9b47..57a2d1c 100644 (file)
--- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java
+++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java
@@ -3,6 +3,7 @@
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
  *  Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
+ *  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.
@@ -467,7 +468,7 @@ public class Apex2JsonEventConverter implements ApexEventProtocolConverter {
      * Determine the name space field of the event header.
      *
      * @param jsonObject the event in JSON format
-     * @param eventName the name of the event
+     * @param name the name of the event
      * @param eventDefinition the definition of the event structure
      * @return the event version
      */

diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEngineServiceHandler.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEngineServiceHandler.java
index f278fd5..e7a16f2 100644 (file)
--- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEngineServiceHandler.java
+++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEngineServiceHandler.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 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.
@@ -43,7 +44,6 @@ public class ApexEngineServiceHandler {
      * Instantiates a new engine holder with its engine service and EngDep service.
      *
      * @param apexEngineService the apex engine service
-     * @param engDepService     the EngDep service
      */
     ApexEngineServiceHandler(final EngineService apexEngineService) {
         this.apexEngineService = apexEngineService;

diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/ApexParameters.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/ApexParameters.java
index 692d5ae..2107aca 100644 (file)
--- a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/ApexParameters.java
+++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/ApexParameters.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  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.
@@ -330,8 +331,9 @@ public class ApexParameters implements ParameterGroup {
      * 
      * @param handlerMapVariableName the variable name of the map on which the paired parameters are being checked
      * @param result The result object to which to append any error messages
-     * @param leftModeParameters The mode parameters being checked
-     * @param rightModeParameters The mode parameters being referenced by the checked parameters
+     * @param peeredMode The event peered mode
+     * @param leftModeParameterMap The mode parameters being checked
+     * @param rightModeParameterMap The mode parameters being referenced by the checked parameters
      */
     private void validatePeeredModePeers(final String handlerMapVariableName, final GroupValidationResult result,
         final EventHandlerPeeredMode peeredMode, final Map<String, EventHandlerParameters> leftModeParameterMap,

diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/PdpUpdateMessageHandler.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/PdpUpdateMessageHandler.java
index 8dc49ee..a8c2c14 100644 (file)
--- a/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/PdpUpdateMessageHandler.java
+++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/PdpUpdateMessageHandler.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019-2021 Nordix Foundation.
  *  Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
+ *  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.
@@ -123,7 +124,6 @@ public class PdpUpdateMessageHandler {
      *
      * @param pdpUpdateMsg the pdp update message from pap
      * @param pdpMessageHandler pdp message handler
-     * @param pdpStatusContext the pdp status object in memory
      * @return pdpResponseDetails the pdp response
      */
     private PdpResponseDetails startOrStopApexEngineBasedOnPolicies(final PdpUpdate pdpUpdateMsg,

diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2File.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2File.java
index 63565ab..946dbd9 100644 (file)
--- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2File.java
+++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2File.java
@@ -3,6 +3,7 @@
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 2020 Nordix Foundation.
  *  Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
+ *  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.
@@ -85,7 +86,7 @@ public class TestFile2File {
     /**
      * Strip variable length text from file string.
      *
-     * @param textFileAsString the file to read and strip
+     * @param outFile the file to read and strip
      * @return the stripped string
      * @throws IOException on out file read exceptions
      */

diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileFiltered.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileFiltered.java
index a890b8e..f00e66d 100644 (file)
--- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileFiltered.java
+++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileFiltered.java
@@ -3,6 +3,7 @@
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 2020 Nordix Foundation.
  *  Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
+ *  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.
@@ -133,7 +134,7 @@ public class TestFile2FileFiltered {
     /**
      * Strip variable length text from file string.
      *
-     * @param textFileAsString the file to read and strip
+     * @param outFile the file to read and strip
      * @return the stripped string
      * @throws IOException on out file read exceptions
      */

diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileIgnore.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileIgnore.java
index 328a52a..485342b 100644 (file)
--- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileIgnore.java
+++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileIgnore.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 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.
@@ -95,7 +96,7 @@ public class TestFile2FileIgnore {
     /**
      * Strip variable length text from file string.
      *
-     * @param textFileAsString the file to read and strip
+     * @param outFile the file to read and strip
      * @return the stripped string
      * @throws IOException on out file read exceptions
      */

diff --git a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java
index 46fba87..766d78a 100644 (file)
--- a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java
+++ b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  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.
@@ -300,7 +301,7 @@ public class Model2JsonEventSchema {
     /**
      * Process the state in the response.
      * @param eventKeys the event keys
-     * @param policies the policies to process
+     * @param policy the policy to process
      */
     private void processState(final Set<AxArtifactKey> eventKeys, final AxPolicy policy) {
         for (final AxState state : policy.getStateMap().values()) {
@@ -329,7 +330,8 @@ public class Model2JsonEventSchema {
     /**
      * Process the internal state.
      * @param eventKeys the event keys
-     * @param policies the policies to process
+     * @param firsState the first state
+     * @param state state
      */
     private void processInternalState(final Set<AxArtifactKey> eventKeys, final String firsState, final AxState state) {
         if (state.getKey().getLocalName().equals(firsState)) {