Apply simple sonar fixes

Note: A number of these were identified, by SonarLint, in the Test
classes, which are not typically scanned by Sonar.

Removed unnecessary imports.
Removed unneeded "throws Xxx".
Replaced lambda with method references.
Replaced duplicate strings with constants.
Replaced try-fail-catch with assert-j methods to eliminate sonar
complaints about duplicate failure messages.
Added missing @Override annotations.
Use map.computeIfAbsent() where appropriate.
Also fixed some minor checkstyle issues.
Removed unneeded "volatile" declarations.
Replaced some if-else constructs with "?:" construct, per sonar.
Replaced Object.wait() with CountDownLatch.await(); according to sonar
(and javadocs), Object.wait() can return due to "spurious wakeups".
Fixed issue whereby CryptoUtilsTest wouldn't run in my Eclipse.

Change-Id: Ib6b71ed65662cfd6209400dac57ed69279bf29ec
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>

1 files changed, 52 insertions, 80 deletions

diff --git a/common-parameters/src/test/java/org/onap/policy/common/parameters/TestValidationResults.java b/common-parameters/src/test/java/org/onap/policy/common/parameters/TestValidationResults.java
index f7451051..46360ef9 100644
--- a/common-parameters/src/test/java/org/onap/policy/common/parameters/TestValidationResults.java
+++ b/common-parameters/src/test/java/org/onap/policy/common/parameters/TestValidationResults.java
@@ -1,53 +1,61 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2019 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.
  * 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=========================================================
  */
 
 package org.onap.policy.common.parameters;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.policy.common.parameters.testclasses.TestParametersL10;
 import org.onap.policy.common.parameters.testclasses.TestParametersLGeneric;
 
 public class TestValidationResults {
+    private static final String NON_EXISTANT_PARAMETER = "nonExistantParameter";
+    private static final String L10L_GENERIC_NESTED_MAP_VAL0 = "l10LGenericNestedMapVal0";
+    private static final String L10_INT_FIELD = "l10IntField";
+    private static final String ENTRY0 = "entry0";
+    private static final String THIS_VALUE_IS_INVALID = "This value is invalid";
+    private static final String SOMETHING_WAS_OBSERVED = "Something was observed";
+    private static final String PG_MAP = "pgMap";
+
     private Map<String, ParameterGroup> pgMap = new LinkedHashMap<>();
     private ParameterGroup pg = new TestParametersL10("pg");
 
     @Before
     public void initMap() {
-        pgMap.put("entry0", new TestParametersLGeneric("entry0"));
+        pgMap.put(ENTRY0, new TestParametersLGeneric(ENTRY0));
     }
 
     @Test
-    public void testGroupMapValidationResult() throws NoSuchFieldException, SecurityException {
-        GroupMapValidationResult result = new GroupMapValidationResult(this.getClass().getDeclaredField("pgMap"),
+    public void testGroupMapValidationResult() throws NoSuchFieldException {
+        GroupMapValidationResult result = new GroupMapValidationResult(this.getClass().getDeclaredField(PG_MAP),
                         pgMap);
 
         assertTrue(result.isValid());
-        assertEquals("pgMap", result.getName());
+        assertEquals(PG_MAP, result.getName());
 
         result.setResult(ValidationStatus.OBSERVATION);
         assertTrue(result.isValid());
@@ -58,26 +66,22 @@ public class TestValidationResults {
         assertTrue(result.isValid());
         assertEquals(ValidationStatus.OBSERVATION, result.getStatus());
 
-        result.setResult(ValidationStatus.OBSERVATION, "Something was observed");
+        result.setResult(ValidationStatus.OBSERVATION, SOMETHING_WAS_OBSERVED);
         assertTrue(result.isValid());
         assertEquals(ValidationStatus.OBSERVATION, result.getStatus());
         assertEquals("parameter group map \"pgMap\" OBSERVATION, Something was observed", result.getResult().trim());
 
-        result.setResult("entry0", new GroupValidationResult(pgMap.get("entry0")));
+        result.setResult(ENTRY0, new GroupValidationResult(pgMap.get(ENTRY0)));
         assertTrue(result.isValid());
         assertEquals(ValidationStatus.OBSERVATION, result.getStatus());
         assertEquals("parameter group map \"pgMap\" OBSERVATION, Something was observed", result.getResult().trim());
 
-        try {
-            result.setResult("nonExistantEntry", new GroupValidationResult(pgMap.get("entry0")));
-            fail("test shold throw an exception here");
-        } catch (Exception e) {
-            assertEquals("no entry with name \"nonExistantEntry\" exists", e.getMessage());
-        }
+        assertThatThrownBy(() -> result.setResult("nonExistantEntry", new GroupValidationResult(pgMap.get(ENTRY0))))
+                        .hasMessage("no entry with name \"nonExistantEntry\" exists");
     }
 
     @Test
-    public void testGroupValidationResult() throws NoSuchFieldException, SecurityException {
+    public void testGroupValidationResult() throws NoSuchFieldException {
         GroupValidationResult result = new GroupValidationResult(pg);
 
         assertTrue(result.isValid());
@@ -93,79 +97,47 @@ public class TestValidationResults {
         assertTrue(result.isValid());
         assertEquals(ValidationStatus.OBSERVATION, result.getStatus());
 
-        result.setResult(ValidationStatus.OBSERVATION, "Something was observed");
+        result.setResult(ValidationStatus.OBSERVATION, SOMETHING_WAS_OBSERVED);
         assertTrue(result.isValid());
         assertEquals(ValidationStatus.OBSERVATION, result.getStatus());
         assertEquals("parameter group \"pg\" type \"org.onap.policy.common.parameters.testclasses.TestParametersL10\""
                         + " OBSERVATION, Something was observed", result.getResult().trim());
 
-        try {
-            result.setResult("nonExistantParameter", ValidationStatus.OBSERVATION, "Something was observed");
-            fail("test shold throw an exception here");
-        } catch (Exception e) {
-            assertEquals("no parameter field exists for parameter: nonExistantParameter", e.getMessage());
-        }
+        assertThatThrownBy(() -> result.setResult(NON_EXISTANT_PARAMETER, ValidationStatus.OBSERVATION,
+                        SOMETHING_WAS_OBSERVED))
+                                        .hasMessage("no parameter field exists for parameter: nonExistantParameter");
 
-        result.setResult("l10IntField", ValidationStatus.OBSERVATION, "Something was observed");
+        result.setResult(L10_INT_FIELD, ValidationStatus.OBSERVATION, SOMETHING_WAS_OBSERVED);
         assertTrue(result.isValid());
 
-        try {
-            result.setResult("nonExistantParameter", new GroupValidationResult(pg));
-            fail("test shold throw an exception here");
-        } catch (Exception e) {
-            assertEquals("no nested parameter field exists for parameter: nonExistantParameter", e.getMessage());
-        }
+        assertThatThrownBy(() -> result.setResult(NON_EXISTANT_PARAMETER, new GroupValidationResult(pg)))
+                        .hasMessage("no nested parameter field exists for parameter: nonExistantParameter");
 
-        try {
-            result.setResult("l10IntField", new GroupValidationResult(pg));
-            fail("test shold throw an exception here");
-        } catch (Exception e) {
-            assertEquals("parameter is not a nested group parameter: l10IntField", e.getMessage());
-        }
+        assertThatThrownBy(() -> result.setResult(L10_INT_FIELD, new GroupValidationResult(pg)))
+                        .hasMessage("parameter is not a nested group parameter: l10IntField");
 
         GroupMapValidationResult groupMapResult = new GroupMapValidationResult(
-                        this.getClass().getDeclaredField("pgMap"), pgMap);
-
-        try {
-            result.setResult("nonExistantParameter", "entry0", groupMapResult);
-            fail("test shold throw an exception here");
-        } catch (Exception e) {
-            assertEquals("no group map parameter field exists for parameter: nonExistantParameter", e.getMessage());
-        }
-
-        try {
-            result.setResult("l10IntField", "entry0", groupMapResult);
-            fail("test shold throw an exception here");
-        } catch (Exception e) {
-            assertEquals("parameter is not a nested group map parameter: l10IntField", e.getMessage());
-        }
-
-        result.setResult("l10LGenericNestedMap", "l10LGenericNestedMapVal0", ValidationStatus.INVALID,
-                        "This value is invalid");
+                        this.getClass().getDeclaredField(PG_MAP), pgMap);
+
+        assertThatThrownBy(() -> result.setResult(NON_EXISTANT_PARAMETER, ENTRY0, groupMapResult))
+                        .hasMessage("no group map parameter field exists for parameter: nonExistantParameter");
+
+        assertThatThrownBy(() -> result.setResult(L10_INT_FIELD, ENTRY0, groupMapResult))
+                        .hasMessage("parameter is not a nested group map parameter: l10IntField");
+
+        result.setResult("l10LGenericNestedMap", L10L_GENERIC_NESTED_MAP_VAL0, ValidationStatus.INVALID,
+                        THIS_VALUE_IS_INVALID);
         assertEquals(ValidationStatus.INVALID, result.getStatus());
-        
-        try {
-            result.setResult("l10IntField", "l10LGenericNestedMapVal0", ValidationStatus.INVALID,
-                            "This value is invalid");
-            fail("test shold throw an exception here");
-        } catch (Exception e) {
-            assertEquals("parameter is not a nested group map parameter: l10IntField", e.getMessage());
-        }
-        
-        try {
-            result.setResult("nonExistantParameter", "l10LGenericNestedMapVal0", ValidationStatus.INVALID,
-                            "This value is invalid");
-            fail("test shold throw an exception here");
-        } catch (Exception e) {
-            assertEquals("no group map parameter field exists for parameter: nonExistantParameter", e.getMessage());
-        }
-        
-        try {
-            result.setResult("l10LGenericNestedMap", "NonExistantKey", ValidationStatus.INVALID,
-                            "This value is invalid");
-            fail("test shold throw an exception here");
-        } catch (Exception e) {
-            assertEquals("no entry with name \"NonExistantKey\" exists", e.getMessage());
-        }
+
+        assertThatThrownBy(() -> result.setResult(L10_INT_FIELD, L10L_GENERIC_NESTED_MAP_VAL0, ValidationStatus.INVALID,
+                        THIS_VALUE_IS_INVALID))
+                                        .hasMessage("parameter is not a nested group map parameter: l10IntField");
+
+        assertThatThrownBy(() -> result.setResult(NON_EXISTANT_PARAMETER, L10L_GENERIC_NESTED_MAP_VAL0,
+                        ValidationStatus.INVALID, THIS_VALUE_IS_INVALID)).hasMessage(
+                                        "no group map parameter field exists for parameter: nonExistantParameter");
+
+        assertThatThrownBy(() -> result.setResult("l10LGenericNestedMap", "NonExistantKey", ValidationStatus.INVALID,
+                        THIS_VALUE_IS_INVALID)).hasMessage("no entry with name \"NonExistantKey\" exists");
     }
 }