Merge "Sonar Fixes"

6 files changed, 24 insertions, 23 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 f3e89a4e0..16e555be1 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
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -99,7 +99,7 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> {
      * @param key the key
      */
     public AxPolicies(final AxArtifactKey key) {
-        this(key, new TreeMap<AxArtifactKey, AxPolicy>());
+        this(key, new TreeMap<>());
     }
 
     /**
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 502ec3a60..939d094e6 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
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -134,7 +134,7 @@ public class AxPolicy extends AxConcept {
      * @param key the key of the policy
      */
     public AxPolicy(final AxArtifactKey key) {
-        this(key, "", new TreeMap<String, AxState>(), "");
+        this(key, "", new TreeMap<>(), "");
     }
 
     /**
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 713e4de79..44b71f84a 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
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 2018 Samsung Electronics Co., Ltd.
- *  Modifications Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -243,12 +243,12 @@ public class AxState extends AxConcept {
         this(new AxStateParamsBuilder()
                         .key(key)                                                             // Key
                         .trigger(AxArtifactKey.getNullKey())                                  // Trigger Reference
-                        .stateOutputs(new TreeMap<String, AxStateOutput>())                   // State Outputs
-                        .contextAlbumReferenceSet(new TreeSet<AxArtifactKey>())               // Context Album Refs
+                        .stateOutputs(new TreeMap<>())                                        // State Outputs
+                        .contextAlbumReferenceSet(new TreeSet<>())                            // Context Album Refs
                         .taskSelectionLogic(new AxTaskSelectionLogic())                       // Task Selection Logic
-                        .stateFinalizerLogicMap(new TreeMap<String, AxStateFinalizerLogic>()) // State Finalizer Logics
+                        .stateFinalizerLogicMap(new TreeMap<>())                              // State Finalizer Logics
                         .defaultTask(AxArtifactKey.getNullKey())                              // Default Task
-                        .taskReferenceMap(new TreeMap<AxArtifactKey, AxStateTaskReference>()) // Task References
+                        .taskReferenceMap(new TreeMap<>())                                    // Task References
         );
         // @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 a0aa705b5..20df8d872 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
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -152,10 +152,10 @@ public class AxTask extends AxConcept {
      */
     public AxTask(final AxArtifactKey key) {
         this(key, // Task Key
-                new TreeMap<String, AxInputField>(), // Input fields
-                new TreeMap<String, AxOutputField>(), // Output Fields
-                new TreeMap<String, AxTaskParameter>(), // Task Parameters
-                new TreeSet<AxArtifactKey>(), // Context Album References
+                new TreeMap<>(), // Input fields
+                new TreeMap<>(), // Output Fields
+                new TreeMap<>(), // Task Parameters
+                new TreeSet<>(), // Context Album References
                 new AxTaskLogic(new AxReferenceKey(key)) // Task Logic
         );
     }
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 4d9dd2089..7986cb658 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
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -106,7 +106,7 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> {
      * @param key the key
      */
     public AxTasks(final AxArtifactKey key) {
-        this(key, new TreeMap<AxArtifactKey, AxTask>());
+        this(key, new TreeMap<>());
     }
 
     /**
diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java
index 7da262c90..96bdc57d0 100644
--- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java
+++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java
@@ -1,19 +1,20 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
@@ -57,20 +58,20 @@ public class PolicyAnalysisResult {
      */
     public PolicyAnalysisResult(final AxPolicyModel policyModel) {
         for (final AxArtifactKey contextSchemaKey : policyModel.getSchemas().getSchemasMap().keySet()) {
-            contextSchemaUsage.put(contextSchemaKey, new TreeSet<AxKey>());
+            contextSchemaUsage.put(contextSchemaKey, new TreeSet<>());
         }
 
         for (final Entry<AxArtifactKey, AxContextAlbum> contextAlbumEntry : policyModel.getAlbums().getAlbumsMap()
                         .entrySet()) {
-            contextAlbumUsage.put(contextAlbumEntry.getKey(), new TreeSet<AxKey>());
+            contextAlbumUsage.put(contextAlbumEntry.getKey(), new TreeSet<>());
         }
 
         for (final AxArtifactKey eventKey : policyModel.getEvents().getEventMap().keySet()) {
-            eventUsage.put(eventKey, new TreeSet<AxKey>());
+            eventUsage.put(eventKey, new TreeSet<>());
         }
 
         for (final AxArtifactKey taskKey : policyModel.getTasks().getTaskMap().keySet()) {
-            taskUsage.put(taskKey, new TreeSet<AxKey>());
+            taskUsage.put(taskKey, new TreeSet<>());
         }
     }