From ef325718219ecb3cef56911dd72ea04c40dd8673 Mon Sep 17 00:00:00 2001 From: "yihua.huang" Date: Sat, 11 Mar 2017 10:52:39 +0800 Subject: [PATCH] rewrite Request.equals and hashCode, add Method to check #483 --- .../java/us/codecraft/webmagic/Request.java | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 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 9ecb1729..3649d325 100644 --- a/webmagic-core/src/main/java/us/codecraft/webmagic/Request.java +++ b/webmagic-core/src/main/java/us/codecraft/webmagic/Request.java @@ -81,27 +81,10 @@ public class Request implements Serializable { return url; } - @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.equals(request.url)) return false; - - return true; - } - public Map getExtras() { return extras; } - @Override - public int hashCode() { - return url.hashCode(); - } - public void setExtras(Map extras) { this.extras = extras; } @@ -133,4 +116,22 @@ public class Request implements Serializable { ", priority=" + priority + '}'; } + + @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; + } + + @Override + public int hashCode() { + int result = url != null ? url.hashCode() : 0; + result = 31 * result + (method != null ? method.hashCode() : 0); + return result; + } }