Merge pull request #25 from chinmoy12c/enhancement/async-health-endpo…

…ints Modified health check endpoints to work asynchronously.
samagra-comms · Apr 12, 2023 · 817d8d1 · 817d8d1
2 parents d9ca06d + 6f4d2e5
commit 817d8d1
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 46 deletions.
diff --git a/src/main/java/com/uci/outbound/health/HealthController.java b/src/main/java/com/uci/outbound/health/HealthController.java
@@ -1,18 +1,10 @@
 package com.uci.outbound.health;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.uci.dao.service.HealthService;
-
 import com.uci.utils.model.ApiResponse;
 import com.uci.utils.model.ApiResponseParams;
 import lombok.extern.slf4j.Slf4j;
-
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
+import reactor.core.publisher.Mono;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -29,15 +21,13 @@ public class HealthController {
 	private HealthService healthService;
 
     @RequestMapping(value = "/health", method = RequestMethod.GET, produces = { "application/json", "text/json" })
-    public ResponseEntity<ApiResponse> statusCheck() throws JsonProcessingException, IOException {
-        log.error("Health API called");
-        ApiResponse response = ApiResponse.builder()
-                .id("api.health")
-                .params(ApiResponseParams.builder().build())
-                .responseCode(HttpStatus.OK.name())
-                .result(healthService.getAllHealthNode())
-                .build();
-
-        return ResponseEntity.ok(response);
+    public Mono<ResponseEntity<ApiResponse>> statusCheck() {
+		return healthService.getAllHealthNode().map(health -> ApiResponse.builder()
+				.id("api.health")
+				.params(ApiResponseParams.builder().build())
+				.responseCode(HttpStatus.OK.name())
+				.result(health)
+				.build()
+		).map(ResponseEntity::ok);
     }
 }
diff --git a/src/main/java/com/uci/outbound/health/ServiceStatusController.java b/src/main/java/com/uci/outbound/health/ServiceStatusController.java
@@ -10,6 +10,7 @@
 import com.uci.utils.model.ApiResponse;
 import com.uci.utils.model.ApiResponseParams;
 import lombok.extern.slf4j.Slf4j;
+import reactor.core.publisher.Mono;
 
 import java.io.IOException;
 
@@ -49,38 +50,37 @@ public ResponseEntity<ApiResponse> statusCheck() throws JsonProcessingException
     }
 
     @RequestMapping(value = "/health/cassandra", method = RequestMethod.GET, produces = { "application/json", "text/json" })
-    public ResponseEntity<ApiResponse> cassandraStatusCheck() throws IOException, JsonProcessingException {
-        ApiResponse response = ApiResponse.builder()
-                .id("api.service.health.cassandra")
-                .params(ApiResponseParams.builder().build())
-                .responseCode(HttpStatus.OK.name())
-                .result(healthService.getCassandraHealthNode())
-                .build();
-
-        return ResponseEntity.ok(response);
+    public Mono<ResponseEntity<ApiResponse>> cassandraStatusCheck() {
+		return healthService.getCassandraHealthNode().map(result->
+				ApiResponse.builder()
+				.id("api.service.health.cassandra")
+				.params(ApiResponseParams.builder().build())
+				.responseCode(HttpStatus.OK.name())
+				.result(result)
+				.build())
+				.map(ResponseEntity::ok);
     }
 
     @RequestMapping(value = "/health/kafka", method = RequestMethod.GET, produces = { "application/json", "text/json" })
-    public ResponseEntity<ApiResponse> kafkaStatusCheck() throws IOException, JsonProcessingException {
-        ApiResponse response = ApiResponse.builder()
-                .id("api.service.health.kafka")
-                .params(ApiResponseParams.builder().build())
-                .responseCode(HttpStatus.OK.name())
-                .result(healthService.getKafkaHealthNode())
-                .build();
-
-        return ResponseEntity.ok(response);
+    public Mono<ResponseEntity<ApiResponse>> kafkaStatusCheck() {
+		return healthService.getKafkaHealthNode().map(result->
+				ApiResponse.builder()
+				.id("api.service.health.kafka")
+				.params(ApiResponseParams.builder().build())
+				.responseCode(HttpStatus.OK.name())
+				.result(result)
+				.build())
+				.map(ResponseEntity::ok);
     }
 
     @RequestMapping(value = "/health/campaign", method = RequestMethod.GET, produces = { "application/json", "text/json" })
-    public ResponseEntity<ApiResponse> campaignUrlStatusCheck() throws JsonProcessingException, IOException {
-        ApiResponse response = ApiResponse.builder()
-                .id("api.service.health.campaign")
-                .params(ApiResponseParams.builder().build())
-                .responseCode(HttpStatus.OK.name())
-                .result(healthService.getCampaignUrlHealthNode())
-                .build();
-
-        return ResponseEntity.ok(response);
+    public Mono<ResponseEntity<ApiResponse>> campaignUrlStatusCheck() {
+        return healthService.getCampaignUrlHealthNode().map(result ->
+				ApiResponse.builder().id("api.service.health.campaign")
+				.params(ApiResponseParams.builder().build())
+				.responseCode(HttpStatus.OK.name())
+				.result(result)
+				.build())
+				.map(ResponseEntity::ok);
     }
 }