1 files changed, 194 insertions, 182 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeMonitoringServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeMonitoringServlet.java
index 3750f20c45..5433bd5be3 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeMonitoringServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeMonitoringServlet.java
@@ -1,182 +1,194 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.be.servlets;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.jcabi.aspects.Loggable;
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import javax.inject.Inject;
-import org.apache.commons.lang3.tuple.Pair;
-import org.openecomp.sdc.be.components.health.HealthCheckBusinessLogic;
-import org.openecomp.sdc.be.components.impl.ComponentInstanceBusinessLogic;
-import org.openecomp.sdc.be.components.impl.GroupBusinessLogic;
-import org.openecomp.sdc.be.components.impl.MonitoringBusinessLogic;
-import org.openecomp.sdc.be.config.BeEcompErrorManager;
-import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.user.UserBusinessLogic;
-import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.api.HealthCheckInfo;
-import org.openecomp.sdc.common.api.HealthCheckWrapper;
-import org.openecomp.sdc.common.log.wrappers.Logger;
-import org.openecomp.sdc.common.monitoring.MonitoringEvent;
-import org.openecomp.sdc.exception.ResponseFormat;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.util.List;
-
-@Loggable(prepend = true, value = Loggable.TRACE, trim = false)
-@Path("/")
-@Api(value = "BE Monitoring", description = "BE Monitoring")
-@Singleton
-public class BeMonitoringServlet extends BeGenericServlet {
-
-    Gson prettyGson = new GsonBuilder().setPrettyPrinting().create();
-
-    private static final Logger log = Logger.getLogger(ConfigServlet.class);
-    private final HealthCheckBusinessLogic healthCheckBusinessLogic;
-    private final MonitoringBusinessLogic monitoringBusinessLogic;
-
-    @Inject
-    public BeMonitoringServlet(UserBusinessLogic userBusinessLogic,
-        ComponentsUtils componentsUtils,
-        HealthCheckBusinessLogic healthCheckBusinessLogic,
-        MonitoringBusinessLogic monitoringBusinessLogic) {
-        super(userBusinessLogic, componentsUtils);
-        this.healthCheckBusinessLogic = healthCheckBusinessLogic;
-        this.monitoringBusinessLogic = monitoringBusinessLogic;
-    }
-
-    @GET
-    @Path("/healthCheck")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(value = "Return aggregate BE health check of SDC BE components", notes = "return BE health check", response = String.class)
-    @ApiResponses(value = { @ApiResponse(code = 200, message = "SDC BE components are all up"), @ApiResponse(code = 500, message = "One or more SDC BE components are down") })
-    public Response getHealthCheck(@Context final HttpServletRequest request) {
-        try {
-            Pair<Boolean, List<HealthCheckInfo>> beHealthCheckInfosStatus = healthCheckBusinessLogic.getBeHealthCheckInfosStatus();
-            Boolean aggregateStatus = beHealthCheckInfosStatus.getLeft();
-            ActionStatus status = aggregateStatus ? ActionStatus.OK : ActionStatus.GENERAL_ERROR;
-            String sdcVersion = getVersionFromContext(request);
-            if (sdcVersion == null || sdcVersion.isEmpty()) {
-                sdcVersion = "UNKNOWN";
-            }
-            String siteMode = healthCheckBusinessLogic.getSiteMode();
-            HealthCheckWrapper healthCheck = new HealthCheckWrapper(beHealthCheckInfosStatus.getRight(), sdcVersion, siteMode);
-            // The response can be either with 200 or 500 aggregate status - the
-            // body of individual statuses is returned either way
-
-            String healthCheckStr = prettyGson.toJson(healthCheck);
-            return buildOkResponse(getComponentsUtils().getResponseFormat(status), healthCheckStr);
-
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeHealthCheckError("BeHealthCheck");
-            log.debug("BE health check unexpected exception", e);
-            return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-        }
-    }
-
-    @POST
-    @Path("/monitoring")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public Response processMonitoringMetrics(@Context final HttpServletRequest request, String json) {
-        try {
-            MonitoringEvent monitoringEvent = convertContentToJson(json, MonitoringEvent.class);
-            if (monitoringEvent == null) {
-                return buildErrorResponse(getComponentsUtils().getResponseFormatAdditionalProperty(ActionStatus.GENERAL_ERROR));
-            }
-            log.trace("Received monitoring metrics: {}", monitoringEvent);
-            Either<Boolean, ResponseFormat> result = monitoringBusinessLogic.logMonitoringEvent(monitoringEvent);
-            if (result.isRight()) {
-                return buildErrorResponse(result.right().value());
-            }
-            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), null);
-
-        } catch (Exception e) {
-            log.debug("BE system metrics unexpected exception", e);
-            return buildErrorResponse(getComponentsUtils().getResponseFormatAdditionalProperty(ActionStatus.GENERAL_ERROR));
-        }
-    }
-
-    @GET
-    @Path("/version")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(value = "return the ASDC application version", notes = "return the ASDC application version", response = String.class)
-    @ApiResponses(value = { @ApiResponse(code = 200, message = "return ASDC version"), @ApiResponse(code = 500, message = "Internal Error") })
-    public Response getSdcVersion(@Context final HttpServletRequest request) {
-        try {
-            String url = request.getMethod() + " " + request.getRequestURI();
-            log.debug("Start handle request of {}", url);
-
-            String version = getVersionFromContext(request);
-            log.debug("asdc version from manifest is: {}", version);
-            if (version == null || version.isEmpty()) {
-                return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.ASDC_VERSION_NOT_FOUND));
-            }
-
-            HealthCheckInfo versionInfo = new HealthCheckInfo();
-            versionInfo.setVersion(version);
-
-            // The response can be either with 200 or 500 aggregate status - the
-            // body of individual statuses is returned either way
-            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), versionInfo);
-
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("getSDCVersion");
-            log.debug("BE get ASDC version unexpected exception", e);
-            return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-        }
-    }
-
-    private String getVersionFromContext(HttpServletRequest request) {
-        ServletContext servletContext = request.getSession().getServletContext();
-        return (String) servletContext.getAttribute(Constants.ASDC_RELEASE_VERSION_ATTR);
-    }
-
-    protected MonitoringEvent convertContentToJson(String content, Class<MonitoringEvent> clazz) {
-
-        MonitoringEvent object = null;
-        try {
-            object = gson.fromJson(content, clazz);
-            object.setFields(null);
-        } catch (Exception e) {
-            log.debug("Failed to convert the content {} to object.", content.substring(0, Math.min(50, content.length())), e);
-        }
-
-        return object;
-    }
-
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.be.servlets;
+
+import java.util.List;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import org.apache.commons.lang3.tuple.Pair;
+import org.openecomp.sdc.be.components.health.HealthCheckBusinessLogic;
+import org.openecomp.sdc.be.components.impl.MonitoringBusinessLogic;
+import org.openecomp.sdc.be.config.BeEcompErrorManager;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.user.UserBusinessLogic;
+import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.api.HealthCheckInfo;
+import org.openecomp.sdc.common.api.HealthCheckWrapper;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.openecomp.sdc.common.monitoring.MonitoringEvent;
+import org.openecomp.sdc.exception.ResponseFormat;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.v3.oas.annotations.OpenAPIDefinition;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.info.Info;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+
+@Loggable(prepend = true, value = Loggable.TRACE, trim = false)
+@Path("/")
+@OpenAPIDefinition(info = @Info(title = "BE Monitoring", description = "BE Monitoring"))
+@Singleton
+public class BeMonitoringServlet extends BeGenericServlet {
+
+    Gson prettyGson = new GsonBuilder().setPrettyPrinting().create();
+
+    private static final Logger log = Logger.getLogger(ConfigServlet.class);
+    private final HealthCheckBusinessLogic healthCheckBusinessLogic;
+    private final MonitoringBusinessLogic monitoringBusinessLogic;
+
+    @Inject
+    public BeMonitoringServlet(UserBusinessLogic userBusinessLogic,
+        ComponentsUtils componentsUtils,
+        HealthCheckBusinessLogic healthCheckBusinessLogic,
+        MonitoringBusinessLogic monitoringBusinessLogic) {
+        super(userBusinessLogic, componentsUtils);
+        this.healthCheckBusinessLogic = healthCheckBusinessLogic;
+        this.monitoringBusinessLogic = monitoringBusinessLogic;
+    }
+
+    @GET
+    @Path("/healthCheck")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(description = "Return aggregate BE health check of SDC BE components", summary = "return BE health check",
+            responses = @ApiResponse(
+                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = String.class)))))
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "SDC BE components are all up"),
+            @ApiResponse(responseCode = "500", description = "One or more SDC BE components are down")})
+    public Response getHealthCheck(@Context final HttpServletRequest request) {
+        try {
+            Pair<Boolean, List<HealthCheckInfo>> beHealthCheckInfosStatus =
+                    healthCheckBusinessLogic.getBeHealthCheckInfosStatus();
+            Boolean aggregateStatus = beHealthCheckInfosStatus.getLeft();
+            ActionStatus status = aggregateStatus ? ActionStatus.OK : ActionStatus.GENERAL_ERROR;
+            String sdcVersion = getVersionFromContext(request);
+            if (sdcVersion == null || sdcVersion.isEmpty()) {
+                sdcVersion = "UNKNOWN";
+            }
+            String siteMode = healthCheckBusinessLogic.getSiteMode();
+            HealthCheckWrapper healthCheck =
+                    new HealthCheckWrapper(beHealthCheckInfosStatus.getRight(), sdcVersion, siteMode);
+            // The response can be either with 200 or 500 aggregate status - the
+            // body of individual statuses is returned either way
+
+            String healthCheckStr = prettyGson.toJson(healthCheck);
+            return buildOkResponse(getComponentsUtils().getResponseFormat(status), healthCheckStr);
+
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeHealthCheckError("BeHealthCheck");
+            log.debug("BE health check unexpected exception", e);
+            return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
+        }
+    }
+
+    @POST
+    @Path("/monitoring")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response processMonitoringMetrics(@Context final HttpServletRequest request, String json) {
+        try {
+            MonitoringEvent monitoringEvent = convertContentToJson(json, MonitoringEvent.class);
+            if (monitoringEvent == null) {
+                return buildErrorResponse(getComponentsUtils().getResponseFormatAdditionalProperty(ActionStatus.GENERAL_ERROR));
+            }
+            log.trace("Received monitoring metrics: {}", monitoringEvent);
+            Either<Boolean, ResponseFormat> result = monitoringBusinessLogic.logMonitoringEvent(monitoringEvent);
+            if (result.isRight()) {
+                return buildErrorResponse(result.right().value());
+            }
+            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), null);
+
+        } catch (Exception e) {
+            log.debug("BE system metrics unexpected exception", e);
+            return buildErrorResponse(getComponentsUtils().getResponseFormatAdditionalProperty(ActionStatus.GENERAL_ERROR));
+        }
+    }
+
+    @GET
+    @Path("/version")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(description = "return the ASDC application version", summary = "return the ASDC application version",
+            responses = @ApiResponse(
+                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = String.class)))))
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "return ASDC version"),
+            @ApiResponse(responseCode = "500", description = "Internal Error")})
+    public Response getSdcVersion(@Context final HttpServletRequest request) {
+        try {
+            String url = request.getMethod() + " " + request.getRequestURI();
+            log.debug("Start handle request of {}", url);
+
+            String version = getVersionFromContext(request);
+            log.debug("asdc version from manifest is: {}", version);
+            if (version == null || version.isEmpty()) {
+                return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.ASDC_VERSION_NOT_FOUND));
+            }
+
+            HealthCheckInfo versionInfo = new HealthCheckInfo();
+            versionInfo.setVersion(version);
+
+            // The response can be either with 200 or 500 aggregate status - the
+            // body of individual statuses is returned either way
+            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), versionInfo);
+
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("getSDCVersion");
+            log.debug("BE get ASDC version unexpected exception", e);
+            return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
+        }
+    }
+
+    private String getVersionFromContext(HttpServletRequest request) {
+        ServletContext servletContext = request.getSession().getServletContext();
+        return (String) servletContext.getAttribute(Constants.ASDC_RELEASE_VERSION_ATTR);
+    }
+
+    protected MonitoringEvent convertContentToJson(String content, Class<MonitoringEvent> clazz) {
+
+        MonitoringEvent object = null;
+        try {
+            object = gson.fromJson(content, clazz);
+            object.setFields(null);
+        } catch (Exception e) {
+            log.debug("Failed to convert the content {} to object.", content.substring(0, Math.min(50, content.length())), e);
+        }
+
+        return object;
+    }
+
+}