Merge "Changes for Checkstyle 8.32"

diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfModelExceptionInfoTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfModelExceptionInfoTest.java
index 9b0855f..2e742c3 100644 (file)
--- a/models-base/src/test/java/org/onap/policy/models/base/PfModelExceptionInfoTest.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/PfModelExceptionInfoTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
+ *  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.
@@ -20,6 +20,7 @@
 
 package org.onap.policy.models.base;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 import javax.ws.rs.core.Response;
@@ -35,19 +36,13 @@ public class PfModelExceptionInfoTest {
 
     @Test
     public void testExceptionInfo() {
-        try {
-            throw new PfModelException(Response.Status.ACCEPTED, "HELLO");
-        } catch (PfModelException pfme) {
-            String errorMessage = getErrorMessage(pfme);
-            assertEquals("Server returned: Accepted", errorMessage.substring(0, 25));
-        }
+        final PfModelException pfme = new PfModelException(Response.Status.ACCEPTED, "HELLO");
+        assertThat(pfme).hasMessage("HELLO");
+        assertEquals("Server returned: Accepted", getErrorMessage(pfme).substring(0, 25));
 
-        try {
-            throw new PfModelRuntimeException(Response.Status.ACCEPTED, "HELLO");
-        } catch (PfModelRuntimeException pfme) {
-            String errorMessage = getErrorMessage(pfme);
-            assertEquals("Server returned: Accepted", errorMessage.substring(0, 25));
-        }
+        final PfModelRuntimeException pfmr = new PfModelRuntimeException(Response.Status.ACCEPTED, "HELLO");
+        assertThat(pfmr).hasMessage("HELLO");
+        assertEquals("Server returned: Accepted", getErrorMessage(pfmr).substring(0, 25));
     }
 
     private String getErrorMessage(final ErrorResponseInfo eri) {

diff --git a/models-errors/src/test/java/org/onap/policy/models/errors/concepts/ErrorResponseUtilsTest.java b/models-errors/src/test/java/org/onap/policy/models/errors/concepts/ErrorResponseUtilsTest.java
index c84840b..c19b18b 100644 (file)
--- a/models-errors/src/test/java/org/onap/policy/models/errors/concepts/ErrorResponseUtilsTest.java
+++ b/models-errors/src/test/java/org/onap/policy/models/errors/concepts/ErrorResponseUtilsTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
+ *  Copyright (C) 2019-2020 Nordix Foundation.
  *  Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +21,7 @@
 
 package org.onap.policy.models.errors.concepts;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
@@ -36,15 +37,13 @@ public class ErrorResponseUtilsTest {
 
     @Test
     public void testErrorResponseUtils() {
-        try {
-            throw new IOException(EXCEPTION1, new NumberFormatException("Exception 0"));
-        } catch (Exception ioe) {
-            ErrorResponse errorResponse = new ErrorResponse();
-            ErrorResponseUtils.getExceptionMessages(errorResponse, ioe);
+        final IOException ioe = new IOException(EXCEPTION1, new NumberFormatException("Exception 0"));
+        final ErrorResponse errorResponse = new ErrorResponse();
+        assertThat(ioe).hasMessage(EXCEPTION1);
 
-            assertEquals(EXCEPTION1, errorResponse.getErrorMessage());
-            assertEquals(EXCEPTION1, errorResponse.getErrorDetails().get(0));
-            assertEquals("Exception 0", errorResponse.getErrorDetails().get(1));
-        }
+        ErrorResponseUtils.getExceptionMessages(errorResponse, ioe);
+        assertEquals(EXCEPTION1, errorResponse.getErrorMessage());
+        assertEquals(EXCEPTION1, errorResponse.getErrorDetails().get(0));
+        assertEquals("Exception 0", errorResponse.getErrorDetails().get(1));
     }
 }

diff --git a/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.json b/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.json
index b2cf26c..32a2912 100644 (file)
--- a/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.json
@@ -29,7 +29,7 @@
                                             "modelInvariantId": "e6130d03-56f1-4b0a-9a1d-e1b2ebc30e0e",
                                             "modelVersionId": "94b18b1d-cc91-4f43-911a-e6348665f292",
                                             "modelName": "VfwclVfwsnkBbefb8ce2bde..base_vfw..module-0",
-                                            "modelVersion": 1,
+                                            "modelVersion": "1",
                                             "modelCustomizationId": "47958575-138f-452a-8c8d-d89b595f8164"
                                         }
                                     },

