Refactor addTargetRequests method to eliminate redundant code. (#1138)

webmagic-core/src/main/java/us/codecraft/webmagic/Page.java

@@ -49,7 +49,7 @@ public class Page {
 
     private byte[] bytes;
 
-    private List<Request> targetRequests = new ArrayList<Request>();
+    private List<Request> targetRequests = new ArrayList<>();
 
     private String charset;
 
@@ -142,13 +142,7 @@ public class Page {
      * @param requests requests
      */
     public void addTargetRequests(Iterable<String> requests) {
-        for (String s : requests) {
-            if (StringUtils.isBlank(s) || s.equals("#") || s.startsWith("javascript:")) {
-                continue;
-            }
-            s = UrlUtils.canonicalizeUrl(s, url.toString());
-            targetRequests.add(new Request(s));
-        }
+    	addTargetRequests(requests, 0); // Default priority is 0
     }
 
     /**
@@ -158,13 +152,32 @@ public class Page {
      * @param priority priority
      */
     public void addTargetRequests(Iterable<String> requests, long priority) {
-        for (String s : requests) {
-            if (StringUtils.isBlank(s) || s.equals("#") || s.startsWith("javascript:")) {
-                continue;
-            }
-            s = UrlUtils.canonicalizeUrl(s, url.toString());
-            targetRequests.add(new Request(s).setPriority(priority));
+    	if(requests == null) {
+    		return;
+    	}
+    	
+        for (String req : requests) {
+        	addRequestIfValid(req, priority);
+        }
+    }
+    
+    /**
+     * Helper method to add a request if it's valid.
+     *
+     * @param url      URL to add
+     * @param priority Priority for the URL
+     */
+    private void addRequestIfValid(String url, long priority) {
+        if (StringUtils.isBlank(url) || url.equals("#") || url.startsWith("javascript:")) {
+            return;
+        }
+
+        String canonicalizedUrl = UrlUtils.canonicalizeUrl(url, this.url.toString());
+        Request req = new Request(canonicalizedUrl);
+        if(priority > 0) {
+            req.setPriority(priority);
         }
+        targetRequests.add(req);
     }
 
     /**