From 68a55c4a1bd64a6dca3b3c80d3e164d35e2a5ab4 Mon Sep 17 00:00:00 2001 From: Per Abich Date: Tue, 16 Oct 2018 09:13:59 +0200 Subject: [PATCH] Added toString() to most Selectors as requested by #34 --- .../proxy/selector/direct/NoProxySelector.java | 4 ++++ .../proxy/selector/fixed/FixedProxySelector.java | 6 ++++++ .../proxy/selector/misc/BufferedProxySelector.java | 11 +++++++++++ .../proxy/selector/misc/ProtocolDispatchSelector.java | 7 +++++++ .../selector/misc/ProxyListFallbackSelector.java | 8 ++++++++ .../selector/whitelist/ProxyBypassListSelector.java | 8 ++++++++ .../selector/whitelist/UseProxyWhiteListSelector.java | 7 +++++++ 7 files changed, 51 insertions(+) diff --git a/src/main/java/com/github/markusbernhardt/proxy/selector/direct/NoProxySelector.java b/src/main/java/com/github/markusbernhardt/proxy/selector/direct/NoProxySelector.java index aefa1eec..a2718534 100644 --- a/src/main/java/com/github/markusbernhardt/proxy/selector/direct/NoProxySelector.java +++ b/src/main/java/com/github/markusbernhardt/proxy/selector/direct/NoProxySelector.java @@ -65,6 +65,10 @@ public List select(URI uri) { return ProxyUtil.noProxyList(); } + @Override + public String toString() { + return "NoProxySelector{}"; + } } /* diff --git a/src/main/java/com/github/markusbernhardt/proxy/selector/fixed/FixedProxySelector.java b/src/main/java/com/github/markusbernhardt/proxy/selector/fixed/FixedProxySelector.java index 439319cd..447fdd3d 100644 --- a/src/main/java/com/github/markusbernhardt/proxy/selector/fixed/FixedProxySelector.java +++ b/src/main/java/com/github/markusbernhardt/proxy/selector/fixed/FixedProxySelector.java @@ -73,4 +73,10 @@ public List select(URI uri) { return this.proxyList; } + @Override + public String toString() { + return "FixedProxySelector{" + + "proxyList=" + proxyList + + '}'; + } } diff --git a/src/main/java/com/github/markusbernhardt/proxy/selector/misc/BufferedProxySelector.java b/src/main/java/com/github/markusbernhardt/proxy/selector/misc/BufferedProxySelector.java index 753c0b1d..5957698e 100644 --- a/src/main/java/com/github/markusbernhardt/proxy/selector/misc/BufferedProxySelector.java +++ b/src/main/java/com/github/markusbernhardt/proxy/selector/misc/BufferedProxySelector.java @@ -50,6 +50,17 @@ public enum CacheScope { CACHE_SCOPE_URL } + @Override + public String toString() { + return "BufferedProxySelector{" + + "delegate=" + delegate + + ", cache=" + cache + + ", maxSize=" + maxSize + + ", ttl=" + ttl + + ", cacheScope=" + cacheScope + + '}'; + } + private ProxySelector delegate; private ConcurrentHashMap cache; diff --git a/src/main/java/com/github/markusbernhardt/proxy/selector/misc/ProtocolDispatchSelector.java b/src/main/java/com/github/markusbernhardt/proxy/selector/misc/ProtocolDispatchSelector.java index e4ae1e79..4de7be20 100644 --- a/src/main/java/com/github/markusbernhardt/proxy/selector/misc/ProtocolDispatchSelector.java +++ b/src/main/java/com/github/markusbernhardt/proxy/selector/misc/ProtocolDispatchSelector.java @@ -135,4 +135,11 @@ public int size() { return this.selectors.size(); } + @Override + public String toString() { + return "ProtocolDispatchSelector{" + + "selectors=" + selectors + + ", fallbackSelector=" + fallbackSelector + + '}'; + } } diff --git a/src/main/java/com/github/markusbernhardt/proxy/selector/misc/ProxyListFallbackSelector.java b/src/main/java/com/github/markusbernhardt/proxy/selector/misc/ProxyListFallbackSelector.java index eebd10ac..d29b15aa 100644 --- a/src/main/java/com/github/markusbernhardt/proxy/selector/misc/ProxyListFallbackSelector.java +++ b/src/main/java/com/github/markusbernhardt/proxy/selector/misc/ProxyListFallbackSelector.java @@ -168,4 +168,12 @@ final void setRetryAfterMs(long retryAfterMs) { this.retryAfterMs = retryAfterMs; } + @Override + public String toString() { + return "ProxyListFallbackSelector{" + + "delegate=" + delegate + + ", failedDelayCache=" + failedDelayCache + + ", retryAfterMs=" + retryAfterMs + + '}'; + } } diff --git a/src/main/java/com/github/markusbernhardt/proxy/selector/whitelist/ProxyBypassListSelector.java b/src/main/java/com/github/markusbernhardt/proxy/selector/whitelist/ProxyBypassListSelector.java index a9a08abd..f24b3b25 100644 --- a/src/main/java/com/github/markusbernhardt/proxy/selector/whitelist/ProxyBypassListSelector.java +++ b/src/main/java/com/github/markusbernhardt/proxy/selector/whitelist/ProxyBypassListSelector.java @@ -72,6 +72,14 @@ public void connectFailed(URI uri, SocketAddress sa, IOException ioe) { this.delegate.connectFailed(uri, sa, ioe); } + @Override + public String toString() { + return "ProxyBypassListSelector{" + + "delegate=" + delegate + + ", whiteListFilter=" + whiteListFilter + + '}'; + } + /************************************************************************* * select * diff --git a/src/main/java/com/github/markusbernhardt/proxy/selector/whitelist/UseProxyWhiteListSelector.java b/src/main/java/com/github/markusbernhardt/proxy/selector/whitelist/UseProxyWhiteListSelector.java index 5db28edd..a37f9941 100644 --- a/src/main/java/com/github/markusbernhardt/proxy/selector/whitelist/UseProxyWhiteListSelector.java +++ b/src/main/java/com/github/markusbernhardt/proxy/selector/whitelist/UseProxyWhiteListSelector.java @@ -79,4 +79,11 @@ public List select(URI uri) { return ProxyUtil.noProxyList(); } + @Override + public String toString() { + return "UseProxyWhiteListSelector{" + + "delegate=" + delegate + + ", whiteListFilter=" + whiteListFilter + + '}'; + } }