diff --git a/src/main/java/org/redkale/annotation/package-info.java b/src/main/java/org/redkale/annotation/package-info.java new file mode 100644 index 000000000..97211c78a --- /dev/null +++ b/src/main/java/org/redkale/annotation/package-info.java @@ -0,0 +1,4 @@ +/** + * 提供基础注解包 + */ +package org.redkale.annotation; diff --git a/src/main/java/org/redkale/boot/watch/package-info.java b/src/main/java/org/redkale/boot/watch/package-info.java new file mode 100644 index 000000000..854fba84d --- /dev/null +++ b/src/main/java/org/redkale/boot/watch/package-info.java @@ -0,0 +1,4 @@ +/** + * 提供系统默认监控包 + */ +package org.redkale.boot.watch; diff --git a/src/main/java/org/redkale/cluster/package-info.java b/src/main/java/org/redkale/cluster/package-info.java new file mode 100644 index 000000000..bde96ddfd --- /dev/null +++ b/src/main/java/org/redkale/cluster/package-info.java @@ -0,0 +1,4 @@ +/** + * 提供注册服务与发现服务包 + */ +package org.redkale.cluster; diff --git a/src/main/java/org/redkale/mq/package-info.java b/src/main/java/org/redkale/mq/package-info.java new file mode 100644 index 000000000..8a7ad8b4f --- /dev/null +++ b/src/main/java/org/redkale/mq/package-info.java @@ -0,0 +1,4 @@ +/** + * MQ服务包 + */ +package org.redkale.mq; diff --git a/src/main/java/org/redkale/net/AsyncIOGroup.java b/src/main/java/org/redkale/net/AsyncIOGroup.java index 9b7ccf276..0f02601ba 100644 --- a/src/main/java/org/redkale/net/AsyncIOGroup.java +++ b/src/main/java/org/redkale/net/AsyncIOGroup.java @@ -61,7 +61,7 @@ public class AsyncIOGroup extends AsyncGroup { private ScheduledThreadPoolExecutor timeoutExecutor; public AsyncIOGroup(final int bufferCapacity, final int bufferPoolSize) { - this(true, null, null, bufferCapacity, bufferPoolSize); + this(true, "Redkale-AnonymousClient-IOThread-%s", null, bufferCapacity, bufferPoolSize); } public AsyncIOGroup(boolean client, String threadNameFormat, final ExecutorService workExecutor, final int bufferCapacity, final int bufferPoolSize) { diff --git a/src/main/java/org/redkale/net/Context.java b/src/main/java/org/redkale/net/Context.java index d9ce64ca8..1e95cb44a 100644 --- a/src/main/java/org/redkale/net/Context.java +++ b/src/main/java/org/redkale/net/Context.java @@ -72,14 +72,14 @@ public class Context { protected int writeTimeoutSeconds; //服务的监听地址 - protected InetSocketAddress address; + protected InetSocketAddress serverAddress; //字符集 protected Charset charset; public Context(ContextConfig config) { this(config.serverStartTime, config.logger, config.workExecutor, config.sslBuilder, config.sslContext, - config.bufferCapacity, config.maxconns, config.maxbody, config.charset, config.address, config.resourceFactory, + config.bufferCapacity, config.maxconns, config.maxbody, config.charset, config.serverAddress, config.resourceFactory, config.prepare, config.aliveTimeoutSeconds, config.readTimeoutSeconds, config.writeTimeoutSeconds); } @@ -95,7 +95,7 @@ public class Context { this.maxconns = maxconns; this.maxbody = maxbody; this.charset = StandardCharsets.UTF_8.equals(charset) ? null : charset; - this.address = address; + this.serverAddress = address; this.prepare = prepare; this.resourceFactory = resourceFactory; this.aliveTimeoutSeconds = aliveTimeoutSeconds; @@ -180,7 +180,7 @@ public class Context { } public InetSocketAddress getServerAddress() { - return address; + return serverAddress; } public long getServerStartTime() { @@ -240,7 +240,7 @@ public class Context { public DispatcherServlet prepare; //服务的监听地址 - public InetSocketAddress address; + public InetSocketAddress serverAddress; //字符集 public Charset charset; diff --git a/src/main/java/org/redkale/net/Server.java b/src/main/java/org/redkale/net/Server.java index 44c16ca77..173f7b256 100644 --- a/src/main/java/org/redkale/net/Server.java +++ b/src/main/java/org/redkale/net/Server.java @@ -322,9 +322,9 @@ public abstract class Server> transportReferences = new CopyOnWriteArrayList<>(); //连接池大小 - protected int poolmaxconns = Integer.getInteger("redkale.net.transport.pool.maxconns", Math.max(100, Utility.cpus() * 16)); //最少是wsthreads的两倍 + protected int poolMaxConns = Integer.getInteger("redkale.net.transport.pool.maxconns", Math.max(100, Utility.cpus() * 16)); //最少是wsthreads的两倍 //检查不可用地址周期, 单位:秒 - protected int checkinterval = Integer.getInteger("redkale.net.transport.check.interval", 30); + protected int checkInterval = Integer.getInteger("redkale.net.transport.check.interval", 30); //心跳周期, 单位:秒 protected int pinginterval; @@ -105,17 +105,17 @@ public class TransportFactory { public void init(AnyValue conf, ByteBuffer pingBuffer, int pongLength) { if (conf != null) { - this.poolmaxconns = conf.getIntValue(NAME_POOLMAXCONNS, this.poolmaxconns); + this.poolMaxConns = conf.getIntValue(NAME_POOLMAXCONNS, this.poolMaxConns); this.pinginterval = conf.getIntValue(NAME_PINGINTERVAL, this.pinginterval); - this.checkinterval = conf.getIntValue(NAME_CHECKINTERVAL, this.checkinterval); - if (this.poolmaxconns < 2) { - this.poolmaxconns = 2; + this.checkInterval = conf.getIntValue(NAME_CHECKINTERVAL, this.checkInterval); + if (this.poolMaxConns < 2) { + this.poolMaxConns = 2; } if (this.pinginterval < 2) { this.pinginterval = 2; } - if (this.checkinterval < 2) { - this.checkinterval = 2; + if (this.checkInterval < 2) { + this.checkInterval = 2; } } this.scheduler = new ScheduledThreadPoolExecutor(1, (Runnable r) -> { @@ -127,9 +127,9 @@ public class TransportFactory { try { checks(); } catch (Throwable t) { - logger.log(Level.SEVERE, "TransportFactory schedule(interval=" + checkinterval + "s) check error", t); + logger.log(Level.SEVERE, "TransportFactory schedule(interval=" + checkInterval + "s) check error", t); } - }, checkinterval, checkinterval, TimeUnit.SECONDS); + }, checkInterval, checkInterval, TimeUnit.SECONDS); if (this.pinginterval > 0) { if (pingBuffer != null) { diff --git a/src/main/java/org/redkale/net/client/package-info.java b/src/main/java/org/redkale/net/client/package-info.java new file mode 100644 index 000000000..a34db97c2 --- /dev/null +++ b/src/main/java/org/redkale/net/client/package-info.java @@ -0,0 +1,4 @@ +/** + * 客户端网络包 + */ +package org.redkale.net.client; diff --git a/src/main/java/org/redkale/persistence/package-info.java b/src/main/java/org/redkale/persistence/package-info.java new file mode 100644 index 000000000..b2186b152 --- /dev/null +++ b/src/main/java/org/redkale/persistence/package-info.java @@ -0,0 +1,4 @@ +/** + * 提供类似javax.persistence包中的部分注解 + */ +package org.redkale.persistence;