diff options
Diffstat (limited to 'catalog-fe/src/main')
| -rw-r--r-- | catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/KibanaServlet.java | 105 |
1 files changed, 53 insertions, 52 deletions
diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/KibanaServlet.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/KibanaServlet.java index 8554927566..844d87075d 100644 --- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/KibanaServlet.java +++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/KibanaServlet.java @@ -4,12 +4,14 @@ * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Modifications Copyright (c) 2019 Samsung + * ================================================================================ * 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. @@ -20,6 +22,8 @@ package org.openecomp.sdc.fe.servlets; +import javax.servlet.http.HttpServletRequest; + import org.eclipse.jetty.proxy.ProxyServlet; import org.openecomp.sdc.common.api.Constants; import org.openecomp.sdc.fe.config.Configuration; @@ -27,55 +31,52 @@ import org.openecomp.sdc.fe.config.ConfigurationManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpServletRequest; - public class KibanaServlet extends ProxyServlet { - private static final long serialVersionUID = 1L; - private static Logger log = LoggerFactory.getLogger(KibanaServlet.class.getName()); - - @Override - public String rewriteTarget(HttpServletRequest request) { - - String originalUrl = request.getRequestURI(); - - String redirectedUrl = getModifiedUrl(request); - - log.debug("KibanaServlet Redirecting request from: {} , to: {}", originalUrl, redirectedUrl); - - return redirectedUrl; - } - - public String getModifiedUrl(HttpServletRequest request) { - Configuration config = getConfiguration(request); - if (config == null) { - log.error("failed to retrieve configuration."); - } - // String scheme = request.getScheme(); - String contextPath = request.getContextPath(); // /mywebapp - String servletPath = request.getServletPath(); // /servlet/MyServlet - String pathInfo = request.getPathInfo(); // /a/b;c=123 - String queryString = request.getQueryString(); // d=789 - - StringBuilder url = new StringBuilder(); - url.append(config.getKibanaProtocol()).append("://").append(config.getKibanaHost()); - url.append(":").append(config.getKibanaPort()); - url.append(contextPath).append(servletPath); - - if (pathInfo != null) { - url.append(pathInfo); - } - if (queryString != null) { - url.append("?").append(queryString); - } - - String redirectedUrl = url.toString().replace("/sdc1/kibanaProxy/", "/"); - return redirectedUrl; - - } - - private Configuration getConfiguration(HttpServletRequest request) { - Configuration config = ((ConfigurationManager) request.getSession().getServletContext() - .getAttribute(Constants.CONFIGURATION_MANAGER_ATTR)).getConfiguration(); - return config; - } + + private static final long serialVersionUID = 1L; + private static final Logger log = LoggerFactory.getLogger(KibanaServlet.class.getName()); + + @Override + public String rewriteTarget(HttpServletRequest request) { + String originalUrl = request.getRequestURI(); + String redirectedUrl = getModifiedUrl(request); + + log.debug("KibanaServlet Redirecting request from: {} , to: {}", originalUrl, redirectedUrl); + + return redirectedUrl; + } + + public String getModifiedUrl(HttpServletRequest request) { + Configuration config = getConfiguration(request); + + if (config == null) { + log.error("Failed to retrieve configuration."); + throw new NullPointerException("Failed to retrieve configuration."); + } + + String contextPath = request.getContextPath(); + String servletPath = request.getServletPath(); + String pathInfo = request.getPathInfo(); + String queryString = request.getQueryString(); + + StringBuilder url = new StringBuilder(); + url.append(config.getKibanaProtocol()).append("://").append(config.getKibanaHost()); + url.append(":").append(config.getKibanaPort()); + url.append(contextPath).append(servletPath); + + if (pathInfo != null) { + url.append(pathInfo); + } + + if (queryString != null) { + url.append("?").append(queryString); + } + + return url.toString().replace("/sdc1/kibanaProxy/", "/"); + } + + private Configuration getConfiguration(HttpServletRequest request) { + return ((ConfigurationManager) request.getSession().getServletContext() + .getAttribute(Constants.CONFIGURATION_MANAGER_ATTR)).getConfiguration(); + } } |