You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ei...@apache.org on 2020/03/18 09:03:09 UTC

[incubator-dolphinscheduler] branch dev updated: Adapting partial code(file name start with N) to the sonar cloud rule (#2215)

This is an automated email from the ASF dual-hosted git repository.

eights pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 0e5fb86  Adapting partial code(file name start with N) to the sonar cloud rule (#2215)
0e5fb86 is described below

commit 0e5fb86bef1f62c64159aedd9ae1c5e361669fb0
Author: gabry.wu <wu...@qq.com>
AuthorDate: Wed Mar 18 17:02:57 2020 +0800

    Adapting partial code(file name start with N) to the sonar cloud rule (#2215)
---
 .../apache/dolphinscheduler/remote/handler/NettyClientHandler.java    | 4 ++--
 .../apache/dolphinscheduler/remote/handler/NettyServerHandler.java    | 4 ++--
 .../org/apache/dolphinscheduler/remote/utils/NamedThreadFactory.java  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyClientHandler.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyClientHandler.java
index 80e561d..76ca464 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyClientHandler.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyClientHandler.java
@@ -126,14 +126,14 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
         if (!ch.isWritable()) {
             if (logger.isWarnEnabled()) {
                 logger.warn("{} is not writable, over high water level : {}",
-                        new Object[]{ch, config.getWriteBufferHighWaterMark()});
+                        ch, config.getWriteBufferHighWaterMark());
             }
 
             config.setAutoRead(false);
         } else {
             if (logger.isWarnEnabled()) {
                 logger.warn("{} is writable, to low water : {}",
-                        new Object[]{ch, config.getWriteBufferLowWaterMark()});
+                        ch, config.getWriteBufferLowWaterMark());
             }
             config.setAutoRead(true);
         }
diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyServerHandler.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyServerHandler.java
index 22251c3..88cd2d5 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyServerHandler.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyServerHandler.java
@@ -158,14 +158,14 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
         if (!ch.isWritable()) {
             if (logger.isWarnEnabled()) {
                 logger.warn("{} is not writable, over high water level : {}",
-                        new Object[]{ch, config.getWriteBufferHighWaterMark()});
+                        ch, config.getWriteBufferHighWaterMark());
             }
 
             config.setAutoRead(false);
         } else {
             if (logger.isWarnEnabled()) {
                 logger.warn("{} is writable, to low water : {}",
-                        new Object[]{ch, config.getWriteBufferLowWaterMark()});
+                        ch, config.getWriteBufferLowWaterMark());
             }
             config.setAutoRead(true);
         }
diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/NamedThreadFactory.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/NamedThreadFactory.java
index 2f0d05e..be84f0f 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/NamedThreadFactory.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/NamedThreadFactory.java
@@ -52,8 +52,8 @@ public class NamedThreadFactory implements ThreadFactory {
      */
     @Override
     public Thread newThread(Runnable r) {
-        final String threadName = count > 0 ? String.format(name + "_%d_%d", count, increment.getAndIncrement())
-                : String.format(name + "_%d", increment.getAndIncrement());
+        final String threadName = count > 0 ? String.format("%s_%d_%d", name, count, increment.getAndIncrement())
+                : String.format("%s_%d", name, increment.getAndIncrement());
         Thread t = new Thread(r, threadName);
         t.setDaemon(true);
         return t;