From ed3f3583cc0600b90e8e6f815f27261517df2f09 Mon Sep 17 00:00:00 2001 From: "yihua.huang" Date: Mon, 4 Nov 2013 01:03:23 +0800 Subject: [PATCH] downloader refactor --- .../codecraft/webmagic/downloader/HttpClientDownloader.java | 4 ++-- .../{HttpClientPool.java => HttpClientGenerator.java} | 4 ++-- .../us/codecraft/webmagic/downloader/HttpClientPool-cmnt.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename webmagic-core/src/main/java/us/codecraft/webmagic/downloader/{HttpClientPool.java => HttpClientGenerator.java} (97%) diff --git a/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientDownloader.java b/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientDownloader.java index cdbc55a..c4a0c01 100644 --- a/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientDownloader.java +++ b/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientDownloader.java @@ -63,14 +63,14 @@ public class HttpClientDownloader implements Downloader { private CloseableHttpClient getHttpClient(Site site) { if (site == null) { - return new HttpClientPool(poolSize).getClient(null); + return new HttpClientGenerator(poolSize).getClient(null); } String domain = site.getDomain(); CloseableHttpClient httpClient = httpClients.get(domain); if (httpClient == null) { synchronized (this) { if (httpClient == null) { - httpClient = new HttpClientPool(poolSize).getClient(site); + httpClient = new HttpClientGenerator(poolSize).getClient(site); httpClients.put(domain, httpClient); } } diff --git a/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientPool.java b/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientGenerator.java similarity index 97% rename from webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientPool.java rename to webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientGenerator.java index a0ab74a..dbc3828 100644 --- a/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientPool.java +++ b/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientGenerator.java @@ -21,11 +21,11 @@ import java.util.Map; * @author code4crafter@gmail.com
* @since 0.3.3 */ -public class HttpClientPool { +public class HttpClientGenerator { private PoolingHttpClientConnectionManager connectionManager; - public HttpClientPool(int poolSize) { + public HttpClientGenerator(int poolSize) { Registry reg = RegistryBuilder.create() .register("http", PlainConnectionSocketFactory.INSTANCE) .register("https", SSLConnectionSocketFactory.getSocketFactory()) diff --git a/zh_docs/us/codecraft/webmagic/downloader/HttpClientPool-cmnt.xml b/zh_docs/us/codecraft/webmagic/downloader/HttpClientPool-cmnt.xml index 9c7ef38..c1416d3 100644 --- a/zh_docs/us/codecraft/webmagic/downloader/HttpClientPool-cmnt.xml +++ b/zh_docs/us/codecraft/webmagic/downloader/HttpClientPool-cmnt.xml @@ -4,7 +4,7 @@ Sat Aug 17 14:14:45 CST 2013 - + Date: 13-4-21 Time: 下午12:29