From 748474de864ca96bff273065df5086d741607a80 Mon Sep 17 00:00:00 2001 From: 3944Realms Date: Mon, 29 Sep 2025 16:56:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=98=E5=8C=96import):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/r3944realms/dg_lab/manager/DGPBClientManager.java | 2 +- .../com/r3944realms/dg_lab/manager/DGPBServerManager.java | 2 +- .../r3944realms/dg_lab/utils/timeTask/DgLabTimerTask.java | 2 +- .../dg_lab/websocket/AbstractWebSocketClient.java | 3 +-- .../dg_lab/websocket/AbstractWebSocketServer.java | 4 +--- .../r3944realms/dg_lab/websocket/PowerBoxWSClient.java | 6 +++--- .../r3944realms/dg_lab/websocket/PowerBoxWSServer.java | 6 +++--- .../websocket/handler/client/ClientDLPBHandler.java | 2 +- .../handler/client/ClientDLPBHandlerContextWrapper.java | 4 ++-- .../websocket/handler/server/DefaultServerOperation.java | 2 -- .../websocket/handler/server/ServerDLPBHandler.java | 2 +- .../handler/server/ServerDLPBHandlerContextWrapper.java | 8 ++++---- .../websocket/sharedData/ClientPowerBoxSharedData.java | 2 +- .../com/r3944realms/dg_lab/api/message/IPowerBoxMsg.java | 2 +- .../dg_lab/api/websocket/message/MessageDirection.java | 1 - 15 files changed, 21 insertions(+), 27 deletions(-) diff --git a/Common/src/main/java/com/r3944realms/dg_lab/manager/DGPBClientManager.java b/Common/src/main/java/com/r3944realms/dg_lab/manager/DGPBClientManager.java index 7962a1e..bd21881 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/manager/DGPBClientManager.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/manager/DGPBClientManager.java @@ -18,8 +18,8 @@ package com.r3944realms.dg_lab.manager; import com.r3944realms.dg_lab.api.manager.IDGLabManager; import com.r3944realms.dg_lab.api.manager.Status; -import com.r3944realms.dg_lab.websocket.PowerBoxWSClient; import com.r3944realms.dg_lab.api.websocket.message.Message; +import com.r3944realms.dg_lab.websocket.PowerBoxWSClient; import com.r3944realms.dg_lab.websocket.sharedData.ClientPowerBoxSharedData; /** diff --git a/Common/src/main/java/com/r3944realms/dg_lab/manager/DGPBServerManager.java b/Common/src/main/java/com/r3944realms/dg_lab/manager/DGPBServerManager.java index bcb6da4..6fb7a73 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/manager/DGPBServerManager.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/manager/DGPBServerManager.java @@ -18,8 +18,8 @@ package com.r3944realms.dg_lab.manager; import com.r3944realms.dg_lab.api.manager.IDGLabManager; import com.r3944realms.dg_lab.api.manager.Status; -import com.r3944realms.dg_lab.websocket.PowerBoxWSServer; import com.r3944realms.dg_lab.api.websocket.message.Message; +import com.r3944realms.dg_lab.websocket.PowerBoxWSServer; import com.r3944realms.dg_lab.websocket.sharedData.ServerPowerBoxSharedData; /** diff --git a/Common/src/main/java/com/r3944realms/dg_lab/utils/timeTask/DgLabTimerTask.java b/Common/src/main/java/com/r3944realms/dg_lab/utils/timeTask/DgLabTimerTask.java index 82d8255..99fdf41 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/utils/timeTask/DgLabTimerTask.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/utils/timeTask/DgLabTimerTask.java @@ -17,11 +17,11 @@ package com.r3944realms.dg_lab.utils.timeTask; -import com.r3944realms.dg_lab.utils.annoation.NeedCompletedInFuture; import com.r3944realms.dg_lab.api.websocket.message.Message; import com.r3944realms.dg_lab.api.websocket.message.PowerBoxMessage; import com.r3944realms.dg_lab.api.websocket.message.role.PlaceholderRole; import com.r3944realms.dg_lab.api.websocket.message.role.WebSocketClientRole; +import com.r3944realms.dg_lab.utils.annoation.NeedCompletedInFuture; import io.netty.channel.ChannelHandlerContext; import java.util.TimerTask; diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketClient.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketClient.java index 20ddd2d..adc8c50 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketClient.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketClient.java @@ -18,9 +18,9 @@ package com.r3944realms.dg_lab.websocket; import com.r3944realms.dg_lab.DgLab; import com.r3944realms.dg_lab.api.manager.Status; +import com.r3944realms.dg_lab.api.websocket.message.Message; import com.r3944realms.dg_lab.utils.stringUtils.StringHandlerUtil; import com.r3944realms.dg_lab.utils.stringUtils.UrlValidator; -import com.r3944realms.dg_lab.api.websocket.message.Message; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; import io.netty.channel.nio.NioEventLoopGroup; @@ -34,7 +34,6 @@ import io.netty.handler.codec.http.websocketx.WebSocketFrameAggregator; import io.netty.handler.codec.http.websocketx.WebSocketVersion; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketServer.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketServer.java index 3ed6926..c4eaf1c 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketServer.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketServer.java @@ -17,12 +17,11 @@ package com.r3944realms.dg_lab.websocket; -import com.google.gson.annotations.Since; import com.r3944realms.dg_lab.DgLab; import com.r3944realms.dg_lab.api.manager.Status; +import com.r3944realms.dg_lab.api.websocket.message.Message; import com.r3944realms.dg_lab.utils.stringUtils.UrlValidator; import com.r3944realms.dg_lab.websocket.handler.server.HttpRequestHandler; -import com.r3944realms.dg_lab.api.websocket.message.Message; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.*; import io.netty.channel.nio.NioEventLoopGroup; @@ -39,7 +38,6 @@ import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.net.ssl.SSLContext; import javax.net.ssl.SSLException; import java.io.File; import java.util.concurrent.CompletableFuture; diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSClient.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSClient.java index 34d5584..d5e0eb3 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSClient.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSClient.java @@ -17,12 +17,12 @@ package com.r3944realms.dg_lab.websocket; import com.r3944realms.dg_lab.api.operation.ClientOperation; -import com.r3944realms.dg_lab.websocket.handler.client.ClientDLPBHandler; -import com.r3944realms.dg_lab.websocket.handler.client.ClientDLPBHandlerContextWrapper; -import com.r3944realms.dg_lab.websocket.handler.client.DefaultClientOperation; import com.r3944realms.dg_lab.api.websocket.message.Message; import com.r3944realms.dg_lab.api.websocket.message.PowerBoxMessage; import com.r3944realms.dg_lab.api.websocket.message.role.WebSocketClientRole; +import com.r3944realms.dg_lab.websocket.handler.client.ClientDLPBHandler; +import com.r3944realms.dg_lab.websocket.handler.client.ClientDLPBHandlerContextWrapper; +import com.r3944realms.dg_lab.websocket.handler.client.DefaultClientOperation; import com.r3944realms.dg_lab.websocket.sharedData.ClientPowerBoxSharedData; import io.netty.channel.ChannelPipeline; import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSServer.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSServer.java index 06b2cfa..bff5af5 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSServer.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSServer.java @@ -17,12 +17,12 @@ package com.r3944realms.dg_lab.websocket; import com.r3944realms.dg_lab.api.operation.ServerOperation; -import com.r3944realms.dg_lab.websocket.handler.server.DefaultServerOperation; -import com.r3944realms.dg_lab.websocket.handler.server.ServerDLPBHandler; -import com.r3944realms.dg_lab.websocket.handler.server.ServerDLPBHandlerContextWrapper; import com.r3944realms.dg_lab.api.websocket.message.Message; import com.r3944realms.dg_lab.api.websocket.message.PowerBoxMessage; import com.r3944realms.dg_lab.api.websocket.message.role.WebSocketServerRole; +import com.r3944realms.dg_lab.websocket.handler.server.DefaultServerOperation; +import com.r3944realms.dg_lab.websocket.handler.server.ServerDLPBHandler; +import com.r3944realms.dg_lab.websocket.handler.server.ServerDLPBHandlerContextWrapper; import com.r3944realms.dg_lab.websocket.sharedData.ServerPowerBoxSharedData; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPipeline; diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/client/ClientDLPBHandler.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/client/ClientDLPBHandler.java index 2660110..f201da1 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/client/ClientDLPBHandler.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/client/ClientDLPBHandler.java @@ -16,9 +16,9 @@ package com.r3944realms.dg_lab.websocket.handler.client; +import com.r3944realms.dg_lab.api.websocket.sharedData.ISharedData; import com.r3944realms.dg_lab.websocket.handler.AbstractDgLabPowerBoxHandler; import com.r3944realms.dg_lab.websocket.handler.IAttachSharedData; -import com.r3944realms.dg_lab.api.websocket.sharedData.ISharedData; import io.netty.channel.ChannelHandler; /** diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/client/ClientDLPBHandlerContextWrapper.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/client/ClientDLPBHandlerContextWrapper.java index ca1c719..79b7e9a 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/client/ClientDLPBHandlerContextWrapper.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/client/ClientDLPBHandlerContextWrapper.java @@ -18,15 +18,15 @@ package com.r3944realms.dg_lab.websocket.handler.client; import com.r3944realms.dg_lab.api.operation.ClientOperation; import com.r3944realms.dg_lab.api.operation.IOperation; -import com.r3944realms.dg_lab.websocket.handler.AbstractDgLabPowerBoxHandlerContextWrapper; import com.r3944realms.dg_lab.api.websocket.message.PowerBoxMessage; import com.r3944realms.dg_lab.api.websocket.message.data.PowerBoxData; import com.r3944realms.dg_lab.api.websocket.message.role.Role; import com.r3944realms.dg_lab.api.websocket.message.role.WebSocketClientRole; import com.r3944realms.dg_lab.api.websocket.message.role.WebSocketServerRole; import com.r3944realms.dg_lab.api.websocket.message.role.type.RoleType; -import com.r3944realms.dg_lab.websocket.sharedData.ClientPowerBoxSharedData; import com.r3944realms.dg_lab.api.websocket.sharedData.ISharedData; +import com.r3944realms.dg_lab.websocket.handler.AbstractDgLabPowerBoxHandlerContextWrapper; +import com.r3944realms.dg_lab.websocket.sharedData.ClientPowerBoxSharedData; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/DefaultServerOperation.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/DefaultServerOperation.java index 9143417..b61d64a 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/DefaultServerOperation.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/DefaultServerOperation.java @@ -19,8 +19,6 @@ package com.r3944realms.dg_lab.websocket.handler.server; import com.r3944realms.dg_lab.api.operation.ServerOperation; import com.r3944realms.dg_lab.api.websocket.message.PowerBoxMessage; -import java.util.UUID; - /** * The type Default server operation. */ diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/ServerDLPBHandler.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/ServerDLPBHandler.java index 55bb203..3218a9f 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/ServerDLPBHandler.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/ServerDLPBHandler.java @@ -16,10 +16,10 @@ package com.r3944realms.dg_lab.websocket.handler.server; +import com.r3944realms.dg_lab.api.websocket.sharedData.ISharedData; import com.r3944realms.dg_lab.websocket.handler.AbstractDgLabPowerBoxHandler; import com.r3944realms.dg_lab.websocket.handler.AbstractDgLabPowerBoxHandlerContextWrapper; import com.r3944realms.dg_lab.websocket.handler.IAttachSharedData; -import com.r3944realms.dg_lab.api.websocket.sharedData.ISharedData; import io.netty.channel.ChannelHandler; diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/ServerDLPBHandlerContextWrapper.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/ServerDLPBHandlerContextWrapper.java index c22ebb1..ef4b53c 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/ServerDLPBHandlerContextWrapper.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/ServerDLPBHandlerContextWrapper.java @@ -18,17 +18,17 @@ package com.r3944realms.dg_lab.websocket.handler.server; import com.google.gson.JsonSyntaxException; import com.r3944realms.dg_lab.api.operation.ServerOperation; -import com.r3944realms.dg_lab.api.websocket.message.role.*; -import com.r3944realms.dg_lab.utils.stringUtils.StringHandlerUtil; -import com.r3944realms.dg_lab.utils.timeTask.DgLabTimerTask; -import com.r3944realms.dg_lab.websocket.handler.AbstractDgLabPowerBoxHandlerContextWrapper; import com.r3944realms.dg_lab.api.websocket.message.Message; import com.r3944realms.dg_lab.api.websocket.message.PowerBoxMessage; import com.r3944realms.dg_lab.api.websocket.message.data.PowerBoxData; import com.r3944realms.dg_lab.api.websocket.message.data.PowerBoxDataWithSingleAttachment; import com.r3944realms.dg_lab.api.websocket.message.data.type.PowerBoxDataType; import com.r3944realms.dg_lab.api.websocket.message.data.type.PowerBoxStatusCode; +import com.r3944realms.dg_lab.api.websocket.message.role.*; import com.r3944realms.dg_lab.api.websocket.message.role.type.RoleType; +import com.r3944realms.dg_lab.utils.stringUtils.StringHandlerUtil; +import com.r3944realms.dg_lab.utils.timeTask.DgLabTimerTask; +import com.r3944realms.dg_lab.websocket.handler.AbstractDgLabPowerBoxHandlerContextWrapper; import com.r3944realms.dg_lab.websocket.sharedData.ServerPowerBoxSharedData; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/sharedData/ClientPowerBoxSharedData.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/sharedData/ClientPowerBoxSharedData.java index 7d19c47..c70eeb0 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/sharedData/ClientPowerBoxSharedData.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/sharedData/ClientPowerBoxSharedData.java @@ -16,8 +16,8 @@ package com.r3944realms.dg_lab.websocket.sharedData; -import com.r3944realms.dg_lab.utils.stringUtils.StringHandlerUtil; import com.r3944realms.dg_lab.api.websocket.sharedData.ISharedData; +import com.r3944realms.dg_lab.utils.stringUtils.StringHandlerUtil; import java.util.Timer; diff --git a/CommonApi/src/main/java/com/r3944realms/dg_lab/api/message/IPowerBoxMsg.java b/CommonApi/src/main/java/com/r3944realms/dg_lab/api/message/IPowerBoxMsg.java index 7e84a96..bfe5154 100644 --- a/CommonApi/src/main/java/com/r3944realms/dg_lab/api/message/IPowerBoxMsg.java +++ b/CommonApi/src/main/java/com/r3944realms/dg_lab/api/message/IPowerBoxMsg.java @@ -25,8 +25,8 @@ import com.r3944realms.dg_lab.api.message.data.PulseWaveList; import com.r3944realms.dg_lab.api.message.data.PulseWaveListGenerator; import com.r3944realms.dg_lab.api.websocket.message.MessageDirection; import com.r3944realms.dg_lab.api.websocket.message.PowerBoxMessage; -import com.r3944realms.dg_lab.api.websocket.message.data.PowerBoxDataWithSingleAttachment; import com.r3944realms.dg_lab.api.websocket.message.data.PowerBoxData; +import com.r3944realms.dg_lab.api.websocket.message.data.PowerBoxDataWithSingleAttachment; import com.r3944realms.dg_lab.api.websocket.message.data.type.PowerBoxDataType; import com.r3944realms.dg_lab.api.websocket.message.role.Role; diff --git a/CommonApi/src/main/java/com/r3944realms/dg_lab/api/websocket/message/MessageDirection.java b/CommonApi/src/main/java/com/r3944realms/dg_lab/api/websocket/message/MessageDirection.java index 678c9a0..d808ae4 100644 --- a/CommonApi/src/main/java/com/r3944realms/dg_lab/api/websocket/message/MessageDirection.java +++ b/CommonApi/src/main/java/com/r3944realms/dg_lab/api/websocket/message/MessageDirection.java @@ -18,7 +18,6 @@ package com.r3944realms.dg_lab.api.websocket.message; import com.r3944realms.dg_lab.api.websocket.message.role.*; - import java.io.Serializable; /**