lowered code smells

[portal.git] / ecomp-portal-BE-common / src / main / java / org / onap / portalapp / portal / controller / HealthCheckController.java

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/HealthCheckController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/HealthCheckController.java
index 6818d50..0acfabf 100644 (file)
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/HealthCheckController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/HealthCheckController.java
@@ -4,6 +4,8 @@
  * ===================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ *  Modification Copyright © 2020 IBM.
+ * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
  * under the Apache License, Version 2.0 (the "License");
@@ -45,8 +47,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.slf4j.MDC;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.onap.music.main.MusicUtil;
 import org.onap.portalapp.controller.EPUnRestrictedBaseController;
@@ -118,7 +119,7 @@ public class HealthCheckController extends EPUnRestrictedBaseController {
        private final String statusDown = "DOWN";
        private final String statusOk = "OK";
 
-       @RequestMapping(value = { "/portalApi/healthCheck" }, method = RequestMethod.GET, produces = "application/json")
+       @GetMapping(value = { "/portalApi/healthCheck" }, produces = "application/json")
        public HealthStatus healthCheck(HttpServletRequest request, HttpServletResponse response) {
                HealthStatus healthStatus = new HealthStatus(500, "");
 
@@ -192,16 +193,17 @@ public class HealthCheckController extends EPUnRestrictedBaseController {
                                }
                                statusCollection.add(CassandraStatusInfo);
 
-                               HealthStatusInfo zookeeperStatusInfo = new HealthStatusInfo("Music-zookeeper");
-                               //zookeeperStatusInfo.hostName = EcompPortalUtils.getMyHostName();
-                               zookeeperStatusInfo.ipAddress = MusicUtil.getMyZkHost();
-                               if (!HealthMonitor.isZookeeperStatusOk()) {
-                                       overallStatus = false;
-                                       zookeeperStatusInfo.healthCheckStatus = statusDown;
-                                       zookeeperStatusInfo.description = "Check the logs for more details";
-                                       EPLogUtil.logEcompError(logger, EPAppMessagesEnum.MusicHealthCheckZookeeperError);
-                               }
-                               statusCollection.add(zookeeperStatusInfo);
+                               /*
+                                * HealthStatusInfo zookeeperStatusInfo = new
+                                * HealthStatusInfo("Music-zookeeper"); --zookeeperStatusInfo.hostName =
+                                * EcompPortalUtils.getMyHostName(); zookeeperStatusInfo.ipAddress =
+                                * MusicUtil.getMyZkHost(); if (!HealthMonitor.isZookeeperStatusOk()) {
+                                * overallStatus = false; zookeeperStatusInfo.healthCheckStatus = statusDown;
+                                * zookeeperStatusInfo.description = "Check the logs for more details";
+                                * EPLogUtil.logEcompError(logger,
+                                * EPAppMessagesEnum.MusicHealthCheckZookeeperError); }
+                                * statusCollection.add(zookeeperStatusInfo);
+                                */
                        }
 
                        String json = "";
@@ -228,8 +230,8 @@ public class HealthCheckController extends EPUnRestrictedBaseController {
                return healthStatus;
        }
 
-       @RequestMapping(value = {
-                       "/portalApi/healthCheckSuspend" }, method = RequestMethod.GET, produces = "application/json")
+       @GetMapping(value = {
+                       "/portalApi/healthCheckSuspend" }, produces = "application/json")
        public HealthStatus healthCheckSuspend(HttpServletRequest request, HttpServletResponse response) {
                HealthStatus healthStatus = new HealthStatus(500, "Suspended for manual failover mechanism");
 
@@ -242,8 +244,8 @@ public class HealthCheckController extends EPUnRestrictedBaseController {
                return healthStatus;
        }
 
-       @RequestMapping(value = {
-                       "/portalApi/healthCheckResume" }, method = RequestMethod.GET, produces = "application/json")
+       @GetMapping(value = {
+                       "/portalApi/healthCheckResume" }, produces = "application/json")
        public HealthStatus healthCheckResume(HttpServletRequest request, HttpServletResponse response) {
                HealthStatus healthStatus = new HealthStatus(500, "Resumed from manual failover mechanism");
 
@@ -254,7 +256,7 @@ public class HealthCheckController extends EPUnRestrictedBaseController {
                return healthStatus;
        }
 
-       @RequestMapping(value = { "/portalApi/ping" }, method = RequestMethod.GET, produces = "application/json")
+       @GetMapping(value = { "/portalApi/ping" }, produces = "application/json")
        public HealthStatus ping(HttpServletRequest request, HttpServletResponse response) {
                HealthStatus healthStatus = new HealthStatus(200, "OK");
                EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/ping", "GET result =", response.getStatus());