lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

格式化

Browse Source
This commit is contained in:
redkale
2024-01-24 20:23:40 +08:00
parent 99a217cef6
commit 84e4a24ff5
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/redkale/cluster/spi/ClusterAgent.java
View File

@@ -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");
}
}

2
src/main/java/org/redkale/convert/json/JsonArray.java
View File

@@ -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<Object> implements JsonElement {
}
}
@Nullable
public Boolean getBoolean(int index) {
final Object val = get(index);
if (val == null) {

2
src/main/java/org/redkale/convert/json/JsonObject.java
View File

@@ -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<String, Object> implements JsonEle
}
}
@Nullable
public Boolean getBoolean(String key) {
final Object val = get(key);
if (val == null) {

12
src/main/java/org/redkale/net/Request.java
View File

@@ -163,23 +163,23 @@ public abstract class Request<C extends Context> {
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;
}

2
src/main/java/org/redkale/net/http/Rest.java
View File

@@ -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());

2
src/main/java/org/redkale/net/http/WebSocket.java
View File

@@ -175,7 +175,7 @@ public abstract class WebSocket<G extends Serializable, T> {
*/
public final CompletableFuture<Integer> 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[]) {

8
src/main/java/org/redkale/source/CacheMemorySource.java
View File

@@ -359,7 +359,7 @@ public final class CacheMemorySource extends AbstractCacheSource {
@Override
public <T> 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 <T> 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;

8
src/main/java/org/redkale/source/DataSqlSource.java
View File

@@ -178,7 +178,7 @@ public interface DataSqlSource extends DataSource {
@AsmDepends
default <K, V> Map<K, V> nativeQueryMap(Class<K> keyType, Class<V> valType, String sql) {
return nativeQuery(sql, rset -> {
Map<K, V> map = new LinkedHashMap<K, V>();
Map<K, V> 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 <K, V> CompletableFuture<Map<K, V>> nativeQueryMapAsync(Class<K> keyType, Class<V> valType, String sql) {
return nativeQueryAsync(sql, rset -> {
Map<K, V> map = new LinkedHashMap<K, V>();
Map<K, V> 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 <K, V> Map<K, V> nativeQueryMap(Class<K> keyType, Class<V> valType, String sql, Map<String, Object> params) {
return nativeQuery(sql, rset -> {
Map<K, V> map = new LinkedHashMap<K, V>();
Map<K, V> 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 <K, V> CompletableFuture<Map<K, V>> nativeQueryMapAsync(Class<K> keyType, Class<V> valType, String sql, Map<String, Object> params) {
return nativeQueryAsync(sql, rset -> {
Map<K, V> map = new LinkedHashMap<K, V>();
Map<K, V> map = new LinkedHashMap<>();
while (rset.next()) {
if (!rset.wasNull()) {
map.put((K) formatColumnValue(keyType, rset.getObject(1)), (V) formatColumnValue(valType, rset.getObject(2)));