Define the constants instead of duplicating a litteral 3 times.

Author: JeanDeboutGat

webmagic-core/src/main/java/us/codecraft/webmagic/model/HttpRequestBody.java

@@ -17,6 +17,8 @@
 public class HttpRequestBody implements Serializable {
 
     private static final long serialVersionUID = 5659170945717023595L;
+    
+    private static final String ENCODING_ERROR ="illegal encoding "; 
 
     public static abstract class ContentType {
 
@@ -68,15 +70,15 @@ public static HttpRequestBody json(String json, String encoding) {
         try {
             return new HttpRequestBody(json.getBytes(encoding), ContentType.JSON, encoding);
         } catch (UnsupportedEncodingException e) {
-            throw new IllegalArgumentException("illegal encoding " + encoding, e);
+            throw new IllegalArgumentException(ENCODING_ERROR+ encoding, e);
         }
     }
 
     public static HttpRequestBody xml(String xml, String encoding) {
         try {
             return new HttpRequestBody(xml.getBytes(encoding), ContentType.XML, encoding);
         } catch (UnsupportedEncodingException e) {
-            throw new IllegalArgumentException("illegal encoding " + encoding, e);
+            throw new IllegalArgumentException(ENCODING_ERROR + encoding, e);
         }
     }
 
@@ -92,7 +94,7 @@ public static HttpRequestBody form(Map<String,Object> params, String encoding){
         try {
             return new HttpRequestBody(URLEncodedUtils.format(nameValuePairs, encoding).getBytes(encoding), ContentType.FORM, encoding);
         } catch (UnsupportedEncodingException e) {
-            throw new IllegalArgumentException("illegal encoding " + encoding, e);
+            throw new IllegalArgumentException(ENCODING_ERROR + encoding, e);
         }
     }
 

webmagic-extension/src/main/java/us/codecraft/webmagic/downloader/PhantomJSDownloader.java

@@ -20,6 +20,7 @@ public class PhantomJSDownloader extends AbstractDownloader {
     private static Logger logger = LoggerFactory.getLogger(PhantomJSDownloader.class);
     private static String crawlJsPath;
     private static String phantomJsCommand = "phantomjs"; // default
+    private static final String HTTP_REQUEST_ERROR = "HTTP request failed";
 
     private int retryNum;
     private int threadNum;
@@ -91,14 +92,14 @@ public Page download(Request request, Task task) {
             logger.info("downloading page: " + request.getUrl());
         }
         String content = getPage(request);
-        if (content.contains("HTTP request failed")) {
+        if (content.contains(HTTP_REQUEST_ERROR)) {
             for (int i = 1; i <= getRetryNum(); i++) {
                 content = getPage(request);
-                if (!content.contains("HTTP request failed")) {
+                if (!content.contains(HTTP_REQUEST_ERROR)) {
                     break;
                 }
             }
-            if (content.contains("HTTP request failed")) {
+            if (content.contains(HTTP_REQUEST_ERROR)) {
                 //when failed
                 Page page = new Page();
                 page.setRequest(request);