From 2622b448b8ff2eca6823f118e31c2534d27a5f4a Mon Sep 17 00:00:00 2001
From: "yihua.huang" <code4crafter@gmail.com>
Date: Sat, 8 Apr 2017 20:09:43 +0800
Subject: [PATCH] fix test

---
 .../java/us/codecraft/webmagic/Request.java     | 14 +++++++++++---
 .../downloader/HttpUriRequestConverter.java     | 17 +++++------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/webmagic-core/src/main/java/us/codecraft/webmagic/Request.java b/webmagic-core/src/main/java/us/codecraft/webmagic/Request.java
index c4b94269..67be957e 100644
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/Request.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/Request.java
@@ -123,12 +123,20 @@ public class Request implements Serializable {
     public int hashCode() {
         int result = url != null ? url.hashCode() : 0;
         result = 31 * result + (method != null ? method.hashCode() : 0);
-        result = 31 * result + (headers != null ? headers.hashCode() : 0);
-        result = 31 * result + (cookies != null ? cookies.hashCode() : 0);
-        
         return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Request request = (Request) o;
+
+        if (url != null ? !url.equals(request.url) : request.url != null) return false;
+        return method != null ? method.equals(request.method) : request.method == null;
+    }
+
     public List<Cookie> getCookies() {
         return cookies;
     }
diff --git a/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpUriRequestConverter.java b/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpUriRequestConverter.java
index acf1a7cb..42119a34 100644
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpUriRequestConverter.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpUriRequestConverter.java
@@ -38,9 +38,11 @@ public class HttpUriRequestConverter {
 
     private HttpClientContext convertHttpClientContext(Request request, Site site, Proxy proxy) {
         HttpClientContext httpContext = new HttpClientContext();
-        AuthState authState = new AuthState();
-        authState.update(new BasicScheme(), new UsernamePasswordCredentials(proxy.getUsername(), proxy.getPassword()));
-        httpContext.setAttribute(HttpClientContext.PROXY_AUTH_STATE, authState);
+        if (proxy != null) {
+            AuthState authState = new AuthState();
+            authState.update(new BasicScheme(), new UsernamePasswordCredentials(proxy.getUsername(), proxy.getPassword()));
+            httpContext.setAttribute(HttpClientContext.PROXY_AUTH_STATE, authState);
+        }
         if (request.getCookies() != null && CollectionUtils.isNotEmpty(request.getCookies())) {
             CookieStore cookieStore = new BasicCookieStore();
             for (Cookie c : request.getCookies()) {
@@ -108,13 +110,4 @@ public class HttpUriRequestConverter {
         return requestBuilder;
     }
 
-    private RequestBuilder addQueryParams(RequestBuilder requestBuilder, Map<String, String> params) {
-        if (params != null) {
-            for (Map.Entry<String, String> entry : params.entrySet()) {
-                requestBuilder.addParameter(entry.getKey(), entry.getValue());
-            }
-        }
-        return requestBuilder;
-    }
-
 }