Fix configuration for Prometheus metrics

JVM related metrics were not being exposed due to spring boot bug
when loading beans configuration.

Issue-ID: POLICY-4146
Change-Id: I334c60b0c0d087c63b28bf44704aa3e909eca646
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

6 files changed, 55 insertions, 68 deletions

diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java
index a0f1a7590..cd6823257 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java
@@ -90,42 +90,42 @@ class CommissioningControllerTest extends CommonRestController {
     }
 
     @Test
-    void testSwagger() throws Exception {
+    void testSwagger() {
         super.testSwagger(COMMISSIONING_ENDPOINT);
     }
 
     @Test
-    void testUnauthorizedCreate() throws Exception {
+    void testUnauthorizedCreate() {
         assertUnauthorizedPost(COMMISSIONING_ENDPOINT, Entity.json(serviceTemplate));
     }
 
     @Test
-    void testUnauthorizedQuery() throws Exception {
+    void testUnauthorizedQuery() {
         assertUnauthorizedGet(COMMISSIONING_ENDPOINT);
     }
 
     @Test
-    void testUnauthorizedQueryElements() throws Exception {
+    void testUnauthorizedQueryElements() {
         assertUnauthorizedGet(COMMISSIONING_ENDPOINT + "/elements");
     }
 
     @Test
-    void testUnauthorizedDelete() throws Exception {
+    void testUnauthorizedDelete() {
         assertUnauthorizedDelete(COMMISSIONING_ENDPOINT);
     }
 
     @Test
-    void testUnauthorizedQueryToscaServiceTemplate() throws Exception {
+    void testUnauthorizedQueryToscaServiceTemplate() {
         assertUnauthorizedGet(COMMISSIONING_ENDPOINT + "/toscaservicetemplate");
     }
 
     @Test
-    void testUnauthorizedQueryToscaServiceTemplateSchema() throws Exception {
+    void testUnauthorizedQueryToscaServiceTemplateSchema() {
         assertUnauthorizedGet(COMMISSIONING_ENDPOINT + "/toscaServiceTemplateSchema");
     }
 
     @Test
-    void testUnauthorizedQueryToscaServiceCommonOrInstanceProperties() throws Exception {
+    void testUnauthorizedQueryToscaServiceCommonOrInstanceProperties() {
         assertUnauthorizedGet(COMMISSIONING_ENDPOINT + "/getCommonOrInstanceProperties");
     }
 
@@ -170,7 +170,7 @@ class CommissioningControllerTest extends CommonRestController {
     }
 
     @Test
-    void testCreateBadRequest() throws Exception {
+    void testCreateBadRequest() {
         Invocation.Builder invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT);
         Response resp = invocationBuilder.post(Entity.json("NotToscaServiceTempalte"));
 
@@ -181,7 +181,7 @@ class CommissioningControllerTest extends CommonRestController {
     }
 
     @Test
-    void testCreate() throws Exception {
+    void testCreate() {
         Invocation.Builder invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT);
         Response resp = invocationBuilder.post(Entity.json(serviceTemplate));
         assertEquals(Response.Status.OK.getStatusCode(), resp.getStatus());
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/InstantiationUtils.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/InstantiationUtils.java
index 49ed40ec8..b0359113b 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/InstantiationUtils.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/InstantiationUtils.java
@@ -91,8 +91,8 @@ public class InstantiationUtils {
         AutomationCompositions automationCompositions) {
         assertThat(response).isNotNull();
         assertThat(response.getErrorDetails()).isNull();
-        assertThat(response.getAffectedAutomationCompositions().size())
-            .isEqualTo(automationCompositions.getAutomationCompositionList().size());
+        assertThat(response.getAffectedAutomationCompositions())
+            .hasSameSizeAs(automationCompositions.getAutomationCompositionList());
         for (AutomationComposition automationComposition : automationCompositions.getAutomationCompositionList()) {
             assertTrue(response.getAffectedAutomationCompositions().stream()
                 .anyMatch(ac -> ac.equals(automationComposition.getKey().asIdentifier())));
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/InstantiationControllerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/InstantiationControllerTest.java
index df21d3f00..35a3094cd 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/InstantiationControllerTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/InstantiationControllerTest.java
@@ -125,7 +125,7 @@ class InstantiationControllerTest extends CommonRestController {
     }
 
     @Test
-    void testSwagger() throws Exception {
+    void testSwagger() {
         super.testSwagger(INSTANTIATION_ENDPOINT);
     }
 
@@ -138,7 +138,7 @@ class InstantiationControllerTest extends CommonRestController {
     }
 
     @Test
-    void testQuery_Unauthorized() throws Exception {
+    void testQuery_Unauthorized() {
         assertUnauthorizedGet(INSTANTIATION_ENDPOINT);
     }
 
@@ -151,7 +151,7 @@ class InstantiationControllerTest extends CommonRestController {
     }
 
     @Test
-    void testDelete_Unauthorized() throws Exception {
+    void testDelete_Unauthorized() {
         assertUnauthorizedDelete(INSTANTIATION_ENDPOINT);
     }
 
@@ -214,7 +214,7 @@ class InstantiationControllerTest extends CommonRestController {
     }
 
     @Test
-    void testQuery_NoResultWithThisName() throws Exception {
+    void testQuery_NoResultWithThisName() {
         Invocation.Builder invocationBuilder = super.sendRequest(INSTANTIATION_ENDPOINT + "?name=noResultWithThisName");
         Response rawresp = invocationBuilder.buildGet().invoke();
         assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus());
@@ -273,7 +273,7 @@ class InstantiationControllerTest extends CommonRestController {
     }
 
     @Test
-    void testDelete_NoResultWithThisName() throws Exception {
+    void testDelete_NoResultWithThisName() {
         Invocation.Builder invocationBuilder =
             super.sendRequest(INSTANTIATION_ENDPOINT + "?name=noResultWithThisName&version=1.0.1");
         Response resp = invocationBuilder.delete();
@@ -325,7 +325,7 @@ class InstantiationControllerTest extends CommonRestController {
     }
 
     @Test
-    void testCreateInstanceProperties() throws Exception {
+    void testCreateInstanceProperties() {
         Invocation.Builder invocationBuilder = super.sendRequest(INSTANTIATION_PROPERTIES);
         Response resp = invocationBuilder.post(Entity.json(serviceTemplate));
         assertEquals(Response.Status.OK.getStatusCode(), resp.getStatus());
@@ -358,7 +358,7 @@ class InstantiationControllerTest extends CommonRestController {
     }
 
     @Test
-    void testDeleteInstancePropertiesBadRequest() throws Exception {
+    void testDeleteInstancePropertiesBadRequest() {
         Invocation.Builder invocationBuilder = super.sendRequest(INSTANTIATION_PROPERTIES);
         Response resp = invocationBuilder.post(Entity.json(serviceTemplate));
         assertEquals(Response.Status.OK.getStatusCode(), resp.getStatus());
@@ -408,7 +408,7 @@ class InstantiationControllerTest extends CommonRestController {
     }
 
     @Test
-    void testCommand_NotFound1() throws Exception {
+    void testCommand_NotFound1() {
         Invocation.Builder invocationBuilder = super.sendRequest(INSTANTIATION_COMMAND_ENDPOINT);
         Response resp = invocationBuilder.put(Entity.json(new InstantiationCommand()));
         assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), resp.getStatus());
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/main/rest/ActuatorControllerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/main/rest/ActuatorControllerTest.java
index 0f9490d87..6a2b102fc 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/main/rest/ActuatorControllerTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/main/rest/ActuatorControllerTest.java
@@ -54,36 +54,36 @@ class ActuatorControllerTest extends CommonRestController {
     }
 
     @Test
-    void testGetHealth_Unauthorized() throws Exception {
+    void testGetHealth_Unauthorized() {
         assertUnauthorizedActGet(HEALTH_ENDPOINT);
     }
 
     @Test
-    void testGetMetrics_Unauthorized() throws Exception {
+    void testGetMetrics_Unauthorized() {
         assertUnauthorizedActGet(METRICS_ENDPOINT);
     }
 
     @Test
-    void testGetPrometheus_Unauthorized() throws Exception {
+    void testGetPrometheus_Unauthorized() {
         assertUnauthorizedActGet(PROMETHEUS_ENDPOINT);
     }
 
     @Test
-    void testGetHealth() throws Exception {
+    void testGetHealth() {
         Invocation.Builder invocationBuilder = super.sendActRequest(HEALTH_ENDPOINT);
         Response rawresp = invocationBuilder.buildGet().invoke();
         assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus());
     }
 
     @Test
-    void testGetMetrics() throws Exception {
+    void testGetMetrics() {
         Invocation.Builder invocationBuilder = super.sendActRequest(METRICS_ENDPOINT);
         Response rawresp = invocationBuilder.buildGet().invoke();
         assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus());
     }
 
     @Test
-    void testGePrometheus() throws Exception {
+    void testGetPrometheus() {
         Invocation.Builder invocationBuilder = super.sendActRequest(PROMETHEUS_ENDPOINT);
         Response rawresp = invocationBuilder.buildGet().invoke();
         assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus());
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/monitoring/rest/MonitoringQueryControllerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/monitoring/rest/MonitoringQueryControllerTest.java
index 6a53f6ce2..e8a8ad0c9 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/monitoring/rest/MonitoringQueryControllerTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/monitoring/rest/MonitoringQueryControllerTest.java
@@ -100,27 +100,27 @@ class MonitoringQueryControllerTest extends CommonRestController {
     }
 
     @Test
-    void testQuery_Unauthorized_for_AcElementStats() throws Exception {
+    void testQuery_Unauthorized_for_AcElementStats() {
         assertUnauthorizedGet(AC_ELEMENT_STATS_ENDPOINT);
     }
 
     @Test
-    void testQuery_Unauthorized_for_AcParticipantStats() throws Exception {
+    void testQuery_Unauthorized_for_AcParticipantStats() {
         assertUnauthorizedGet(PARTICIPANT_STATS_ENDPOINT);
     }
 
     @Test
-    void testQuery_Unauthorized_for_ParticipantStatsPerAc() throws Exception {
+    void testQuery_Unauthorized_for_ParticipantStatsPerAc() {
         assertUnauthorizedGet(PARTICIPANT_STATS_PER_AC_ENDPOINT);
     }
 
     @Test
-    void testQuery_Unauthorized_for_AcElementStatsPerAc() throws Exception {
+    void testQuery_Unauthorized_for_AcElementStatsPerAc() {
         assertUnauthorizedGet(AC_ELEMENT_STATS_PER_AC_ENDPOINT);
     }
 
     @Test
-    void testSwagger_AcStats() throws Exception {
+    void testSwagger_AcStats() {
         super.testSwagger(AC_ELEMENT_STATS_ENDPOINT);
         super.testSwagger(PARTICIPANT_STATS_ENDPOINT);
         super.testSwagger(AC_ELEMENT_STATS_PER_AC_ENDPOINT);
@@ -128,7 +128,7 @@ class MonitoringQueryControllerTest extends CommonRestController {
     }
 
     @Test
-    void testAcElementStatisticsEndpoint() throws Exception {
+    void testAcElementStatisticsEndpoint() {
         // Filter statistics only based on participant Id and UUID
         Invocation.Builder invokeRequest1 = super.sendRequest(AC_ELEMENT_STATS_ENDPOINT + "?name="
                 + acElementStatisticsList.getAcElementStatistics().get(0).getParticipantId().getName() + "&version="
@@ -164,14 +164,14 @@ class MonitoringQueryControllerTest extends CommonRestController {
     }
 
     @Test
-    void testAcElementStats_BadRequest() throws Exception {
+    void testAcElementStats_BadRequest() {
         Invocation.Builder invokeRequest1 = super.sendRequest(AC_ELEMENT_STATS_ENDPOINT + "?version=1.0.0");
         Response response1 = invokeRequest1.buildGet().invoke();
         assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response1.getStatus());
     }
 
     @Test
-    void testParticipantStatisticsEndpoint() throws Exception {
+    void testParticipantStatisticsEndpoint() {
 
         // Filter statistics only based on participant Id
         Invocation.Builder invokeRequest1 = super.sendRequest(PARTICIPANT_STATS_ENDPOINT + "?name="
@@ -200,14 +200,14 @@ class MonitoringQueryControllerTest extends CommonRestController {
     }
 
     @Test
-    void testParticipantStats_BadRequest() throws Exception {
+    void testParticipantStats_BadRequest() {
         Invocation.Builder invokeRequest1 = super.sendRequest(PARTICIPANT_STATS_ENDPOINT + "?version=0.0");
         Response response1 = invokeRequest1.buildGet().invoke();
         assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response1.getStatus());
     }
 
     @Test
-    void testParticipantStatsPerAcEndpoint() throws Exception {
+    void testParticipantStatsPerAcEndpoint() {
         Invocation.Builder invokeRequest1 =
                 super.sendRequest(PARTICIPANT_STATS_PER_AC_ENDPOINT + "?name=dummyName&version=1.001");
         Response response1 = invokeRequest1.buildGet().invoke();
@@ -217,14 +217,14 @@ class MonitoringQueryControllerTest extends CommonRestController {
     }
 
     @Test
-    void testParticipantStatsPerAc_BadRequest() throws Exception {
+    void testParticipantStatsPerAc_BadRequest() {
         Invocation.Builder invokeRequest1 = super.sendRequest(PARTICIPANT_STATS_PER_AC_ENDPOINT);
         Response response1 = invokeRequest1.buildGet().invoke();
         assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response1.getStatus());
     }
 
     @Test
-    void testAcElementStatisticsPerAcEndpoint() throws Exception {
+    void testAcElementStatisticsPerAcEndpoint() {
         Invocation.Builder invokeRequest1 =
                 super.sendRequest(AC_ELEMENT_STATS_PER_AC_ENDPOINT + "?name=dummyName&version=1.001");
         Response response1 = invokeRequest1.buildGet().invoke();
@@ -234,7 +234,7 @@ class MonitoringQueryControllerTest extends CommonRestController {
     }
 
     @Test
-    void testAcElementStatsPerAc_BadRequest() throws Exception {
+    void testAcElementStatsPerAc_BadRequest() {
         Invocation.Builder invokeRequest1 = super.sendRequest(AC_ELEMENT_STATS_PER_AC_ENDPOINT);
         Response response1 = invokeRequest1.buildGet().invoke();
         assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response1.getStatus());
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/util/rest/CommonRestController.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/util/rest/CommonRestController.java
index 0fc0a6e9f..89d956aea 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/util/rest/CommonRestController.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/util/rest/CommonRestController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,9 +42,8 @@ import org.onap.policy.common.utils.network.NetworkUtil;
 public class CommonRestController {
 
     public static final String SELF = NetworkUtil.getHostname();
-    public static final String CONTEXT_PATH = "onap/automationcomposition";
+    public static final String CONTEXT_PATH = "onap/policy/clamp/acm";
     public static final String ENDPOINT_PREFIX = CONTEXT_PATH + "/v2/";
-    public static final String ACTUATOR_ENDPOINT = CONTEXT_PATH + "/actuator/";
 
     private static String httpPrefix;
 
@@ -52,10 +51,9 @@ public class CommonRestController {
      * Verifies that an endpoint appears within the swagger response.
      *
      * @param endpoint the endpoint of interest
-     * @throws Exception if an error occurs
      */
-    protected void testSwagger(final String endpoint) throws Exception {
-        final Invocation.Builder invocationBuilder = sendRequest("api-docs");
+    protected void testSwagger(final String endpoint) {
+        final Invocation.Builder invocationBuilder = sendActRequest("v2/api-docs");
         final String resp = invocationBuilder.get(String.class);
 
         assertThat(resp).contains(endpoint);
@@ -66,9 +64,8 @@ public class CommonRestController {
      *
      * @param endpoint the target endpoint
      * @return a request builder
-     * @throws Exception if an error occurs
      */
-    protected Invocation.Builder sendRequest(final String endpoint) throws Exception {
+    protected Invocation.Builder sendRequest(final String endpoint) {
         return sendFqeRequest(httpPrefix + ENDPOINT_PREFIX + endpoint, true);
     }
 
@@ -77,10 +74,9 @@ public class CommonRestController {
      *
      * @param endpoint the target endpoint
      * @return a request builder
-     * @throws Exception if an error occurs
      */
-    protected Invocation.Builder sendActRequest(final String endpoint) throws Exception {
-        return sendFqeRequest(httpPrefix + ACTUATOR_ENDPOINT + endpoint, true);
+    protected Invocation.Builder sendActRequest(final String endpoint) {
+        return sendFqeRequest(httpPrefix + endpoint, true);
     }
 
     /**
@@ -88,9 +84,8 @@ public class CommonRestController {
      *
      * @param endpoint the target endpoint
      * @return a request builder
-     * @throws Exception if an error occurs
      */
-    protected Invocation.Builder sendNoAuthRequest(final String endpoint) throws Exception {
+    protected Invocation.Builder sendNoAuthRequest(final String endpoint) {
         return sendFqeRequest(httpPrefix + ENDPOINT_PREFIX + endpoint, false);
     }
 
@@ -99,10 +94,9 @@ public class CommonRestController {
      *
      * @param endpoint the target endpoint
      * @return a request builder
-     * @throws Exception if an error occurs
      */
-    protected Invocation.Builder sendNoAuthActRequest(final String endpoint) throws Exception {
-        return sendFqeRequest(httpPrefix + ACTUATOR_ENDPOINT + endpoint, false);
+    protected Invocation.Builder sendNoAuthActRequest(final String endpoint) {
+        return sendFqeRequest(httpPrefix + endpoint, false);
     }
 
     /**
@@ -111,10 +105,8 @@ public class CommonRestController {
      * @param fullyQualifiedEndpoint the fully qualified target endpoint
      * @param includeAuth if authorization header should be included
      * @return a request builder
-     * @throws Exception if an error occurs
      */
-    protected Invocation.Builder sendFqeRequest(final String fullyQualifiedEndpoint, boolean includeAuth)
-            throws Exception {
+    protected Invocation.Builder sendFqeRequest(final String fullyQualifiedEndpoint, boolean includeAuth) {
         final Client client = ClientBuilder.newBuilder().build();
 
         client.property(ClientProperties.METAINF_SERVICES_LOOKUP_DISABLE, "true");
@@ -134,9 +126,8 @@ public class CommonRestController {
      *
      * @param endPoint the endpoint
      * @param entity the entity ofthe body
-     * @throws Exception if an error occurs
      */
-    protected void assertUnauthorizedPost(final String endPoint, final Entity<?> entity) throws Exception {
+    protected void assertUnauthorizedPost(final String endPoint, final Entity<?> entity) {
         Response rawresp = sendNoAuthRequest(endPoint).post(entity);
         assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), rawresp.getStatus());
     }
@@ -146,9 +137,8 @@ public class CommonRestController {
      *
      * @param endPoint the endpoint
      * @param entity the entity ofthe body
-     * @throws Exception if an error occurs
      */
-    protected void assertUnauthorizedPut(final String endPoint, final Entity<?> entity) throws Exception {
+    protected void assertUnauthorizedPut(final String endPoint, final Entity<?> entity) {
         Response rawresp = sendNoAuthRequest(endPoint).put(entity);
         assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), rawresp.getStatus());
     }
@@ -157,9 +147,8 @@ public class CommonRestController {
      * Assert that GET call is Unauthorized.
      *
      * @param endPoint the endpoint
-     * @throws Exception if an error occurs
      */
-    protected void assertUnauthorizedGet(final String endPoint) throws Exception {
+    protected void assertUnauthorizedGet(final String endPoint) {
         Response rawresp = sendNoAuthRequest(endPoint).buildGet().invoke();
         assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), rawresp.getStatus());
     }
@@ -168,9 +157,8 @@ public class CommonRestController {
      * Assert that GET call to actuator endpoint is Unauthorized.
      *
      * @param endPoint the endpoint
-     * @throws Exception if an error occurs
      */
-    protected void assertUnauthorizedActGet(final String endPoint) throws Exception {
+    protected void assertUnauthorizedActGet(final String endPoint) {
         Response rawresp = sendNoAuthActRequest(endPoint).buildGet().invoke();
         assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), rawresp.getStatus());
     }
@@ -179,9 +167,8 @@ public class CommonRestController {
      * Assert that DELETE call is Unauthorized.
      *
      * @param endPoint the endpoint
-     * @throws Exception if an error occurs
      */
-    protected void assertUnauthorizedDelete(final String endPoint) throws Exception {
+    protected void assertUnauthorizedDelete(final String endPoint) {
         Response rawresp = sendNoAuthRequest(endPoint).delete();
         assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), rawresp.getStatus());
     }