1 files changed, 57 insertions, 58 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/monitoring/EsGateway.java b/catalog-be/src/main/java/org/openecomp/sdc/be/monitoring/EsGateway.java
index 6be300d6db..ba6596d1a2 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/monitoring/EsGateway.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/monitoring/EsGateway.java
@@ -20,12 +20,6 @@
 
 package org.openecomp.sdc.be.monitoring;
 
-import java.net.URI;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.api.Response;
 import org.eclipse.jetty.proxy.ProxyServlet;
@@ -36,75 +30,80 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
 
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.net.URI;
+
 public class EsGateway extends ProxyServlet {
 
-	private static final long serialVersionUID = 1L;
-	private static Logger log = LoggerFactory.getLogger(EsGateway.class.getName());
+    private static final long serialVersionUID = 1L;
+    private static final Logger log = LoggerFactory.getLogger(EsGateway.class);
 
-	@Override
-	public URI rewriteURI(HttpServletRequest request) {
+    @Override
+    public URI rewriteURI(HttpServletRequest request) {
 
-		String originalUrl = request.getRequestURI();
+        String originalUrl = request.getRequestURI();
 
-		String redirectedUrl = getModifiedUrl(request);
+        String redirectedUrl = getModifiedUrl(request);
 
-		log.debug("EsGateway Redirecting request from: {} , to: {}", originalUrl, redirectedUrl);
-		return URI.create(redirectedUrl);
-	}
+        log.debug("EsGateway Redirecting request from: {} , to: {}", originalUrl, redirectedUrl);
+        return URI.create(redirectedUrl);
+    }
 
-	@Override
-	public void customizeProxyRequest(Request proxyRequest, HttpServletRequest request) {
-		super.customizeProxyRequest(proxyRequest, request);
+    @Override
+    public void customizeProxyRequest(Request proxyRequest, HttpServletRequest request) {
+        super.customizeProxyRequest(proxyRequest, request);
 
-	}
+    }
 
-	@Override
-	protected void onResponseSuccess(HttpServletRequest request, HttpServletResponse response, Response proxyResponse) {
-		super.onResponseSuccess(request, response, proxyResponse);
-	}
+    @Override
+    protected void onResponseSuccess(HttpServletRequest request, HttpServletResponse response, Response proxyResponse) {
+        super.onResponseSuccess(request, response, proxyResponse);
+    }
 
-	public String getModifiedUrl(HttpServletRequest request) {
-		String esHost = null;
-		String esPort = null;
-		MonitoringBusinessLogic monitoringBL = getMonitoringBL(request.getSession().getServletContext());
-		if (monitoringBL == null) {
-			log.error("failed to retrive monitoringBL.");
-		} else {
-			esHost = monitoringBL.getEsHost();
-			esPort = monitoringBL.getEsPort();
-		}
+    public String getModifiedUrl(HttpServletRequest request) {
+        String esHost = null;
+        String esPort = null;
+        MonitoringBusinessLogic monitoringBL = getMonitoringBL(request.getSession().getServletContext());
+        if (monitoringBL == null) {
+            log.error("failed to retrive monitoringBL.");
+        } else {
+            esHost = monitoringBL.getEsHost();
+            esPort = monitoringBL.getEsPort();
+        }
 
-		//String scheme = request.getScheme(); esGateway HTTP
-		String scheme = "http";
-		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
+        //String scheme = request.getScheme(); esGateway HTTP
+        String scheme = "http";
+        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(scheme).append("://").append(esHost);
-		url.append(":").append(esPort);
-		url.append(contextPath).append(servletPath);
+        StringBuilder url = new StringBuilder();
+        url.append(scheme).append("://").append(esHost);
+        url.append(":").append(esPort);
+        url.append(contextPath).append(servletPath);
 
-		if (pathInfo != null) {
-			url.append(pathInfo);
-		}
-		if (queryString != null) {
-			url.append("?").append(queryString);
-		}
+        if (pathInfo != null) {
+            url.append(pathInfo);
+        }
+        if (queryString != null) {
+            url.append("?").append(queryString);
+        }
 
-		String redirectedUrl = url.toString().replace("/sdc2/esGateway/", "/");
-		return redirectedUrl;
+        String redirectedUrl = url.toString().replace("/sdc2/esGateway/", "/");
+        return redirectedUrl;
 
-	}
+    }
 
-	protected MonitoringBusinessLogic getMonitoringBL(ServletContext context) {
+    protected MonitoringBusinessLogic getMonitoringBL(ServletContext context) {
 
-		WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
-		WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
-		MonitoringBusinessLogic monitoringBusinessLogic = webApplicationContext.getBean(MonitoringBusinessLogic.class);
+        WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
+        WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
+        MonitoringBusinessLogic monitoringBusinessLogic = webApplicationContext.getBean(MonitoringBusinessLogic.class);
 
-		return monitoringBusinessLogic;
-	}
+        return monitoringBusinessLogic;
+    }
 
 }