格式化
This commit is contained in:
@@ -207,11 +207,7 @@ public abstract class ClusterAgent {
|
|||||||
}
|
}
|
||||||
int s = intervalCheckSeconds();
|
int s = intervalCheckSeconds();
|
||||||
if (s > 0) { //暂停,弥补其他依赖本进程服务的周期偏差
|
if (s > 0) { //暂停,弥补其他依赖本进程服务的周期偏差
|
||||||
try {
|
Utility.sleep(s * 1000);
|
||||||
Thread.sleep(s * 1000);
|
|
||||||
} catch (InterruptedException ex) {
|
|
||||||
//do nothing
|
|
||||||
}
|
|
||||||
logger.info(this.getClass().getSimpleName() + " wait for " + s * 1000 + "ms after deregister");
|
logger.info(this.getClass().getSimpleName() + " wait for " + s * 1000 + "ms after deregister");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ package org.redkale.convert.json;
|
|||||||
|
|
||||||
import java.math.*;
|
import java.math.*;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
import org.redkale.annotation.Nullable;
|
||||||
import org.redkale.convert.ConvertDisabled;
|
import org.redkale.convert.ConvertDisabled;
|
||||||
import org.redkale.util.*;
|
import org.redkale.util.*;
|
||||||
|
|
||||||
@@ -340,6 +341,7 @@ public class JsonArray extends ArrayList<Object> implements JsonElement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
public Boolean getBoolean(int index) {
|
public Boolean getBoolean(int index) {
|
||||||
final Object val = get(index);
|
final Object val = get(index);
|
||||||
if (val == null) {
|
if (val == null) {
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ package org.redkale.convert.json;
|
|||||||
|
|
||||||
import java.math.*;
|
import java.math.*;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
import org.redkale.annotation.Nullable;
|
||||||
import org.redkale.convert.ConvertDisabled;
|
import org.redkale.convert.ConvertDisabled;
|
||||||
import org.redkale.util.*;
|
import org.redkale.util.*;
|
||||||
|
|
||||||
@@ -365,6 +366,7 @@ public class JsonObject extends LinkedHashMap<String, Object> implements JsonEle
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
public Boolean getBoolean(String key) {
|
public Boolean getBoolean(String key) {
|
||||||
final Object val = get(key);
|
final Object val = get(key);
|
||||||
if (val == null) {
|
if (val == null) {
|
||||||
|
|||||||
@@ -163,23 +163,23 @@ public abstract class Request<C extends Context> {
|
|||||||
return this.context;
|
return this.context;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public long getCreateTime() {
|
||||||
|
return createTime;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @see #getCreateTime()
|
* @see #getCreateTime()
|
||||||
*
|
*
|
||||||
* @return long
|
* @return long
|
||||||
* @deprecated
|
* @deprecated replace by {@link #getCreateTime() }
|
||||||
*/
|
*/
|
||||||
@Deprecated(since = "2.7.0") //replace by getCreateTime()
|
@Deprecated(since = "2.7.0")
|
||||||
@ConvertDisabled
|
@ConvertDisabled
|
||||||
public long getCreatetime() {
|
public long getCreatetime() {
|
||||||
return getCreateTime();
|
return getCreateTime();
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getCreateTime() {
|
|
||||||
return createTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getTraceid() {
|
public String getTraceid() {
|
||||||
return traceid;
|
return traceid;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1574,7 +1574,7 @@ public final class Rest {
|
|||||||
urlpath = urlpath.substring(1);
|
urlpath = urlpath.substring(1);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
urlpath = (catalog.isEmpty() ? "/" : ("/" + catalog + "/")) + defmodulename + "/*";
|
urlpath = (catalog.isEmpty() ? "/" : ("/" + catalog + '/')) + defmodulename + "/*";
|
||||||
}
|
}
|
||||||
|
|
||||||
classMap.put("type", serviceType.getName());
|
classMap.put("type", serviceType.getName());
|
||||||
|
|||||||
@@ -175,7 +175,7 @@ public abstract class WebSocket<G extends Serializable, T> {
|
|||||||
*/
|
*/
|
||||||
public final CompletableFuture<Integer> send(Object message, boolean last) {
|
public final CompletableFuture<Integer> send(Object message, boolean last) {
|
||||||
if (message instanceof CompletableFuture) {
|
if (message instanceof CompletableFuture) {
|
||||||
return ((CompletableFuture) message).thenCompose((json) -> {
|
return ((CompletableFuture) message).thenCompose(json -> {
|
||||||
if (json instanceof CharSequence) {
|
if (json instanceof CharSequence) {
|
||||||
return sendPacket(new WebSocketPacket(json.toString(), last));
|
return sendPacket(new WebSocketPacket(json.toString(), last));
|
||||||
} else if (json == null || json instanceof byte[]) {
|
} else if (json == null || json instanceof byte[]) {
|
||||||
|
|||||||
@@ -359,7 +359,7 @@ public final class CacheMemorySource extends AbstractCacheSource {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> boolean setnxex(String key, int expireSeconds, Convert convert, Type type, T value) {
|
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
|
@Override
|
||||||
@@ -483,7 +483,7 @@ public final class CacheMemorySource extends AbstractCacheSource {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> void setex(String key, int expireSeconds, Convert convert, Type type, T value) {
|
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
|
@Override
|
||||||
@@ -503,7 +503,7 @@ public final class CacheMemorySource extends AbstractCacheSource {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void expire(String key, int expireSeconds) {
|
public void expire(String key, int expireSeconds) {
|
||||||
pexpire(key, expireSeconds * 1000);
|
pexpire(key, expireSeconds * 1000L);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -966,7 +966,7 @@ public final class CacheMemorySource extends AbstractCacheSource {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if (expireSeconds > 0) {
|
if (expireSeconds > 0) {
|
||||||
entry.milliSeconds(expireSeconds * 1000);
|
entry.milliSeconds(expireSeconds * 1000L);
|
||||||
}
|
}
|
||||||
final Convert c = convert == null ? this.convert : convert;
|
final Convert c = convert == null ? this.convert : convert;
|
||||||
// OBJECT, ATOMIC, DOUBLE, SSET, ZSET, LIST, MAP;
|
// OBJECT, ATOMIC, DOUBLE, SSET, ZSET, LIST, MAP;
|
||||||
|
|||||||
@@ -178,7 +178,7 @@ public interface DataSqlSource extends DataSource {
|
|||||||
@AsmDepends
|
@AsmDepends
|
||||||
default <K, V> Map<K, V> nativeQueryMap(Class<K> keyType, Class<V> valType, String sql) {
|
default <K, V> Map<K, V> nativeQueryMap(Class<K> keyType, Class<V> valType, String sql) {
|
||||||
return nativeQuery(sql, rset -> {
|
return nativeQuery(sql, rset -> {
|
||||||
Map<K, V> map = new LinkedHashMap<K, V>();
|
Map<K, V> map = new LinkedHashMap<>();
|
||||||
while (rset.next()) {
|
while (rset.next()) {
|
||||||
if (!rset.wasNull()) {
|
if (!rset.wasNull()) {
|
||||||
map.put((K) formatColumnValue(keyType, rset.getObject(1)), (V) formatColumnValue(valType, rset.getObject(2)));
|
map.put((K) formatColumnValue(keyType, rset.getObject(1)), (V) formatColumnValue(valType, rset.getObject(2)));
|
||||||
@@ -191,7 +191,7 @@ public interface DataSqlSource extends DataSource {
|
|||||||
@AsmDepends
|
@AsmDepends
|
||||||
default <K, V> CompletableFuture<Map<K, V>> nativeQueryMapAsync(Class<K> keyType, Class<V> valType, String sql) {
|
default <K, V> CompletableFuture<Map<K, V>> nativeQueryMapAsync(Class<K> keyType, Class<V> valType, String sql) {
|
||||||
return nativeQueryAsync(sql, rset -> {
|
return nativeQueryAsync(sql, rset -> {
|
||||||
Map<K, V> map = new LinkedHashMap<K, V>();
|
Map<K, V> map = new LinkedHashMap<>();
|
||||||
while (rset.next()) {
|
while (rset.next()) {
|
||||||
if (!rset.wasNull()) {
|
if (!rset.wasNull()) {
|
||||||
map.put((K) formatColumnValue(keyType, rset.getObject(1)), (V) formatColumnValue(valType, rset.getObject(2)));
|
map.put((K) formatColumnValue(keyType, rset.getObject(1)), (V) formatColumnValue(valType, rset.getObject(2)));
|
||||||
@@ -283,7 +283,7 @@ public interface DataSqlSource extends DataSource {
|
|||||||
@AsmDepends
|
@AsmDepends
|
||||||
default <K, V> Map<K, V> nativeQueryMap(Class<K> keyType, Class<V> valType, String sql, Map<String, Object> params) {
|
default <K, V> Map<K, V> nativeQueryMap(Class<K> keyType, Class<V> valType, String sql, Map<String, Object> params) {
|
||||||
return nativeQuery(sql, rset -> {
|
return nativeQuery(sql, rset -> {
|
||||||
Map<K, V> map = new LinkedHashMap<K, V>();
|
Map<K, V> map = new LinkedHashMap<>();
|
||||||
while (rset.next()) {
|
while (rset.next()) {
|
||||||
if (!rset.wasNull()) {
|
if (!rset.wasNull()) {
|
||||||
map.put((K) formatColumnValue(keyType, rset.getObject(1)), (V) formatColumnValue(valType, rset.getObject(2)));
|
map.put((K) formatColumnValue(keyType, rset.getObject(1)), (V) formatColumnValue(valType, rset.getObject(2)));
|
||||||
@@ -296,7 +296,7 @@ public interface DataSqlSource extends DataSource {
|
|||||||
@AsmDepends
|
@AsmDepends
|
||||||
default <K, V> CompletableFuture<Map<K, V>> nativeQueryMapAsync(Class<K> keyType, Class<V> valType, String sql, Map<String, Object> params) {
|
default <K, V> CompletableFuture<Map<K, V>> nativeQueryMapAsync(Class<K> keyType, Class<V> valType, String sql, Map<String, Object> params) {
|
||||||
return nativeQueryAsync(sql, rset -> {
|
return nativeQueryAsync(sql, rset -> {
|
||||||
Map<K, V> map = new LinkedHashMap<K, V>();
|
Map<K, V> map = new LinkedHashMap<>();
|
||||||
while (rset.next()) {
|
while (rset.next()) {
|
||||||
if (!rset.wasNull()) {
|
if (!rset.wasNull()) {
|
||||||
map.put((K) formatColumnValue(keyType, rset.getObject(1)), (V) formatColumnValue(valType, rset.getObject(2)));
|
map.put((K) formatColumnValue(keyType, rset.getObject(1)), (V) formatColumnValue(valType, rset.getObject(2)));
|
||||||
|
|||||||
Reference in New Issue
Block a user