Skip to content

Commit d0843be

Browse files
committed
Revert "简化代码"
This reverts commit 9cc5287.
1 parent 5ceccc6 commit d0843be

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientDownloader.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,24 @@
3232
*/
3333
public class HttpClientDownloader extends AbstractDownloader {
3434

35+
private Logger logger = LoggerFactory.getLogger(getClass());
36+
3537
private final Map<String, CloseableHttpClient> httpClients = new HashMap<String, CloseableHttpClient>();
36-
private final Logger logger = LoggerFactory.getLogger(getClass());
37-
private final HttpClientGenerator httpClientGenerator = new HttpClientGenerator();
38+
39+
private HttpClientGenerator httpClientGenerator = new HttpClientGenerator();
3840

3941
private HttpUriRequestConverter httpUriRequestConverter = new HttpUriRequestConverter();
4042

4143
private ProxyProvider proxyProvider;
4244

43-
private final boolean responseHeader = true;
45+
private boolean responseHeader = true;
4446

47+
private volatile boolean refreshProxyOnError = false;
4548

46-
private Predicate<Throwable> refreshProxyOnError = t -> false;
49+
private Predicate<Throwable> throwablePredicate = t->false;
4750

48-
public void setRefreshProxyOnError(Predicate<Throwable> proxyOnError) {
49-
this.refreshProxyOnError = refreshProxyOnError;
51+
public void setThrowablePredicate(Predicate<Throwable> predicate){
52+
this.throwablePredicate = predicate;
5053
}
5154

5255
public void setHttpUriRequestConverter(HttpUriRequestConverter httpUriRequestConverter) {
@@ -116,7 +119,7 @@ protected Page handleResponse(Request request, String charset, HttpResponse http
116119
String contentType = httpResponse.getEntity().getContentType() == null ? "" : httpResponse.getEntity().getContentType().getValue();
117120
Page page = new Page();
118121
page.setBytes(bytes);
119-
if (!request.isBinaryContent()) {
122+
if (!request.isBinaryContent()){
120123
if (charset == null) {
121124
charset = getHtmlCharset(contentType, bytes);
122125
}

0 commit comments

Comments
 (0)