From 84e4a24ff5903b4f62d5753545efb81324c9736c Mon Sep 17 00:00:00 2001 From: redkale Date: Wed, 24 Jan 2024 20:23:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/redkale/cluster/spi/ClusterAgent.java | 6 +----- .../java/org/redkale/convert/json/JsonArray.java | 2 ++ .../java/org/redkale/convert/json/JsonObject.java | 2 ++ src/main/java/org/redkale/net/Request.java | 12 ++++++------ src/main/java/org/redkale/net/http/Rest.java | 2 +- src/main/java/org/redkale/net/http/WebSocket.java | 2 +- .../java/org/redkale/source/CacheMemorySource.java | 8 ++++---- src/main/java/org/redkale/source/DataSqlSource.java | 8 ++++---- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/redkale/cluster/spi/ClusterAgent.java b/src/main/java/org/redkale/cluster/spi/ClusterAgent.java index 18f3c5168..5c7c25837 100644 --- a/src/main/java/org/redkale/cluster/spi/ClusterAgent.java +++ b/src/main/java/org/redkale/cluster/spi/ClusterAgent.java @@ -207,11 +207,7 @@ public abstract class ClusterAgent { } int s = intervalCheckSeconds(); if (s > 0) { //暂停，弥补其他依赖本进程服务的周期偏差 - try { - Thread.sleep(s * 1000); - } catch (InterruptedException ex) { - //do nothing - } + Utility.sleep(s * 1000); logger.info(this.getClass().getSimpleName() + " wait for " + s * 1000 + "ms after deregister"); } } diff --git a/src/main/java/org/redkale/convert/json/JsonArray.java b/src/main/java/org/redkale/convert/json/JsonArray.java index c546646d7..dbfe283b7 100644 --- a/src/main/java/org/redkale/convert/json/JsonArray.java +++ b/src/main/java/org/redkale/convert/json/JsonArray.java @@ -5,6 +5,7 @@ package org.redkale.convert.json; import java.math.*; import java.util.*; +import org.redkale.annotation.Nullable; import org.redkale.convert.ConvertDisabled; import org.redkale.util.*; @@ -340,6 +341,7 @@ public class JsonArray extends ArrayList implements JsonElement { } } + @Nullable public Boolean getBoolean(int index) { final Object val = get(index); if (val == null) { diff --git a/src/main/java/org/redkale/convert/json/JsonObject.java b/src/main/java/org/redkale/convert/json/JsonObject.java index a7318551d..4af39b3cb 100644 --- a/src/main/java/org/redkale/convert/json/JsonObject.java +++ b/src/main/java/org/redkale/convert/json/JsonObject.java @@ -5,6 +5,7 @@ package org.redkale.convert.json; import java.math.*; import java.util.*; +import org.redkale.annotation.Nullable; import org.redkale.convert.ConvertDisabled; import org.redkale.util.*; @@ -365,6 +366,7 @@ public class JsonObject extends LinkedHashMap implements JsonEle } } + @Nullable public Boolean getBoolean(String key) { final Object val = get(key); if (val == null) { diff --git a/src/main/java/org/redkale/net/Request.java b/src/main/java/org/redkale/net/Request.java index ec6a46836..49925debf 100644 --- a/src/main/java/org/redkale/net/Request.java +++ b/src/main/java/org/redkale/net/Request.java @@ -163,23 +163,23 @@ public abstract class Request { return this.context; } + public long getCreateTime() { + return createTime; + } + /** * * @see #getCreateTime() * * @return long - * @deprecated + * @deprecated replace by {@link #getCreateTime() } */ - @Deprecated(since = "2.7.0") //replace by getCreateTime() + @Deprecated(since = "2.7.0") @ConvertDisabled public long getCreatetime() { return getCreateTime(); } - public long getCreateTime() { - return createTime; - } - public String getTraceid() { return traceid; } diff --git a/src/main/java/org/redkale/net/http/Rest.java b/src/main/java/org/redkale/net/http/Rest.java index 4ba3e1359..daf81381e 100644 --- a/src/main/java/org/redkale/net/http/Rest.java +++ b/src/main/java/org/redkale/net/http/Rest.java @@ -1574,7 +1574,7 @@ public final class Rest { urlpath = urlpath.substring(1); } } else { - urlpath = (catalog.isEmpty() ? "/" : ("/" + catalog + "/")) + defmodulename + "/*"; + urlpath = (catalog.isEmpty() ? "/" : ("/" + catalog + '/')) + defmodulename + "/*"; } classMap.put("type", serviceType.getName()); diff --git a/src/main/java/org/redkale/net/http/WebSocket.java b/src/main/java/org/redkale/net/http/WebSocket.java index 9fffaca51..bf9a85d48 100644 --- a/src/main/java/org/redkale/net/http/WebSocket.java +++ b/src/main/java/org/redkale/net/http/WebSocket.java @@ -175,7 +175,7 @@ public abstract class WebSocket { */ public final CompletableFuture send(Object message, boolean last) { if (message instanceof CompletableFuture) { - return ((CompletableFuture) message).thenCompose((json) -> { + return ((CompletableFuture) message).thenCompose(json -> { if (json instanceof CharSequence) { return sendPacket(new WebSocketPacket(json.toString(), last)); } else if (json == null || json instanceof byte[]) { diff --git a/src/main/java/org/redkale/source/CacheMemorySource.java b/src/main/java/org/redkale/source/CacheMemorySource.java index 3ffb3b8d4..bd3988f21 100644 --- a/src/main/java/org/redkale/source/CacheMemorySource.java +++ b/src/main/java/org/redkale/source/CacheMemorySource.java @@ -359,7 +359,7 @@ public final class CacheMemorySource extends AbstractCacheSource { @Override public boolean setnxex(String key, int expireSeconds, Convert convert, Type type, T value) { - return setnxpx(key, expireSeconds * 1000, convert, type, value); + return setnxpx(key, expireSeconds * 1000L, convert, type, value); } @Override @@ -483,7 +483,7 @@ public final class CacheMemorySource extends AbstractCacheSource { @Override public void setex(String key, int expireSeconds, Convert convert, Type type, T value) { - set0(key, expireSeconds * 1000, convert, type, value); + set0(key, expireSeconds * 1000L, convert, type, value); } @Override @@ -503,7 +503,7 @@ public final class CacheMemorySource extends AbstractCacheSource { @Override public void expire(String key, int expireSeconds) { - pexpire(key, expireSeconds * 1000); + pexpire(key, expireSeconds * 1000L); } @Override @@ -966,7 +966,7 @@ public final class CacheMemorySource extends AbstractCacheSource { return null; } if (expireSeconds > 0) { - entry.milliSeconds(expireSeconds * 1000); + entry.milliSeconds(expireSeconds * 1000L); } final Convert c = convert == null ? this.convert : convert; // OBJECT, ATOMIC, DOUBLE, SSET, ZSET, LIST, MAP; diff --git a/src/main/java/org/redkale/source/DataSqlSource.java b/src/main/java/org/redkale/source/DataSqlSource.java index 5c8e237ba..fd79c735b 100644 --- a/src/main/java/org/redkale/source/DataSqlSource.java +++ b/src/main/java/org/redkale/source/DataSqlSource.java @@ -178,7 +178,7 @@ public interface DataSqlSource extends DataSource { @AsmDepends default Map nativeQueryMap(Class keyType, Class valType, String sql) { return nativeQuery(sql, rset -> { - Map map = new LinkedHashMap(); + Map map = new LinkedHashMap<>(); while (rset.next()) { if (!rset.wasNull()) { map.put((K) formatColumnValue(keyType, rset.getObject(1)), (V) formatColumnValue(valType, rset.getObject(2))); @@ -191,7 +191,7 @@ public interface DataSqlSource extends DataSource { @AsmDepends default CompletableFuture> nativeQueryMapAsync(Class keyType, Class valType, String sql) { return nativeQueryAsync(sql, rset -> { - Map map = new LinkedHashMap(); + Map map = new LinkedHashMap<>(); while (rset.next()) { if (!rset.wasNull()) { map.put((K) formatColumnValue(keyType, rset.getObject(1)), (V) formatColumnValue(valType, rset.getObject(2))); @@ -283,7 +283,7 @@ public interface DataSqlSource extends DataSource { @AsmDepends default Map nativeQueryMap(Class keyType, Class valType, String sql, Map params) { return nativeQuery(sql, rset -> { - Map map = new LinkedHashMap(); + Map map = new LinkedHashMap<>(); while (rset.next()) { if (!rset.wasNull()) { map.put((K) formatColumnValue(keyType, rset.getObject(1)), (V) formatColumnValue(valType, rset.getObject(2))); @@ -296,7 +296,7 @@ public interface DataSqlSource extends DataSource { @AsmDepends default CompletableFuture> nativeQueryMapAsync(Class keyType, Class valType, String sql, Map params) { return nativeQueryAsync(sql, rset -> { - Map map = new LinkedHashMap(); + Map map = new LinkedHashMap<>(); while (rset.next()) { if (!rset.wasNull()) { map.put((K) formatColumnValue(keyType, rset.getObject(1)), (V) formatColumnValue(valType, rset.getObject(2)));