diff --git a/monitor/pom.xml b/monitor/pom.xml index 241a1a7a..8415b22e 100644 --- a/monitor/pom.xml +++ b/monitor/pom.xml @@ -57,7 +57,7 @@ com.zfoo - util + net ${zfoo.version} diff --git a/monitor/src/main/java/com/zfoo/monitor/Monitor.java b/monitor/src/main/java/com/zfoo/monitor/Monitor.java index 008e499a..b3f19f4d 100644 --- a/monitor/src/main/java/com/zfoo/monitor/Monitor.java +++ b/monitor/src/main/java/com/zfoo/monitor/Monitor.java @@ -13,11 +13,11 @@ package com.zfoo.monitor; import com.zfoo.monitor.util.OSUtils; +import com.zfoo.net.util.NetUtils; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.util.FileUtils; import com.zfoo.protocol.util.StringUtils; import com.zfoo.scheduler.util.TimeUtils; -import com.zfoo.util.net.NetUtils; import java.util.ArrayList; import java.util.List; diff --git a/monitor/src/main/java/com/zfoo/monitor/util/OSUtils.java b/monitor/src/main/java/com/zfoo/monitor/util/OSUtils.java index 3c9f05f0..aa459021 100644 --- a/monitor/src/main/java/com/zfoo/monitor/util/OSUtils.java +++ b/monitor/src/main/java/com/zfoo/monitor/util/OSUtils.java @@ -14,10 +14,10 @@ package com.zfoo.monitor.util; import com.zfoo.monitor.*; +import com.zfoo.net.util.NetUtils; import com.zfoo.protocol.util.IOUtils; import com.zfoo.protocol.util.StringUtils; import com.zfoo.scheduler.util.TimeUtils; -import com.zfoo.util.net.NetUtils; import com.zfoo.util.security.IdUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/net/src/main/java/com/zfoo/net/config/model/ProviderConfig.java b/net/src/main/java/com/zfoo/net/config/model/ProviderConfig.java index f4ad9c14..2479a6b7 100644 --- a/net/src/main/java/com/zfoo/net/config/model/ProviderConfig.java +++ b/net/src/main/java/com/zfoo/net/config/model/ProviderConfig.java @@ -13,9 +13,9 @@ package com.zfoo.net.config.model; +import com.zfoo.net.core.HostAndPort; +import com.zfoo.net.util.NetUtils; import com.zfoo.protocol.util.StringUtils; -import com.zfoo.util.net.HostAndPort; -import com.zfoo.util.net.NetUtils; import java.util.List; import java.util.Objects; 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 7d68dee6..2424a6b0 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 @@ -16,6 +16,7 @@ package com.zfoo.net.consumer.registry; import com.zfoo.event.manager.EventBus; import com.zfoo.net.NetContext; import com.zfoo.net.consumer.event.ConsumerStartEvent; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.core.tcp.TcpClient; import com.zfoo.net.core.tcp.TcpServer; import com.zfoo.net.session.Session; @@ -24,13 +25,8 @@ import com.zfoo.protocol.collection.ArrayUtils; import com.zfoo.protocol.collection.concurrent.ConcurrentArrayList; import com.zfoo.protocol.collection.concurrent.ConcurrentHashSet; import com.zfoo.protocol.exception.ExceptionUtils; -import com.zfoo.protocol.util.AssertionUtils; -import com.zfoo.protocol.util.IOUtils; -import com.zfoo.protocol.util.JsonUtils; -import com.zfoo.protocol.util.StringUtils; +import com.zfoo.protocol.util.*; import com.zfoo.scheduler.manager.SchedulerBus; -import com.zfoo.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import io.netty.util.concurrent.FastThreadLocalThread; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; 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 61be05aa..a6e168ba 100644 --- a/net/src/main/java/com/zfoo/net/core/AbstractClient.java +++ b/net/src/main/java/com/zfoo/net/core/AbstractClient.java @@ -19,7 +19,6 @@ import com.zfoo.net.session.Session; import com.zfoo.protocol.exception.ExceptionUtils; import com.zfoo.protocol.util.IOUtils; import com.zfoo.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; import io.netty.channel.epoll.Epoll; 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 a044b5d8..10cbd0ed 100644 --- a/net/src/main/java/com/zfoo/net/core/AbstractServer.java +++ b/net/src/main/java/com/zfoo/net/core/AbstractServer.java @@ -15,7 +15,6 @@ package com.zfoo.net.core; import com.zfoo.protocol.util.IOUtils; import com.zfoo.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.*; import io.netty.channel.epoll.Epoll; diff --git a/util/src/main/java/com/zfoo/util/net/HostAndPort.java b/net/src/main/java/com/zfoo/net/core/HostAndPort.java similarity index 99% rename from util/src/main/java/com/zfoo/util/net/HostAndPort.java rename to net/src/main/java/com/zfoo/net/core/HostAndPort.java index 1a3cff27..c7e43c63 100644 --- a/util/src/main/java/com/zfoo/util/net/HostAndPort.java +++ b/net/src/main/java/com/zfoo/net/core/HostAndPort.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.net; +package com.zfoo.net.core; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.util.StringUtils; diff --git a/net/src/main/java/com/zfoo/net/core/gateway/GatewayServer.java b/net/src/main/java/com/zfoo/net/core/gateway/GatewayServer.java index 8ce51103..9d15c93b 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/GatewayServer.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/GatewayServer.java @@ -14,12 +14,12 @@ package com.zfoo.net.core.gateway; import com.zfoo.net.core.AbstractServer; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.GatewayRouteHandler; import com.zfoo.net.handler.codec.tcp.TcpCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; import com.zfoo.net.session.Session; import com.zfoo.protocol.IPacket; -import com.zfoo.util.net.HostAndPort; import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; import org.springframework.lang.Nullable; diff --git a/net/src/main/java/com/zfoo/net/core/gateway/WebsocketGatewayServer.java b/net/src/main/java/com/zfoo/net/core/gateway/WebsocketGatewayServer.java index 21dab091..e36d1720 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/WebsocketGatewayServer.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/WebsocketGatewayServer.java @@ -14,13 +14,13 @@ package com.zfoo.net.core.gateway; import com.zfoo.net.core.AbstractServer; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.GatewayRouteHandler; import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; import com.zfoo.net.session.Session; import com.zfoo.protocol.IPacket; import com.zfoo.protocol.util.IOUtils; -import com.zfoo.util.net.HostAndPort; import io.netty.channel.socket.SocketChannel; import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpServerCodec; diff --git a/net/src/main/java/com/zfoo/net/core/gateway/WebsocketSslGatewayServer.java b/net/src/main/java/com/zfoo/net/core/gateway/WebsocketSslGatewayServer.java index 4f76cbb0..89f8c456 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/WebsocketSslGatewayServer.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/WebsocketSslGatewayServer.java @@ -14,13 +14,13 @@ package com.zfoo.net.core.gateway; import com.zfoo.net.core.AbstractServer; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.GatewayRouteHandler; import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; import com.zfoo.net.session.Session; import com.zfoo.protocol.IPacket; import com.zfoo.protocol.util.IOUtils; -import com.zfoo.util.net.HostAndPort; import io.netty.channel.socket.SocketChannel; import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpServerCodec; diff --git a/net/src/main/java/com/zfoo/net/core/http/HttpServer.java b/net/src/main/java/com/zfoo/net/core/http/HttpServer.java index 8df15faa..ca89000a 100644 --- a/net/src/main/java/com/zfoo/net/core/http/HttpServer.java +++ b/net/src/main/java/com/zfoo/net/core/http/HttpServer.java @@ -14,11 +14,11 @@ package com.zfoo.net.core.http; import com.zfoo.net.core.AbstractServer; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.ServerRouteHandler; import com.zfoo.net.handler.codec.http.HttpCodecHandler; import com.zfoo.net.packet.DecodedPacketInfo; import com.zfoo.protocol.util.IOUtils; -import com.zfoo.util.net.HostAndPort; import io.netty.channel.socket.SocketChannel; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpObjectAggregator; diff --git a/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufGatewayServer.java b/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufGatewayServer.java index e28e80f7..1ec931ea 100644 --- a/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufGatewayServer.java +++ b/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufGatewayServer.java @@ -14,12 +14,12 @@ package com.zfoo.net.core.jprotobuf; import com.zfoo.net.core.AbstractServer; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.GatewayRouteHandler; import com.zfoo.net.handler.codec.jprotobuf.JProtobufTcpCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; import com.zfoo.net.session.Session; import com.zfoo.protocol.IPacket; -import com.zfoo.util.net.HostAndPort; import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; import org.springframework.lang.Nullable; diff --git a/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufTcpClient.java b/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufTcpClient.java index 98fc2ced..7cc457b0 100644 --- a/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufTcpClient.java +++ b/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufTcpClient.java @@ -14,10 +14,10 @@ package com.zfoo.net.core.jprotobuf; import com.zfoo.net.core.AbstractClient; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.ClientRouteHandler; import com.zfoo.net.handler.codec.jprotobuf.JProtobufTcpCodecHandler; import com.zfoo.net.handler.idle.ClientIdleHandler; -import com.zfoo.util.net.HostAndPort; import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; diff --git a/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufTcpServer.java b/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufTcpServer.java index 697a498c..59932ba1 100644 --- a/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufTcpServer.java +++ b/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufTcpServer.java @@ -14,10 +14,10 @@ package com.zfoo.net.core.jprotobuf; import com.zfoo.net.core.AbstractServer; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.ServerRouteHandler; import com.zfoo.net.handler.codec.jprotobuf.JProtobufTcpCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; -import com.zfoo.util.net.HostAndPort; import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; diff --git a/net/src/main/java/com/zfoo/net/core/json/JsonWebsocketClient.java b/net/src/main/java/com/zfoo/net/core/json/JsonWebsocketClient.java index 41dab18a..bd1439c3 100644 --- a/net/src/main/java/com/zfoo/net/core/json/JsonWebsocketClient.java +++ b/net/src/main/java/com/zfoo/net/core/json/JsonWebsocketClient.java @@ -14,10 +14,10 @@ package com.zfoo.net.core.json; import com.zfoo.net.core.AbstractClient; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.ClientRouteHandler; import com.zfoo.net.handler.codec.json.JsonWebSocketCodecHandler; import com.zfoo.protocol.util.IOUtils; -import com.zfoo.util.net.HostAndPort; import io.netty.channel.socket.SocketChannel; import io.netty.handler.codec.http.HttpClientCodec; import io.netty.handler.codec.http.HttpObjectAggregator; diff --git a/net/src/main/java/com/zfoo/net/core/json/JsonWebsocketServer.java b/net/src/main/java/com/zfoo/net/core/json/JsonWebsocketServer.java index abdaf309..5e881331 100644 --- a/net/src/main/java/com/zfoo/net/core/json/JsonWebsocketServer.java +++ b/net/src/main/java/com/zfoo/net/core/json/JsonWebsocketServer.java @@ -14,10 +14,10 @@ package com.zfoo.net.core.json; import com.zfoo.net.core.AbstractServer; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.ServerRouteHandler; import com.zfoo.net.handler.codec.json.JsonWebSocketCodecHandler; import com.zfoo.protocol.util.IOUtils; -import com.zfoo.util.net.HostAndPort; import io.netty.channel.socket.SocketChannel; import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpServerCodec; diff --git a/net/src/main/java/com/zfoo/net/core/tcp/TcpClient.java b/net/src/main/java/com/zfoo/net/core/tcp/TcpClient.java index 37dca9b5..c1996f37 100644 --- a/net/src/main/java/com/zfoo/net/core/tcp/TcpClient.java +++ b/net/src/main/java/com/zfoo/net/core/tcp/TcpClient.java @@ -14,10 +14,10 @@ package com.zfoo.net.core.tcp; import com.zfoo.net.core.AbstractClient; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.ClientRouteHandler; import com.zfoo.net.handler.codec.tcp.TcpCodecHandler; import com.zfoo.net.handler.idle.ClientIdleHandler; -import com.zfoo.util.net.HostAndPort; import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; diff --git a/net/src/main/java/com/zfoo/net/core/tcp/TcpServer.java b/net/src/main/java/com/zfoo/net/core/tcp/TcpServer.java index 59c1ec83..db0c31ee 100644 --- a/net/src/main/java/com/zfoo/net/core/tcp/TcpServer.java +++ b/net/src/main/java/com/zfoo/net/core/tcp/TcpServer.java @@ -14,10 +14,10 @@ package com.zfoo.net.core.tcp; import com.zfoo.net.core.AbstractServer; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.ServerRouteHandler; import com.zfoo.net.handler.codec.tcp.TcpCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; -import com.zfoo.util.net.HostAndPort; import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; diff --git a/net/src/main/java/com/zfoo/net/core/udp/UdpClient.java b/net/src/main/java/com/zfoo/net/core/udp/UdpClient.java index c81fd654..1f35362d 100644 --- a/net/src/main/java/com/zfoo/net/core/udp/UdpClient.java +++ b/net/src/main/java/com/zfoo/net/core/udp/UdpClient.java @@ -15,12 +15,12 @@ package com.zfoo.net.core.udp; import com.zfoo.net.NetContext; import com.zfoo.net.core.AbstractClient; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.BaseRouteHandler; import com.zfoo.net.handler.ClientRouteHandler; import com.zfoo.net.handler.codec.udp.UdpCodecHandler; import com.zfoo.net.session.Session; import com.zfoo.protocol.exception.ExceptionUtils; -import com.zfoo.util.net.HostAndPort; import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelOption; diff --git a/net/src/main/java/com/zfoo/net/core/udp/UdpServer.java b/net/src/main/java/com/zfoo/net/core/udp/UdpServer.java index 1774de76..bfa83d12 100644 --- a/net/src/main/java/com/zfoo/net/core/udp/UdpServer.java +++ b/net/src/main/java/com/zfoo/net/core/udp/UdpServer.java @@ -13,9 +13,9 @@ package com.zfoo.net.core.udp; import com.zfoo.net.core.AbstractServer; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.ServerRouteHandler; import com.zfoo.net.handler.codec.udp.UdpCodecHandler; -import com.zfoo.util.net.HostAndPort; import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelOption; diff --git a/net/src/main/java/com/zfoo/net/core/websocket/WebsocketClient.java b/net/src/main/java/com/zfoo/net/core/websocket/WebsocketClient.java index 076d40e1..6c8b9906 100644 --- a/net/src/main/java/com/zfoo/net/core/websocket/WebsocketClient.java +++ b/net/src/main/java/com/zfoo/net/core/websocket/WebsocketClient.java @@ -14,10 +14,10 @@ package com.zfoo.net.core.websocket; import com.zfoo.net.core.AbstractClient; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.ClientRouteHandler; import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler; import com.zfoo.protocol.util.IOUtils; -import com.zfoo.util.net.HostAndPort; import io.netty.channel.socket.SocketChannel; import io.netty.handler.codec.http.HttpClientCodec; import io.netty.handler.codec.http.HttpObjectAggregator; diff --git a/net/src/main/java/com/zfoo/net/core/websocket/WebsocketServer.java b/net/src/main/java/com/zfoo/net/core/websocket/WebsocketServer.java index cf5ee231..8b8f1204 100644 --- a/net/src/main/java/com/zfoo/net/core/websocket/WebsocketServer.java +++ b/net/src/main/java/com/zfoo/net/core/websocket/WebsocketServer.java @@ -14,10 +14,10 @@ package com.zfoo.net.core.websocket; import com.zfoo.net.core.AbstractServer; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.ServerRouteHandler; import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler; import com.zfoo.protocol.util.IOUtils; -import com.zfoo.util.net.HostAndPort; import io.netty.channel.socket.SocketChannel; import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpServerCodec; diff --git a/net/src/main/java/com/zfoo/net/core/websocket/WebsocketSslClient.java b/net/src/main/java/com/zfoo/net/core/websocket/WebsocketSslClient.java index 4083664d..d8364621 100644 --- a/net/src/main/java/com/zfoo/net/core/websocket/WebsocketSslClient.java +++ b/net/src/main/java/com/zfoo/net/core/websocket/WebsocketSslClient.java @@ -14,31 +14,22 @@ package com.zfoo.net.core.websocket; import com.zfoo.net.core.AbstractClient; -import com.zfoo.net.core.AbstractServer; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.ClientRouteHandler; import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler; import com.zfoo.net.handler.idle.ClientIdleHandler; import com.zfoo.protocol.util.IOUtils; -import com.zfoo.util.net.HostAndPort; import io.netty.channel.socket.SocketChannel; -import io.netty.handler.codec.http.DefaultHttpHeaders; import io.netty.handler.codec.http.HttpClientCodec; import io.netty.handler.codec.http.HttpObjectAggregator; -import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakerFactory; import io.netty.handler.codec.http.websocketx.WebSocketClientProtocolConfig; import io.netty.handler.codec.http.websocketx.WebSocketClientProtocolHandler; -import io.netty.handler.codec.http.websocketx.WebSocketVersion; -import io.netty.handler.ssl.SslContext; -import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.SslHandler; import io.netty.handler.stream.ChunkedWriteHandler; import io.netty.handler.timeout.IdleStateHandler; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; -import javax.net.ssl.SSLException; -import java.io.InputStream; -import java.net.URI; import java.net.URISyntaxException; import java.security.NoSuchAlgorithmException; diff --git a/net/src/main/java/com/zfoo/net/core/websocket/WebsocketSslServer.java b/net/src/main/java/com/zfoo/net/core/websocket/WebsocketSslServer.java index b07ad3db..9261b57d 100644 --- a/net/src/main/java/com/zfoo/net/core/websocket/WebsocketSslServer.java +++ b/net/src/main/java/com/zfoo/net/core/websocket/WebsocketSslServer.java @@ -14,12 +14,11 @@ package com.zfoo.net.core.websocket; import com.zfoo.net.core.AbstractServer; -import com.zfoo.net.handler.GatewayRouteHandler; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.ServerRouteHandler; import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; import com.zfoo.protocol.util.IOUtils; -import com.zfoo.util.net.HostAndPort; import io.netty.channel.socket.SocketChannel; import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpServerCodec; diff --git a/util/src/main/java/com/zfoo/util/net/NetUtils.java b/net/src/main/java/com/zfoo/net/util/NetUtils.java similarity index 99% rename from util/src/main/java/com/zfoo/util/net/NetUtils.java rename to net/src/main/java/com/zfoo/net/util/NetUtils.java index 695a9032..115029d5 100644 --- a/util/src/main/java/com/zfoo/util/net/NetUtils.java +++ b/net/src/main/java/com/zfoo/net/util/NetUtils.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.net; +package com.zfoo.net.util; import com.zfoo.protocol.collection.ArrayUtils; import com.zfoo.protocol.util.AssertionUtils; diff --git a/net/src/test/java/com/zfoo/net/config/RegistryTest.java b/net/src/test/java/com/zfoo/net/config/RegistryTest.java index 1fd58f9f..c20c2c69 100644 --- a/net/src/test/java/com/zfoo/net/config/RegistryTest.java +++ b/net/src/test/java/com/zfoo/net/config/RegistryTest.java @@ -18,8 +18,8 @@ import com.zfoo.net.config.model.ConsumerModule; import com.zfoo.net.config.model.ProviderConfig; import com.zfoo.net.config.model.ProviderModule; import com.zfoo.net.consumer.registry.RegisterVO; +import com.zfoo.net.core.HostAndPort; import com.zfoo.protocol.registration.ProtocolModule; -import com.zfoo.util.net.HostAndPort; import io.netty.util.NetUtil; import org.junit.Assert; 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 66cd2576..febb1687 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 @@ -13,10 +13,10 @@ package com.zfoo.net.core.csharp; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.core.tcp.TcpServer; import com.zfoo.net.session.SessionUtils; import com.zfoo.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; 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 841c90da..6cc11acb 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 @@ -14,13 +14,13 @@ package com.zfoo.net.core.gateway; import com.zfoo.net.NetContext; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.core.tcp.TcpClient; 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.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; 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 de7a4904..0acdc5cf 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 @@ -13,13 +13,13 @@ package com.zfoo.net.core.http; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.packet.DecodedPacketInfo; 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.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import org.junit.Ignore; 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 d8735d2e..149ba49b 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 @@ -14,10 +14,10 @@ package com.zfoo.net.core.jprotobuf.client; import com.zfoo.net.NetContext; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.core.jprotobuf.JProtobufTcpClient; import com.zfoo.net.packet.jprotobuf.JProtobufHelloRequest; import com.zfoo.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; 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 7df933b9..3b3e0f27 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 @@ -13,9 +13,9 @@ package com.zfoo.net.core.jprotobuf.server; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.core.jprotobuf.JProtobufTcpServer; import com.zfoo.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; 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 ceabd6c0..4a7d6656 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 @@ -14,10 +14,10 @@ package com.zfoo.net.core.json.client; import com.zfoo.net.NetContext; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.core.json.JsonWebsocketClient; import com.zfoo.net.packet.json.JsonHelloRequest; import com.zfoo.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import io.netty.handler.codec.http.websocketx.WebSocketClientProtocolConfig; import org.junit.Ignore; import org.junit.Test; 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 1ac3fa72..d764c918 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 @@ -13,9 +13,9 @@ package com.zfoo.net.core.json.server; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.core.json.JsonWebsocketServer; import com.zfoo.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; 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 68ece6c6..6ca6ffdb 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 @@ -14,10 +14,10 @@ package com.zfoo.net.core.tcp.client; import com.zfoo.net.NetContext; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.core.tcp.TcpClient; import com.zfoo.net.packet.tcp.TcpHelloRequest; import com.zfoo.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; 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 d90c73c9..7c4b7dcb 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 @@ -13,9 +13,9 @@ package com.zfoo.net.core.tcp.server; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.core.tcp.TcpServer; import com.zfoo.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; 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 59b3b72e..38e2b97e 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 @@ -13,12 +13,12 @@ package com.zfoo.net.core.tcpAsync.client; import com.zfoo.net.NetContext; +import com.zfoo.net.core.HostAndPort; 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.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; 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 a69cd974..e386908f 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 @@ -14,12 +14,12 @@ package com.zfoo.net.core.tcpAsync.client; import com.zfoo.net.NetContext; +import com.zfoo.net.core.HostAndPort; 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.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; 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 a7feac23..62ba96d2 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 @@ -13,9 +13,9 @@ package com.zfoo.net.core.tcpAsync.server; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.core.tcp.TcpServer; import com.zfoo.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; 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 ca039e48..b9db2afb 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 @@ -13,12 +13,12 @@ package com.zfoo.net.core.tcpSync.client; import com.zfoo.net.NetContext; +import com.zfoo.net.core.HostAndPort; 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.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; 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 4ad66086..89f71f61 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 @@ -14,12 +14,12 @@ package com.zfoo.net.core.tcpSync.client; import com.zfoo.net.NetContext; +import com.zfoo.net.core.HostAndPort; 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.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; 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 8ec9c5b6..de794d01 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 @@ -13,9 +13,9 @@ package com.zfoo.net.core.tcpSync.server; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.core.tcp.TcpServer; import com.zfoo.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; 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 182f279a..a18fef3b 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 @@ -13,11 +13,11 @@ package com.zfoo.net.core.udp.client; import com.zfoo.net.NetContext; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.core.udp.UdpClient; import com.zfoo.net.packet.udp.UdpHelloRequest; import com.zfoo.net.router.attachment.UdpAttachment; import com.zfoo.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; 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 df9e3871..07dcc3c9 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 @@ -12,9 +12,9 @@ package com.zfoo.net.core.udp.server; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.core.udp.UdpServer; import com.zfoo.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; 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 1a6a44e6..235e428a 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 @@ -14,10 +14,10 @@ package com.zfoo.net.core.websocket.client; import com.zfoo.net.NetContext; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.core.websocket.WebsocketClient; import com.zfoo.net.packet.websocket.WebsocketHelloRequest; import com.zfoo.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import io.netty.handler.codec.http.websocketx.WebSocketClientProtocolConfig; import org.junit.Ignore; import org.junit.Test; 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 2336dca4..a37ffdcc 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 @@ -13,9 +13,9 @@ package com.zfoo.net.core.websocket.server; +import com.zfoo.net.core.HostAndPort; import com.zfoo.net.core.websocket.WebsocketServer; import com.zfoo.protocol.util.ThreadUtils; -import com.zfoo.util.net.HostAndPort; import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/util/src/test/java/com/zfoo/util/NetUtilsTest.java b/net/src/test/java/com/zfoo/net/util/NetUtilsTest.java similarity index 97% rename from util/src/test/java/com/zfoo/util/NetUtilsTest.java rename to net/src/test/java/com/zfoo/net/util/NetUtilsTest.java index a331d38f..58b4f7cd 100644 --- a/util/src/test/java/com/zfoo/util/NetUtilsTest.java +++ b/net/src/test/java/com/zfoo/net/util/NetUtilsTest.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,9 +10,8 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.util; +package com.zfoo.net.util; -import com.zfoo.util.net.NetUtils; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java b/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java index d328d250..1e40d91b 100644 --- a/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java +++ b/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java @@ -35,8 +35,6 @@ import com.zfoo.protocol.collection.ArrayUtils; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.exception.RunException; import com.zfoo.protocol.util.*; -import com.zfoo.protocol.util.RandomUtils; -import com.zfoo.util.net.HostAndPort; import org.bson.Document; import org.bson.codecs.configuration.CodecRegistries; import org.bson.codecs.configuration.CodecRegistry; @@ -107,9 +105,14 @@ public class OrmManager implements IOrmManager { // 设置数据库地址 var hostConfig = ormConfig.getHost(); if (CollectionUtils.isNotEmpty(hostConfig.getAddress())) { - var hostList = HostAndPort.toHostAndPortList(hostConfig.getAddress().values()) + var hostList = hostConfig.getAddress().values() .stream() - .map(it -> new ServerAddress(it.getHost(), it.getPort())) + .map(it -> it.split(StringUtils.COMMA_REGEX)) + .flatMap(it -> Arrays.stream(it)) + .map(it -> StringUtils.trim(it)) + .filter(it -> StringUtils.isNotBlank(it)) + .map(it -> it.split(StringUtils.COLON_REGEX)) + .map(it -> new ServerAddress(it[0], Integer.parseInt(it[1]))) .collect(Collectors.toList()); mongoBuilder.applyToClusterSettings(builder -> builder.hosts(hostList)); }