From b6977d2f7ce64ece732ac1a1a0525dac972d7ccf Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Wed, 17 Feb 2021 15:23:38 -0500
Subject: Fix sonars in apex-pdp

Addressed the following issues:
- initialize mocks before use
- use parameterized queries
- Random() is not secure
- provide parameterized type for generics
- unused imports
- constructor visibility
- use compute() instead of containsKey()/put()
- make final fields static
- rename constants to all upper case
- no assert() in Thread.run() methods
- nested try
- nested if/else
- too many break/continue
- use try-with-resources
- repeatable annotations
- overlapping characters in reg ex
- hashcode is not sufficient in compareTo()
- need equals() with compareTo()
- make class an interface
- use parameterized test
- multiple calls in assert()
- log or re-throw
- use different type of lambda
- use parameterized logging
- use StringBuilder instead of concatenation
- use StandardCharsets.UTF_8

Issue-ID: POLICY-2906
Change-Id: I2cf8c885e3e22c2c6cbe6403a34906928afad022
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 ...stRequestorCarrierTechnologyParametersTest.java | 31 +++++++++-------------
 1 file changed, 13 insertions(+), 18 deletions(-)

(limited to 'plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor')

diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParametersTest.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParametersTest.java
index fdf094f54..d5268b14c 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParametersTest.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParametersTest.java
@@ -3,6 +3,7 @@
  *  Copyright (C) 2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
  *  Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
+ *  Modifications Copyright (C) 2021 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.
@@ -41,35 +42,29 @@ public class RestRequestorCarrierTechnologyParametersTest {
 
     @Test
     public void testRestRequestorCarrierTechnologyParametersBadList() {
-        ApexCommandLineArguments arguments = new ApexCommandLineArguments();
-        arguments.setToscaPolicyFilePath("src/test/resources/prodcons/RESTRequestorWithHTTPHeaderBadList.json");
-        arguments.setRelativeFileRoot(".");
-
-        assertThatThrownBy(() -> {
-            new ApexParameterHandler().getParameters(arguments);
-        }).hasMessageContaining("HTTP header array entry is null\n    parameter");
+        verifyException("src/test/resources/prodcons/RESTRequestorWithHTTPHeaderBadList.json",
+                        "HTTP header array entry is null\n    parameter");
     }
 
     @Test
     public void testRestRequestorCarrierTechnologyParametersNotKvPairs() {
-        ApexCommandLineArguments arguments = new ApexCommandLineArguments();
-        arguments.setToscaPolicyFilePath("src/test/resources/prodcons/RESTRequestorWithHTTPHeaderNotKvPairs.json");
-        arguments.setRelativeFileRoot(".");
-
-        assertThatThrownBy(() -> {
-            new ApexParameterHandler().getParameters(arguments);
-        }).hasMessageContaining("HTTP header array entries must have one key and one value: [aaa, bbb, ccc]");
+        verifyException("src/test/resources/prodcons/RESTRequestorWithHTTPHeaderNotKvPairs.json",
+                        "HTTP header array entries must have one key and one value: [aaa, bbb, ccc]");
     }
 
     @Test
     public void testRestRequestorCarrierTechnologyParametersNulls() {
+        verifyException("src/test/resources/prodcons/RESTRequestorWithHTTPHeaderNulls.json",
+                        "HTTP header key is null or blank: [null, bbb]");
+    }
+
+    private void verifyException(String fileName, String expectedMsg) {
         ApexCommandLineArguments arguments = new ApexCommandLineArguments();
-        arguments.setToscaPolicyFilePath("src/test/resources/prodcons/RESTRequestorWithHTTPHeaderNulls.json");
+        arguments.setToscaPolicyFilePath(fileName);
         arguments.setRelativeFileRoot(".");
 
-        assertThatThrownBy(() -> {
-            new ApexParameterHandler().getParameters(arguments);
-        }).hasMessageContaining("HTTP header key is null or blank: [null, bbb]");
+        assertThatThrownBy(() -> new ApexParameterHandler().getParameters(arguments)).describedAs(fileName)
+                        .hasMessageContaining(expectedMsg);
     }
 
     @Test
-- 
cgit 1.2.3-korg