diff options
Diffstat (limited to 'bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy')
4 files changed, 43 insertions, 40 deletions
diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java index 1dd90b730..1f13abdb3 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oakland Software Incorporated and others + * Copyright (c) 2008, 2017 Oakland Software Incorporated and others * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -50,6 +50,7 @@ public class UnixProxyProvider extends AbstractProxyProvider { // Nothing to initialize } + @Override public IProxyData[] select(URI uri) { String[] nonProxyHosts = getNonProxiedHosts(); if (nonProxyHosts != null) { @@ -75,6 +76,7 @@ public class UnixProxyProvider extends AbstractProxyProvider { return proxies; } + @Override public IProxyData[] getProxyData() { String[] commonTypes = new String[] { IProxyData.HTTP_PROXY_TYPE, IProxyData.SOCKS_PROXY_TYPE, IProxyData.HTTPS_PROXY_TYPE }; @@ -82,7 +84,7 @@ public class UnixProxyProvider extends AbstractProxyProvider { } private IProxyData[] getProxyForTypes(String[] types) { - ArrayList allData = new ArrayList(); + ArrayList<IProxyData> allData = new ArrayList<>(); for (int i = 0; i < types.length; i++) { String type = types[i]; ProxyData pd = getSystemProxyInfo(type); @@ -90,9 +92,10 @@ public class UnixProxyProvider extends AbstractProxyProvider { allData.add(pd); } } - return (IProxyData[]) allData.toArray(new IProxyData[0]); + return allData.toArray(new IProxyData[0]); } + @Override public String[] getNonProxiedHosts() { String[] npHosts; diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyProviderUtil.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyProviderUtil.java index f13dc5cc3..9f16a1d5b 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyProviderUtil.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyProviderUtil.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 compeople AG and others. + * Copyright (c) 2008, 2017 compeople AG and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -56,8 +56,8 @@ public final class ProxyProviderUtil { * @param protocolSpecificProxies * a map from http schemes to the list of scheme specific proxies */ - public static void fillProxyLists(String proxyList, List universalProxies, - Map protocolSpecificProxies) { + public static void fillProxyLists(String proxyList, List<IProxyData> universalProxies, + Map<String, List<IProxyData>> protocolSpecificProxies) { StringTokenizer tokenizer = new StringTokenizer(proxyList, ";"); //$NON-NLS-1$ while (tokenizer.hasMoreTokens()) { createProxy(tokenizer.nextToken(), universalProxies, @@ -66,7 +66,7 @@ public final class ProxyProviderUtil { } private static void createProxy(final String proxyDefinition, - List universalProxies, Map protocolSpecificProxies) { + List<IProxyData> universalProxies, Map<String, List<IProxyData>> protocolSpecificProxies) { String protocol = null; String host = null; int port = 0; @@ -127,11 +127,11 @@ public final class ProxyProviderUtil { return PROXY_DEFAULT_PORT; } - private static void addProtocolSpecificProxy(Map protocolSpecificProxies, + private static void addProtocolSpecificProxy(Map<String, List<IProxyData>> protocolSpecificProxies, String protocol, IProxyData proxy) { - List list = (List) protocolSpecificProxies.get(protocol); + List<IProxyData> list = protocolSpecificProxies.get(protocol); if (list == null) { - list = new ArrayList(); + list = new ArrayList<>(); protocolSpecificProxies.put(protocol, list); } @@ -164,7 +164,7 @@ public final class ProxyProviderUtil { * Pac related helper methods below here. */ - private static final Map PROXY_TYPE_MAP; + private static final Map<String, String> PROXY_TYPE_MAP; /* * @see "http://wp.netscape.com/eng/mozilla/2.0/relnotes/demo/proxy-live.html" @@ -176,7 +176,7 @@ public final class ProxyProviderUtil { static { // mapping of pacProgram proxy type names to java proxy types: - final Map temp = new HashMap(); + final Map<String, String> temp = new HashMap<>(); temp.put(PAC_PROXY_TYPE_DIRECT, NO_PROXY); temp.put(PAC_PROXY_TYPE_PROXY, IProxyData.HTTP_PROXY_TYPE); temp.put(PAC_PROXY_TYPE_SOCKS, IProxyData.SOCKS_PROXY_TYPE); @@ -187,12 +187,12 @@ public final class ProxyProviderUtil { * @param pacFindProxyForUrlResult * @return a list of IProxyData objects */ - public static List getProxies(String pacFindProxyForUrlResult) { + public static List<IProxyData> getProxies(String pacFindProxyForUrlResult) { if (pacFindProxyForUrlResult == null || pacFindProxyForUrlResult.trim().length() == 0) - return Collections.EMPTY_LIST; + return Collections.emptyList(); - final List result = new ArrayList(); + final List<IProxyData> result = new ArrayList<>(); final StringTokenizer scanner = new StringTokenizer( pacFindProxyForUrlResult, ";"); //$NON-NLS-1$ while (scanner.hasMoreTokens()) { @@ -214,7 +214,7 @@ public final class ProxyProviderUtil { pacProxy = "PROXY " + pacProxy; //$NON-NLS-1$ StringTokenizer scanner = new StringTokenizer(pacProxy); String pacProxyType = scanner.nextToken(); - String proxyType = (String) PROXY_TYPE_MAP.get(pacProxyType); + String proxyType = PROXY_TYPE_MAP.get(pacProxyType); if (proxyType == null || proxyType.equals(NO_PROXY)) return null; @@ -234,9 +234,9 @@ public final class ProxyProviderUtil { } private static boolean startsWithProxyType(String pacProxy) { - Iterator iter = PROXY_TYPE_MAP.keySet().iterator(); + Iterator<String> iter = PROXY_TYPE_MAP.keySet().iterator(); while (iter.hasNext()) - if (pacProxy.startsWith((String) iter.next())) + if (pacProxy.startsWith(iter.next())) return true; return false; diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/StaticProxyConfig.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/StaticProxyConfig.java index b1e139f91..92c516b98 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/StaticProxyConfig.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/StaticProxyConfig.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 compeople AG and others. + * Copyright (c) 2008, 2017 compeople AG and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -29,8 +29,8 @@ import org.eclipse.core.net.proxy.IProxyData; public class StaticProxyConfig { private static final String[] KNOWN_TYPES = {"HTTP", "HTTPS", "FTP", "GOPHER"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - private List universalProxies = new ArrayList(); - private Map protocolSpecificProxies = new HashMap(); + private List<IProxyData> universalProxies = new ArrayList<>(); + private Map<String, List<IProxyData>> protocolSpecificProxies = new HashMap<>(); private ProxyBypass proxyBypass; /** @@ -51,21 +51,21 @@ public class StaticProxyConfig { * @param uri * @param proxies */ - public void select(URI uri, List proxies) { + public void select(URI uri, List<IProxyData> proxies) { if (proxyBypass.bypassProxyFor(uri)) return; if (!protocolSpecificProxies.isEmpty()) { if (uri.getScheme() != null) { - List protocolProxies = (List) protocolSpecificProxies.get(uri + List<IProxyData> protocolProxies = protocolSpecificProxies.get(uri .getScheme().toUpperCase()); if (protocolProxies == null) return; proxies.addAll(protocolProxies); } else { - Iterator it = protocolSpecificProxies.values().iterator(); + Iterator<List<IProxyData>> it = protocolSpecificProxies.values().iterator(); while (it.hasNext()) { - List protocolProxies = (List) it.next(); + List<IProxyData> protocolProxies = it.next(); if (protocolProxies == null) return; proxies.addAll(protocolProxies); @@ -91,15 +91,15 @@ public class StaticProxyConfig { IProxyData[] data = getUniversalProxiesData(); if (data.length > 0) return data; - List proxies = new ArrayList(); - Iterator it = protocolSpecificProxies.values().iterator(); + List<IProxyData> proxies = new ArrayList<>(); + Iterator<List<IProxyData>> it = protocolSpecificProxies.values().iterator(); while (it.hasNext()) { - List protocolProxies = (List) it.next(); + List<IProxyData> protocolProxies = it.next(); if (protocolProxies != null) { proxies.addAll(protocolProxies); } } - return (IProxyData[]) proxies.toArray(new IProxyData[0]); + return proxies.toArray(new IProxyData[0]); } private IProxyData[] getUniversalProxiesData() { diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpProxyProvider.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpProxyProvider.java index fd263d417..06e547305 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpProxyProvider.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpProxyProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 compeople AG and others. + * Copyright (c) 2008, 2017 compeople AG and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -156,7 +156,7 @@ public class WinHttpProxyProvider { return EMPTY_PROXIES; } - List proxies = new ArrayList(); + List<IProxyData> proxies = new ArrayList<>(); // Let�s find out if auto detect has changed. if (newProxyConfig.autoDetectChanged(proxyConfig)) { @@ -203,10 +203,10 @@ public class WinHttpProxyProvider { return toArray(proxies); } - protected void pacSelect(int hHttpSession, URI uri, List proxies) { + protected void pacSelect(int hHttpSession, URI uri, List<IProxyData> proxies) { if (!tryPac) return; - List pacProxies = pacSelect(hHttpSession, proxyConfig + List<IProxyData> pacProxies = pacSelect(hHttpSession, proxyConfig .getAutoConfigUrl(), uri); if (pacProxies == null) tryPac = false; @@ -215,7 +215,7 @@ public class WinHttpProxyProvider { } - protected void wpadSelect(int hHttpSession, URI uri, List proxies) { + protected void wpadSelect(int hHttpSession, URI uri, List<IProxyData> proxies) { if (tryWpadGetUrl) { tryWpadGetUrl = false; AutoProxyHolder autoProxyHolder = new AutoProxyHolder(); @@ -232,7 +232,7 @@ public class WinHttpProxyProvider { } if (wpadAutoConfigUrl == null) return; - List wpadProxies = pacSelect(hHttpSession, wpadAutoConfigUrl, uri); + List<IProxyData> wpadProxies = pacSelect(hHttpSession, wpadAutoConfigUrl, uri); if (wpadProxies == null) wpadAutoConfigUrl = null; else @@ -247,14 +247,14 @@ public class WinHttpProxyProvider { * @param uri * @return a list of proxies (IProxyData) or null in case of an error. */ - protected List pacSelect(int hHttpSession, String configUrl, URI uri) { + protected List<IProxyData> pacSelect(int hHttpSession, String configUrl, URI uri) { // Don�t ask for anything else than http or https since that is not // supported by WinHttp pac file support: // ERROR_WINHTTP_UNRECOGNIZED_SCHEME if (!IProxyData.HTTP_PROXY_TYPE.equalsIgnoreCase(uri.getScheme()) && !IProxyData.HTTPS_PROXY_TYPE.equalsIgnoreCase(uri .getScheme())) - return Collections.EMPTY_LIST; + return Collections.emptyList(); // Set up the autoproxy call. WinHttpAutoProxyOptions autoProxyOptions = new WinHttpAutoProxyOptions(); autoProxyOptions @@ -272,7 +272,7 @@ public class WinHttpProxyProvider { } ProxyBypass proxyBypass = new ProxyBypass(proxyInfo.getProxyBypass()); if (proxyBypass.bypassProxyFor(uri)) - return Collections.EMPTY_LIST; + return Collections.emptyList(); return ProxyProviderUtil.getProxies(proxyInfo.getProxy()); } @@ -281,8 +281,8 @@ public class WinHttpProxyProvider { this.logThrowable = throwable; } - private static IProxyData[] toArray(List proxies) { - return (IProxyData[]) proxies.toArray(new IProxyData[proxies.size()]); + private static IProxyData[] toArray(List<IProxyData> proxies) { + return proxies.toArray(new IProxyData[proxies.size()]); } } |