rename to before and add after method

Author: fivesmallq

src/main/java/im/nll/data/extractor/Extractors.java

@@ -25,7 +25,8 @@ public class Extractors {
     private List<String> htmlList;
     private Map<String, List<Extractor>> extractorsMap = new LinkedHashMap<>();
     private Map<String, List<Filter>> filtersMap = new LinkedHashMap();
-    private List<Filter> globalFilter = new LinkedList<>();
+    private List<Filter> beforeFilter = new LinkedList<>();
+    private List<Filter> afterFilter = new LinkedList<>();
     private String prevField;
 
     public Extractors(String html) {
@@ -200,8 +201,19 @@ public Extractors filter(Filter filter) {
      * @param filter
      * @return
      */
-    public Extractors filterAll(Filter filter) {
-        globalFilter.add(filter);
+    public Extractors before(Filter filter) {
+        beforeFilter.add(filter);
+        return this;
+    }
+
+    /**
+     * process all values use filter after field filter
+     *
+     * @param filter
+     * @return
+     */
+    public Extractors after(Filter filter) {
+        beforeFilter.add(filter);
         return this;
     }
 
@@ -256,8 +268,9 @@ public String asString() {
             for (Extractor extractor : extractors) {
                 result = extractor.extract(result);
             }
-            result = filterGlobal(result);
+            result = filterBefore(result);
             result = filter(DEFAULT_FIELD, result);
+            result = filterAfter(result);
         }
         return result;
     }
@@ -280,7 +293,9 @@ public String asJSONString() {
             for (Extractor extractor : extractors) {
                 result = extractor.extract(result);
             }
+            result = filterBefore(result);
             result = filter(DEFAULT_FIELD, result);
+            result = filterAfter(result);
         }
         return result;
     }
@@ -305,8 +320,9 @@ public List<String> asStringList(String separator) {
                         for (Extractor extractor : extractors) {
                             result = extractor.extract(result);
                         }
-                        result = filterGlobal(result);
+                        result = filterBefore(result);
                         result = filter(name, result);
+                        result = filterAfter(result);
                         stringBuffer.append(result).append(separator);
                     }
                     int length = stringBuffer.length();
@@ -435,8 +451,9 @@ private <T> T extractBean(String html, Class<T> clazz) {
             for (Extractor extractor : extractors) {
                 result = extractor.extract(result);
             }
-            result = filterGlobal(result);
+            result = filterBefore(result);
             result = filter(name, result);
+            result = filterAfter(result);
             try {
                 Reflect.on(entity).set(name, result);
             } catch (Exception e) {
@@ -455,9 +472,9 @@ private Map<String, String> extractMap(String html) {
             for (Extractor extractor : extractors) {
                 result = extractor.extract(result);
             }
-            //global filter all
-            result = filterGlobal(result);
+            result = filterBefore(result);
             result = filter(name, result);
+            result = filterAfter(result);
             try {
                 map.put(name, result);
             } catch (Exception e) {
@@ -475,8 +492,15 @@ private String filter(String name, String result) {
         return result;
     }
 
-    private String filterGlobal(String result) {
-        for (Filter filter : globalFilter) {
+    private String filterBefore(String result) {
+        for (Filter filter : beforeFilter) {
+            result = filter.process(result);
+        }
+        return result;
+    }
+
+    private String filterAfter(String result) {
+        for (Filter filter : afterFilter) {
             result = filter.process(result);
         }
         return result;

src/test/java/im/nll/data/extractor/ExtractorsTest.java

@@ -372,7 +372,7 @@ public void testToBeanListFilter() throws Exception {
     @Test
     public void testToBeanListFilterAll() throws Exception {
         List<Language> languages = Extractors.on(listHtml)
-                .filterAll(value -> "all-" + value)
+                .before(value -> "all-" + value)
                 .split(xpath("//tr[@class='item']"))
                 .extract("type", xpath("//td[1]/text()")).filter(value -> "type:" + value)
                 .extract("name", xpath("//td[2]/text()")).filter(value -> "name:" + value)