1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

1 files changed, 7 insertions, 51 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/HealthcheckHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/HealthcheckHandler.java
index 0ae1695516..bc8c2e03cf 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/HealthcheckHandler.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/HealthcheckHandler.java
@@ -25,14 +25,17 @@ import javax.ws.rs.HEAD;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.DefaultValue;
 import javax.ws.rs.core.Response;
-import org.openecomp.mso.HealthCheckUtils;
 
+import org.openecomp.mso.HealthCheckUtils;
 import org.openecomp.mso.logger.MsoLogger;
 import org.openecomp.mso.utils.UUIDChecker;
 
-@Path("/")
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+
+@Path("/healthcheck")
+@Api(value="/healthcheck",description="API Handler Infra Health Check")
 public class HealthcheckHandler {
 
     public final static String MSO_PROP_APIHANDLER_INFRA = "MSO_PROP_APIHANDLER_INFRA";
@@ -41,8 +44,8 @@ public class HealthcheckHandler {
 
     @HEAD
     @GET
-    @Path("/healthcheck")
     @Produces("text/html")
+    @ApiOperation(value="Perform Health Check",response=Response.class)
     public Response healthcheck (@QueryParam("requestId") String requestId) {
         long startTime = System.currentTimeMillis ();
         MsoLogger.setServiceName ("Healthcheck");
@@ -62,51 +65,4 @@ public class HealthcheckHandler {
         msoLogger.debug("healthcheck - Successful");
         return HealthCheckUtils.HEALTH_CHECK_RESPONSE;
     }
-
-    @HEAD
-    @GET
-    @Path("/nodehealthcheck")
-    @Produces("text/html")
-    public Response nodeHealthcheck () {
-        long startTime = System.currentTimeMillis ();
-        MsoLogger.setServiceName ("NodeHealthcheck");
-        // Generate a Request Id
-        String requestId = UUIDChecker.generateUUID(msoLogger);
-        HealthCheckUtils healthCheck = new HealthCheckUtils ();
-        if (!healthCheck.siteStatusCheck (msoLogger, startTime)) {
-            return HealthCheckUtils.HEALTH_CHECK_NOK_RESPONSE;
-        }
-
-        if (healthCheck.verifyNodeHealthCheck(HealthCheckUtils.NodeType.APIH, requestId)) {
-            msoLogger.debug("nodeHealthcheck - Successful");
-            return HealthCheckUtils.HEALTH_CHECK_RESPONSE;
-        } else {
-            msoLogger.debug("nodeHealthcheck - At leaset one of the sub-modules is not available.");
-            return  HealthCheckUtils.HEALTH_CHECK_NOK_RESPONSE;
-        }
-    }
-
-    @HEAD
-    @GET
-    @Path("/globalhealthcheck")
-    @Produces("text/html")
-    public Response globalHealthcheck (@DefaultValue("true") @QueryParam("enableBpmn") boolean enableBpmn) {
-        long startTime = System.currentTimeMillis ();
-        MsoLogger.setServiceName ("GlobalHealthcheck");
-        // Generate a Request Id
-        String requestId = UUIDChecker.generateUUID(msoLogger);
-        HealthCheckUtils healthCheck = new HealthCheckUtils ();
-        if (!healthCheck.siteStatusCheck (msoLogger, startTime)) {
-            return HealthCheckUtils.HEALTH_CHECK_NOK_RESPONSE;
-        }
-
-        if (healthCheck.verifyGlobalHealthCheck(enableBpmn, requestId)) {
-            msoLogger.debug("globalHealthcheck - Successful");
-            return HealthCheckUtils.HEALTH_CHECK_RESPONSE;
-        } else {
-            msoLogger.debug("globalHealthcheck - At leaset one of the sub-modules is not available");
-            return  HealthCheckUtils.HEALTH_CHECK_NOK_RESPONSE;
-        }
-    } 
-
 }