nio enhancement

CHANGELOG.md

@@ -3,7 +3,16 @@
 
 -------------------------------------------------------------------------------------------------------------
 
-## 5.3.11 (2020-08-01)
+# 5.4.0 (2020-08-01)
+
+### 新特性
+* 【socket】     对NioServer和NioClient改造（pr#992@Github）
+
+### Bug修复#
+
+-------------------------------------------------------------------------------------------------------------
+
+# 5.3.11 (2020-08-01)
 
 ### 新特性
 * 【captcha】     AbstractCaptcha增加getImageBase64Data方法（pr#985@Github）
@@ -13,7 +22,7 @@
 * 【core   】     MapUtil增加getXXX的默认值重载（issue#I1PTGI@Gitee）
 * 【core   】     CalendarUtil增加parseByPatterns方法（issue#993@Github）
 
-### Bug修复
+### Bug修复#
 
 -------------------------------------------------------------------------------------------------------------
 

README.md

@@ -116,21 +116,21 @@ Hutool的存在就是为了减少代码搜索成本，避免网络上参差不
 <dependency>
     <groupId>cn.hutool</groupId>
     <artifactId>hutool-all</artifactId>
-    <version>5.3.11</version>
+    <version>5.4.0</version>
 </dependency>
 ```
 
 ### Gradle
 ```
-compile 'cn.hutool:hutool-all:5.3.11'
+compile 'cn.hutool:hutool-all:5.4.0'
 ```
 
 ### 非Maven项目
 
 点击以下任一链接，下载`hutool-all-X.X.X.jar`即可：
 
-- [Maven中央库1](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.3.11/)
-- [Maven中央库2](http://repo2.maven.org/maven2/cn/hutool/hutool-all/5.3.11/)
+- [Maven中央库1](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.4.0/)
+- [Maven中央库2](http://repo2.maven.org/maven2/cn/hutool/hutool-all/5.4.0/)
 
 > 注意
 > Hutool 5.x支持JDK8+，对Android平台没有测试，不能保证所有工具类或工具方法可用。

bin/version.txt

@@ -1 +1 @@
-5.3.11
+5.4.0

docs/js/version.js

@@ -1 +1 @@
-var version = '5.3.11'
+var version = '5.4.0'

hutool-all/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-all</artifactId>

hutool-aop/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-aop</artifactId>

hutool-bloomFilter/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-bloomFilter</artifactId>

hutool-bom/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-bom</artifactId>

hutool-cache/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-cache</artifactId>

hutool-captcha/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-captcha</artifactId>

hutool-core/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-core</artifactId>

hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java

@@ -2419,7 +2419,11 @@ public static byte[] bytes(CharSequence str, Charset charset) {
 
 	/**
 	 * 将对象转为字符串<br>
-	 * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+	 *
+	 * <pre>
+	 * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组
+	 * 2、对象数组会调用Arrays.toString方法
+	 * </pre>
 	 *
 	 * @param obj 对象
 	 * @return 字符串

hutool-cron/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-cron</artifactId>

hutool-crypto/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-crypto</artifactId>

hutool-db/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-db</artifactId>

hutool-dfa/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-dfa</artifactId>

hutool-extra/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-extra</artifactId>

hutool-http/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-http</artifactId>

hutool-json/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-json</artifactId>

hutool-log/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-log</artifactId>

hutool-poi/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-poi</artifactId>

hutool-script/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-script</artifactId>

hutool-setting/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-setting</artifactId>

hutool-socket/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.3.11-SNAPSHOT</version>
+		<version>5.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-socket</artifactId>

hutool-socket/src/main/java/cn/hutool/socket/aio/AioServer.java

@@ -1,13 +1,5 @@
 package cn.hutool.socket.aio;
 
-import java.io.Closeable;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.SocketOption;
-import java.nio.ByteBuffer;
-import java.nio.channels.AsynchronousChannelGroup;
-import java.nio.channels.AsynchronousServerSocketChannel;
-
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.thread.ThreadFactoryBuilder;
@@ -16,6 +8,14 @@
 import cn.hutool.log.LogFactory;
 import cn.hutool.socket.SocketConfig;
 
+import java.io.Closeable;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.SocketOption;
+import java.nio.ByteBuffer;
+import java.nio.channels.AsynchronousChannelGroup;
+import java.nio.channels.AsynchronousServerSocketChannel;
+
 /**
  * 基于AIO的Socket服务端实现
  *
@@ -76,11 +76,7 @@ public AioServer init(InetSocketAddress address) {
 	 * @param sync 是否阻塞
 	 */
 	public void start(boolean sync) {
-		try {
-			doStart(sync);
-		} catch (IOException e) {
-			throw new IORuntimeException(e);
-		}
+		doStart(sync);
 	}
 
 	/**
@@ -173,9 +169,8 @@ public void close() {
 	 * 开始监听
 	 *
 	 * @param sync 是否阻塞
-	 * @throws IOException IO异常
 	 */
-	private void doStart(boolean sync) throws IOException {
+	private void doStart(boolean sync) {
 		log.debug("Aio Server started, waiting for accept.");
 
 		// 接收客户端连接

hutool-socket/src/main/java/cn/hutool/socket/nio/AcceptHandler.java

@@ -0,0 +1,38 @@
+package cn.hutool.socket.nio;
+
+import cn.hutool.core.io.IORuntimeException;
+import cn.hutool.log.StaticLog;
+
+import java.io.IOException;
+import java.nio.channels.CompletionHandler;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+
+/**
+ * 接入完成回调，单例使用
+ * 
+ * @author looly
+ */
+public class AcceptHandler implements CompletionHandler<ServerSocketChannel, NioServer> {
+
+	@Override
+	public void completed(ServerSocketChannel serverSocketChannel, NioServer nioServer) {
+		SocketChannel socketChannel;
+		try {
+			// 获取连接到此服务器的客户端通道
+			socketChannel = serverSocketChannel.accept();
+			StaticLog.debug("Client [{}] accepted.", socketChannel.getRemoteAddress());
+		} catch (IOException e) {
+			throw new IORuntimeException(e);
+		}
+
+		// SocketChannel通道的可读事件注册到Selector中
+		NioUtil.registerChannel(nioServer.getSelector(), socketChannel, Operation.READ);
+	}
+
+	@Override
+	public void failed(Throwable exc, NioServer nioServer) {
+		StaticLog.error(exc);
+	}
+
+}

hutool-socket/src/main/java/cn/hutool/socket/nio/ChannelHandler.java

@@ -0,0 +1,17 @@
+package cn.hutool.socket.nio;
+
+import java.nio.channels.SocketChannel;
+
+/**
+ * NIO数据处理接口，通过实现此接口，可以从{@link SocketChannel}中读写数据
+ *
+ */
+public interface ChannelHandler {
+
+	/**
+	 * 处理NIO数据
+	 *
+	 * @param socketChannel {@link SocketChannel}
+	 */
+	void handle(SocketChannel socketChannel);
+}