Merge "API healthcheck must return healthcheck report object"

[policy/api.git] / main / src / main / java / org / onap / policy / api / main / rest / ApiRestController.java

diff --git a/main/src/main/java/org/onap/policy/api/main/rest/ApiRestController.java b/main/src/main/java/org/onap/policy/api/main/rest/ApiRestController.java
index d6f6d6a..a734b2d 100644 (file)
--- a/main/src/main/java/org/onap/policy/api/main/rest/ApiRestController.java
+++ b/main/src/main/java/org/onap/policy/api/main/rest/ApiRestController.java
@@ -136,8 +136,9 @@ public class ApiRestController extends CommonRestController {
     public ResponseEntity<HealthCheckReport> getHealthCheck(\r
         @RequestHeader(name = REQUEST_ID_NAME, required = false)\r
         @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId) {\r
-        updateApiStatisticsCounter(Target.OTHER, HttpStatus.OK, HttpMethod.GET);\r
-        return makeOkResponse(requestId, healthCheckProvider.performHealthCheck());\r
+        final var report = healthCheckProvider.performHealthCheck();\r
+        updateApiStatisticsCounter(Target.OTHER, HttpStatus.resolve(report.getCode()), HttpMethod.GET);\r
+        return makeResponse(requestId, report, report.getCode());\r
     }\r
 \r
     /**\r
@@ -1151,4 +1152,4 @@ public class ApiRestController extends CommonRestController {
             }\r
         }\r
     }\r
-}
\ No newline at end of file
+}\r