Skip to content

Commit de25eb9

Browse files
3944Realms3944Realms
committed
feat(对操作类增加错误参数): 对操作类增加错误参数
* 添加操作Operation类的Error方法错误的参数，同时移除无参方法 BREAKING CHANGE: 移除了Operation错误方法的无参实现
1 parent 5c4dd0d commit de25eb9

File tree

10 files changed

+57
-44
lines changed

10 files changed

+57
-44
lines changed

‎Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketClient.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ protected void initChannel(NioSocketChannel ch) throws SSLException {
297297
ClientChannel = channelFuture.sync().channel();
298298
ClientChannel.closeFuture().sync();
299299
} catch (Exception e) {
300-
startingError();
300+
startingError("Catch Exception: " + e.getMessage());
301301
ClientStatus = Status.ERROR;
302302
logger.error(e.getMessage());
303303
} finally {
@@ -320,15 +320,15 @@ public final void start() {
320320
starting();
321321
switch (ClientStatus) {
322322
case STARTING -> {
323-
startingError();
323+
startingError("Client is already starting");
324324
logger.info("Client is already starting.");
325325
}
326326
case RUNNING -> {
327-
startingError();
327+
startingError("Client is already running.");
328328
logger.info("Client is already running.");
329329
}
330330
case STOPPING -> {
331-
startingError();
331+
startingError("Client is stopping");
332332
logger.info("Client is stopping");
333333
}
334334
case STOPPED, WAITING_FOR_INIT -> {
@@ -356,7 +356,7 @@ protected CompletableFuture<Void> stop0() {
356356
/**
357357
* Starting error.
358358
*/
359-
protected abstract void startingError();
359+
protected abstract void startingError(String msg);
360360

361361
/**
362362
* Started.
@@ -371,7 +371,7 @@ protected CompletableFuture<Void> stop0() {
371371
/**
372372
* Stopping error.
373373
*/
374-
protected abstract void stoppingError();
374+
protected abstract void stoppingError(String msg);
375375

376376
/**
377377
* Stopped.
@@ -385,11 +385,11 @@ public final void stop() {
385385
stopping();
386386
switch (ClientStatus) {
387387
case WAITING_FOR_INIT -> {
388-
stoppingError();
388+
stoppingError("Client is not initialized.");
389389
logger.warn("Not Init. (It shouldn't be happened)");
390390
}
391391
case STARTING -> {
392-
stoppingError();
392+
stoppingError("Client is already starting.");
393393
logger.info("Client is starting, please waiting.");
394394
}
395395
case RUNNING, ERROR -> {
@@ -424,11 +424,11 @@ public final void stop() {
424424
});
425425
}
426426
case STOPPING -> {
427-
stoppingError();
427+
stoppingError("Client is already stopping.");
428428
logger.info("Client is already stopping");
429429
}
430430
case STOPPED -> {
431-
stoppingError();
431+
stoppingError("Client has been stopped.");
432432
logger.info("Client has stopped");
433433
}
434434
}

‎Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketServer.java‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.r3944realms.dg_lab.websocket;
1818

1919

20+
import com.google.gson.annotations.Since;
2021
import com.r3944realms.dg_lab.DgLab;
2122
import com.r3944realms.dg_lab.api.manager.Status;
2223
import com.r3944realms.dg_lab.utils.stringUtils.UrlValidator;
@@ -248,7 +249,7 @@ protected void initChannel(NioSocketChannel ch) throws SSLException {
248249
channelFuture.channel().closeFuture().sync();
249250
} catch (Exception e) {
250251
ServerStatus = Status.ERROR;
251-
stoppingError();
252+
stoppingError("Catch Exception:" + e.getMessage());
252253
logger.error(e.getMessage());
253254
} finally {
254255
if(ServerStatus == Status.ERROR || ServerStatus == Status.RUNNING) stop();
@@ -262,10 +263,12 @@ protected void initChannel(NioSocketChannel ch) throws SSLException {
262263
*/
263264
protected abstract void starting();
264265

266+
267+
265268
/**
266-
* Starting error.
269+
* Starting error(With error result).
267270
*/
268-
protected abstract void startingError();
271+
protected abstract void startingError(String error);
269272

270273
/**
271274
* Started.
@@ -280,8 +283,7 @@ protected void initChannel(NioSocketChannel ch) throws SSLException {
280283
/**
281284
* Stopping error.
282285
*/
283-
protected abstract void stoppingError();
284-
286+
protected abstract void stoppingError(String error);
285287
/**
286288
* Stopped.
287289
*/
@@ -301,15 +303,15 @@ public final void start() {
301303
starting();
302304
switch (ServerStatus) {
303305
case STARTING -> {
304-
startingError();
306+
startingError("Server is already starting.");
305307
logger.info("Server is already starting.");
306308
}
307309
case RUNNING -> {
308-
startingError();
310+
startingError("Server is already running.");
309311
logger.info("Server is already running.");
310312
}
311313
case STOPPING -> {
312-
startingError();
314+
startingError("Server is stopping");
313315
logger.info("Server is stopping");
314316
}
315317
case STOPPED, WAITING_FOR_INIT -> {
@@ -336,11 +338,11 @@ public final void stop() {
336338
stopping();
337339
switch (ServerStatus) {
338340
case WAITING_FOR_INIT -> {
339-
stoppingError();
341+
stoppingError("Not Init. (It shouldn't be happened)");
340342
logger.warn("Not Init. (It shouldn't be happened)");
341343
}
342344
case STARTING -> {
343-
stoppingError();
345+
stoppingError("Server is starting, please waiting.");
344346
logger.info("Server is starting, please waiting.");
345347
}
346348
case RUNNING -> {
@@ -392,11 +394,11 @@ public final void stop() {
392394

393395
}
394396
case STOPPING -> {
395-
stoppingError();
397+
stoppingError("Server is already stopping");
396398
logger.info("Server is already stopping");
397399
}
398400
case STOPPED -> {
399-
stoppingError();
401+
stoppingError("Server has stopped");
400402
logger.info("Server has stopped");
401403
}
402404
}

‎Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSClient.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ protected void starting() {
183183
}
184184

185185
@Override
186-
protected void startingError() {
187-
operation.ClientStartingErrorHandler();
186+
protected void startingError(String msg) {
187+
operation.ClientStartingErrorHandler(msg);
188188
}
189189

190190
@Override
@@ -198,8 +198,8 @@ protected void stopping() {
198198
}
199199

200200
@Override
201-
protected void stoppingError() {
202-
operation.ClientStoppingErrorHandler();
201+
protected void stoppingError(String msg) {
202+
operation.ClientStoppingErrorHandler(msg);
203203
}
204204

205205
@Override

‎Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSServer.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,10 @@ protected void starting() {
118118
operation.ServerStartingHandler();
119119
}
120120

121+
121122
@Override
122-
protected void startingError() {
123-
operation.ServerStartingErrorHandler();
123+
protected void startingError(String error) {
124+
operation.ServerStartingErrorHandler(error);
124125
}
125126

126127
@Override
@@ -134,8 +135,8 @@ protected void stopping() {
134135
}
135136

136137
@Override
137-
protected void stoppingError() {
138-
operation.ServerStoppingErrorHandler();
138+
protected void stoppingError(String error) {
139+
operation.ServerStoppingErrorHandler(error);
139140
}
140141

141142
@Override

‎Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/client/DefaultClientOperation.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,22 @@ public void ClientStartedHandler() {
3434
}
3535

3636
@Override
37-
public void ClientStartingErrorHandler() {
38-
//NOOP
37+
public void ClientStartingErrorHandler(String errorMsg) {
38+
3939
}
4040

4141
@Override
4242
public void ClientStoppingHandler() {
4343
//NOOP
4444
}
4545

46+
4647
@Override
47-
public void ClientStoppingErrorHandler() {
48+
public void ClientStoppingErrorHandler(String errorMsg) {
4849
//NOOP
4950
}
5051

52+
5153
@Override
5254
public void ClientStoppedHandler() {
5355
//NOOP

‎Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/DefaultServerOperation.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public void ServerStartingHandler() {
7474
}
7575

7676
@Override
77-
public void ServerStartingErrorHandler() {
78-
77+
public void ServerStartingErrorHandler(String errorMessage) {
78+
//NOOP
7979
}
8080

8181
@Override
@@ -89,10 +89,11 @@ public void ServerStoppingHandler() {
8989
}
9090

9191
@Override
92-
public void ServerStoppingErrorHandler() {
93-
92+
public void ServerStoppingErrorHandler(String errorMessage) {
93+
//NOOP
9494
}
9595

96+
9697
@Override
9798
public void ServerStoppedHandler() {
9899
//NOOP

‎CommonApi/src/main/java/com/r3944realms/dg_lab/api/operation/ClientOperation.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ public interface ClientOperation extends IOperation {
3434

3535
/**
3636
* 客户端启动遇到错误后处理
37+
* @param errorMsg 错误消息
3738
*/
38-
void ClientStartingErrorHandler();
39-
39+
void ClientStartingErrorHandler(String errorMsg);
4040
/**
4141
* 客户端线程关闭中处理
4242
*/
4343
void ClientStoppingHandler();
4444

4545
/**
4646
* 客户端线程关闭中遇到错误后处理
47+
* @param errorMsg 错误消息
4748
*/
48-
void ClientStoppingErrorHandler();
49-
49+
void ClientStoppingErrorHandler(String errorMsg);
5050
/**
5151
* 客户端线程完全关闭后处理
5252
*/

‎CommonApi/src/main/java/com/r3944realms/dg_lab/api/operation/ServerOperation.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ public interface ServerOperation extends IOperation {
3131

3232
/**
3333
* 服务器线程开启中遇到错误后处理
34+
* @param errorMessage 错误消息
3435
*/
35-
void ServerStartingErrorHandler();
36+
void ServerStartingErrorHandler(String errorMessage);
3637

3738
/**
3839
* 服务器线程开启后处理
@@ -46,8 +47,9 @@ public interface ServerOperation extends IOperation {
4647

4748
/**
4849
* 服务器线程关闭中遇到错误后处理
50+
* @param errorMessage 错误消息
4951
*/
50-
void ServerStoppingErrorHandler();
52+
void ServerStoppingErrorHandler(String errorMessage);
5153

5254
/**
5355
* 服务器线程完全关闭后处理

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ org.gradle.configuration-cache=true
77
org.gradle.configuration-cache.problems=warn
88
# ROOT
99
project_name=DgLab
10-
project_version=4.2.11.18
10+
project_version=4.3.11.18
1111
project_group=top.r3944realms.dg_lab
1212

1313
# API

‎versionlog.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
统一用4位版本，对于测试性更新统一在其后加-Beta。
33
修复问题更新为加0.0.0.1，添加/移除新特性加0.0.1.0，小部分重构更新加0.1.0.0，大量重构加1.0.0.0
44

5+
2025-09-23-1
6+
project_version=4.3.11.18
7+
* 添加操作Operation类的Error方法错误的参数，同时移除无参方法
8+
*
9+
510
2025-09-21-4
611
project_version=4.2.11.18
712
* 添加服务器对SSL密码参数支持

0 commit comments

Comments
 (0)