Merge "Sonar Fixes"

18 files changed, 69 insertions, 67 deletions

diff --git a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorLoop.java b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorLoop.java
index cfe2077bc..3adea1a89 100644
--- a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorLoop.java
+++ b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorLoop.java
@@ -257,7 +257,6 @@ public class CommandLineEditorLoop {
                 writer.println(e.getMessage());
                 executionStatus.setRight(executionStatus.getRight() + 1);
                 LOGGER.debug(COMMAND_LINE_ERROR, e);
-                continue;
             } catch (final Exception e) {
                 e.printStackTrace(writer);
                 LOGGER.error(COMMAND_LINE_ERROR, e);
diff --git a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineParser.java b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineParser.java
index 3eba53d2d..05066adb4 100644
--- a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineParser.java
+++ b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineParser.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=========================================================
  */
@@ -22,6 +23,7 @@ package org.onap.policy.apex.auth.clieditor;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -87,7 +89,7 @@ public class CommandLineParser {
 
     /**
      * This method merges the next set of quotes.
-     * 
+     *
      * @param wordsSplitOnQuotes the words split on quotes
      * @param wordsWithQuotesMerged the merged words
      * @param wordIndex the current word index
@@ -240,7 +242,7 @@ public class CommandLineParser {
 
     /**
      * Strip and split a word on blanks into an array of words split on blanks.
-     * 
+     *
      * @param word the word to split
      * @return the array of split words
      */
@@ -257,9 +259,7 @@ public class CommandLineParser {
 
         // Split on space characters
         final String[] splitWords = singleSpaceWord.split(" ");
-        for (final String splitWord : splitWords) {
-            strippedAndSplitWords.add(splitWord);
-        }
+        Collections.addAll(strippedAndSplitWords, splitWords);
 
         return strippedAndSplitWords;
     }
diff --git a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/utils/CliUtils.java b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/utils/CliUtils.java
index ccf799047..a70439e10 100644
--- a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/utils/CliUtils.java
+++ b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/utils/CliUtils.java
@@ -217,7 +217,7 @@ public class CliUtils {
                 if (argValue instanceof String && !key.equals("o")) {
                     cliArgsList.add("-" + key);
                     cliArgsList.add(argValue.toString());
-                } else if (argValue instanceof Boolean && (Boolean) argValue) {
+                } else if (argValue instanceof Boolean && (boolean) argValue) {
                     cliArgsList.add("-" + key);
                 }
             } catch (Exception e) {
diff --git a/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestResource.java b/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestResource.java
index dd9d8b2c6..f31f47cd4 100644
--- a/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestResource.java
+++ b/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestResource.java
@@ -1,6 +1,7 @@
 /*-
  * ============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.
@@ -294,7 +295,7 @@ public class ApexMonitoringRestResource {
         SlidingWindowList<Counter> valueList;
 
         if (!cache.containsKey(host)) {
-            cache.put(host, new HashMap<String, List<Counter>>());
+            cache.put(host, new HashMap<>());
         }
 
         if (cache.get(host).containsKey(id)) {
@@ -312,7 +313,7 @@ public class ApexMonitoringRestResource {
 
     /**
      * Get an engine service facade for sending REST requests. This method is package because it is used by unit test.
-     * 
+     *
      * @param hostName the host name of the Apex engine
      * @param port the port of the Apex engine
      * @return the engine service facade
@@ -359,21 +360,21 @@ public class ApexMonitoringRestResource {
             if (this == obj) {
                 return true;
             }
-            
+
             if (!super.equals(obj)) {
                 return false;
             }
-            
+
             if (getClass() != obj.getClass()) {
                 return false;
             }
-            
+
             @SuppressWarnings("unchecked")
             SlidingWindowList<V> other = (SlidingWindowList<V>) obj;
             if (!getOuterType().equals(other.getOuterType())) {
                 return false;
             }
-            
+
             return maxEntries == other.maxEntries;
         }
     }
diff --git a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/RawMessageHandler.java b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/RawMessageHandler.java
index ca51a9e33..acd7bdfea 100644
--- a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/RawMessageHandler.java
+++ b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/RawMessageHandler.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.
@@ -104,7 +104,7 @@ public class RawMessageHandler<M> implements WebSocketMessageListener<M>, Runnab
             if (messageHolder != null) {
                 final List<M> messages = messageHolder.getMessages();
                 if (messages != null) {
-                    messageBlockQueue.add(new MessageBlock<M>(messages, incomingData.getConn()));
+                    messageBlockQueue.add(new MessageBlock<>(messages, incomingData.getConn()));
                 }
             }
         } catch (final IOException | ClassNotFoundException e) {
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 fc876d8ea..446a00a68 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
@@ -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.
@@ -100,7 +100,7 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey
      * @param key the key of the concept
      */
     public AxKeyInformation(final AxArtifactKey key) {
-        this(key, new TreeMap<AxArtifactKey, AxKeyInfo>());
+        this(key, new TreeMap<>());
     }
 
     /**
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 a28fbf663..99e5300dc 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
@@ -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 final class AxContextAlbums extends AxConcept implements AxConceptGetter<
      * @param key the key of the context album container
      */
     public AxContextAlbums(final AxArtifactKey key) {
-        this(key, new TreeMap<AxArtifactKey, AxContextAlbum>());
+        this(key, new TreeMap<>());
     }
 
     /**
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 a0f031450..8c4110b62 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
@@ -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.
@@ -108,7 +108,7 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon
      * @param key the key of the context album container
      */
     public AxContextSchemas(final AxArtifactKey key) {
-        this(key, new TreeMap<AxArtifactKey, AxContextSchema>());
+        this(key, new TreeMap<>());
     }
 
     /**
diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java
index 26e21aed7..156b733ef 100644
--- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java
+++ b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.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.
@@ -130,7 +130,7 @@ public class AxEvent extends AxConcept {
      * @param key the key of the event
      */
     public AxEvent(final AxArtifactKey key) {
-        this(key, "", "", "", new TreeMap<String, AxField>());
+        this(key, "", "", "", new TreeMap<>());
     }
 
     /**
@@ -141,7 +141,7 @@ public class AxEvent extends AxConcept {
      * @param nameSpace the name space of the event
      */
     public AxEvent(final AxArtifactKey key, final String nameSpace) {
-        this(key, nameSpace, "", "", new TreeMap<String, AxField>());
+        this(key, nameSpace, "", "", new TreeMap<>());
     }
 
     /**
@@ -154,7 +154,7 @@ public class AxEvent extends AxConcept {
      * @param target the target of the event
      */
     public AxEvent(final AxArtifactKey key, final String nameSpace, final String source, final String target) {
-        this(key, nameSpace, source, target, new TreeMap<String, AxField>());
+        this(key, nameSpace, source, target, new TreeMap<>());
     }
 
     /**
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 2df7dee07..8c3f294c6 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
@@ -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.
@@ -107,7 +107,7 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> {
      * @param key the event container key
      */
     public AxEvents(final AxArtifactKey key) {
-        this(key, new TreeMap<AxArtifactKey, AxEvent>());
+        this(key, new TreeMap<>());
     }
 
     /**
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<>());
         }
     }
 
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaProducer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaProducer.java
index b570c4021..f7ff14744 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaProducer.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaProducer.java
@@ -80,7 +80,7 @@ public class ApexKafkaProducer extends ApexPluginsEventProducer {
             }
         }
 
-        kafkaProducer.send(new ProducerRecord<String, Object>(kafkaProducerProperties.getProducerTopic(), name, event));
+        kafkaProducer.send(new ProducerRecord<>(kafkaProducerProperties.getProducerTopic(), name, event));
         if (LOGGER.isTraceEnabled()) {
             LOGGER.trace("event sent from engine using {} to topic {} : {} ", this.name,
                     kafkaProducerProperties.getProducerTopic(), event);
diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/SynchronousEventCache.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/SynchronousEventCache.java
index 1a486375d..39c5c2c62 100644
--- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/SynchronousEventCache.java
+++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/SynchronousEventCache.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=========================================================
  */
@@ -34,7 +35,7 @@ import org.slf4j.ext.XLoggerFactory;
 /**
  * This class holds a cache of the synchronous events sent into Apex and that have not yet been replied to. It runs a
  * thread to time out events that have not been replied to in the specified timeout.
- * 
+ *
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
 public class SynchronousEventCache extends PeeredReference implements Runnable {
@@ -64,7 +65,7 @@ public class SynchronousEventCache extends PeeredReference implements Runnable {
 
     /**
      * Create a synchronous event cache that caches outstanding synchronous Apex events.
-     * 
+     *
      * @param peeredMode the peered mode for which to return the reference
      * @param consumer the consumer that is populating the cache
      * @param producer the producer that is emptying the cache
@@ -110,7 +111,7 @@ public class SynchronousEventCache extends PeeredReference implements Runnable {
 
     /**
      * Remove the record of an event sent to Apex if it exists in the cache.
-     * 
+     *
      * @param executionId the execution ID of the event
      * @return The removed event
      */
@@ -122,7 +123,7 @@ public class SynchronousEventCache extends PeeredReference implements Runnable {
 
     /**
      * Check if an event exists in the to apex cache.
-     * 
+     *
      * @param executionId the execution ID of the event
      * @return true if the event exists, false otherwise
      */
@@ -147,7 +148,7 @@ public class SynchronousEventCache extends PeeredReference implements Runnable {
 
     /**
      * Remove the record of an event received from Apex if it exists in the cache.
-     * 
+     *
      * @param executionId the execution ID of the event
      * @return The removed event
      */
@@ -159,7 +160,7 @@ public class SynchronousEventCache extends PeeredReference implements Runnable {
 
     /**
      * Check if an event exists in the from apex cache.
-     * 
+     *
      * @param executionId the execution ID of the event
      * @return true if the event exists, false otherwise
      */
@@ -215,7 +216,7 @@ public class SynchronousEventCache extends PeeredReference implements Runnable {
 
     /**
      * Cache a synchronized event sent in an event cache.
-     * 
+     *
      * @param eventCacheMap the map to cache the event on
      * @param executionId the execution ID of the event
      * @param event the event to cache
@@ -236,7 +237,7 @@ public class SynchronousEventCache extends PeeredReference implements Runnable {
         }
 
         // Add the event to the map
-        eventCacheMap.put(executionId, new SimpleEntry<Long, Object>(System.currentTimeMillis(), event));
+        eventCacheMap.put(executionId, new SimpleEntry<>(System.currentTimeMillis(), event));
 
         if (LOGGER.isDebugEnabled()) {
             String message = "event has been cached:" + event;
@@ -248,7 +249,7 @@ public class SynchronousEventCache extends PeeredReference implements Runnable {
 
     /**
      * Remove the record of an event if it exists in the cache.
-     * 
+     *
      * @param eventCacheMap the map to remove the event from
      * @param executionId the execution ID of the event
      * @return The removed event
@@ -272,7 +273,7 @@ public class SynchronousEventCache extends PeeredReference implements Runnable {
     /**
      * Time out events on an event cache map. Events that have a timeout longer than the configured timeout are timed
      * out.
-     * 
+     *
      * @param eventCacheMap the event cache to operate on
      */
     private void timeoutEventsOnCache(final Map<Long, SimpleEntry<Long, Object>> eventCacheMap) {