Cleanup sonar bugs and security hotspot

Just some trivial sonar bugs for missing argument and a
couple sonar overrides to clear security hotspots.

Issue-ID: POLICY-2165
Change-Id: I392e5fee458465c66313a16a8912e23a3a119848
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

diff --git a/models-interactions/model-actors/actor.cds/src/main/java/org/onap/policy/controlloop/actor/cds/CdsActorServiceProvider.java b/models-interactions/model-actors/actor.cds/src/main/java/org/onap/policy/controlloop/actor/cds/CdsActorServiceProvider.java
index 0b0ae6b..e3b91f2 100644 (file)
--- a/models-interactions/model-actors/actor.cds/src/main/java/org/onap/policy/controlloop/actor/cds/CdsActorServiceProvider.java
+++ b/models-interactions/model-actors/actor.cds/src/main/java/org/onap/policy/controlloop/actor/cds/CdsActorServiceProvider.java
@@ -231,7 +231,7 @@ public class CdsActorServiceProvider extends ActorImpl {
         public void onError(final Throwable throwable) {
             Status status = Status.fromThrowable(throwable);
             cdsStatus.compareAndSet(null, CdsActorConstants.ERROR);
-            LOGGER.error("Failed processing blueprint {} {}", status, throwable);
+            LOGGER.error("Failed processing blueprint {}", status, throwable);
         }
 
         /**

diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
index 41f4d3b..24dcd8b 100644 (file)
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
@@ -253,7 +253,7 @@ public final class AaiManager {
             urlGet = url + PNF_URL;
             pnfName = URLEncoder.encode(pnfName, StandardCharsets.UTF_8.toString()) + AAI_DEPTH_SUFFIX;
         } catch (UnsupportedEncodingException e) {
-            logger.error("Failed to encode the pnfName: {} using UTF-8 encoding. {}", pnfName, e);
+            logger.error("Failed to encode the pnfName: {} using UTF-8", pnfName, e);
             return null;
         }
         String responseGet = getStringQuery(urlGet, username, password, requestId, pnfName);

diff --git a/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/PdpSimulatorMain.java b/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/PdpSimulatorMain.java
index e367cca..99bf20e 100644 (file)
--- a/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/PdpSimulatorMain.java
+++ b/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/PdpSimulatorMain.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019 Nordix Foundation.
- *  Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ *  Modifications Copyright (C) 2019-2020 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.
@@ -143,12 +143,12 @@ public class PdpSimulatorMain {
     }
 
     /**
-     * The main method.
+     * The main method. Arguments are validated in the constructor thus adding the NOSONAR.
      *
      * @param args the arguments
      *
      */
-    public static void main(final String[] args) {
+    public static void main(final String[] args) { // NOSONAR
         new PdpSimulatorMain(args);
     }
 }

diff --git a/models-sim/policy-models-simulators/src/main/java/org/onap/policy/models/simulators/Main.java b/models-sim/policy-models-simulators/src/main/java/org/onap/policy/models/simulators/Main.java
index a0b1655..d161e54 100644 (file)
--- a/models-sim/policy-models-simulators/src/main/java/org/onap/policy/models/simulators/Main.java
+++ b/models-sim/policy-models-simulators/src/main/java/org/onap/policy/models/simulators/Main.java
@@ -127,11 +127,11 @@ public class Main extends ServiceManagerContainer {
     }
 
     /**
-     * The main method.
+     * The main method. The arguments are validated, thus adding the NOSONAR.
      *
      * @param args the arguments, the first of which is the name of the parameter file
      */
-    public static void main(final String[] args) {
+    public static void main(final String[] args) { // NOSONAR
         try {
             if (args.length != 1) {
                 throw new IllegalArgumentException("arg(s): parameter-file-name");