Remove zookeeper reference

[music.git] / src / main / java / org / onap / music / rest / RestMusicHealthCheckAPI.java

diff --git a/src/main/java/org/onap/music/rest/RestMusicHealthCheckAPI.java b/src/main/java/org/onap/music/rest/RestMusicHealthCheckAPI.java
index 895f0ab..cb8965e 100644 (file)
--- a/src/main/java/org/onap/music/rest/RestMusicHealthCheckAPI.java
+++ b/src/main/java/org/onap/music/rest/RestMusicHealthCheckAPI.java
@@ -3,6 +3,8 @@
  * org.onap.music
  * ===================================================================
  *  Copyright (c) 2017 AT&T Intellectual Property
+ *
+ *  Modifications Copyright (C) 2018 IBM.
  * ===================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,6 +21,7 @@
  * ============LICENSE_END=============================================
  * ====================================================================
  */
+
 package org.onap.music.rest;
 
 import java.util.HashMap;
@@ -35,20 +38,14 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.Consumes;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.core.Response.Status;
 
 
-import org.onap.music.response.jsonobjects.JsonResponse;
 import org.onap.music.eelf.healthcheck.MusicHealthCheck;
 import org.onap.music.eelf.logging.EELFLoggerDelegate;
 import org.onap.music.main.MusicUtil;
-import org.onap.music.main.ResultType;
 
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
 import com.datastax.driver.core.ConsistencyLevel;
 
 import io.swagger.annotations.Api;
@@ -58,63 +55,58 @@ import io.swagger.annotations.ApiParam;
 
 
 
-@Path("/v{version: [0-9]+}/service")
+@Path("/v2/service")
 @Api(value="Healthcheck Api")
 public class RestMusicHealthCheckAPI {
-       
-       
-       private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MusicUtil.class);
-       
-       
-       @GET
-       @Path("/pingCassandra/{consistency}")
-       @ApiOperation(value = "Get Health Status", response = Map.class)
-       @Produces(MediaType.APPLICATION_JSON)
-       public Response cassandraStatus(@Context HttpServletResponse response, @ApiParam(value = "Consistency level",
+    
+    
+    private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MusicUtil.class);
+    private static final String ACTIVE_STATUS = "ACTIVE";
+    
+    @GET
+    @Path("/pingCassandra/{consistency}")
+    @ApiOperation(value = "Get Health Status", response = Map.class)
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response cassandraStatus(@Context HttpServletResponse response, @ApiParam(value = "Consistency level",
             required = true) @PathParam("consistency") String consistency) {
-               logger.info(EELFLoggerDelegate.applicationLogger,"Replying to request for MUSIC Health Check status for Cassandra");
-               
-               Map<String, Object> resultMap = new HashMap<>();
-               if(ConsistencyLevel.valueOf(consistency) == null) {
-                       resultMap.put("INVALID", "Consistency level is invalid...");
-                       return Response.status(Status.BAD_REQUEST).entity(resultMap).build();
-               }
-               MusicHealthCheck cassHealthCheck = new MusicHealthCheck();
-               String status = cassHealthCheck.getCassandraStatus(consistency);
-               if(status.equals("ACTIVE")) {
-                       resultMap.put("ACTIVE", "Cassandra Running and Listening to requests");
-                       return Response.status(Status.OK).entity(resultMap).build();
-               } else {
-                       resultMap.put("INACTIVE", "One or more nodes in the Cluster is/are down or not responding.");
-                       return Response.status(Status.BAD_REQUEST).entity(resultMap).build();
-               }
-               
-               
-               
-       }
-       
-       @GET
-       @Path("/pingZookeeper")
-       @ApiOperation(value = "Get Health Status", response = Map.class)
-       @Produces(MediaType.APPLICATION_JSON)
-       public Response ZKStatus(@Context HttpServletResponse response) {
-               logger.info(EELFLoggerDelegate.applicationLogger,"Replying to request for MUSIC Health Check status for Zookeeper");
-               Map<String, Object> resultMap = new HashMap<>();
-               MusicHealthCheck ZKHealthCheck = new MusicHealthCheck();
-               String status = ZKHealthCheck.getZookeeperStatus();
-               if(status.equals("ACTIVE")) {
-                       resultMap.put("ACTIVE", "Zookeeper is Active and Running");
-                       return Response.status(Status.OK).entity(resultMap).build();
-               }else {
-                       resultMap.put("INACTIVE", "Zookeeper is not responding");
-                       return Response.status(Status.BAD_REQUEST).entity(resultMap).build();
-               }
-       }
-       
-       
-       
-       
-       
-       
+        logger.info(EELFLoggerDelegate.applicationLogger,"Replying to request for MUSIC Health Check status for Cassandra");
+        
+        Map<String, Object> resultMap = new HashMap<>();
+        if(ConsistencyLevel.valueOf(consistency) == null) {
+            resultMap.put("INVALID", "Consistency level is invalid...");
+            return Response.status(Status.BAD_REQUEST).entity(resultMap).build();
+        }
+        MusicHealthCheck cassHealthCheck = new MusicHealthCheck();
+        String status = cassHealthCheck.getCassandraStatus(consistency);
+        if(status.equals(ACTIVE_STATUS)) {
+            resultMap.put(ACTIVE_STATUS, "Cassandra Running and Listening to requests");
+            return Response.status(Status.OK).entity(resultMap).build();
+        } else {
+            resultMap.put("INACTIVE", "One or more nodes in the Cluster is/are down or not responding.");
+            return Response.status(Status.BAD_REQUEST).entity(resultMap).build();
+        }
+        
+        
+        
+    }
+    
+    @GET
+    @Path("/musicHealthCheck")
+    @ApiOperation(value = "Get Health Status", response = Map.class)
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response musicHealthCheck() {
+        logger.info(EELFLoggerDelegate.applicationLogger,"Replying to request for Health Check status for MUSIC");
+        Map<String, Object> resultMap = new HashMap<>();
+        MusicHealthCheck healthCheck = new MusicHealthCheck();
+
+        String status = healthCheck.getCassandraStatus(ConsistencyLevel.ANY.toString());
+        if(status.equals(ACTIVE_STATUS)) {
+            resultMap.put("Cassandra", "Active");
+        } else {
+            resultMap.put("Cassandra", "Inactive");
+        }
+        resultMap.put("MUSIC", "Active");
+        return Response.status(Status.OK).entity(resultMap).build();
+    }
 
 }