From 691c36c66669738988892962a22986d8d9d70141 Mon Sep 17 00:00:00 2001 From: ZhouYixun <291028775@qq.com> Date: Sat, 10 Sep 2022 18:02:03 +0800 Subject: [PATCH] feat: update package url --- README.md | 6 +++--- README_CN.md | 4 ++-- .../sonic/{core => driver}/ios/IOSDriver.java | 14 ++++++------- .../{core => driver}/ios/RespHandler.java | 10 +++++----- .../ios/enums/ActionType.java | 2 +- .../ios/enums/AuthResource.java | 2 +- .../ios/enums/IOSSelector.java | 2 +- .../ios/enums/PasteboardType.java | 2 +- .../ios/enums/SystemButton.java | 2 +- .../{core => driver}/ios/enums/TextKey.java | 2 +- .../ios/enums/XCUIElementType.java | 2 +- .../{core => driver}/ios/models/BaseResp.java | 2 +- .../ios/models/Capabilities.java | 2 +- .../{core => driver}/ios/models/ErrorMsg.java | 3 +-- .../{core => driver}/ios/models/IOSRect.java | 2 +- .../ios/models/SessionInfo.java | 2 +- .../ios/models/TouchActions.java | 4 ++-- .../ios/models/WindowSize.java | 2 +- .../ios/service/WdaClient.java | 12 +++++------ .../ios/service/WebElement.java | 6 +++--- .../ios/service/impl/WdaClientImpl.java | 20 +++++++++---------- .../ios/service/impl/WebElementImpl.java | 14 ++++++------- .../sonic/{core => driver}/tool/Logger.java | 2 +- .../tool/SonicRespException.java | 2 +- .../{core => driver}/ios/IOSDriverTest.java | 10 +++++----- .../{core => driver}/ios/RespHandlerTest.java | 4 ++-- .../ios/service/WdaClientTest.java | 18 ++++++++--------- .../tool/SonicRespExceptionTest.java | 2 +- 28 files changed, 77 insertions(+), 78 deletions(-) rename src/main/java/org/cloud/sonic/{core => driver}/ios/IOSDriver.java (97%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/RespHandler.java (90%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/enums/ActionType.java (95%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/enums/AuthResource.java (96%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/enums/IOSSelector.java (96%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/enums/PasteboardType.java (95%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/enums/SystemButton.java (95%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/enums/TextKey.java (95%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/enums/XCUIElementType.java (99%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/models/BaseResp.java (95%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/models/Capabilities.java (95%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/models/ErrorMsg.java (93%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/models/IOSRect.java (96%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/models/SessionInfo.java (95%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/models/TouchActions.java (95%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/models/WindowSize.java (95%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/service/WdaClient.java (90%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/service/WebElement.java (87%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/service/impl/WdaClientImpl.java (97%) rename src/main/java/org/cloud/sonic/{core => driver}/ios/service/impl/WebElementImpl.java (93%) rename src/main/java/org/cloud/sonic/{core => driver}/tool/Logger.java (97%) rename src/main/java/org/cloud/sonic/{core => driver}/tool/SonicRespException.java (95%) rename src/test/java/org/cloud/sonic/{core => driver}/ios/IOSDriverTest.java (97%) rename src/test/java/org/cloud/sonic/{core => driver}/ios/RespHandlerTest.java (87%) rename src/test/java/org/cloud/sonic/{core => driver}/ios/service/WdaClientTest.java (95%) rename src/test/java/org/cloud/sonic/{core => driver}/tool/SonicRespExceptionTest.java (96%) diff --git a/README.md b/README.md index a7fbf7d..8ed13f6 100644 --- a/README.md +++ b/README.md @@ -71,10 +71,10 @@ implementation 'io.github.soniccloudorg:sonic-driver-core:1.0.16' ### Code ```java -package org.cloud.sonic.core.ios; +package org.cloud.sonic.driver.ios; -import org.cloud.sonic.core.ios.enums.IOSSelector; -import org.cloud.sonic.core.tool.SonicRespException; +import org.cloud.sonic.driver.ios.enums.IOSSelector; +import org.cloud.sonic.driver.tool.SonicRespException; public class MyTest { diff --git a/README_CN.md b/README_CN.md index 72948b8..b2ca6f9 100644 --- a/README_CN.md +++ b/README_CN.md @@ -64,9 +64,9 @@ implementation 'io.github.soniccloudorg:sonic-driver-core:1.0.16' ### 代码 ```java -package org.cloud.sonic.core.ios; +package org.cloud.sonic.driver.ios; -import org.cloud.sonic.core.tool.SonicRespException; +import org.cloud.sonic.driver.tool.SonicRespException; public class MyTest { diff --git a/src/main/java/org/cloud/sonic/core/ios/IOSDriver.java b/src/main/java/org/cloud/sonic/driver/ios/IOSDriver.java similarity index 97% rename from src/main/java/org/cloud/sonic/core/ios/IOSDriver.java rename to src/main/java/org/cloud/sonic/driver/ios/IOSDriver.java index 44e6ffc..f235af5 100644 --- a/src/main/java/org/cloud/sonic/core/ios/IOSDriver.java +++ b/src/main/java/org/cloud/sonic/driver/ios/IOSDriver.java @@ -14,15 +14,15 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios; +package org.cloud.sonic.driver.ios; import com.alibaba.fastjson.JSONObject; -import org.cloud.sonic.core.ios.enums.*; -import org.cloud.sonic.core.ios.models.*; -import org.cloud.sonic.core.ios.service.WdaClient; -import org.cloud.sonic.core.ios.service.WebElement; -import org.cloud.sonic.core.ios.service.impl.WdaClientImpl; -import org.cloud.sonic.core.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.service.WebElement; +import org.cloud.sonic.driver.ios.service.impl.WdaClientImpl; +import org.cloud.sonic.driver.tool.SonicRespException; import java.util.List; diff --git a/src/main/java/org/cloud/sonic/core/ios/RespHandler.java b/src/main/java/org/cloud/sonic/driver/ios/RespHandler.java similarity index 90% rename from src/main/java/org/cloud/sonic/core/ios/RespHandler.java rename to src/main/java/org/cloud/sonic/driver/ios/RespHandler.java index fb6099c..50ddb18 100644 --- a/src/main/java/org/cloud/sonic/core/ios/RespHandler.java +++ b/src/main/java/org/cloud/sonic/driver/ios/RespHandler.java @@ -14,17 +14,17 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios; +package org.cloud.sonic.driver.ios; import cn.hutool.core.io.IORuntimeException; import cn.hutool.http.HttpException; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import org.cloud.sonic.core.ios.models.BaseResp; -import org.cloud.sonic.core.ios.models.ErrorMsg; -import org.cloud.sonic.core.ios.service.WdaClient; -import org.cloud.sonic.core.tool.SonicRespException; +import org.cloud.sonic.driver.ios.models.BaseResp; +import org.cloud.sonic.driver.ios.models.ErrorMsg; +import org.cloud.sonic.driver.ios.service.WdaClient; +import org.cloud.sonic.driver.tool.SonicRespException; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/cloud/sonic/core/ios/enums/ActionType.java b/src/main/java/org/cloud/sonic/driver/ios/enums/ActionType.java similarity index 95% rename from src/main/java/org/cloud/sonic/core/ios/enums/ActionType.java rename to src/main/java/org/cloud/sonic/driver/ios/enums/ActionType.java index 619a6a1..69f67fe 100644 --- a/src/main/java/org/cloud/sonic/core/ios/enums/ActionType.java +++ b/src/main/java/org/cloud/sonic/driver/ios/enums/ActionType.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.enums; +package org.cloud.sonic.driver.ios.enums; public enum ActionType { PRESS("press"), diff --git a/src/main/java/org/cloud/sonic/core/ios/enums/AuthResource.java b/src/main/java/org/cloud/sonic/driver/ios/enums/AuthResource.java similarity index 96% rename from src/main/java/org/cloud/sonic/core/ios/enums/AuthResource.java rename to src/main/java/org/cloud/sonic/driver/ios/enums/AuthResource.java index bb457d1..b39a96f 100644 --- a/src/main/java/org/cloud/sonic/core/ios/enums/AuthResource.java +++ b/src/main/java/org/cloud/sonic/driver/ios/enums/AuthResource.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.enums; +package org.cloud.sonic.driver.ios.enums; public enum AuthResource { CONTACTS(1), diff --git a/src/main/java/org/cloud/sonic/core/ios/enums/IOSSelector.java b/src/main/java/org/cloud/sonic/driver/ios/enums/IOSSelector.java similarity index 96% rename from src/main/java/org/cloud/sonic/core/ios/enums/IOSSelector.java rename to src/main/java/org/cloud/sonic/driver/ios/enums/IOSSelector.java index 0802485..642a55a 100644 --- a/src/main/java/org/cloud/sonic/core/ios/enums/IOSSelector.java +++ b/src/main/java/org/cloud/sonic/driver/ios/enums/IOSSelector.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.enums; +package org.cloud.sonic.driver.ios.enums; public enum IOSSelector { CLASS_NAME("class name"), diff --git a/src/main/java/org/cloud/sonic/core/ios/enums/PasteboardType.java b/src/main/java/org/cloud/sonic/driver/ios/enums/PasteboardType.java similarity index 95% rename from src/main/java/org/cloud/sonic/core/ios/enums/PasteboardType.java rename to src/main/java/org/cloud/sonic/driver/ios/enums/PasteboardType.java index 043b581..726d086 100644 --- a/src/main/java/org/cloud/sonic/core/ios/enums/PasteboardType.java +++ b/src/main/java/org/cloud/sonic/driver/ios/enums/PasteboardType.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.enums; +package org.cloud.sonic.driver.ios.enums; public enum PasteboardType { PLAIN_TEXT("plaintext"), diff --git a/src/main/java/org/cloud/sonic/core/ios/enums/SystemButton.java b/src/main/java/org/cloud/sonic/driver/ios/enums/SystemButton.java similarity index 95% rename from src/main/java/org/cloud/sonic/core/ios/enums/SystemButton.java rename to src/main/java/org/cloud/sonic/driver/ios/enums/SystemButton.java index 60cd91c..adf822a 100644 --- a/src/main/java/org/cloud/sonic/core/ios/enums/SystemButton.java +++ b/src/main/java/org/cloud/sonic/driver/ios/enums/SystemButton.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.enums; +package org.cloud.sonic.driver.ios.enums; public enum SystemButton { HOME("home"), diff --git a/src/main/java/org/cloud/sonic/core/ios/enums/TextKey.java b/src/main/java/org/cloud/sonic/driver/ios/enums/TextKey.java similarity index 95% rename from src/main/java/org/cloud/sonic/core/ios/enums/TextKey.java rename to src/main/java/org/cloud/sonic/driver/ios/enums/TextKey.java index 3de47b8..56ddc21 100644 --- a/src/main/java/org/cloud/sonic/core/ios/enums/TextKey.java +++ b/src/main/java/org/cloud/sonic/driver/ios/enums/TextKey.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.enums; +package org.cloud.sonic.driver.ios.enums; public enum TextKey { BACK_SPACE("\u0008"), diff --git a/src/main/java/org/cloud/sonic/core/ios/enums/XCUIElementType.java b/src/main/java/org/cloud/sonic/driver/ios/enums/XCUIElementType.java similarity index 99% rename from src/main/java/org/cloud/sonic/core/ios/enums/XCUIElementType.java rename to src/main/java/org/cloud/sonic/driver/ios/enums/XCUIElementType.java index 8d968ee..d9fd8e0 100644 --- a/src/main/java/org/cloud/sonic/core/ios/enums/XCUIElementType.java +++ b/src/main/java/org/cloud/sonic/driver/ios/enums/XCUIElementType.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.enums; +package org.cloud.sonic.driver.ios.enums; public enum XCUIElementType { ANY("XCUIElementTypeAny"), diff --git a/src/main/java/org/cloud/sonic/core/ios/models/BaseResp.java b/src/main/java/org/cloud/sonic/driver/ios/models/BaseResp.java similarity index 95% rename from src/main/java/org/cloud/sonic/core/ios/models/BaseResp.java rename to src/main/java/org/cloud/sonic/driver/ios/models/BaseResp.java index fdfa118..530169e 100644 --- a/src/main/java/org/cloud/sonic/core/ios/models/BaseResp.java +++ b/src/main/java/org/cloud/sonic/driver/ios/models/BaseResp.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.models; +package org.cloud.sonic.driver.ios.models; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/cloud/sonic/core/ios/models/Capabilities.java b/src/main/java/org/cloud/sonic/driver/ios/models/Capabilities.java similarity index 95% rename from src/main/java/org/cloud/sonic/core/ios/models/Capabilities.java rename to src/main/java/org/cloud/sonic/driver/ios/models/Capabilities.java index 945369b..718ad3d 100644 --- a/src/main/java/org/cloud/sonic/core/ios/models/Capabilities.java +++ b/src/main/java/org/cloud/sonic/driver/ios/models/Capabilities.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.models; +package org.cloud.sonic.driver.ios.models; import lombok.AllArgsConstructor; import lombok.ToString; diff --git a/src/main/java/org/cloud/sonic/core/ios/models/ErrorMsg.java b/src/main/java/org/cloud/sonic/driver/ios/models/ErrorMsg.java similarity index 93% rename from src/main/java/org/cloud/sonic/core/ios/models/ErrorMsg.java rename to src/main/java/org/cloud/sonic/driver/ios/models/ErrorMsg.java index 317032c..a25f91e 100644 --- a/src/main/java/org/cloud/sonic/core/ios/models/ErrorMsg.java +++ b/src/main/java/org/cloud/sonic/driver/ios/models/ErrorMsg.java @@ -14,10 +14,9 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.models; +package org.cloud.sonic.driver.ios.models; import lombok.AllArgsConstructor; -import lombok.Data; import lombok.ToString; @ToString diff --git a/src/main/java/org/cloud/sonic/core/ios/models/IOSRect.java b/src/main/java/org/cloud/sonic/driver/ios/models/IOSRect.java similarity index 96% rename from src/main/java/org/cloud/sonic/core/ios/models/IOSRect.java rename to src/main/java/org/cloud/sonic/driver/ios/models/IOSRect.java index 87f0e20..9e92829 100644 --- a/src/main/java/org/cloud/sonic/core/ios/models/IOSRect.java +++ b/src/main/java/org/cloud/sonic/driver/ios/models/IOSRect.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.models; +package org.cloud.sonic.driver.ios.models; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/cloud/sonic/core/ios/models/SessionInfo.java b/src/main/java/org/cloud/sonic/driver/ios/models/SessionInfo.java similarity index 95% rename from src/main/java/org/cloud/sonic/core/ios/models/SessionInfo.java rename to src/main/java/org/cloud/sonic/driver/ios/models/SessionInfo.java index ce8d1c6..41358b4 100644 --- a/src/main/java/org/cloud/sonic/core/ios/models/SessionInfo.java +++ b/src/main/java/org/cloud/sonic/driver/ios/models/SessionInfo.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.models; +package org.cloud.sonic.driver.ios.models; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/cloud/sonic/core/ios/models/TouchActions.java b/src/main/java/org/cloud/sonic/driver/ios/models/TouchActions.java similarity index 95% rename from src/main/java/org/cloud/sonic/core/ios/models/TouchActions.java rename to src/main/java/org/cloud/sonic/driver/ios/models/TouchActions.java index 860400f..16278d0 100644 --- a/src/main/java/org/cloud/sonic/core/ios/models/TouchActions.java +++ b/src/main/java/org/cloud/sonic/driver/ios/models/TouchActions.java @@ -14,11 +14,11 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.models; +package org.cloud.sonic.driver.ios.models; import lombok.Getter; import lombok.ToString; -import org.cloud.sonic.core.ios.enums.ActionType; +import org.cloud.sonic.driver.ios.enums.ActionType; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/cloud/sonic/core/ios/models/WindowSize.java b/src/main/java/org/cloud/sonic/driver/ios/models/WindowSize.java similarity index 95% rename from src/main/java/org/cloud/sonic/core/ios/models/WindowSize.java rename to src/main/java/org/cloud/sonic/driver/ios/models/WindowSize.java index 00b7d2f..06585ec 100644 --- a/src/main/java/org/cloud/sonic/core/ios/models/WindowSize.java +++ b/src/main/java/org/cloud/sonic/driver/ios/models/WindowSize.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.models; +package org.cloud.sonic.driver.ios.models; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/cloud/sonic/core/ios/service/WdaClient.java b/src/main/java/org/cloud/sonic/driver/ios/service/WdaClient.java similarity index 90% rename from src/main/java/org/cloud/sonic/core/ios/service/WdaClient.java rename to src/main/java/org/cloud/sonic/driver/ios/service/WdaClient.java index 836cd9d..8b8601a 100644 --- a/src/main/java/org/cloud/sonic/core/ios/service/WdaClient.java +++ b/src/main/java/org/cloud/sonic/driver/ios/service/WdaClient.java @@ -14,14 +14,14 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.service; +package org.cloud.sonic.driver.ios.service; import com.alibaba.fastjson.JSONObject; -import org.cloud.sonic.core.ios.RespHandler; -import org.cloud.sonic.core.ios.models.TouchActions; -import org.cloud.sonic.core.ios.models.WindowSize; -import org.cloud.sonic.core.tool.Logger; -import org.cloud.sonic.core.tool.SonicRespException; +import org.cloud.sonic.driver.ios.RespHandler; +import org.cloud.sonic.driver.ios.models.TouchActions; +import org.cloud.sonic.driver.ios.models.WindowSize; +import org.cloud.sonic.driver.tool.Logger; +import org.cloud.sonic.driver.tool.SonicRespException; import java.util.List; diff --git a/src/main/java/org/cloud/sonic/core/ios/service/WebElement.java b/src/main/java/org/cloud/sonic/driver/ios/service/WebElement.java similarity index 87% rename from src/main/java/org/cloud/sonic/core/ios/service/WebElement.java rename to src/main/java/org/cloud/sonic/driver/ios/service/WebElement.java index e13fb06..6821b85 100644 --- a/src/main/java/org/cloud/sonic/core/ios/service/WebElement.java +++ b/src/main/java/org/cloud/sonic/driver/ios/service/WebElement.java @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.service; +package org.cloud.sonic.driver.ios.service; -import org.cloud.sonic.core.ios.models.IOSRect; -import org.cloud.sonic.core.tool.SonicRespException; +import org.cloud.sonic.driver.ios.models.IOSRect; +import org.cloud.sonic.driver.tool.SonicRespException; /** * @author Eason diff --git a/src/main/java/org/cloud/sonic/core/ios/service/impl/WdaClientImpl.java b/src/main/java/org/cloud/sonic/driver/ios/service/impl/WdaClientImpl.java similarity index 97% rename from src/main/java/org/cloud/sonic/core/ios/service/impl/WdaClientImpl.java rename to src/main/java/org/cloud/sonic/driver/ios/service/impl/WdaClientImpl.java index 2b08e5d..44a1313 100644 --- a/src/main/java/org/cloud/sonic/core/ios/service/impl/WdaClientImpl.java +++ b/src/main/java/org/cloud/sonic/driver/ios/service/impl/WdaClientImpl.java @@ -14,21 +14,21 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.service.impl; +package org.cloud.sonic.driver.ios.service.impl; import cn.hutool.http.HttpUtil; import cn.hutool.http.Method; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import org.cloud.sonic.core.ios.RespHandler; -import org.cloud.sonic.core.ios.models.BaseResp; -import org.cloud.sonic.core.ios.models.SessionInfo; -import org.cloud.sonic.core.ios.models.TouchActions; -import org.cloud.sonic.core.ios.models.WindowSize; -import org.cloud.sonic.core.ios.service.WdaClient; -import org.cloud.sonic.core.ios.service.WebElement; -import org.cloud.sonic.core.tool.Logger; -import org.cloud.sonic.core.tool.SonicRespException; +import org.cloud.sonic.driver.ios.RespHandler; +import org.cloud.sonic.driver.ios.models.BaseResp; +import org.cloud.sonic.driver.ios.models.SessionInfo; +import org.cloud.sonic.driver.ios.models.TouchActions; +import org.cloud.sonic.driver.ios.models.WindowSize; +import org.cloud.sonic.driver.ios.service.WdaClient; +import org.cloud.sonic.driver.ios.service.WebElement; +import org.cloud.sonic.driver.tool.Logger; +import org.cloud.sonic.driver.tool.SonicRespException; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/src/main/java/org/cloud/sonic/core/ios/service/impl/WebElementImpl.java b/src/main/java/org/cloud/sonic/driver/ios/service/impl/WebElementImpl.java similarity index 93% rename from src/main/java/org/cloud/sonic/core/ios/service/impl/WebElementImpl.java rename to src/main/java/org/cloud/sonic/driver/ios/service/impl/WebElementImpl.java index 4b36bff..b3797a5 100644 --- a/src/main/java/org/cloud/sonic/core/ios/service/impl/WebElementImpl.java +++ b/src/main/java/org/cloud/sonic/driver/ios/service/impl/WebElementImpl.java @@ -14,17 +14,17 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.service.impl; +package org.cloud.sonic.driver.ios.service.impl; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; -import org.cloud.sonic.core.ios.models.BaseResp; -import org.cloud.sonic.core.ios.models.IOSRect; -import org.cloud.sonic.core.ios.service.WdaClient; -import org.cloud.sonic.core.ios.service.WebElement; -import org.cloud.sonic.core.tool.Logger; -import org.cloud.sonic.core.tool.SonicRespException; +import org.cloud.sonic.driver.ios.models.BaseResp; +import org.cloud.sonic.driver.ios.models.IOSRect; +import org.cloud.sonic.driver.ios.service.WdaClient; +import org.cloud.sonic.driver.ios.service.WebElement; +import org.cloud.sonic.driver.tool.Logger; +import org.cloud.sonic.driver.tool.SonicRespException; import java.util.Base64; diff --git a/src/main/java/org/cloud/sonic/core/tool/Logger.java b/src/main/java/org/cloud/sonic/driver/tool/Logger.java similarity index 97% rename from src/main/java/org/cloud/sonic/core/tool/Logger.java rename to src/main/java/org/cloud/sonic/driver/tool/Logger.java index 3a86afc..b14ea48 100644 --- a/src/main/java/org/cloud/sonic/core/tool/Logger.java +++ b/src/main/java/org/cloud/sonic/driver/tool/Logger.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.cloud.sonic.core.tool; +package org.cloud.sonic.driver.tool; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/main/java/org/cloud/sonic/core/tool/SonicRespException.java b/src/main/java/org/cloud/sonic/driver/tool/SonicRespException.java similarity index 95% rename from src/main/java/org/cloud/sonic/core/tool/SonicRespException.java rename to src/main/java/org/cloud/sonic/driver/tool/SonicRespException.java index 45f7856..6cc0fc7 100644 --- a/src/main/java/org/cloud/sonic/core/tool/SonicRespException.java +++ b/src/main/java/org/cloud/sonic/driver/tool/SonicRespException.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.cloud.sonic.core.tool; +package org.cloud.sonic.driver.tool; public class SonicRespException extends Exception{ public SonicRespException(String message) { diff --git a/src/test/java/org/cloud/sonic/core/ios/IOSDriverTest.java b/src/test/java/org/cloud/sonic/driver/ios/IOSDriverTest.java similarity index 97% rename from src/test/java/org/cloud/sonic/core/ios/IOSDriverTest.java rename to src/test/java/org/cloud/sonic/driver/ios/IOSDriverTest.java index c413d0a..204e520 100644 --- a/src/test/java/org/cloud/sonic/core/ios/IOSDriverTest.java +++ b/src/test/java/org/cloud/sonic/driver/ios/IOSDriverTest.java @@ -14,13 +14,13 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios; +package org.cloud.sonic.driver.ios; import com.alibaba.fastjson.JSONObject; -import org.cloud.sonic.core.ios.enums.*; -import org.cloud.sonic.core.ios.models.*; -import org.cloud.sonic.core.ios.service.WebElement; -import org.cloud.sonic.core.tool.SonicRespException; +import org.cloud.sonic.driver.ios.enums.*; +import org.cloud.sonic.driver.ios.models.*; +import org.cloud.sonic.driver.ios.service.WebElement; +import org.cloud.sonic.driver.tool.SonicRespException; import org.junit.*; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/src/test/java/org/cloud/sonic/core/ios/RespHandlerTest.java b/src/test/java/org/cloud/sonic/driver/ios/RespHandlerTest.java similarity index 87% rename from src/test/java/org/cloud/sonic/core/ios/RespHandlerTest.java rename to src/test/java/org/cloud/sonic/driver/ios/RespHandlerTest.java index 43a6167..f6cae01 100644 --- a/src/test/java/org/cloud/sonic/core/ios/RespHandlerTest.java +++ b/src/test/java/org/cloud/sonic/driver/ios/RespHandlerTest.java @@ -1,7 +1,7 @@ -package org.cloud.sonic.core.ios; +package org.cloud.sonic.driver.ios; import cn.hutool.http.HttpUtil; -import org.cloud.sonic.core.tool.SonicRespException; +import org.cloud.sonic.driver.tool.SonicRespException; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/cloud/sonic/core/ios/service/WdaClientTest.java b/src/test/java/org/cloud/sonic/driver/ios/service/WdaClientTest.java similarity index 95% rename from src/test/java/org/cloud/sonic/core/ios/service/WdaClientTest.java rename to src/test/java/org/cloud/sonic/driver/ios/service/WdaClientTest.java index b15ef06..eeaa32c 100644 --- a/src/test/java/org/cloud/sonic/core/ios/service/WdaClientTest.java +++ b/src/test/java/org/cloud/sonic/driver/ios/service/WdaClientTest.java @@ -14,17 +14,17 @@ * limitations under the License. * */ -package org.cloud.sonic.core.ios.service; +package org.cloud.sonic.driver.ios.service; import com.alibaba.fastjson.JSONObject; -import org.cloud.sonic.core.ios.RespHandler; -import org.cloud.sonic.core.ios.enums.IOSSelector; -import org.cloud.sonic.core.ios.models.BaseResp; -import org.cloud.sonic.core.ios.models.ErrorMsg; -import org.cloud.sonic.core.ios.enums.PasteboardType; -import org.cloud.sonic.core.ios.models.TouchActions; -import org.cloud.sonic.core.ios.service.impl.WdaClientImpl; -import org.cloud.sonic.core.tool.SonicRespException; +import org.cloud.sonic.driver.ios.RespHandler; +import org.cloud.sonic.driver.ios.enums.IOSSelector; +import org.cloud.sonic.driver.ios.models.BaseResp; +import org.cloud.sonic.driver.ios.models.ErrorMsg; +import org.cloud.sonic.driver.ios.enums.PasteboardType; +import org.cloud.sonic.driver.ios.models.TouchActions; +import org.cloud.sonic.driver.ios.service.impl.WdaClientImpl; +import org.cloud.sonic.driver.tool.SonicRespException; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/src/test/java/org/cloud/sonic/core/tool/SonicRespExceptionTest.java b/src/test/java/org/cloud/sonic/driver/tool/SonicRespExceptionTest.java similarity index 96% rename from src/test/java/org/cloud/sonic/core/tool/SonicRespExceptionTest.java rename to src/test/java/org/cloud/sonic/driver/tool/SonicRespExceptionTest.java index c0c4d7a..b772637 100644 --- a/src/test/java/org/cloud/sonic/core/tool/SonicRespExceptionTest.java +++ b/src/test/java/org/cloud/sonic/driver/tool/SonicRespExceptionTest.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.cloud.sonic.core.tool; +package org.cloud.sonic.driver.tool; import org.junit.Assert; import org.junit.Test;