doc: format code

SonicCloudOrg · Apr 27, 2023 · 999baa6 · 999baa6
1 parent 90a0ea9
commit 999baa6
Show file tree

Hide file tree

Showing 29 changed files with 77 additions and 73 deletions.
diff --git a/src/main/java/org/cloud/sonic/driver/android/AndroidDriver.java b/src/main/java/org/cloud/sonic/driver/android/AndroidDriver.java
@@ -23,9 +23,9 @@
 import org.cloud.sonic.driver.android.service.impl.AndroidElementImpl;
 import org.cloud.sonic.driver.android.service.impl.UiaClientImpl;
 import org.cloud.sonic.driver.common.enums.PasteboardType;
+import org.cloud.sonic.driver.common.models.WindowSize;
 import org.cloud.sonic.driver.common.tool.RespHandler;
 import org.cloud.sonic.driver.common.tool.SonicRespException;
-import org.cloud.sonic.driver.common.models.WindowSize;
 
 import java.util.List;
 

diff --git a/src/main/java/org/cloud/sonic/driver/android/enmus/AndroidSelector.java b/src/main/java/org/cloud/sonic/driver/android/enmus/AndroidSelector.java
@@ -26,6 +26,7 @@ public enum AndroidSelector {
     UIAUTOMATOR("-android uiautomator");
 
     private final String selector;
+
     AndroidSelector(String selector) {
         this.selector = selector;
     }

diff --git a/src/main/java/org/cloud/sonic/driver/android/service/AndroidElement.java b/src/main/java/org/cloud/sonic/driver/android/service/AndroidElement.java
@@ -18,7 +18,6 @@
 
 import org.cloud.sonic.driver.common.models.BaseElement;
 import org.cloud.sonic.driver.common.tool.SonicRespException;
-import org.cloud.sonic.driver.common.models.ElementRect;
 
 /**
  * @author Eason
@@ -30,7 +29,7 @@ public interface AndroidElement extends BaseElement {
 
     void sendKeys(String text) throws SonicRespException;
 
-    void sendKeys(String text,boolean isCover) throws SonicRespException;
+    void sendKeys(String text, boolean isCover) throws SonicRespException;
 
     void clear() throws SonicRespException;
 

diff --git a/src/main/java/org/cloud/sonic/driver/android/service/UiaClient.java b/src/main/java/org/cloud/sonic/driver/android/service/UiaClient.java
@@ -17,10 +17,10 @@
 package org.cloud.sonic.driver.android.service;
 
 import com.alibaba.fastjson.JSONObject;
-import org.cloud.sonic.driver.common.tool.RespHandler;
+import org.cloud.sonic.driver.common.models.WindowSize;
 import org.cloud.sonic.driver.common.tool.Logger;
+import org.cloud.sonic.driver.common.tool.RespHandler;
 import org.cloud.sonic.driver.common.tool.SonicRespException;
-import org.cloud.sonic.driver.common.models.WindowSize;
 
 import java.util.List;
 

diff --git a/src/main/java/org/cloud/sonic/driver/android/service/impl/AndroidElementImpl.java b/src/main/java/org/cloud/sonic/driver/android/service/impl/AndroidElementImpl.java
@@ -22,9 +22,9 @@
 import org.cloud.sonic.driver.android.service.AndroidElement;
 import org.cloud.sonic.driver.android.service.UiaClient;
 import org.cloud.sonic.driver.common.models.BaseResp;
+import org.cloud.sonic.driver.common.models.ElementRect;
 import org.cloud.sonic.driver.common.tool.Logger;
 import org.cloud.sonic.driver.common.tool.SonicRespException;
-import org.cloud.sonic.driver.common.models.ElementRect;
 
 import java.util.Base64;
 
@@ -66,7 +66,7 @@ public void sendKeys(String text, boolean isCover) throws SonicRespException {
         data.put("replace", isCover);
         BaseResp b = uiaClient.getRespHandler().getResp(
                 HttpUtil.createPost(uiaClient.getRemoteUrl() + "/session/"
-                        + uiaClient.getSessionId() + "/element/" + id + "/value")
+                                + uiaClient.getSessionId() + "/element/" + id + "/value")
                         .body(data.toJSONString()), 60000);
         if (b.getErr() == null) {
             logger.info("send key to %s.", id);

diff --git a/src/main/java/org/cloud/sonic/driver/android/service/impl/UiaClientImpl.java b/src/main/java/org/cloud/sonic/driver/android/service/impl/UiaClientImpl.java
@@ -24,9 +24,9 @@
 import org.cloud.sonic.driver.android.service.UiaClient;
 import org.cloud.sonic.driver.common.models.BaseResp;
 import org.cloud.sonic.driver.common.models.SessionInfo;
-import org.cloud.sonic.driver.common.tool.RespHandler;
 import org.cloud.sonic.driver.common.models.WindowSize;
 import org.cloud.sonic.driver.common.tool.Logger;
+import org.cloud.sonic.driver.common.tool.RespHandler;
 import org.cloud.sonic.driver.common.tool.SonicRespException;
 
 import java.nio.charset.StandardCharsets;

diff --git a/src/main/java/org/cloud/sonic/driver/common/enums/PasteboardType.java b/src/main/java/org/cloud/sonic/driver/common/enums/PasteboardType.java
@@ -22,6 +22,7 @@ public enum PasteboardType {
     URL("url");
 
     private final String type;
+
     PasteboardType(String pasteboardType) {
         this.type = pasteboardType;
     }

diff --git a/src/main/java/org/cloud/sonic/driver/common/models/BaseElement.java b/src/main/java/org/cloud/sonic/driver/common/models/BaseElement.java
@@ -4,7 +4,9 @@
 
 public interface BaseElement {
     ElementRect getRect() throws SonicRespException;
+
     String getAttribute(String name) throws SonicRespException;
+
     // the xpath or id or csspath...
     String getUniquelyIdentifies() throws SonicRespException;
 

diff --git a/src/main/java/org/cloud/sonic/driver/common/tool/RespHandler.java b/src/main/java/org/cloud/sonic/driver/common/tool/RespHandler.java
@@ -52,7 +52,7 @@ public BaseResp getResp(HttpRequest httpRequest, int timeout) throws SonicRespEx
 
     public BaseResp initResp(String response) {
         if (response.contains("traceback") || response.contains("stacktrace")) {
-            return initErrorMsg(response.replace("stacktrace","traceback"));
+            return initErrorMsg(response.replace("stacktrace", "traceback"));
         } else {
             return JSON.parseObject(response, BaseResp.class);
         }

diff --git a/src/main/java/org/cloud/sonic/driver/common/tool/SonicRespException.java b/src/main/java/org/cloud/sonic/driver/common/tool/SonicRespException.java
@@ -16,7 +16,7 @@
  */
 package org.cloud.sonic.driver.common.tool;
 
-public class SonicRespException extends Exception{
+public class SonicRespException extends Exception {
     public SonicRespException(String message) {
         super(message);
     }

diff --git a/src/main/java/org/cloud/sonic/driver/ios/IOSDriver.java b/src/main/java/org/cloud/sonic/driver/ios/IOSDriver.java
@@ -19,14 +19,14 @@
 import com.alibaba.fastjson.JSONObject;
 import org.cloud.sonic.driver.common.enums.PasteboardType;
 import org.cloud.sonic.driver.common.models.WindowSize;
+import org.cloud.sonic.driver.common.tool.RespHandler;
+import org.cloud.sonic.driver.common.tool.SonicRespException;
 import org.cloud.sonic.driver.ios.enums.*;
-import org.cloud.sonic.driver.ios.models.*;
-import org.cloud.sonic.driver.ios.service.WdaClient;
+import org.cloud.sonic.driver.ios.models.TouchActions;
 import org.cloud.sonic.driver.ios.service.IOSElement;
+import org.cloud.sonic.driver.ios.service.WdaClient;
 import org.cloud.sonic.driver.ios.service.impl.IOSElementImpl;
 import org.cloud.sonic.driver.ios.service.impl.WdaClientImpl;
-import org.cloud.sonic.driver.common.tool.RespHandler;
-import org.cloud.sonic.driver.common.tool.SonicRespException;
 
 import java.util.List;
 
@@ -416,7 +416,7 @@ public IOSElement findElement(IOSSelector iosSelector, String value) throws Soni
      * @throws SonicRespException
      */
     public IOSElement findElement(String wdaElementID) throws SonicRespException {
-        return new IOSElementImpl(wdaElementID,wdaClient);
+        return new IOSElementImpl(wdaElementID, wdaClient);
     }
 
     /**

diff --git a/src/main/java/org/cloud/sonic/driver/ios/enums/ActionType.java b/src/main/java/org/cloud/sonic/driver/ios/enums/ActionType.java
@@ -23,6 +23,7 @@ public enum ActionType {
     RELEASE("release");
 
     private final String type;
+
     ActionType(String type) {
         this.type = type;
     }

diff --git a/src/main/java/org/cloud/sonic/driver/ios/enums/IOSSelector.java b/src/main/java/org/cloud/sonic/driver/ios/enums/IOSSelector.java
@@ -30,6 +30,7 @@ public enum IOSSelector {
     PARTIAL_LINK_TEXT("partial link text");
 
     private final String selector;
+
     IOSSelector(String selector) {
         this.selector = selector;
     }

diff --git a/src/main/java/org/cloud/sonic/driver/ios/enums/SystemButton.java b/src/main/java/org/cloud/sonic/driver/ios/enums/SystemButton.java
@@ -22,6 +22,7 @@ public enum SystemButton {
     VOLUME_DOWN("volumeDown");
 
     private final String button;
+
     SystemButton(String button) {
         this.button = button;
     }

diff --git a/src/main/java/org/cloud/sonic/driver/ios/enums/XCUIElementType.java b/src/main/java/org/cloud/sonic/driver/ios/enums/XCUIElementType.java
@@ -111,7 +111,8 @@ public enum XCUIElementType {
     MENU_BAR_ITEM("XCUIElementTypeMenuBarItem"),
 
     INCREMENT_ARROW("XCUIElementTypeIncrementArrow"),
-    DECREMENT_ARROW("XCUIElementTypeDecrementArrow"),;
+    DECREMENT_ARROW("XCUIElementTypeDecrementArrow"),
+    ;
 
     private final String type;
 

diff --git a/src/main/java/org/cloud/sonic/driver/ios/models/TouchActions.java b/src/main/java/org/cloud/sonic/driver/ios/models/TouchActions.java
@@ -43,13 +43,13 @@ public class Options {
             private Integer ms;
         }
 
-        public TouchAction(ActionType actionType){
+        public TouchAction(ActionType actionType) {
             this.action = actionType.getType();
             this.options = new Options();
         }
     }
 
-    public TouchActions(){
+    public TouchActions() {
         actions = new ArrayList<>();
     }
 

diff --git a/src/main/java/org/cloud/sonic/driver/ios/service/IOSElement.java b/src/main/java/org/cloud/sonic/driver/ios/service/IOSElement.java
@@ -17,7 +17,6 @@
 package org.cloud.sonic.driver.ios.service;
 
 import org.cloud.sonic.driver.common.models.BaseElement;
-import org.cloud.sonic.driver.common.models.ElementRect;
 import org.cloud.sonic.driver.common.tool.SonicRespException;
 
 /**
@@ -30,7 +29,7 @@ public interface IOSElement extends BaseElement {
 
     void sendKeys(String text) throws SonicRespException;
 
-    void sendKeys(String text,int frequency) throws SonicRespException;
+    void sendKeys(String text, int frequency) throws SonicRespException;
 
     void clear() throws SonicRespException;
 

diff --git a/src/main/java/org/cloud/sonic/driver/ios/service/WdaClient.java b/src/main/java/org/cloud/sonic/driver/ios/service/WdaClient.java
@@ -17,11 +17,11 @@
 package org.cloud.sonic.driver.ios.service;
 
 import com.alibaba.fastjson.JSONObject;
-import org.cloud.sonic.driver.common.tool.RespHandler;
-import org.cloud.sonic.driver.ios.models.TouchActions;
 import org.cloud.sonic.driver.common.models.WindowSize;
 import org.cloud.sonic.driver.common.tool.Logger;
+import org.cloud.sonic.driver.common.tool.RespHandler;
 import org.cloud.sonic.driver.common.tool.SonicRespException;
+import org.cloud.sonic.driver.ios.models.TouchActions;
 
 import java.util.List;
 

diff --git a/src/main/java/org/cloud/sonic/driver/ios/service/impl/IOSElementImpl.java b/src/main/java/org/cloud/sonic/driver/ios/service/impl/IOSElementImpl.java
@@ -20,11 +20,11 @@
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson2.JSON;
 import org.cloud.sonic.driver.common.models.BaseResp;
+import org.cloud.sonic.driver.common.models.ElementRect;
 import org.cloud.sonic.driver.common.tool.Logger;
 import org.cloud.sonic.driver.common.tool.SonicRespException;
-import org.cloud.sonic.driver.common.models.ElementRect;
-import org.cloud.sonic.driver.ios.service.WdaClient;
 import org.cloud.sonic.driver.ios.service.IOSElement;
+import org.cloud.sonic.driver.ios.service.WdaClient;
 
 import java.util.Base64;
 

diff --git a/src/main/java/org/cloud/sonic/driver/ios/service/impl/WdaClientImpl.java b/src/main/java/org/cloud/sonic/driver/ios/service/impl/WdaClientImpl.java
@@ -22,12 +22,12 @@
 import com.alibaba.fastjson.JSONObject;
 import org.cloud.sonic.driver.common.models.BaseResp;
 import org.cloud.sonic.driver.common.models.SessionInfo;
-import org.cloud.sonic.driver.ios.service.IOSElement;
+import org.cloud.sonic.driver.common.models.WindowSize;
 import org.cloud.sonic.driver.common.tool.Logger;
 import org.cloud.sonic.driver.common.tool.RespHandler;
 import org.cloud.sonic.driver.common.tool.SonicRespException;
 import org.cloud.sonic.driver.ios.models.TouchActions;
-import org.cloud.sonic.driver.common.models.WindowSize;
+import org.cloud.sonic.driver.ios.service.IOSElement;
 import org.cloud.sonic.driver.ios.service.WdaClient;
 
 import java.nio.charset.StandardCharsets;

diff --git a/src/main/java/org/cloud/sonic/driver/poco/models/PocoElement.java b/src/main/java/org/cloud/sonic/driver/poco/models/PocoElement.java
@@ -113,7 +113,7 @@ public PocoElement(RootElement root, Element currentNodeXmlElement) {
 
     public Payload getPayload() {
 
-        if (rootElement.getVersion()!=getVersion()){
+        if (rootElement.getVersion() != getVersion()) {
             Element xmlPocoNode = rootElement.getXmlElement().select(currentNodeSelector).first();
             if (xmlPocoNode == null) {
                 return null;
@@ -126,7 +126,7 @@ public Payload getPayload() {
 
     public List<PocoElement> getChildren() {
 
-        if (rootElement.getVersion()!=getVersion()){
+        if (rootElement.getVersion() != getVersion()) {
             Element xmlPocoNode = rootElement.getXmlElement().select(currentNodeSelector).first();
 
             if (xmlPocoNode == null) {
@@ -139,7 +139,7 @@ public List<PocoElement> getChildren() {
 
             Elements childList = xmlPocoNode.children();
 
-            for (Element child:childList) {
+            for (Element child : childList) {
                 children.add(new PocoElement(rootElement, child));
             }
 
@@ -158,7 +158,7 @@ public void parseXmlNode(Element xmlNode) {
         payload.texture = xmlNode.attr("texture");
 
         String _instanceId = xmlNode.attr("_instanceId");
-        payload._instanceId = _instanceId.isEmpty()? 0 : Integer.parseInt(_instanceId);
+        payload._instanceId = _instanceId.isEmpty() ? 0 : Integer.parseInt(_instanceId);
 
         String _ilayer = xmlNode.attr("_ilayer");
         payload._ilayer = _ilayer.isEmpty() ? 0 : Integer.parseInt(_ilayer);
@@ -195,20 +195,20 @@ private List<Float> parseFloatAttrList(String floatAttrStr) {
         return result;
     }
 
-    public Boolean currentTheNodeExists(){
-        return rootElement.getXmlElement().select(currentNodeSelector).first()!=null;
+    public Boolean currentTheNodeExists() {
+        return rootElement.getXmlElement().select(currentNodeSelector).first() != null;
     }
 
-    public PocoElement getParentNode(){
+    public PocoElement getParentNode() {
         Element xmlPocoNode = rootElement.getXmlElement().select(currentNodeSelector).first();
 
         if (xmlPocoNode == null) {
             return null;
         }
         Element parentNode = xmlPocoNode.parent();
-        if (parentNode==null){
+        if (parentNode == null) {
             return null;
         }
-        return new PocoElement(rootElement,parentNode);
+        return new PocoElement(rootElement, parentNode);
     }
 }
diff --git a/src/main/java/org/cloud/sonic/driver/poco/models/RootElement.java b/src/main/java/org/cloud/sonic/driver/poco/models/RootElement.java
@@ -22,13 +22,14 @@ public class RootElement {
     private Element XmlElement;
     private long version;
 
-    public RootElement(){}
+    public RootElement() {
+    }
 
-    public RootElement(Element XmlElement){
+    public RootElement(Element XmlElement) {
         this.XmlElement = XmlElement;
     }
 
-    public RootElement(Element XmlElement, long version){
+    public RootElement(Element XmlElement, long version) {
         this(XmlElement);
         this.version = version;
     }
@@ -50,8 +51,8 @@ public void setVersion(long version) {
         this.version = version;
     }
 
-    public synchronized void updateVersion(Element rootXmlElement){
+    public synchronized void updateVersion(Element rootXmlElement) {
         this.XmlElement = rootXmlElement;
-        this.version+=1;
+        this.version += 1;
     }
 }
diff --git a/src/main/java/org/cloud/sonic/driver/poco/service/PocoClient.java b/src/main/java/org/cloud/sonic/driver/poco/service/PocoClient.java
@@ -16,7 +16,6 @@
  */
 package org.cloud.sonic.driver.poco.service;
 
-import com.alibaba.fastjson.JSONObject;
 import org.cloud.sonic.driver.common.models.WindowSize;
 import org.cloud.sonic.driver.common.tool.Logger;
 import org.cloud.sonic.driver.common.tool.SonicRespException;

diff --git a/src/main/java/org/cloud/sonic/driver/poco/util/PocoTool.java b/src/main/java/org/cloud/sonic/driver/poco/util/PocoTool.java
@@ -19,7 +19,7 @@
 import com.alibaba.fastjson.JSONObject;
 
 public class PocoTool {
-    public static boolean checkPocoRpcResultID(String pocoRpcResult,String sendID){
+    public static boolean checkPocoRpcResultID(String pocoRpcResult, String sendID) {
         JSONObject object = JSONObject.parseObject(pocoRpcResult);
         return sendID.equals(object.getString("id"));
     }

diff --git a/src/test/java/org/cloud/sonic/driver/android/service/UiaClientTest.java b/src/test/java/org/cloud/sonic/driver/android/service/UiaClientTest.java
@@ -8,8 +8,6 @@
 import org.cloud.sonic.driver.common.tool.RespHandler;
 import org.cloud.sonic.driver.common.tool.SonicRespException;
 import org.cloud.sonic.driver.ios.enums.IOSSelector;
-import org.cloud.sonic.driver.ios.service.WdaClient;
-import org.cloud.sonic.driver.ios.service.impl.WdaClientImpl;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -56,7 +54,7 @@ public void testGetWindowSize() {
     public void testSendKeys() {
         Boolean hasThrow = false;
         try {
-            uiaClient.sendKeys("test",false);
+            uiaClient.sendKeys("test", false);
         } catch (Throwable e) {
             hasThrow = true;
             Assert.assertEquals(SonicRespException.class, e.getClass());

diff --git a/src/test/java/org/cloud/sonic/driver/ios/IOSDriverTest.java b/src/test/java/org/cloud/sonic/driver/ios/IOSDriverTest.java
@@ -20,10 +20,10 @@
 import org.cloud.sonic.driver.common.enums.PasteboardType;
 import org.cloud.sonic.driver.common.models.ElementRect;
 import org.cloud.sonic.driver.common.models.WindowSize;
+import org.cloud.sonic.driver.common.tool.SonicRespException;
 import org.cloud.sonic.driver.ios.enums.*;
-import org.cloud.sonic.driver.ios.models.*;
+import org.cloud.sonic.driver.ios.models.TouchActions;
 import org.cloud.sonic.driver.ios.service.IOSElement;
-import org.cloud.sonic.driver.common.tool.SonicRespException;
 import org.junit.*;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;