Rename constant names to match regular expressions and comply a namin…

…g convention
code4craft · Mar 30, 2021 · 51b8da2 · 51b8da2
1 parent c942d7c
commit 51b8da2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/webmagic-extension/src/main/java/us/codecraft/webmagic/configurable/ExpressionType.java b/webmagic-extension/src/main/java/us/codecraft/webmagic/configurable/ExpressionType.java
@@ -5,6 +5,6 @@
  */
 public enum ExpressionType {
 
-    XPath, Regex, Css, JsonPath;
+    X_PATH, REGEX, CSS, JSON_PATH;
 
 }
diff --git a/webmagic-extension/src/main/java/us/codecraft/webmagic/configurable/ExtractRule.java b/webmagic-extension/src/main/java/us/codecraft/webmagic/configurable/ExtractRule.java
@@ -77,21 +77,21 @@ public Selector getSelector() {
 
     private Selector compileSelector() {
         switch (expressionType) {
-            case Css:
+            case CSS:
                 if (expressionParams.length >= 1) {
                     return $(expressionValue, expressionParams[0]);
                 } else {
                     return $(expressionValue);
                 }
-            case XPath:
+            case X_PATH:
                 return xpath(expressionValue);
-            case Regex:
+            case REGEX:
                 if (expressionParams.length >= 1) {
                     return regex(expressionValue, Integer.parseInt(expressionParams[0]));
                 } else {
                     return regex(expressionValue);
                 }
-            case JsonPath:
+            case JSON_PATH:
                 return new JsonPathSelector(expressionValue);
             default:
                 return xpath(expressionValue);