Merge "Update policy-apex-pdp for checkstyle 8.43"

10 files changed, 40 insertions, 40 deletions

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 fe597bb08..6da5ab3a8 100644
--- 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
@@ -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/AxReferenceKey.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java
index 33e26ef69..03a75a7fb 100644
--- 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
@@ -54,7 +54,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 616599653..30e021f43 100644
--- 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
@@ -77,7 +77,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 705691c22..bfd1809a7 100644
--- 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
@@ -77,9 +77,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 8c3f294c6..ea4ec57a4 100644
--- 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
@@ -77,9 +77,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 16e555be1..922cc247a 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
@@ -77,9 +77,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..4baba0029 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
@@ -103,7 +103,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 fcc6d995a..78a96a1f2 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
@@ -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
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 34b35da65..04b40e44b 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
@@ -117,7 +117,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
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..73012d8bc 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
@@ -75,9 +75,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