From 8cbdcca40f29da15e4b4e39104a72dab4de1d5bd Mon Sep 17 00:00:00 2001 From: redkale Date: Tue, 7 Nov 2023 11:09:52 +0800 Subject: [PATCH] =?UTF-8?q?sonar=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/redkale/asm/ClassWriter.java | 1 + src/main/java/org/redkale/asm/FieldWriter.java | 1 + src/main/java/org/redkale/asm/Label.java | 1 + .../java/org/redkale/asm/MethodWriter.java | 2 ++ .../java/org/redkale/boot/ApiDocCommand.java | 18 +++++++++--------- .../org/redkale/boot/LoggingSearchHandler.java | 2 ++ .../java/org/redkale/boot/NodeInterceptor.java | 4 ++-- .../org/redkale/cluster/CacheClusterAgent.java | 3 --- .../redkale/cluster/HttpLocalRpcClient.java | 2 +- .../org/redkale/convert/AnyValueEncoder.java | 1 + .../org/redkale/convert/ObjectDecoder.java | 2 ++ .../org/redkale/convert/ObjectEncoder.java | 2 ++ .../org/redkale/convert/bson/BsonFactory.java | 3 ++- .../org/redkale/convert/bson/BsonReader.java | 3 +++ .../org/redkale/convert/bson/BsonWriter.java | 4 ++++ .../convert/protobuf/ProtobufReader.java | 5 ++++- .../java/org/redkale/net/ProtocolCodec.java | 1 + src/main/java/org/redkale/net/Request.java | 7 +++++++ src/main/java/org/redkale/net/Response.java | 2 +- src/main/java/org/redkale/net/SSLBuilder.java | 2 ++ .../org/redkale/net/client/ClientAddress.java | 4 +--- .../redkale/net/client/ClientConnection.java | 2 +- .../java/org/redkale/net/http/HttpServlet.java | 2 ++ .../org/redkale/net/http/HttpSimpleCodec.java | 2 +- .../redkale/net/sncp/SncpClientRequest.java | 2 ++ .../org/redkale/net/sncp/SncpClientResult.java | 1 + .../org/redkale/source/CacheMemorySource.java | 1 + .../org/redkale/source/DataMemorySource.java | 1 + src/main/java/org/redkale/util/AnyValue.java | 8 ++++---- src/main/java/org/redkale/util/ByteArray.java | 1 + src/main/java/org/redkale/util/Creator.java | 1 + .../org/redkale/util/NonBlockingHashMap.java | 1 + 32 files changed, 65 insertions(+), 27 deletions(-) diff --git a/src/main/java/org/redkale/asm/ClassWriter.java b/src/main/java/org/redkale/asm/ClassWriter.java index b16fad438..c60f5e2c1 100644 --- a/src/main/java/org/redkale/asm/ClassWriter.java +++ b/src/main/java/org/redkale/asm/ClassWriter.java @@ -859,6 +859,7 @@ public class ClassWriter extends ClassVisitor { @Override public final void visitEnd() { + //do nothing } // ------------------------------------------------------------------------ diff --git a/src/main/java/org/redkale/asm/FieldWriter.java b/src/main/java/org/redkale/asm/FieldWriter.java index 85c68574d..ab63f9639 100644 --- a/src/main/java/org/redkale/asm/FieldWriter.java +++ b/src/main/java/org/redkale/asm/FieldWriter.java @@ -215,6 +215,7 @@ final class FieldWriter extends FieldVisitor { @Override public void visitEnd() { + //do nothing } // ------------------------------------------------------------------------ diff --git a/src/main/java/org/redkale/asm/Label.java b/src/main/java/org/redkale/asm/Label.java index 4c33dd2f6..57cb99188 100644 --- a/src/main/java/org/redkale/asm/Label.java +++ b/src/main/java/org/redkale/asm/Label.java @@ -287,6 +287,7 @@ public class Label { * Constructs a new label. */ public Label() { + //do nothing } // ------------------------------------------------------------------------ diff --git a/src/main/java/org/redkale/asm/MethodWriter.java b/src/main/java/org/redkale/asm/MethodWriter.java index e8fd34a19..274eaad88 100644 --- a/src/main/java/org/redkale/asm/MethodWriter.java +++ b/src/main/java/org/redkale/asm/MethodWriter.java @@ -623,6 +623,7 @@ class MethodWriter extends MethodVisitor { @Override public void visitCode() { + //do nothing } @Override @@ -1700,6 +1701,7 @@ class MethodWriter extends MethodVisitor { @Override public void visitEnd() { + //do nothing } // ------------------------------------------------------------------------ diff --git a/src/main/java/org/redkale/boot/ApiDocCommand.java b/src/main/java/org/redkale/boot/ApiDocCommand.java index 915a37463..ad08b0c06 100644 --- a/src/main/java/org/redkale/boot/ApiDocCommand.java +++ b/src/main/java/org/redkale/boot/ApiDocCommand.java @@ -386,18 +386,18 @@ public final class ApiDocCommand { if (!swaggerComponentsMap.isEmpty()) { swaggerResultMap.put("components", Utility.ofMap("schemas", swaggerComponentsMap)); } - final FileOutputStream out = new FileOutputStream(new File(app.getHome(), "openapi-doc.json")); - out.write(JsonConvert.root().convertTo(swaggerResultMap).getBytes(StandardCharsets.UTF_8)); - out.close(); + try (FileOutputStream out = new FileOutputStream(new File(app.getHome(), "openapi-doc.json"))) { + out.write(JsonConvert.root().convertTo(swaggerResultMap).getBytes(StandardCharsets.UTF_8)); + } } { Map oldapisResultMap = new LinkedHashMap<>(); oldapisResultMap.put("servers", serverList); oldapisResultMap.put("types", typesMap); final String json = JsonConvert.root().convertTo(oldapisResultMap); - final FileOutputStream out = new FileOutputStream(new File(app.getHome(), "apidoc.json")); - out.write(json.getBytes(StandardCharsets.UTF_8)); - out.close(); + try (FileOutputStream out = new FileOutputStream(new File(app.getHome(), "apidoc.json"))) { + out.write(json.getBytes(StandardCharsets.UTF_8)); + } File doctemplate = new File(app.getConfPath().toString(), "apidoc-template.html"); InputStream in = null; if (doctemplate.isFile() && doctemplate.canRead()) { @@ -406,9 +406,9 @@ public final class ApiDocCommand { if (in != null) { String content = Utility.read(in).replace("'#{content}'", json); in.close(); - FileOutputStream outhtml = new FileOutputStream(new File(app.getHome(), "apidoc.html")); - outhtml.write(content.getBytes(StandardCharsets.UTF_8)); - outhtml.close(); + try (FileOutputStream outhtml = new FileOutputStream(new File(app.getHome(), "apidoc.html"))) { + outhtml.write(content.getBytes(StandardCharsets.UTF_8)); + } } } return "apidoc success"; diff --git a/src/main/java/org/redkale/boot/LoggingSearchHandler.java b/src/main/java/org/redkale/boot/LoggingSearchHandler.java index 7573a03dd..d22a6387a 100644 --- a/src/main/java/org/redkale/boot/LoggingSearchHandler.java +++ b/src/main/java/org/redkale/boot/LoggingSearchHandler.java @@ -240,10 +240,12 @@ public class LoggingSearchHandler extends LoggingBaseHandler { @Override public void flush() { + //do nothing } @Override public void close() throws SecurityException { + //do nothing } @Entity diff --git a/src/main/java/org/redkale/boot/NodeInterceptor.java b/src/main/java/org/redkale/boot/NodeInterceptor.java index a6edf764b..f7fc34ab8 100644 --- a/src/main/java/org/redkale/boot/NodeInterceptor.java +++ b/src/main/java/org/redkale/boot/NodeInterceptor.java @@ -22,7 +22,7 @@ public class NodeInterceptor { * @param server NodeServer */ public void preStart(NodeServer server) { - + //do nothing } /** @@ -32,7 +32,7 @@ public class NodeInterceptor { * @param server NodeServer */ public void preShutdown(NodeServer server) { - + //do nothing } } diff --git a/src/main/java/org/redkale/cluster/CacheClusterAgent.java b/src/main/java/org/redkale/cluster/CacheClusterAgent.java index a88049e39..e9d1f79c4 100644 --- a/src/main/java/org/redkale/cluster/CacheClusterAgent.java +++ b/src/main/java/org/redkale/cluster/CacheClusterAgent.java @@ -352,9 +352,6 @@ public class CacheClusterAgent extends ClusterAgent implements Resourcable { public String resname; - public AddressEntry() { - } - public AddressEntry refresh() { this.time = System.currentTimeMillis(); return this; diff --git a/src/main/java/org/redkale/cluster/HttpLocalRpcClient.java b/src/main/java/org/redkale/cluster/HttpLocalRpcClient.java index 6442518b5..eec8c3b73 100644 --- a/src/main/java/org/redkale/cluster/HttpLocalRpcClient.java +++ b/src/main/java/org/redkale/cluster/HttpLocalRpcClient.java @@ -111,7 +111,7 @@ public class HttpLocalRpcClient extends HttpRpcClient { if (logger.isLoggable(Level.FINE)) { logger.log(Level.FINE, "sendMessage: request=" + request + ", not found servlet"); } - future.completeExceptionally(new RuntimeException("404 Not Found " + topic)); + future.completeExceptionally(new HttpException("404 Not Found " + topic)); return future; } HttpRequest req = new HttpMessageLocalRequest(context(), request, userid); diff --git a/src/main/java/org/redkale/convert/AnyValueEncoder.java b/src/main/java/org/redkale/convert/AnyValueEncoder.java index 728b13cbc..2330fc49b 100644 --- a/src/main/java/org/redkale/convert/AnyValueEncoder.java +++ b/src/main/java/org/redkale/convert/AnyValueEncoder.java @@ -23,6 +23,7 @@ public class AnyValueEncoder implements Encodeable implements Decodeable { //---------------------------------- 可定制方法 ---------------------------------- protected void initForEachDeMember(ConvertFactory factory, DeMember member) { + //do nothing } protected void afterInitDeMember(ConvertFactory factory) { + //do nothing } protected boolean hasNext(R in, boolean first) { diff --git a/src/main/java/org/redkale/convert/ObjectEncoder.java b/src/main/java/org/redkale/convert/ObjectEncoder.java index 8d1cd0b2e..f5456b6a6 100644 --- a/src/main/java/org/redkale/convert/ObjectEncoder.java +++ b/src/main/java/org/redkale/convert/ObjectEncoder.java @@ -313,9 +313,11 @@ public class ObjectEncoder implements Encodeable { //---------------------------------- 可定制方法 ---------------------------------- protected void initForEachEnMember(ConvertFactory factory, EnMember member) { + //do nothing } protected void afterInitEnMember(ConvertFactory factory) { + //do nothing } protected W objectWriter(W out, T value) { diff --git a/src/main/java/org/redkale/convert/bson/BsonFactory.java b/src/main/java/org/redkale/convert/bson/BsonFactory.java index d7b2ea79c..e37e937fe 100644 --- a/src/main/java/org/redkale/convert/bson/BsonFactory.java +++ b/src/main/java/org/redkale/convert/bson/BsonFactory.java @@ -230,7 +230,8 @@ public final class BsonFactory extends ConvertFactory { return skipMapDecoder; case 127: return BsonFactory.objectDecoder; + default: + return null; } - return null; } } diff --git a/src/main/java/org/redkale/convert/bson/BsonReader.java b/src/main/java/org/redkale/convert/bson/BsonReader.java index 8cbc4983c..e6000b702 100644 --- a/src/main/java/org/redkale/convert/bson/BsonReader.java +++ b/src/main/java/org/redkale/convert/bson/BsonReader.java @@ -180,6 +180,7 @@ public class BsonReader extends Reader { @Override public final void readMapE() { + //do nothing } /** @@ -205,6 +206,7 @@ public class BsonReader extends Reader { @Override public final void readArrayE() { + //do nothing } /** @@ -212,6 +214,7 @@ public class BsonReader extends Reader { */ @Override public final void readBlank() { + //do nothing } @Override diff --git a/src/main/java/org/redkale/convert/bson/BsonWriter.java b/src/main/java/org/redkale/convert/bson/BsonWriter.java index 10ab5c2e1..d490d9ab1 100644 --- a/src/main/java/org/redkale/convert/bson/BsonWriter.java +++ b/src/main/java/org/redkale/convert/bson/BsonWriter.java @@ -316,10 +316,12 @@ public class BsonWriter extends Writer implements ByteTuple { @Override public final void writeArrayMark() { + //do nothing } @Override public final void writeArrayE() { + //do nothing } @Override @@ -332,10 +334,12 @@ public class BsonWriter extends Writer implements ByteTuple { @Override public final void writeMapMark() { + //do nothing } @Override public final void writeMapE() { + //do nothing } } diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufReader.java b/src/main/java/org/redkale/convert/protobuf/ProtobufReader.java index d00f52721..ec8e3fcf8 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufReader.java +++ b/src/main/java/org/redkale/convert/protobuf/ProtobufReader.java @@ -125,7 +125,7 @@ public class ProtobufReader extends Reader { @Override public final void readObjectE(final Class clazz) { - + //do nothing } @Override @@ -135,6 +135,7 @@ public class ProtobufReader extends Reader { @Override public final void readMapE() { + //do nothing } /** @@ -168,6 +169,7 @@ public class ProtobufReader extends Reader { @Override public final void readArrayE() { + //do nothing } /** @@ -176,6 +178,7 @@ public class ProtobufReader extends Reader { */ @Override public final void readBlank() { + //do nothing } @Override diff --git a/src/main/java/org/redkale/net/ProtocolCodec.java b/src/main/java/org/redkale/net/ProtocolCodec.java index 8e787e814..57e8c561e 100644 --- a/src/main/java/org/redkale/net/ProtocolCodec.java +++ b/src/main/java/org/redkale/net/ProtocolCodec.java @@ -39,6 +39,7 @@ class ProtocolCodec implements CompletionHandler { } public void prepare() { + //do nothing } protected boolean recycle() { diff --git a/src/main/java/org/redkale/net/Request.java b/src/main/java/org/redkale/net/Request.java index b5b9fe0a8..3d356a2a8 100644 --- a/src/main/java/org/redkale/net/Request.java +++ b/src/main/java/org/redkale/net/Request.java @@ -155,6 +155,13 @@ public abstract class Request { return this.context; } + /** + * + * @see #getCreateTime() + * + * @return long + * @deprecated + */ @Deprecated(since = "2.7.0") //replace by getCreateTime() @ConvertDisabled public long getCreatetime() { diff --git a/src/main/java/org/redkale/net/Response.java b/src/main/java/org/redkale/net/Response.java index 2e4750e92..15b51e2c2 100644 --- a/src/main/java/org/redkale/net/Response.java +++ b/src/main/java/org/redkale/net/Response.java @@ -466,7 +466,7 @@ public abstract class Response> { finishBuffers(kill, buffer); } - protected void send(final ByteTuple array, final CompletionHandler handler) { + protected void send(final ByteTuple array, final CompletionHandler handler) { ByteBuffer buffer = this.writeBuffer; if (buffer != null && buffer.capacity() >= array.length()) { buffer.clear(); diff --git a/src/main/java/org/redkale/net/SSLBuilder.java b/src/main/java/org/redkale/net/SSLBuilder.java index 82f66e99d..a2558c7d5 100644 --- a/src/main/java/org/redkale/net/SSLBuilder.java +++ b/src/main/java/org/redkale/net/SSLBuilder.java @@ -92,10 +92,12 @@ public class SSLBuilder { trustManagers = new TrustManager[]{new X509TrustManager() { @Override public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException { + //do nothing } @Override public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException { + //do nothing } @Override diff --git a/src/main/java/org/redkale/net/client/ClientAddress.java b/src/main/java/org/redkale/net/client/ClientAddress.java index ee502c655..53a5b46e1 100644 --- a/src/main/java/org/redkale/net/client/ClientAddress.java +++ b/src/main/java/org/redkale/net/client/ClientAddress.java @@ -40,9 +40,7 @@ public class ClientAddress implements java.io.Serializable { if (this.weights == null) { this.weights = new ArrayList<>(); } - for (WeightAddress addr : addrs) { - this.weights.add(addr); - } + this.weights.addAll(Arrays.asList(addrs)); return this; } diff --git a/src/main/java/org/redkale/net/client/ClientConnection.java b/src/main/java/org/redkale/net/client/ClientConnection.java index bf83a4e3c..7250265a5 100644 --- a/src/main/java/org/redkale/net/client/ClientConnection.java +++ b/src/main/java/org/redkale/net/client/ClientConnection.java @@ -59,7 +59,7 @@ public abstract class ClientConnection } void postDestroy(Application application, HttpContext context, AnyValue config) { + //do nothing } //Server执行start后运行此方法 public void postStart(HttpContext context, AnyValue config) { + //do nothing } /** diff --git a/src/main/java/org/redkale/net/http/HttpSimpleCodec.java b/src/main/java/org/redkale/net/http/HttpSimpleCodec.java index a5948f6b9..bccd268bd 100644 --- a/src/main/java/org/redkale/net/http/HttpSimpleCodec.java +++ b/src/main/java/org/redkale/net/http/HttpSimpleCodec.java @@ -19,7 +19,7 @@ class HttpSimpleCodec extends ClientCodec { @Override public void decodeMessages(ByteBuffer buffer, ByteArray array) { - + //do nothing } } diff --git a/src/main/java/org/redkale/net/sncp/SncpClientRequest.java b/src/main/java/org/redkale/net/sncp/SncpClientRequest.java index 66ce0ef9a..c8f2a90da 100644 --- a/src/main/java/org/redkale/net/sncp/SncpClientRequest.java +++ b/src/main/java/org/redkale/net/sncp/SncpClientRequest.java @@ -27,6 +27,7 @@ public class SncpClientRequest extends ClientRequest { private byte[] bodyContent; public SncpClientRequest() { + //do nothing } public SncpClientRequest prepare(SncpHeader header, long seqid, String traceid, byte[] bodyContent) { @@ -40,6 +41,7 @@ public class SncpClientRequest extends ClientRequest { @Override protected void prepare() { + //do nothing } @Override diff --git a/src/main/java/org/redkale/net/sncp/SncpClientResult.java b/src/main/java/org/redkale/net/sncp/SncpClientResult.java index 459d49f7c..d8ad935cc 100644 --- a/src/main/java/org/redkale/net/sncp/SncpClientResult.java +++ b/src/main/java/org/redkale/net/sncp/SncpClientResult.java @@ -26,6 +26,7 @@ public class SncpClientResult implements ClientResult { private byte[] bodyContent; protected void prepare() { + //do nothing } protected boolean recycle() { diff --git a/src/main/java/org/redkale/source/CacheMemorySource.java b/src/main/java/org/redkale/source/CacheMemorySource.java index dfca6031e..a5d352126 100644 --- a/src/main/java/org/redkale/source/CacheMemorySource.java +++ b/src/main/java/org/redkale/source/CacheMemorySource.java @@ -84,6 +84,7 @@ public final class CacheMemorySource extends AbstractCacheSource { @Override @ResourceListener public void onResourceChange(ResourceEvent[] events) { + //do nothing } protected ExecutorService subExecutor() { diff --git a/src/main/java/org/redkale/source/DataMemorySource.java b/src/main/java/org/redkale/source/DataMemorySource.java index 28d2f31d3..ea6a30bc3 100644 --- a/src/main/java/org/redkale/source/DataMemorySource.java +++ b/src/main/java/org/redkale/source/DataMemorySource.java @@ -48,6 +48,7 @@ public class DataMemorySource extends AbstractDataSource { @Override @ResourceListener public void onResourceChange(ResourceEvent[] events) { + //do nothing } public static boolean acceptsConf(AnyValue config) { diff --git a/src/main/java/org/redkale/util/AnyValue.java b/src/main/java/org/redkale/util/AnyValue.java index 8c0476183..527b3e6bd 100644 --- a/src/main/java/org/redkale/util/AnyValue.java +++ b/src/main/java/org/redkale/util/AnyValue.java @@ -57,12 +57,12 @@ public abstract class AnyValue { * 区分name大小写的比较策略 * */ - public static final BiPredicate EQUALS = (name1, name2) -> name1.equals(name2); + public static final BiPredicate EQUALS_PREDICATE = (name1, name2) -> name1.equals(name2); /** * 不区分name大小写的比较策略 */ - public static final BiPredicate EQUALSIGNORE = (name1, name2) -> name1.equalsIgnoreCase(name2); + public static final BiPredicate EQUALS_IGNORE = (name1, name2) -> name1.equalsIgnoreCase(name2); private boolean ignoreCase; @@ -140,7 +140,7 @@ public abstract class AnyValue { */ public DefaultAnyValue(boolean ignoreCase) { this.ignoreCase = ignoreCase; - this.predicate = ignoreCase ? EQUALSIGNORE : EQUALS; + this.predicate = ignoreCase ? EQUALS_IGNORE : EQUALS_PREDICATE; } /** @@ -430,7 +430,7 @@ public abstract class AnyValue { public void setIgnoreCase(boolean ignoreCase) { this.ignoreCase = ignoreCase; if (this.predicate == null) { - this.predicate = ignoreCase ? EQUALSIGNORE : EQUALS; + this.predicate = ignoreCase ? EQUALS_IGNORE : EQUALS_PREDICATE; } } diff --git a/src/main/java/org/redkale/util/ByteArray.java b/src/main/java/org/redkale/util/ByteArray.java index 4ba8d50ea..61eb65fce 100644 --- a/src/main/java/org/redkale/util/ByteArray.java +++ b/src/main/java/org/redkale/util/ByteArray.java @@ -86,6 +86,7 @@ public final class ByteArray implements ByteTuple { @Override public void close() throws IOException { + //do nothing } }; } diff --git a/src/main/java/org/redkale/util/Creator.java b/src/main/java/org/redkale/util/Creator.java index d0c6a6488..a85c27bc9 100644 --- a/src/main/java/org/redkale/util/Creator.java +++ b/src/main/java/org/redkale/util/Creator.java @@ -545,6 +545,7 @@ public interface Creator { return new URLConnection(u) { @Override public void connect() throws IOException { + //do nothing } @Override diff --git a/src/main/java/org/redkale/util/NonBlockingHashMap.java b/src/main/java/org/redkale/util/NonBlockingHashMap.java index 256189149..d81616282 100644 --- a/src/main/java/org/redkale/util/NonBlockingHashMap.java +++ b/src/main/java/org/redkale/util/NonBlockingHashMap.java @@ -459,6 +459,7 @@ public class NonBlockingHashMap extends AbstractMap // tests hang until it gets called... by somebody ... for some reason, // any reason.... protected void rehash() { + //do nothing } /**