2020-09-08 优化代码，移动QueryHandlerUtil

fanyong920 · Sep 8, 2020 · fdfdbb7 · fdfdbb7
1 parent c637664
commit fdfdbb7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/com/ruiyun/jvppeteer/core/page/DOMWorld.java b/src/main/java/com/ruiyun/jvppeteer/core/page/DOMWorld.java
@@ -10,6 +10,7 @@
 import com.ruiyun.jvppeteer.options.WaitForSelectorOptions;
 import com.ruiyun.jvppeteer.protocol.PageEvaluateType;
 import com.ruiyun.jvppeteer.util.Helper;
+import com.ruiyun.jvppeteer.util.QueryHandlerUtil;
 import com.ruiyun.jvppeteer.util.StringUtil;
 import com.ruiyun.jvppeteer.util.ValidateUtil;
 

diff --git a/src/main/java/com/ruiyun/jvppeteer/core/page/ElementHandle.java b/src/main/java/com/ruiyun/jvppeteer/core/page/ElementHandle.java
@@ -8,12 +8,12 @@
 import com.ruiyun.jvppeteer.options.ScreenshotOptions;
 import com.ruiyun.jvppeteer.options.Viewport;
 import com.ruiyun.jvppeteer.protocol.DOM.GetBoxModelReturnValue;
-import com.ruiyun.jvppeteer.protocol.PageEvaluateType;
 import com.ruiyun.jvppeteer.protocol.input.BoxModel;
 import com.ruiyun.jvppeteer.protocol.input.ClickablePoint;
 import com.ruiyun.jvppeteer.protocol.runtime.RemoteObject;
 import com.ruiyun.jvppeteer.transport.CDPSession;
 import com.ruiyun.jvppeteer.util.Helper;
+import com.ruiyun.jvppeteer.util.QueryHandlerUtil;
 import com.ruiyun.jvppeteer.util.StringUtil;
 import com.ruiyun.jvppeteer.util.ValidateUtil;
 

diff --git a/src/main/java/com/ruiyun/jvppeteer/core/page/ExecutionContext.java b/src/main/java/com/ruiyun/jvppeteer/core/page/ExecutionContext.java
@@ -69,7 +69,7 @@ public Object evaluate(String pageFunction,  List<Object> args) {
         return this.evaluateInternal(true, pageFunction,Helper.isFunction(pageFunction) ? PageEvaluateType.FUNCTION : PageEvaluateType.STRING, args);
     }
 
-    public Object evaluateInternal(boolean returnByValue, String pageFunction, PageEvaluateType type, List<Object> args) {
+    private Object evaluateInternal(boolean returnByValue, String pageFunction, PageEvaluateType type, List<Object> args) {
         String suffix = "//# sourceURL=" + ExecutionContext.EVALUATION_SCRIPT_URL;
         if (PageEvaluateType.STRING.equals(type)) {
             int contextId = this.contextId;

diff --git a/...jvppeteer/core/page/QueryHandlerUtil.java → ...iyun/jvppeteer/util/QueryHandlerUtil.java b/...jvppeteer/core/page/QueryHandlerUtil.java → ...iyun/jvppeteer/util/QueryHandlerUtil.java
@@ -1,6 +1,9 @@
-package com.ruiyun.jvppeteer.core.page;
+package com.ruiyun.jvppeteer.util;
 
 
+import com.ruiyun.jvppeteer.core.page.QueryHandler;
+import com.ruiyun.jvppeteer.core.page.QuerySelector;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;