diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/BitMap.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/BitMap.java index 637158203..0e8eecf4d 100644 --- a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/BitMap.java +++ b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/BitMap.java @@ -22,6 +22,7 @@ public interface BitMap{ * 检查是否包含值 * * @param i 值 + * @return 是否包含 */ boolean contains(long i); @@ -30,5 +31,5 @@ public interface BitMap{ * * @param i 值 */ - public void remove(long i); + void remove(long i); } \ No newline at end of file diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/IntMap.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/IntMap.java index 0ced56cb8..e5d310ca4 100644 --- a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/IntMap.java +++ b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/IntMap.java @@ -11,7 +11,7 @@ import java.io.Serializable; public class IntMap implements BitMap, Serializable { private static final long serialVersionUID = 1L; - private int[] ints = null; + private int[] ints; /** * 构造 @@ -40,10 +40,7 @@ public class IntMap implements BitMap, Serializable { public boolean contains(long i) { int r = (int) (i / BitMap.MACHINE32); int c = (int) (i % BitMap.MACHINE32); - if (((int) ((ints[r] >>> c)) & 1) == 1) { - return true; - } - return false; + return ((int) ((ints[r] >>> c)) & 1) == 1; } @Override diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/LongMap.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/LongMap.java index 6a90940fd..5acf5eb4a 100644 --- a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/LongMap.java +++ b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/LongMap.java @@ -11,7 +11,7 @@ import java.io.Serializable; public class LongMap implements BitMap, Serializable { private static final long serialVersionUID = 1L; - private long[] longs = null; + private long[] longs; /** * 构造 @@ -40,10 +40,7 @@ public class LongMap implements BitMap, Serializable { public boolean contains(long i) { int r = (int) (i / BitMap.MACHINE64); long c = i % BitMap.MACHINE64; - if (((longs[r] >>> c) & 1) == 1) { - return true; - } - return false; + return ((longs[r] >>> c) & 1) == 1; } @Override diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/DefaultFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/DefaultFilter.java index edb116fa0..1dc3756c0 100644 --- a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/DefaultFilter.java +++ b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/DefaultFilter.java @@ -4,20 +4,20 @@ import cn.hutool.core.util.HashUtil; /** * 默认Bloom过滤器,使用Java自带的Hash算法 - * @author loolly * + * @author loolly */ public class DefaultFilter extends AbstractFilter { private static final long serialVersionUID = 1L; - public DefaultFilter(long maxValue, int MACHINENUM) { - super(maxValue, MACHINENUM); + public DefaultFilter(long maxValue, int machineNumber) { + super(maxValue, machineNumber); } - + public DefaultFilter(long maxValue) { super(maxValue); } - + @Override public long hash(String str) { return HashUtil.javaDefaultHash(str) % size; diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/ELFFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/ELFFilter.java index e7c2a5f0c..1b8f2004f 100644 --- a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/ELFFilter.java +++ b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/ELFFilter.java @@ -5,8 +5,8 @@ import cn.hutool.core.util.HashUtil; public class ELFFilter extends AbstractFilter { private static final long serialVersionUID = 1L; - public ELFFilter(long maxValue, int MACHINENUM) { - super(maxValue, MACHINENUM); + public ELFFilter(long maxValue, int machineNumber) { + super(maxValue, machineNumber); } public ELFFilter(long maxValue) { diff --git a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioClient.java b/hutool-socket/src/main/java/cn/hutool/socket/aio/AioClient.java index 62c622deb..9d69f7d41 100644 --- a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioClient.java +++ b/hutool-socket/src/main/java/cn/hutool/socket/aio/AioClient.java @@ -64,6 +64,7 @@ public class AioClient implements Closeable{ * @param 选项泛型 * @param name {@link SocketOption} 枚举 * @param value SocketOption参数 + * @return this * @throws IOException IO异常 */ public AioClient setOption(SocketOption name, T value) throws IOException { @@ -92,7 +93,8 @@ public class AioClient implements Closeable{ /** * 写数据到服务端 - * + * + * @param data 数据 * @return this */ public AioClient write(ByteBuffer data) { diff --git a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioServer.java b/hutool-socket/src/main/java/cn/hutool/socket/aio/AioServer.java index dd7805631..bf090a4eb 100644 --- a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioServer.java +++ b/hutool-socket/src/main/java/cn/hutool/socket/aio/AioServer.java @@ -18,11 +18,10 @@ import cn.hutool.socket.SocketConfig; /** * 基于AIO的Socket服务端实现 - * - * @author looly * + * @author looly */ -public class AioServer implements Closeable{ +public class AioServer implements Closeable { private static final Log log = LogFactory.get(); private static AcceptHandler ACCEPT_HANDLER = new AcceptHandler(); @@ -30,11 +29,11 @@ public class AioServer implements Closeable{ private AsynchronousServerSocketChannel channel; protected IoAction ioAction; protected SocketConfig config; - - + + /** * 构造 - * + * * @param port 端口 */ public AioServer(int port) { @@ -43,9 +42,9 @@ public class AioServer implements Closeable{ /** * 构造 - * + * * @param address 地址 - * @param config {@link SocketConfig} 配置项 + * @param config {@link SocketConfig} 配置项 */ public AioServer(InetSocketAddress address, SocketConfig config) { this.config = config; @@ -54,7 +53,7 @@ public class AioServer implements Closeable{ /** * 初始化 - * + * * @param address 地址和端口 * @return this */ @@ -73,7 +72,7 @@ public class AioServer implements Closeable{ /** * 开始监听 - * + * * @param sync 是否阻塞 */ public void start(boolean sync) { @@ -88,9 +87,10 @@ public class AioServer implements Closeable{ * 设置 Socket 的 Option 选项
* 选项见:{@link java.net.StandardSocketOptions} * - * @param 选项泛型 - * @param name {@link SocketOption} 枚举 + * @param 选项泛型 + * @param name {@link SocketOption} 枚举 * @param value SocketOption参数 + * @return this * @throws IOException IO异常 */ public AioServer setOption(SocketOption name, T value) throws IOException { @@ -100,7 +100,7 @@ public class AioServer implements Closeable{ /** * 获取IO处理器 - * + * * @return {@link IoAction} */ public IoAction getIoAction() { @@ -109,7 +109,7 @@ public class AioServer implements Closeable{ /** * 设置IO处理器,单例存在 - * + * * @param ioAction {@link IoAction} * @return this; */ @@ -120,7 +120,7 @@ public class AioServer implements Closeable{ /** * 获取{@link AsynchronousServerSocketChannel} - * + * * @return {@link AsynchronousServerSocketChannel} */ public AsynchronousServerSocketChannel getChannel() { @@ -129,7 +129,7 @@ public class AioServer implements Closeable{ /** * 处理接入的客户端 - * + * * @return this */ public AioServer accept() { @@ -139,7 +139,7 @@ public class AioServer implements Closeable{ /** * 服务是否开启状态 - * + * * @return 服务是否开启状态 */ public boolean isOpen() { @@ -168,9 +168,10 @@ public class AioServer implements Closeable{ } // ------------------------------------------------------------------------------------- Private method start + /** * 开始监听 - * + * * @param sync 是否阻塞 * @throws IOException IO异常 */ diff --git a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioSession.java b/hutool-socket/src/main/java/cn/hutool/socket/aio/AioSession.java index 920bd65ef..94c285b49 100644 --- a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioSession.java +++ b/hutool-socket/src/main/java/cn/hutool/socket/aio/AioSession.java @@ -118,7 +118,8 @@ public class AioSession implements Closeable{ /** * 写数据到目标端,并关闭输出 - * + * + * @param data 数据 * @return this */ public AioSession writeAndClose(ByteBuffer data) { @@ -128,7 +129,8 @@ public class AioSession implements Closeable{ /** * 写数据到目标端 - * + * + * @param data 数据 * @return {@link Future} */ public Future write(ByteBuffer data) { @@ -137,7 +139,8 @@ public class AioSession implements Closeable{ /** * 写数据到目标端 - * + * + * @param data 数据 * @param handler {@link CompletionHandler} * @return this */ diff --git a/hutool-socket/src/main/java/cn/hutool/socket/nio/NioClient.java b/hutool-socket/src/main/java/cn/hutool/socket/nio/NioClient.java index a4afe4cae..d91d48c30 100644 --- a/hutool-socket/src/main/java/cn/hutool/socket/nio/NioClient.java +++ b/hutool-socket/src/main/java/cn/hutool/socket/nio/NioClient.java @@ -11,17 +11,17 @@ import cn.hutool.core.io.IoUtil; /** * NIO客户端 - * + * * @author looly * @since 4.4.5 */ -public class NioClient implements Closeable{ +public class NioClient implements Closeable { private SocketChannel channel; /** * 构造 - * + * * @param host 服务器地址 * @param port 端口 */ @@ -31,7 +31,7 @@ public class NioClient implements Closeable{ /** * 构造 - * + * * @param address 服务器地址 */ public NioClient(InetSocketAddress address) { @@ -40,7 +40,7 @@ public class NioClient implements Closeable{ /** * 初始化 - * + * * @param address 地址和端口 * @return this */ @@ -56,8 +56,9 @@ public class NioClient implements Closeable{ /** * 处理读事件
* 当收到读取准备就绪的信号后,回调此方法,用户可读取从客户端传世来的消息 - * + * * @param buffer 服务端数据存储缓存 + * @return this */ public NioClient read(ByteBuffer buffer) { try { @@ -71,8 +72,9 @@ public class NioClient implements Closeable{ /** * 实现写逻辑
* 当收到写出准备就绪的信号后,回调此方法,用户可向客户端发送消息 - * + * * @param datas 发送的数据 + * @return this */ public NioClient write(ByteBuffer... datas) { try {