1 files changed, 92 insertions, 92 deletions

diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/MobProxy.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/MobProxy.java
index d082f2d174..70a1dd6f81 100644
--- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/MobProxy.java
+++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/MobProxy.java
@@ -7,9 +7,9 @@
  * 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.
@@ -28,105 +28,105 @@ import com.github.markusbernhardt.proxy.ProxySearch.Strategy;
 import com.github.markusbernhardt.proxy.util.PlatformUtil;
 import com.github.markusbernhardt.proxy.util.PlatformUtil.Platform;
 import net.lightbody.bmp.BrowserMobProxyServer;
+import org.apache.http.HttpStatus;
 import org.slf4j.LoggerFactory;
 
-import java.net.*;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.SocketAddress;
+import java.net.URI;
 import java.util.HashMap;
 import java.util.List;
 
 public class MobProxy {
-	
-	private static HashMap<Long, BrowserMobProxyServer> mobProxyServerMap = new HashMap<Long, BrowserMobProxyServer>();
-	public static InetSocketAddress localProxyAddress = getProxy();	
-	
-	public static InetSocketAddress getProxy(){		
-		setLogger();
-	    
-		ProxySearch proxySearch = new ProxySearch(); 
-//		proxySearch.addStrategy(Strategy.JAVA); 
-//		proxySearch.addStrategy(Strategy.BROWSER);
-//		proxySearch.addStrategy(Strategy.OS_DEFAULT);
-//		proxySearch.addStrategy(Strategy.ENV_VAR);
-		if (PlatformUtil.getCurrentPlattform() == Platform.WIN) {
-		    proxySearch.addStrategy(Strategy.IE);
-		    proxySearch.addStrategy(Strategy.FIREFOX);
-		    proxySearch.addStrategy(Strategy.JAVA);
-		} else if (PlatformUtil.getCurrentPlattform() == Platform.LINUX) {
-		    proxySearch.addStrategy(Strategy.GNOME);
-		    proxySearch.addStrategy(Strategy.KDE);
-		    proxySearch.addStrategy(Strategy.FIREFOX);
-		    proxySearch.addStrategy(Strategy.ENV_VAR);
-		    return null;
-		} else {
-		    proxySearch.addStrategy(Strategy.OS_DEFAULT);
-		}
-		ProxySelector proxySelector = proxySearch.getProxySelector(); 
 
-		ProxySelector.setDefault(proxySelector); 
-		URI home = URI.create("http://www.google.com"); 
-		System.out.println("ProxySelector: " + proxySelector); 
-		System.out.println("URI: " + home); 
-		List<Proxy> proxyList = proxySelector.select(home); 
-		String host = null;
-		String port = null;
-		if (proxyList != null && !proxyList.isEmpty()) { 
-		 for (Proxy proxy : proxyList) { 
-		   System.out.println(proxy); 
-		   SocketAddress address = proxy.address(); 
-		   if (address instanceof InetSocketAddress) { 
-		     host = ((InetSocketAddress) address).getHostName(); 
-		     port = Integer.toString(((InetSocketAddress) address).getPort()); 
-		     System.setProperty("http.proxyHost", host); 
-		     System.setProperty("http.proxyPort", port); 
-		   } 
-		 } 
-		}
-		InetSocketAddress address = new InetSocketAddress(host, Integer.parseInt(port));
-		return address;
-	}
-    
-	// set logger for all classes connected to MobProxy
-	public static void setLogger() {
-		LoggerContext lc = (LoggerContext) LoggerFactory. getILoggerFactory();
-//	    lc.getLogger("ROOT").setLevel(Level.DEBUG);
-		for(Logger logger:lc.getLoggerList()){
-			logger.setLevel(Level.INFO);
-		}
-	}
-	
-	public static synchronized void setProxyServer() {
-		BrowserMobProxyServer server = new BrowserMobProxyServer();
-		server.setTrustAllServers(true);
-		if (localProxyAddress != null){
-			server.setChainedProxy(localProxyAddress);
-			server.start();
-		} else {
-			server.start();
-			// filter firefox requests to mozilla when system proxy is absent
-			server.blacklistRequests(".*mozilla.*", 200);
-		}
-		addProxyServerToPull(Thread.currentThread().getId(), server);
-	}
-	
-	public static synchronized BrowserMobProxyServer getPoxyServer() {
+    private static HashMap<Long, BrowserMobProxyServer> mobProxyServerMap = new HashMap<Long, BrowserMobProxyServer>();
+    private static InetSocketAddress localProxyAddress = getProxy();
+
+    public static InetSocketAddress getProxy() {
+        setLogger();
+
+        ProxySearch proxySearch = new ProxySearch();
+        if (PlatformUtil.getCurrentPlattform() == Platform.WIN) {
+            proxySearch.addStrategy(Strategy.IE);
+            proxySearch.addStrategy(Strategy.FIREFOX);
+            proxySearch.addStrategy(Strategy.JAVA);
+        } else if (PlatformUtil.getCurrentPlattform() == Platform.LINUX) {
+            proxySearch.addStrategy(Strategy.GNOME);
+            proxySearch.addStrategy(Strategy.KDE);
+            proxySearch.addStrategy(Strategy.FIREFOX);
+            proxySearch.addStrategy(Strategy.ENV_VAR);
+            return null;
+        } else {
+            proxySearch.addStrategy(Strategy.OS_DEFAULT);
+        }
+        ProxySelector proxySelector = proxySearch.getProxySelector();
+
+        ProxySelector.setDefault(proxySelector);
+        URI home = URI.create("http://www.google.com");
+        System.out.println("ProxySelector: " + proxySelector);
+        System.out.println("URI: " + home);
+        List<Proxy> proxyList = proxySelector.select(home);
+        String host = null;
+        String port = null;
+        if (proxyList != null && !proxyList.isEmpty()) {
+            for (Proxy proxy : proxyList) {
+                System.out.println(proxy);
+                SocketAddress address = proxy.address();
+                if (address instanceof InetSocketAddress) {
+                    host = ((InetSocketAddress) address).getHostName();
+                    port = Integer.toString(((InetSocketAddress) address).getPort());
+                    System.setProperty("http.proxyHost", host);
+                    System.setProperty("http.proxyPort", port);
+                }
+            }
+        }
+        InetSocketAddress address = new InetSocketAddress(host, Integer.parseInt(port));
+        return address;
+    }
+
+    // set logger for all classes connected to MobProxy
+    public static void setLogger() {
+        LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
+        for (Logger logger : lc.getLoggerList()) {
+            logger.setLevel(Level.INFO);
+        }
+    }
+
+    public static synchronized void setProxyServer() {
+        BrowserMobProxyServer server = new BrowserMobProxyServer();
+        server.setTrustAllServers(true);
+        if (localProxyAddress != null) {
+            server.setChainedProxy(localProxyAddress);
+            server.start();
+        } else {
+            server.start();
+            // filter firefox requests to mozilla when system proxy is absent
+            server.blacklistRequests(".*mozilla.*", HttpStatus.SC_OK);
+        }
+        addProxyServerToPull(Thread.currentThread().getId(), server);
+    }
+
+    public static synchronized BrowserMobProxyServer getPoxyServer() {
         return mobProxyServerMap.get(Thread.currentThread().getId());
     }
-	
-	public static void addProxyServerToPull(Long threadId, BrowserMobProxyServer server){
-		mobProxyServerMap.put(threadId, server);
-	}
-	
-	public static synchronized void removePoxyServer() {
-		if (getPoxyServer() != null){
-			getPoxyServer().stop();
-			mobProxyServerMap.remove(Thread.currentThread().getId());
-		}
+
+    public static void addProxyServerToPull(Long threadId, BrowserMobProxyServer server) {
+        mobProxyServerMap.put(threadId, server);
+    }
+
+    public static synchronized void removePoxyServer() {
+        if (getPoxyServer() != null) {
+            getPoxyServer().stop();
+            mobProxyServerMap.remove(Thread.currentThread().getId());
+        }
+    }
+
+    public static void removeAllProxyServers() {
+        for (Long threadNumber : mobProxyServerMap.keySet()) {
+            mobProxyServerMap.get(threadNumber).stop();
+        }
     }
-	
-	public static void removeAllProxyServers(){
-		for(Long threadNumber :mobProxyServerMap.keySet()){
-			mobProxyServerMap.get(threadNumber).stop();
-		}
-	}
 
 }