diff --git a/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.yaml
index b1b8ca5..fbf8735 100644 (file)
--- a/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.yaml
@@ -25,7 +25,7 @@ topology_template:
                                 modelInvariantId: e6130d03-56f1-4b0a-9a1d-e1b2ebc30e0e
                                 modelVersionId: 94b18b1d-cc91-4f43-911a-e6348665f292
                                 modelName: VfwclVfwsnkBbefb8ce2bde..base_vfw..module-0
-                                modelVersion: 1
+                                modelVersion: "1"
                                 modelCustomizationId: 47958575-138f-452a-8c8d-d89b595f8164
                         payload:
                             requestParameters: '{"usePreload":true,"userParams":[]}'

diff --git a/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.json b/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.json
index 66ce270..ae48b67 100644 (file)
--- a/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.json
+++ b/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.json
@@ -28,7 +28,7 @@
                                             "modelInvariantId": "e6130d03-56f1-4b0a-9a1d-e1b2ebc30e0e",
                                             "modelVersionId": "94b18b1d-cc91-4f43-911a-e6348665f292",
                                             "modelName": "VfwclVfwsnkBbefb8ce2bde..base_vfw..module-0",
-                                            "modelVersion": 1,
+                                            "modelVersion": "1",
                                             "modelCustomizationId": "47958575-138f-452a-8c8d-d89b595f8164"
                                         }
                                     },

diff --git a/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.yaml
index 33adaec..78f690b 100644 (file)
--- a/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.yaml
@@ -25,7 +25,7 @@ topology_template:
                                 modelInvariantId: e6130d03-56f1-4b0a-9a1d-e1b2ebc30e0e
                                 modelVersionId: 94b18b1d-cc91-4f43-911a-e6348665f292
                                 modelName: VfwclVfwsnkBbefb8ce2bde..base_vfw..module-0
-                                modelVersion: 1
+                                modelVersion: "1"
                                 modelCustomizationId: 47958575-138f-452a-8c8d-d89b595f8164
                           payload:
                              requestParameters: '{"usePreload":true,"userParams":[]}'

diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java
index aa48b0a..fb01d5e 100644 (file)
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java
@@ -21,10 +21,10 @@
 
 package org.onap.policy.models.tosca.simple.serialization;
 
+import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
@@ -130,7 +130,7 @@ public class MonitoringPolicySerializationTest {
 
     @Test
     public void testSerialization() {
-        try {
+        assertThatCode(() -> {
             // vCPE
             JpaToscaServiceTemplate serviceTemplate = deserializeMonitoringInputJson(VCPE_MON_INPUT_JSON);
             String serializedServiceTemplate = serializeMonitoringServiceTemplate(serviceTemplate);
@@ -146,10 +146,7 @@ public class MonitoringPolicySerializationTest {
             serializedServiceTemplate = serializeMonitoringServiceTemplate(serviceTemplate);
             verifyVfwMonitoringOutputserialization(serializedServiceTemplate);
 
-        } catch (Exception e) {
-            LOGGER.warn("No exception should be thrown", e);
-            fail("No exception should be thrown");
-        }
+        }).as("No exception should be thrown").doesNotThrowAnyException();
     }
 
     private JpaToscaServiceTemplate deserializeMonitoringInputJson(String resourcePath) throws Exception {