From ff3e06c1238a5e3eadd2968dc6e2a04290fe70ad Mon Sep 17 00:00:00 2001 From: godotg Date: Sat, 2 Sep 2023 20:36:02 +0800 Subject: [PATCH] ref[move]: move ThreadUtils --- .../java/com/zfoo/event/EventContext.java | 2 +- .../java/com/zfoo/event/manager/EventBus.java | 2 +- .../java/com/zfoo/event/ApplicationTest.java | 2 +- .../com/zfoo/monitor/ApplicationTest.java | 2 +- .../main/java/com/zfoo/net/NetContext.java | 5 +-- .../consumer/registry/ZookeeperRegistry.java | 2 +- .../com/zfoo/net/core/AbstractClient.java | 2 +- .../com/zfoo/net/core/AbstractServer.java | 2 +- .../zfoo/net/router/answer/AsyncAnswer.java | 2 +- .../main/java/com/zfoo/net/task/TaskBus.java | 2 +- .../net/base/aio/client/AioClientTest.java | 2 +- .../net/base/aio/server/AioServerTest.java | 2 +- .../com/zfoo/net/base/http/AsyncHttpTest.java | 2 +- .../netty/echoserver1/EchoClientTest.java | 2 +- .../netty/echoserver1/EchoServerTest.java | 2 +- .../netty/echoserver2/EchoClientTest.java | 2 +- .../netty/echoserver2/EchoServerTest.java | 2 +- .../netty/nettyfileserver/FileClientTest.java | 2 +- .../netty/nettyfileserver/FileServerTest.java | 2 +- .../netty/subscribe/SubscribeClientTest.java | 2 +- .../netty/subscribe/SubscribeServerTest.java | 2 +- .../netty/timeserver1/TimeClientTest.java | 2 +- .../netty/timeserver1/TimeServerTest.java | 2 +- .../netty/timeserver2/TimeClientTest.java | 2 +- .../netty/timeserver2/TimeServerTest.java | 2 +- .../base/netty/udpserver/UDPClientTest.java | 2 +- .../base/netty/udpserver/UDPServerTest.java | 2 +- .../base/nio/filechannel/FileReaderTest.java | 2 +- .../base/nio/filechannel/FileWriterTest.java | 2 +- .../zfoo/net/base/nio/nio/NioClientTest.java | 2 +- .../zfoo/net/base/nio/nio/NioServerTest.java | 2 +- .../com/zfoo/net/core/csharp/ServerTest.java | 2 +- .../zfoo/net/core/gateway/GatewayTest.java | 2 +- .../zfoo/net/core/http/HttpServerTest.java | 2 +- .../core/jprotobuf/client/TcpClientTest.java | 2 +- .../server/JProtobufTcpServerTest.java | 2 +- .../json/client/JsonWebsocketClientTest.java | 2 +- .../json/server/JsonWebsocketServerTest.java | 2 +- .../zfoo/net/core/provider/ProviderTest.java | 2 +- .../net/core/tcp/client/TcpClientTest.java | 2 +- .../net/core/tcp/server/TcpServerTest.java | 2 +- .../tcpAsync/client/BenchmarkAsyncTest.java | 2 +- .../core/tcpAsync/client/TcpClientTest.java | 2 +- .../core/tcpAsync/server/TcpServerTest.java | 2 +- .../tcpSync/client/BenchmarkSyncTest.java | 2 +- .../core/tcpSync/client/TcpClientTest.java | 2 +- .../core/tcpSync/server/TcpServerTest.java | 2 +- .../net/core/udp/client/UdpClientTest.java | 2 +- .../net/core/udp/server/UdpServerTest.java | 2 +- .../websocket/client/WebsocketClientTest.java | 2 +- .../websocket/server/WebsocketServerTest.java | 2 +- .../com/zfoo/net/session/SessionUtils.java | 2 +- .../com/zfoo/net/util/SimpleCacheTest.java | 2 +- .../curator/cache/CuratorCacheTest.java | 2 +- .../java/com/zfoo/orm/cache/EntityCaches.java | 2 +- .../com/zfoo/orm/cache/EntityCachesTest.java | 2 +- .../test/java/com/zfoo/orm/cache/OrmTest.java | 2 +- .../java/com/zfoo/orm/text/IndexTextTest.java | 2 +- .../com/zfoo/orm/text/TextSearchTest.java | 2 +- .../com/zfoo/orm/util/MongoIdUtilsTest.java | 2 +- .../com/zfoo/protocol}/util/ThreadUtils.java | 3 +- .../com/zfoo/scheduler/SchedulerContext.java | 2 +- .../zfoo/scheduler/manager/SchedulerBus.java | 2 +- .../com/zfoo/scheduler/ApplicationTest.java | 2 +- .../zfoo/scheduler/util/TimeUtilsTest.java | 2 +- .../main/java/com/zfoo/util/SafeRunnable.java | 36 ------------------- 66 files changed, 65 insertions(+), 105 deletions(-) rename {util/src/main/java/com/zfoo => protocol/src/main/java/com/zfoo/protocol}/util/ThreadUtils.java (99%) delete mode 100644 util/src/main/java/com/zfoo/util/SafeRunnable.java diff --git a/event/src/main/java/com/zfoo/event/EventContext.java b/event/src/main/java/com/zfoo/event/EventContext.java index 5105a472..fdd38145 100644 --- a/event/src/main/java/com/zfoo/event/EventContext.java +++ b/event/src/main/java/com/zfoo/event/EventContext.java @@ -16,7 +16,7 @@ package com.zfoo.event; import com.zfoo.event.manager.EventBus; import com.zfoo.protocol.exception.ExceptionUtils; import com.zfoo.protocol.util.ReflectionUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; diff --git a/event/src/main/java/com/zfoo/event/manager/EventBus.java b/event/src/main/java/com/zfoo/event/manager/EventBus.java index 878ba9ed..0a3a249d 100644 --- a/event/src/main/java/com/zfoo/event/manager/EventBus.java +++ b/event/src/main/java/com/zfoo/event/manager/EventBus.java @@ -19,7 +19,7 @@ import com.zfoo.protocol.collection.concurrent.CopyOnWriteHashMapLongObject; import com.zfoo.protocol.util.AssertionUtils; import com.zfoo.protocol.util.StringUtils; import com.zfoo.protocol.util.RandomUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import io.netty.util.concurrent.FastThreadLocalThread; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/event/src/test/java/com/zfoo/event/ApplicationTest.java b/event/src/test/java/com/zfoo/event/ApplicationTest.java index fcae6917..942bb99e 100644 --- a/event/src/test/java/com/zfoo/event/ApplicationTest.java +++ b/event/src/test/java/com/zfoo/event/ApplicationTest.java @@ -14,7 +14,7 @@ package com.zfoo.event; import com.zfoo.event.manager.EventBus; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/monitor/src/test/java/com/zfoo/monitor/ApplicationTest.java b/monitor/src/test/java/com/zfoo/monitor/ApplicationTest.java index 47156782..19f5a28b 100644 --- a/monitor/src/test/java/com/zfoo/monitor/ApplicationTest.java +++ b/monitor/src/test/java/com/zfoo/monitor/ApplicationTest.java @@ -16,7 +16,7 @@ package com.zfoo.monitor; import com.zfoo.monitor.util.JvmUtils; import com.zfoo.monitor.util.OSUtils; import com.zfoo.protocol.util.JsonUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/main/java/com/zfoo/net/NetContext.java b/net/src/main/java/com/zfoo/net/NetContext.java index 90c25cd4..4fa847bb 100644 --- a/net/src/main/java/com/zfoo/net/NetContext.java +++ b/net/src/main/java/com/zfoo/net/NetContext.java @@ -20,15 +20,13 @@ import com.zfoo.net.core.AbstractServer; import com.zfoo.net.packet.IPacketService; import com.zfoo.net.router.IRouter; import com.zfoo.net.session.ISessionManager; -import com.zfoo.net.session.Session; import com.zfoo.net.task.TaskBus; -import com.zfoo.protocol.collection.ArrayUtils; import com.zfoo.protocol.exception.ExceptionUtils; import com.zfoo.protocol.util.IOUtils; import com.zfoo.protocol.util.ReflectionUtils; import com.zfoo.scheduler.SchedulerContext; import com.zfoo.scheduler.model.StopWatch; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; @@ -39,7 +37,6 @@ import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.core.Ordered; import java.lang.reflect.Field; -import java.util.ArrayList; import java.util.concurrent.ExecutorService; /** diff --git a/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java b/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java index 55bc651e..7d68dee6 100644 --- a/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java +++ b/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java @@ -29,7 +29,7 @@ import com.zfoo.protocol.util.IOUtils; import com.zfoo.protocol.util.JsonUtils; import com.zfoo.protocol.util.StringUtils; import com.zfoo.scheduler.manager.SchedulerBus; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import io.netty.util.concurrent.FastThreadLocalThread; import org.apache.curator.framework.CuratorFramework; diff --git a/net/src/main/java/com/zfoo/net/core/AbstractClient.java b/net/src/main/java/com/zfoo/net/core/AbstractClient.java index 81228f68..61be05aa 100644 --- a/net/src/main/java/com/zfoo/net/core/AbstractClient.java +++ b/net/src/main/java/com/zfoo/net/core/AbstractClient.java @@ -18,7 +18,7 @@ import com.zfoo.net.handler.BaseRouteHandler; import com.zfoo.net.session.Session; import com.zfoo.protocol.exception.ExceptionUtils; import com.zfoo.protocol.util.IOUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; diff --git a/net/src/main/java/com/zfoo/net/core/AbstractServer.java b/net/src/main/java/com/zfoo/net/core/AbstractServer.java index 6bdc4084..a044b5d8 100644 --- a/net/src/main/java/com/zfoo/net/core/AbstractServer.java +++ b/net/src/main/java/com/zfoo/net/core/AbstractServer.java @@ -14,7 +14,7 @@ package com.zfoo.net.core; import com.zfoo.protocol.util.IOUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.*; diff --git a/net/src/main/java/com/zfoo/net/router/answer/AsyncAnswer.java b/net/src/main/java/com/zfoo/net/router/answer/AsyncAnswer.java index 905349be..d790432b 100644 --- a/net/src/main/java/com/zfoo/net/router/answer/AsyncAnswer.java +++ b/net/src/main/java/com/zfoo/net/router/answer/AsyncAnswer.java @@ -15,7 +15,7 @@ package com.zfoo.net.router.answer; import com.zfoo.net.router.attachment.SignalAttachment; import com.zfoo.protocol.IPacket; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import java.util.ArrayList; import java.util.List; diff --git a/net/src/main/java/com/zfoo/net/task/TaskBus.java b/net/src/main/java/com/zfoo/net/task/TaskBus.java index 81b4d7f3..8a2df6a1 100644 --- a/net/src/main/java/com/zfoo/net/task/TaskBus.java +++ b/net/src/main/java/com/zfoo/net/task/TaskBus.java @@ -25,7 +25,7 @@ import com.zfoo.protocol.util.AssertionUtils; import com.zfoo.protocol.util.StringUtils; import com.zfoo.scheduler.manager.SchedulerBus; import com.zfoo.protocol.util.RandomUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import io.netty.util.concurrent.FastThreadLocalThread; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/net/src/test/java/com/zfoo/net/base/aio/client/AioClientTest.java b/net/src/test/java/com/zfoo/net/base/aio/client/AioClientTest.java index cb686d27..11bc6c4b 100644 --- a/net/src/test/java/com/zfoo/net/base/aio/client/AioClientTest.java +++ b/net/src/test/java/com/zfoo/net/base/aio/client/AioClientTest.java @@ -1,7 +1,7 @@ package com.zfoo.net.base.aio.client; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/base/aio/server/AioServerTest.java b/net/src/test/java/com/zfoo/net/base/aio/server/AioServerTest.java index bd0fe392..1e7c6679 100644 --- a/net/src/test/java/com/zfoo/net/base/aio/server/AioServerTest.java +++ b/net/src/test/java/com/zfoo/net/base/aio/server/AioServerTest.java @@ -1,7 +1,7 @@ package com.zfoo.net.base.aio.server; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/base/http/AsyncHttpTest.java b/net/src/test/java/com/zfoo/net/base/http/AsyncHttpTest.java index f2ab93eb..0aa7838f 100644 --- a/net/src/test/java/com/zfoo/net/base/http/AsyncHttpTest.java +++ b/net/src/test/java/com/zfoo/net/base/http/AsyncHttpTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.base.http; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/base/netty/echoserver1/EchoClientTest.java b/net/src/test/java/com/zfoo/net/base/netty/echoserver1/EchoClientTest.java index d96d25a2..d69911a7 100644 --- a/net/src/test/java/com/zfoo/net/base/netty/echoserver1/EchoClientTest.java +++ b/net/src/test/java/com/zfoo/net/base/netty/echoserver1/EchoClientTest.java @@ -1,7 +1,7 @@ package com.zfoo.net.base.netty.echoserver1; import com.zfoo.protocol.util.StringUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/net/src/test/java/com/zfoo/net/base/netty/echoserver1/EchoServerTest.java b/net/src/test/java/com/zfoo/net/base/netty/echoserver1/EchoServerTest.java index 28bdd8ad..b483508b 100644 --- a/net/src/test/java/com/zfoo/net/base/netty/echoserver1/EchoServerTest.java +++ b/net/src/test/java/com/zfoo/net/base/netty/echoserver1/EchoServerTest.java @@ -1,7 +1,7 @@ package com.zfoo.net.base.netty.echoserver1; import com.zfoo.protocol.util.StringUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/net/src/test/java/com/zfoo/net/base/netty/echoserver2/EchoClientTest.java b/net/src/test/java/com/zfoo/net/base/netty/echoserver2/EchoClientTest.java index 119c0ab0..967c0dbe 100644 --- a/net/src/test/java/com/zfoo/net/base/netty/echoserver2/EchoClientTest.java +++ b/net/src/test/java/com/zfoo/net/base/netty/echoserver2/EchoClientTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.base.netty.echoserver2; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; diff --git a/net/src/test/java/com/zfoo/net/base/netty/echoserver2/EchoServerTest.java b/net/src/test/java/com/zfoo/net/base/netty/echoserver2/EchoServerTest.java index b82dcdab..a2fda1a6 100644 --- a/net/src/test/java/com/zfoo/net/base/netty/echoserver2/EchoServerTest.java +++ b/net/src/test/java/com/zfoo/net/base/netty/echoserver2/EchoServerTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.base.netty.echoserver2; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; diff --git a/net/src/test/java/com/zfoo/net/base/netty/nettyfileserver/FileClientTest.java b/net/src/test/java/com/zfoo/net/base/netty/nettyfileserver/FileClientTest.java index e7231fd9..0950d3fa 100644 --- a/net/src/test/java/com/zfoo/net/base/netty/nettyfileserver/FileClientTest.java +++ b/net/src/test/java/com/zfoo/net/base/netty/nettyfileserver/FileClientTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.base.netty.nettyfileserver; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; diff --git a/net/src/test/java/com/zfoo/net/base/netty/nettyfileserver/FileServerTest.java b/net/src/test/java/com/zfoo/net/base/netty/nettyfileserver/FileServerTest.java index 1a1b0386..63a666d9 100644 --- a/net/src/test/java/com/zfoo/net/base/netty/nettyfileserver/FileServerTest.java +++ b/net/src/test/java/com/zfoo/net/base/netty/nettyfileserver/FileServerTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.base.netty.nettyfileserver; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; diff --git a/net/src/test/java/com/zfoo/net/base/netty/subscribe/SubscribeClientTest.java b/net/src/test/java/com/zfoo/net/base/netty/subscribe/SubscribeClientTest.java index e5726b71..188dae66 100644 --- a/net/src/test/java/com/zfoo/net/base/netty/subscribe/SubscribeClientTest.java +++ b/net/src/test/java/com/zfoo/net/base/netty/subscribe/SubscribeClientTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.base.netty.subscribe; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; diff --git a/net/src/test/java/com/zfoo/net/base/netty/subscribe/SubscribeServerTest.java b/net/src/test/java/com/zfoo/net/base/netty/subscribe/SubscribeServerTest.java index be2d3a9a..0ac15260 100644 --- a/net/src/test/java/com/zfoo/net/base/netty/subscribe/SubscribeServerTest.java +++ b/net/src/test/java/com/zfoo/net/base/netty/subscribe/SubscribeServerTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.base.netty.subscribe; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; diff --git a/net/src/test/java/com/zfoo/net/base/netty/timeserver1/TimeClientTest.java b/net/src/test/java/com/zfoo/net/base/netty/timeserver1/TimeClientTest.java index 1a62bedb..8111d6b4 100644 --- a/net/src/test/java/com/zfoo/net/base/netty/timeserver1/TimeClientTest.java +++ b/net/src/test/java/com/zfoo/net/base/netty/timeserver1/TimeClientTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.base.netty.timeserver1; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; diff --git a/net/src/test/java/com/zfoo/net/base/netty/timeserver1/TimeServerTest.java b/net/src/test/java/com/zfoo/net/base/netty/timeserver1/TimeServerTest.java index 1e3c462c..a3f85b14 100644 --- a/net/src/test/java/com/zfoo/net/base/netty/timeserver1/TimeServerTest.java +++ b/net/src/test/java/com/zfoo/net/base/netty/timeserver1/TimeServerTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.base.netty.timeserver1; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; diff --git a/net/src/test/java/com/zfoo/net/base/netty/timeserver2/TimeClientTest.java b/net/src/test/java/com/zfoo/net/base/netty/timeserver2/TimeClientTest.java index eb462052..f5d8b0c4 100644 --- a/net/src/test/java/com/zfoo/net/base/netty/timeserver2/TimeClientTest.java +++ b/net/src/test/java/com/zfoo/net/base/netty/timeserver2/TimeClientTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.base.netty.timeserver2; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; diff --git a/net/src/test/java/com/zfoo/net/base/netty/timeserver2/TimeServerTest.java b/net/src/test/java/com/zfoo/net/base/netty/timeserver2/TimeServerTest.java index 2335e250..14420822 100644 --- a/net/src/test/java/com/zfoo/net/base/netty/timeserver2/TimeServerTest.java +++ b/net/src/test/java/com/zfoo/net/base/netty/timeserver2/TimeServerTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.base.netty.timeserver2; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; diff --git a/net/src/test/java/com/zfoo/net/base/netty/udpserver/UDPClientTest.java b/net/src/test/java/com/zfoo/net/base/netty/udpserver/UDPClientTest.java index 19a13a20..660d52f7 100644 --- a/net/src/test/java/com/zfoo/net/base/netty/udpserver/UDPClientTest.java +++ b/net/src/test/java/com/zfoo/net/base/netty/udpserver/UDPClientTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.base.netty.udpserver; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.Unpooled; import io.netty.channel.Channel; diff --git a/net/src/test/java/com/zfoo/net/base/netty/udpserver/UDPServerTest.java b/net/src/test/java/com/zfoo/net/base/netty/udpserver/UDPServerTest.java index d5fa4446..d9f4ca73 100644 --- a/net/src/test/java/com/zfoo/net/base/netty/udpserver/UDPServerTest.java +++ b/net/src/test/java/com/zfoo/net/base/netty/udpserver/UDPServerTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.base.netty.udpserver; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelOption; diff --git a/net/src/test/java/com/zfoo/net/base/nio/filechannel/FileReaderTest.java b/net/src/test/java/com/zfoo/net/base/nio/filechannel/FileReaderTest.java index 4eb304fb..9b205e1d 100644 --- a/net/src/test/java/com/zfoo/net/base/nio/filechannel/FileReaderTest.java +++ b/net/src/test/java/com/zfoo/net/base/nio/filechannel/FileReaderTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.base.nio.filechannel; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/base/nio/filechannel/FileWriterTest.java b/net/src/test/java/com/zfoo/net/base/nio/filechannel/FileWriterTest.java index 81711bac..7d4a9bc9 100644 --- a/net/src/test/java/com/zfoo/net/base/nio/filechannel/FileWriterTest.java +++ b/net/src/test/java/com/zfoo/net/base/nio/filechannel/FileWriterTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.base.nio.filechannel; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/base/nio/nio/NioClientTest.java b/net/src/test/java/com/zfoo/net/base/nio/nio/NioClientTest.java index e172df00..4761ce6f 100644 --- a/net/src/test/java/com/zfoo/net/base/nio/nio/NioClientTest.java +++ b/net/src/test/java/com/zfoo/net/base/nio/nio/NioClientTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.base.nio.nio; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/base/nio/nio/NioServerTest.java b/net/src/test/java/com/zfoo/net/base/nio/nio/NioServerTest.java index c5e919e1..b70c1379 100644 --- a/net/src/test/java/com/zfoo/net/base/nio/nio/NioServerTest.java +++ b/net/src/test/java/com/zfoo/net/base/nio/nio/NioServerTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.base.nio.nio; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/core/csharp/ServerTest.java b/net/src/test/java/com/zfoo/net/core/csharp/ServerTest.java index 5abd352a..66cd2576 100644 --- a/net/src/test/java/com/zfoo/net/core/csharp/ServerTest.java +++ b/net/src/test/java/com/zfoo/net/core/csharp/ServerTest.java @@ -15,7 +15,7 @@ package com.zfoo.net.core.csharp; import com.zfoo.net.core.tcp.TcpServer; import com.zfoo.net.session.SessionUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/core/gateway/GatewayTest.java b/net/src/test/java/com/zfoo/net/core/gateway/GatewayTest.java index c06ec17d..841c90da 100644 --- a/net/src/test/java/com/zfoo/net/core/gateway/GatewayTest.java +++ b/net/src/test/java/com/zfoo/net/core/gateway/GatewayTest.java @@ -19,7 +19,7 @@ import com.zfoo.net.packet.gateway.GatewayToProviderRequest; import com.zfoo.net.packet.gateway.GatewayToProviderResponse; import com.zfoo.net.session.SessionUtils; import com.zfoo.protocol.util.JsonUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/core/http/HttpServerTest.java b/net/src/test/java/com/zfoo/net/core/http/HttpServerTest.java index 7ba8892a..de7a4904 100644 --- a/net/src/test/java/com/zfoo/net/core/http/HttpServerTest.java +++ b/net/src/test/java/com/zfoo/net/core/http/HttpServerTest.java @@ -18,7 +18,7 @@ import com.zfoo.net.packet.http.HttpHelloRequest; import com.zfoo.net.router.attachment.HttpAttachment; import com.zfoo.protocol.exception.RunException; import com.zfoo.protocol.util.StringUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; diff --git a/net/src/test/java/com/zfoo/net/core/jprotobuf/client/TcpClientTest.java b/net/src/test/java/com/zfoo/net/core/jprotobuf/client/TcpClientTest.java index e089ca74..d8735d2e 100644 --- a/net/src/test/java/com/zfoo/net/core/jprotobuf/client/TcpClientTest.java +++ b/net/src/test/java/com/zfoo/net/core/jprotobuf/client/TcpClientTest.java @@ -16,7 +16,7 @@ package com.zfoo.net.core.jprotobuf.client; import com.zfoo.net.NetContext; import com.zfoo.net.core.jprotobuf.JProtobufTcpClient; import com.zfoo.net.packet.jprotobuf.JProtobufHelloRequest; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/core/jprotobuf/server/JProtobufTcpServerTest.java b/net/src/test/java/com/zfoo/net/core/jprotobuf/server/JProtobufTcpServerTest.java index 421ecbbe..7df933b9 100644 --- a/net/src/test/java/com/zfoo/net/core/jprotobuf/server/JProtobufTcpServerTest.java +++ b/net/src/test/java/com/zfoo/net/core/jprotobuf/server/JProtobufTcpServerTest.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.jprotobuf.server; import com.zfoo.net.core.jprotobuf.JProtobufTcpServer; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/core/json/client/JsonWebsocketClientTest.java b/net/src/test/java/com/zfoo/net/core/json/client/JsonWebsocketClientTest.java index 9d9d3f35..ceabd6c0 100644 --- a/net/src/test/java/com/zfoo/net/core/json/client/JsonWebsocketClientTest.java +++ b/net/src/test/java/com/zfoo/net/core/json/client/JsonWebsocketClientTest.java @@ -16,7 +16,7 @@ package com.zfoo.net.core.json.client; import com.zfoo.net.NetContext; import com.zfoo.net.core.json.JsonWebsocketClient; import com.zfoo.net.packet.json.JsonHelloRequest; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import io.netty.handler.codec.http.websocketx.WebSocketClientProtocolConfig; import org.junit.Ignore; diff --git a/net/src/test/java/com/zfoo/net/core/json/server/JsonWebsocketServerTest.java b/net/src/test/java/com/zfoo/net/core/json/server/JsonWebsocketServerTest.java index b5feadc7..1ac3fa72 100644 --- a/net/src/test/java/com/zfoo/net/core/json/server/JsonWebsocketServerTest.java +++ b/net/src/test/java/com/zfoo/net/core/json/server/JsonWebsocketServerTest.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.json.server; import com.zfoo.net.core.json.JsonWebsocketServer; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/core/provider/ProviderTest.java b/net/src/test/java/com/zfoo/net/core/provider/ProviderTest.java index fc40f9dc..5b27e8f4 100644 --- a/net/src/test/java/com/zfoo/net/core/provider/ProviderTest.java +++ b/net/src/test/java/com/zfoo/net/core/provider/ProviderTest.java @@ -18,7 +18,7 @@ import com.zfoo.net.packet.provider.ProviderMessAnswer; import com.zfoo.net.packet.provider.ProviderMessAsk; import com.zfoo.net.session.SessionUtils; import com.zfoo.protocol.util.JsonUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; diff --git a/net/src/test/java/com/zfoo/net/core/tcp/client/TcpClientTest.java b/net/src/test/java/com/zfoo/net/core/tcp/client/TcpClientTest.java index 54e6475a..68ece6c6 100644 --- a/net/src/test/java/com/zfoo/net/core/tcp/client/TcpClientTest.java +++ b/net/src/test/java/com/zfoo/net/core/tcp/client/TcpClientTest.java @@ -16,7 +16,7 @@ package com.zfoo.net.core.tcp.client; import com.zfoo.net.NetContext; import com.zfoo.net.core.tcp.TcpClient; import com.zfoo.net.packet.tcp.TcpHelloRequest; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/core/tcp/server/TcpServerTest.java b/net/src/test/java/com/zfoo/net/core/tcp/server/TcpServerTest.java index 0130e9bc..d90c73c9 100644 --- a/net/src/test/java/com/zfoo/net/core/tcp/server/TcpServerTest.java +++ b/net/src/test/java/com/zfoo/net/core/tcp/server/TcpServerTest.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.tcp.server; import com.zfoo.net.core.tcp.TcpServer; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/core/tcpAsync/client/BenchmarkAsyncTest.java b/net/src/test/java/com/zfoo/net/core/tcpAsync/client/BenchmarkAsyncTest.java index 9ab82404..59b3b72e 100644 --- a/net/src/test/java/com/zfoo/net/core/tcpAsync/client/BenchmarkAsyncTest.java +++ b/net/src/test/java/com/zfoo/net/core/tcpAsync/client/BenchmarkAsyncTest.java @@ -17,7 +17,7 @@ import com.zfoo.net.core.tcp.TcpClient; import com.zfoo.net.packet.tcp.AsyncMessAnswer; import com.zfoo.net.packet.tcp.AsyncMessAsk; import com.zfoo.protocol.util.JsonUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/core/tcpAsync/client/TcpClientTest.java b/net/src/test/java/com/zfoo/net/core/tcpAsync/client/TcpClientTest.java index 7e75d535..a69cd974 100644 --- a/net/src/test/java/com/zfoo/net/core/tcpAsync/client/TcpClientTest.java +++ b/net/src/test/java/com/zfoo/net/core/tcpAsync/client/TcpClientTest.java @@ -18,7 +18,7 @@ import com.zfoo.net.core.tcp.TcpClient; import com.zfoo.net.packet.tcp.AsyncMessAnswer; import com.zfoo.net.packet.tcp.AsyncMessAsk; import com.zfoo.protocol.util.JsonUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/core/tcpAsync/server/TcpServerTest.java b/net/src/test/java/com/zfoo/net/core/tcpAsync/server/TcpServerTest.java index 14da463e..a7feac23 100644 --- a/net/src/test/java/com/zfoo/net/core/tcpAsync/server/TcpServerTest.java +++ b/net/src/test/java/com/zfoo/net/core/tcpAsync/server/TcpServerTest.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.tcpAsync.server; import com.zfoo.net.core.tcp.TcpServer; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/core/tcpSync/client/BenchmarkSyncTest.java b/net/src/test/java/com/zfoo/net/core/tcpSync/client/BenchmarkSyncTest.java index dc662e80..ca039e48 100644 --- a/net/src/test/java/com/zfoo/net/core/tcpSync/client/BenchmarkSyncTest.java +++ b/net/src/test/java/com/zfoo/net/core/tcpSync/client/BenchmarkSyncTest.java @@ -17,7 +17,7 @@ import com.zfoo.net.core.tcp.TcpClient; import com.zfoo.net.packet.tcp.SyncMessAnswer; import com.zfoo.net.packet.tcp.SyncMessAsk; import com.zfoo.protocol.util.JsonUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/core/tcpSync/client/TcpClientTest.java b/net/src/test/java/com/zfoo/net/core/tcpSync/client/TcpClientTest.java index a8aa4187..4ad66086 100644 --- a/net/src/test/java/com/zfoo/net/core/tcpSync/client/TcpClientTest.java +++ b/net/src/test/java/com/zfoo/net/core/tcpSync/client/TcpClientTest.java @@ -18,7 +18,7 @@ import com.zfoo.net.core.tcp.TcpClient; import com.zfoo.net.packet.tcp.SyncMessAnswer; import com.zfoo.net.packet.tcp.SyncMessAsk; import com.zfoo.protocol.util.JsonUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/core/tcpSync/server/TcpServerTest.java b/net/src/test/java/com/zfoo/net/core/tcpSync/server/TcpServerTest.java index 9d9a5d57..8ec9c5b6 100644 --- a/net/src/test/java/com/zfoo/net/core/tcpSync/server/TcpServerTest.java +++ b/net/src/test/java/com/zfoo/net/core/tcpSync/server/TcpServerTest.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.tcpSync.server; import com.zfoo.net.core.tcp.TcpServer; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/core/udp/client/UdpClientTest.java b/net/src/test/java/com/zfoo/net/core/udp/client/UdpClientTest.java index 2ef20b44..182f279a 100644 --- a/net/src/test/java/com/zfoo/net/core/udp/client/UdpClientTest.java +++ b/net/src/test/java/com/zfoo/net/core/udp/client/UdpClientTest.java @@ -16,7 +16,7 @@ import com.zfoo.net.NetContext; import com.zfoo.net.core.udp.UdpClient; import com.zfoo.net.packet.udp.UdpHelloRequest; import com.zfoo.net.router.attachment.UdpAttachment; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/core/udp/server/UdpServerTest.java b/net/src/test/java/com/zfoo/net/core/udp/server/UdpServerTest.java index f3f55039..df9e3871 100644 --- a/net/src/test/java/com/zfoo/net/core/udp/server/UdpServerTest.java +++ b/net/src/test/java/com/zfoo/net/core/udp/server/UdpServerTest.java @@ -13,7 +13,7 @@ package com.zfoo.net.core.udp.server; import com.zfoo.net.core.udp.UdpServer; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/core/websocket/client/WebsocketClientTest.java b/net/src/test/java/com/zfoo/net/core/websocket/client/WebsocketClientTest.java index ebbfc489..1a6a44e6 100644 --- a/net/src/test/java/com/zfoo/net/core/websocket/client/WebsocketClientTest.java +++ b/net/src/test/java/com/zfoo/net/core/websocket/client/WebsocketClientTest.java @@ -16,7 +16,7 @@ package com.zfoo.net.core.websocket.client; import com.zfoo.net.NetContext; import com.zfoo.net.core.websocket.WebsocketClient; import com.zfoo.net.packet.websocket.WebsocketHelloRequest; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import io.netty.handler.codec.http.websocketx.WebSocketClientProtocolConfig; import org.junit.Ignore; diff --git a/net/src/test/java/com/zfoo/net/core/websocket/server/WebsocketServerTest.java b/net/src/test/java/com/zfoo/net/core/websocket/server/WebsocketServerTest.java index 53fb79fb..2336dca4 100644 --- a/net/src/test/java/com/zfoo/net/core/websocket/server/WebsocketServerTest.java +++ b/net/src/test/java/com/zfoo/net/core/websocket/server/WebsocketServerTest.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.websocket.server; import com.zfoo.net.core.websocket.WebsocketServer; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/session/SessionUtils.java b/net/src/test/java/com/zfoo/net/session/SessionUtils.java index 64354e5c..a2f264c2 100644 --- a/net/src/test/java/com/zfoo/net/session/SessionUtils.java +++ b/net/src/test/java/com/zfoo/net/session/SessionUtils.java @@ -16,7 +16,7 @@ package com.zfoo.net.session; import com.zfoo.net.NetContext; import com.zfoo.protocol.util.FileUtils; import com.zfoo.protocol.util.StringUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import java.util.function.Consumer; diff --git a/net/src/test/java/com/zfoo/net/util/SimpleCacheTest.java b/net/src/test/java/com/zfoo/net/util/SimpleCacheTest.java index 00c9190d..cf91ea50 100644 --- a/net/src/test/java/com/zfoo/net/util/SimpleCacheTest.java +++ b/net/src/test/java/com/zfoo/net/util/SimpleCacheTest.java @@ -14,7 +14,7 @@ package com.zfoo.net.util; import com.zfoo.protocol.model.Pair; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.junit.Ignore; import org.junit.Test; diff --git a/net/src/test/java/com/zfoo/net/zookeeper/curator/cache/CuratorCacheTest.java b/net/src/test/java/com/zfoo/net/zookeeper/curator/cache/CuratorCacheTest.java index 68bbb7e5..61c98a8a 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/curator/cache/CuratorCacheTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/curator/cache/CuratorCacheTest.java @@ -1,7 +1,7 @@ package com.zfoo.net.zookeeper.curator.cache; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.cache.ChildData; diff --git a/orm/src/main/java/com/zfoo/orm/cache/EntityCaches.java b/orm/src/main/java/com/zfoo/orm/cache/EntityCaches.java index 1d6ef58b..cfaecb65 100644 --- a/orm/src/main/java/com/zfoo/orm/cache/EntityCaches.java +++ b/orm/src/main/java/com/zfoo/orm/cache/EntityCaches.java @@ -27,7 +27,7 @@ import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.util.AssertionUtils; import com.zfoo.protocol.util.StringUtils; import com.zfoo.scheduler.util.TimeUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.slf4j.Logger; diff --git a/orm/src/test/java/com/zfoo/orm/cache/EntityCachesTest.java b/orm/src/test/java/com/zfoo/orm/cache/EntityCachesTest.java index 7aaa9883..e3531e55 100644 --- a/orm/src/test/java/com/zfoo/orm/cache/EntityCachesTest.java +++ b/orm/src/test/java/com/zfoo/orm/cache/EntityCachesTest.java @@ -16,7 +16,7 @@ package com.zfoo.orm.cache; import com.mongodb.client.model.Filters; import com.zfoo.orm.OrmContext; import com.zfoo.orm.entity.UserEntity; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.bson.Document; import org.junit.Ignore; import org.junit.Test; diff --git a/orm/src/test/java/com/zfoo/orm/cache/OrmTest.java b/orm/src/test/java/com/zfoo/orm/cache/OrmTest.java index 086af7c9..2c6c23f8 100644 --- a/orm/src/test/java/com/zfoo/orm/cache/OrmTest.java +++ b/orm/src/test/java/com/zfoo/orm/cache/OrmTest.java @@ -14,7 +14,7 @@ package com.zfoo.orm.cache; import com.zfoo.orm.OrmContext; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/orm/src/test/java/com/zfoo/orm/text/IndexTextTest.java b/orm/src/test/java/com/zfoo/orm/text/IndexTextTest.java index 8d0de864..ffd36e36 100644 --- a/orm/src/test/java/com/zfoo/orm/text/IndexTextTest.java +++ b/orm/src/test/java/com/zfoo/orm/text/IndexTextTest.java @@ -16,7 +16,7 @@ package com.zfoo.orm.text; import com.mongodb.client.model.Filters; import com.zfoo.orm.OrmContext; import com.zfoo.orm.entity.UserEntity; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/orm/src/test/java/com/zfoo/orm/text/TextSearchTest.java b/orm/src/test/java/com/zfoo/orm/text/TextSearchTest.java index ca4dc15b..63d8d86c 100644 --- a/orm/src/test/java/com/zfoo/orm/text/TextSearchTest.java +++ b/orm/src/test/java/com/zfoo/orm/text/TextSearchTest.java @@ -16,7 +16,7 @@ package com.zfoo.orm.text; import com.mongodb.client.model.Filters; import com.zfoo.orm.OrmContext; import com.zfoo.orm.entity.UserEntity; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/orm/src/test/java/com/zfoo/orm/util/MongoIdUtilsTest.java b/orm/src/test/java/com/zfoo/orm/util/MongoIdUtilsTest.java index d76e7036..bdad7b41 100644 --- a/orm/src/test/java/com/zfoo/orm/util/MongoIdUtilsTest.java +++ b/orm/src/test/java/com/zfoo/orm/util/MongoIdUtilsTest.java @@ -13,7 +13,7 @@ package com.zfoo.orm.util; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/util/src/main/java/com/zfoo/util/ThreadUtils.java b/protocol/src/main/java/com/zfoo/protocol/util/ThreadUtils.java similarity index 99% rename from util/src/main/java/com/zfoo/util/ThreadUtils.java rename to protocol/src/main/java/com/zfoo/protocol/util/ThreadUtils.java index 9f39028e..7b40f8bf 100644 --- a/util/src/main/java/com/zfoo/util/ThreadUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/util/ThreadUtils.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.util; +package com.zfoo.protocol.util; import io.netty.util.concurrent.EventExecutorGroup; import org.slf4j.Logger; diff --git a/scheduler/src/main/java/com/zfoo/scheduler/SchedulerContext.java b/scheduler/src/main/java/com/zfoo/scheduler/SchedulerContext.java index 224341fe..d42c6c33 100644 --- a/scheduler/src/main/java/com/zfoo/scheduler/SchedulerContext.java +++ b/scheduler/src/main/java/com/zfoo/scheduler/SchedulerContext.java @@ -19,7 +19,7 @@ import com.zfoo.protocol.util.StringUtils; import com.zfoo.scheduler.manager.SchedulerBus; import com.zfoo.scheduler.model.anno.Scheduler; import com.zfoo.scheduler.model.vo.SchedulerDefinition; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; diff --git a/scheduler/src/main/java/com/zfoo/scheduler/manager/SchedulerBus.java b/scheduler/src/main/java/com/zfoo/scheduler/manager/SchedulerBus.java index a475c470..95a32183 100644 --- a/scheduler/src/main/java/com/zfoo/scheduler/manager/SchedulerBus.java +++ b/scheduler/src/main/java/com/zfoo/scheduler/manager/SchedulerBus.java @@ -18,7 +18,7 @@ import com.zfoo.protocol.util.StringUtils; import com.zfoo.scheduler.SchedulerContext; import com.zfoo.scheduler.model.vo.SchedulerDefinition; import com.zfoo.scheduler.util.TimeUtils; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import io.netty.util.concurrent.FastThreadLocalThread; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/scheduler/src/test/java/com/zfoo/scheduler/ApplicationTest.java b/scheduler/src/test/java/com/zfoo/scheduler/ApplicationTest.java index 2a7fdc51..bf3386cd 100644 --- a/scheduler/src/test/java/com/zfoo/scheduler/ApplicationTest.java +++ b/scheduler/src/test/java/com/zfoo/scheduler/ApplicationTest.java @@ -13,7 +13,7 @@ package com.zfoo.scheduler; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/scheduler/src/test/java/com/zfoo/scheduler/util/TimeUtilsTest.java b/scheduler/src/test/java/com/zfoo/scheduler/util/TimeUtilsTest.java index e7c02c63..041ea55b 100644 --- a/scheduler/src/test/java/com/zfoo/scheduler/util/TimeUtilsTest.java +++ b/scheduler/src/test/java/com/zfoo/scheduler/util/TimeUtilsTest.java @@ -13,7 +13,7 @@ package com.zfoo.scheduler.util; -import com.zfoo.util.ThreadUtils; +import com.zfoo.protocol.util.ThreadUtils; import org.junit.Ignore; import org.junit.Test; diff --git a/util/src/main/java/com/zfoo/util/SafeRunnable.java b/util/src/main/java/com/zfoo/util/SafeRunnable.java deleted file mode 100644 index ff90ce94..00000000 --- a/util/src/main/java/com/zfoo/util/SafeRunnable.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.zfoo.util; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * @author godotg - * @version 3.0 - */ -public class SafeRunnable implements Runnable { - - private static final Logger logger = LoggerFactory.getLogger(SafeRunnable.class); - - private Runnable runnable; - - private SafeRunnable() { - } - - public static SafeRunnable valueOf(Runnable runnable) { - var run = new SafeRunnable(); - run.runnable = runnable; - return run; - } - - @Override - public void run() { - try { - runnable.run(); - } catch (Exception e) { - logger.error("unknown exception", e); - } catch (Throwable t) { - logger.error("unknown error", t); - } - } - -}