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, 30 insertions, 54 deletions

diff --git a/common-parameters/src/test/java/org/onap/policy/common/parameters/TestValidationErrors.java b/common-parameters/src/test/java/org/onap/policy/common/parameters/TestValidationErrors.java
index 2c1e2f18..b02022d7 100644
--- a/common-parameters/src/test/java/org/onap/policy/common/parameters/TestValidationErrors.java
+++ b/common-parameters/src/test/java/org/onap/policy/common/parameters/TestValidationErrors.java
@@ -1,29 +1,29 @@
 /*-
  * ============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.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import org.junit.Test;
 import org.onap.policy.common.parameters.testclasses.ParameterGroupMissingGetter;
@@ -51,25 +51,18 @@ public class TestValidationErrors {
 
         ParameterGroupWithParameterGroupCollection illegalCollection = new ParameterGroupWithParameterGroupCollection(
                         "Illegal Collection");
-        try {
-            illegalCollection.isValid();
-            fail("test should throw an exception");
-        } catch (ParameterRuntimeException e) {
-            assertEquals("collection parameter \"parameterGroupArrayList\" is illegal,"
-                            + " parameter groups are not allowed as collection members", e.getMessage());
-        }
+
+        assertThatThrownBy(illegalCollection::isValid).isInstanceOf(ParameterRuntimeException.class)
+                        .hasMessage("collection parameter \"parameterGroupArrayList\" is illegal,"
+                                        + " parameter groups are not allowed as collection members");
     }
 
     @Test
     public void testNullCollection() {
         ParameterGroupWithNullCollection nullCollection = new ParameterGroupWithNullCollection("Null Collection");
 
-        try {
-            nullCollection.isValid();
-            fail("test should throw an exception");
-        } catch (ParameterRuntimeException e) {
-            assertEquals("collection parameter \"nullList\" is null", e.getMessage());
-        }
+        assertThatThrownBy(nullCollection::isValid).isInstanceOf(ParameterRuntimeException.class)
+                        .hasMessage("collection parameter \"nullList\" is null");
     }
 
     @Test
@@ -83,59 +76,42 @@ public class TestValidationErrors {
     @Test
     public void testMapNullValueValidation() {
         ParameterGroupWithNullMapValue nullMap = new ParameterGroupWithNullMapValue("Null Map value");
-        try {
-            nullMap.isValid();
-            fail("test should throw an exception");
-        } catch (ParameterRuntimeException e) {
-            assertEquals("map parameter \"nullMap\" is null", e.getMessage());
-        }
+
+        assertThatThrownBy(nullMap::isValid).isInstanceOf(ParameterRuntimeException.class)
+                        .hasMessage("map parameter \"nullMap\" is null");
     }
 
     @Test
     public void testBadMapKeyValidation() {
         ParameterGroupWithIllegalMapKey illegalMap = new ParameterGroupWithIllegalMapKey("Illegal Map");
-        try {
-            illegalMap.isValid();
-            fail("test should throw an exception");
-        } catch (ParameterRuntimeException e) {
-            assertEquals("map entry is not a parameter group keyed by a string, key \"1\" "
-                            + "in map \"badMap\" is not a string", e.getMessage());
-        }
+
+        assertThatThrownBy(illegalMap::isValid).isInstanceOf(ParameterRuntimeException.class)
+                        .hasMessage("map entry is not a parameter group keyed by a string, key \"1\" "
+                                        + "in map \"badMap\" is not a string");
     }
 
     @Test
     public void testBadMapValueValidation() {
         ParameterGroupWithIllegalMapValue illegalMap = new ParameterGroupWithIllegalMapValue("Illegal Map");
-        try {
-            illegalMap.isValid();
-            fail("test should throw an exception");
-        } catch (ParameterRuntimeException e) {
-            assertEquals("map entry is not a parameter group keyed by a string, value \"1\" in "
-                            + "map \"intMap\" is not a parameter group", e.getMessage());
-        }
+
+        assertThatThrownBy(illegalMap::isValid).isInstanceOf(ParameterRuntimeException.class)
+                        .hasMessage("map entry is not a parameter group keyed by a string, value \"1\" in "
+                                        + "map \"intMap\" is not a parameter group");
     }
-    
+
     @Test
     public void testMissingGetter() {
         ParameterGroupMissingGetter badGetterName = new ParameterGroupMissingGetter("BGN");
-        try {
-            badGetterName.isValid();
-            fail("test should throw an exception");
-        } catch (ParameterRuntimeException e) {
-            assertEquals("could not get getter method for parameter \"value\"", e.getMessage());
-        }
-        
+
+        assertThatThrownBy(badGetterName::isValid).isInstanceOf(ParameterRuntimeException.class)
+                        .hasMessage("could not get getter method for parameter \"value\"");
     }
-    
+
     @Test
     public void testPrivateGetter() {
         ParameterGroupPrivateGetter privateGetter = new ParameterGroupPrivateGetter("privateGetter");
-        try {
-            privateGetter.isValid();
-            fail("test should throw an exception");
-        } catch (ParameterRuntimeException e) {
-            assertEquals("could not get getter method for parameter \"value\"", e.getMessage());
-        }
-        
+
+        assertThatThrownBy(privateGetter::isValid).isInstanceOf(ParameterRuntimeException.class)
+                        .hasMessage("could not get getter method for parameter \"value\"");
     }
 }