fix bad smell

zhanglei28 · zhanglei28 · commit 2468879f9ee9 · 2025-03-05T12:33:59.000+08:00
diff --git a/motan-benchmark/pom.xml b/motan-benchmark/pom.xml
@@ -35,6 +35,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <skip.jacoco>true</skip.jacoco>
+        <sonar.skip>true</sonar.skip>
     </properties>
 
     <dependencies>
diff --git a/motan-core/src/main/java/com/weibo/api/motan/admin/handler/FaultInjectCommandHandler.java b/motan-core/src/main/java/com/weibo/api/motan/admin/handler/FaultInjectCommandHandler.java
@@ -1,7 +1,6 @@
 package com.weibo.api.motan.admin.handler;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.weibo.api.motan.admin.AbstractAdminCommandHandler;
 import com.weibo.api.motan.common.MotanConstants;
@@ -42,7 +41,7 @@ public String[] getCommandName() {
     protected void process(String command, Map<String, String> params, Map<String, String> attachments, JSONObject result) {
         if (commands[0].equals(command)) {
             String configs = params.get("configs");
-            List<FaultInjectionFilter.FaultInjectionConfig> configList = JSONArray.parseArray(configs, FaultInjectionFilter.FaultInjectionConfig.class);
+            List<FaultInjectionFilter.FaultInjectionConfig> configList = JSON.parseArray(configs, FaultInjectionFilter.FaultInjectionConfig.class);
             if (configList == null) {
                 throw new MotanServiceException("param configs not correct");
             }
diff --git a/motan-core/src/main/java/com/weibo/api/motan/registry/support/DirectRegistry.java b/motan-core/src/main/java/com/weibo/api/motan/registry/support/DirectRegistry.java
@@ -44,7 +44,7 @@ public DirectRegistry(URL url) {
                 }
             } catch (Exception e) {
                 throw new MotanFrameworkException(
-                        String.format("parse direct url error, invalid direct registry address %s, address should be ip1:port1,ip2:port2 ..."));
+                        String.format("parse direct url error, invalid direct registry address %s, address should be ip1:port1,ip2:port2 ...", address));
             }
         } else {
             registerDirectUrl(url.getHost(), url.getPort());
diff --git a/motan-core/src/main/java/com/weibo/api/motan/registry/support/command/RpcCommandUtil.java b/motan-core/src/main/java/com/weibo/api/motan/registry/support/command/RpcCommandUtil.java
@@ -16,7 +16,7 @@
 
 package com.weibo.api.motan.registry.support.command;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSON;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.weibo.api.motan.util.LoggerUtil;
@@ -37,7 +37,7 @@ public class RpcCommandUtil {
      */
     public static RpcCommand stringToCommand(String commandString) {
         try {
-            RpcCommand rpcCommand = JSONObject.parseObject(commandString, RpcCommand.class);
+            RpcCommand rpcCommand = JSON.parseObject(commandString, RpcCommand.class);
             if (rpcCommand != null) {
                 rpcCommand.sort();
             }
@@ -58,7 +58,7 @@ public static String commandToString(RpcCommand command) {
         if (command == null) {
             return null;
         }
-        return JSONObject.toJSONString(command);
+        return JSON.toJSONString(command);
     }
 
     private static PatternEvaluator evaluator = new PatternEvaluator();
diff --git a/motan-core/src/main/java/com/weibo/api/motan/serialize/SimpleSerialization.java b/motan-core/src/main/java/com/weibo/api/motan/serialize/SimpleSerialization.java
@@ -203,8 +203,6 @@ public <T> T deserialize(byte[] bytes, Class<T> clz) throws IOException {
     private <T> T deserialize(GrowableByteBuffer buffer, Class<T> clz) throws IOException {
         byte type = buffer.get();
         switch (type) {
-            default:
-                break;
             case NULL:
                 return null;
             case STRING:
@@ -242,6 +240,7 @@ private <T> T deserialize(GrowableByteBuffer buffer, Class<T> clz) throws IOExce
                 if (clz == byte.class || clz == Byte.class || clz == Object.class) {
                     return (T) readByte(buffer);
                 }
+                break;
             case INT16:
                 if (clz == short.class || clz == Short.class || clz == Object.class) {
                     return (T) readInt16(buffer);
@@ -283,6 +282,8 @@ private <T> T deserialize(GrowableByteBuffer buffer, Class<T> clz) throws IOExce
                     return (T) readSet(buffer);
                 }
                 break;
+            default:
+                break;
         }
         throw new MotanServiceException("SimpleSerialization not support " + type + " with receiver type:" + clz);
     }
diff --git a/motan-core/src/main/java/com/weibo/api/motan/transport/async/MotanAsyncProcessor.java b/motan-core/src/main/java/com/weibo/api/motan/transport/async/MotanAsyncProcessor.java
@@ -58,18 +58,17 @@ public Set<String> getSupportedAnnotationTypes() {
 
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-        if (roundEnv.processingOver()) {
-            return true;
-        }
-        for (Element elem : roundEnv.getElementsAnnotatedWith(MotanAsync.class)) {
-            processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "MotanAsyncProcessor will process " + elem);
-            try {
-                writeAsyncClass(elem);
-                processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "MotanAsyncProcessor done for " + elem);
-            } catch (Exception e) {
-                processingEnv.getMessager().printMessage(Diagnostic.Kind.WARNING,
-                        "MotanAsyncProcessor process " + elem + " fail. exception:" + e.getMessage());
-                e.printStackTrace();
+        if (!roundEnv.processingOver()) {
+            for (Element elem : roundEnv.getElementsAnnotatedWith(MotanAsync.class)) {
+                processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "MotanAsyncProcessor will process " + elem);
+                try {
+                    writeAsyncClass(elem);
+                    processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "MotanAsyncProcessor done for " + elem);
+                } catch (Exception e) {
+                    processingEnv.getMessager().printMessage(Diagnostic.Kind.WARNING,
+                            "MotanAsyncProcessor process " + elem + " fail. exception:" + e.getMessage());
+                    e.printStackTrace();
+                }
             }
         }
         return true;
diff --git a/motan-core/src/main/java/com/weibo/api/motan/util/CollectionUtil.java b/motan-core/src/main/java/com/weibo/api/motan/util/CollectionUtil.java
@@ -28,6 +28,7 @@
  */
 
 public class CollectionUtil {
+    private static Random rnd = new Random();
 
     @SuppressWarnings("rawtypes")
     public static boolean isEmpty(Collection collection) {
@@ -40,7 +41,6 @@ public static boolean isEmpty(Map map) {
     }
 
     public static void shuffleByteArray(byte[] array) {
-        Random rnd = new Random();
         for (int i = array.length - 1; i > 0; i--) {
             int index = rnd.nextInt(i + 1);
             // swap
diff --git a/motan-core/src/main/java/com/weibo/api/motan/util/ExceptionUtil.java b/motan-core/src/main/java/com/weibo/api/motan/util/ExceptionUtil.java
@@ -16,6 +16,7 @@
 
 package com.weibo.api.motan.util;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.weibo.api.motan.exception.*;
 import org.apache.commons.lang3.StringUtils;
@@ -101,7 +102,7 @@ public static String toMessage(Exception e) {
     public static MotanAbstractException fromMessage(String msg) {
         if (StringUtils.isNotBlank(msg)) {
             try {
-                JSONObject jsonObject = JSONObject.parseObject(msg);
+                JSONObject jsonObject = JSON.parseObject(msg);
                 int type = jsonObject.getIntValue("errtype");
                 int errcode = jsonObject.getIntValue("errcode");
                 String errmsg = jsonObject.getString("errmsg");
diff --git a/motan-core/src/test/java/com/weibo/api/motan/proxy/RefererInvocationHandlerTest.java b/motan-core/src/test/java/com/weibo/api/motan/proxy/RefererInvocationHandlerTest.java
@@ -87,12 +87,14 @@ public void testLocalMehtod() throws Exception{
         //local method
         Method method = TestServiceImpl.class.getMethod("toString");
         assertTrue(handler.isLocalMethod(method));
+        String result = null;
         try {
-            String result = (String)handler.invoke(null, method, null);
-            assertEquals("{protocol:motan[motan://local:80/test?group=default_rpc, available:true]}", result);
+            result = (String)handler.invoke(null, method, null);
         } catch (Throwable e) {
-            assertTrue(false);
+            fail(e.getMessage());
         }
+        assertEquals("{protocol:motan[motan://local:80/test?group=default_rpc, available:true]}", result);
+
 
         method = TestServiceImpl.class.getMethod("hashCode");
         assertTrue(handler.isLocalMethod(method));
diff --git a/motan-demo/pom.xml b/motan-demo/pom.xml
@@ -36,6 +36,7 @@
     <properties>
         <spring-boot.version>2.3.1.RELEASE</spring-boot.version>
         <skip.jacoco>true</skip.jacoco>
+        <sonar.skip>true</sonar.skip>
     </properties>
 
     <dependencies>
diff --git a/motan-extension/filter-extension/filter-opentracing/src/main/java/com/weibo/api/motan/filter/opentracing/OpenTracingContext.java b/motan-extension/filter-extension/filter-opentracing/src/main/java/com/weibo/api/motan/filter/opentracing/OpenTracingContext.java
@@ -47,7 +47,7 @@ public static void setActiveSpan(Span span) {
         RpcContext.getContext().putAttribute(ACTIVE_SPAN, span);
     }
 
-    public void setTracerFactory(TracerFactory tracerFactory) {
+    public static void setTracerFactory(TracerFactory tracerFactory) {
         OpenTracingContext.tracerFactory = tracerFactory;
     }
 }
diff --git a/motan-springsupport/src/main/java/com/weibo/api/motan/config/springsupport/MotanBeanDefinitionParser.java b/motan-springsupport/src/main/java/com/weibo/api/motan/config/springsupport/MotanBeanDefinitionParser.java
@@ -129,7 +129,7 @@ private static BeanDefinition parse(Element element, ParserContext parserContext
                     || setter.getParameterTypes().length != 1) {
                 continue;
             }
-            String property = (name.substring(3, 4).toLowerCase() + name.substring(4)).replaceAll("_", "-");
+            String property = (name.substring(3, 4).toLowerCase() + name.substring(4)).replace("_", "-");
             props.add(property);
             if ("id".equals(property)) {
                 bd.getPropertyValues().addPropertyValue("id", id);
diff --git a/motan-transport-netty4/src/main/java/com/weibo/api/motan/transport/netty4/http/Netty4HttpServer.java b/motan-transport-netty4/src/main/java/com/weibo/api/motan/transport/netty4/http/Netty4HttpServer.java
@@ -44,7 +44,6 @@
  */
 public class Netty4HttpServer extends AbstractServer implements StatisticCallback {
     private HttpMessageHandler httpMessageHandler;
-    private URL url;
     private Channel channel;
     private EventLoopGroup bossGroup;
     private EventLoopGroup workerGroup;

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public DirectRegistry(URL url) {`
`44`	`44`	`}`
`45`	`45`	`} catch (Exception e) {`
`46`	`46`	`throw new MotanFrameworkException(`
`47`		`- String.format("parse direct url error, invalid direct registry address %s, address should be ip1:port1,ip2:port2 ..."));`
	`47`	`+ String.format("parse direct url error, invalid direct registry address %s, address should be ip1:port1,ip2:port2 ...", address));`
`48`	`48`	`}`
`49`	`49`	`} else {`
`50`	`50`	`registerDirectUrl(url.getHost(), url.getPort());`
Original file line number	Diff line number	Diff line change
`@@ -203,8 +203,6 @@ public <T> T deserialize(byte[] bytes, Class<T> clz) throws IOException {`
`203`	`203`	`private <T> T deserialize(GrowableByteBuffer buffer, Class<T> clz) throws IOException {`
`204`	`204`	`byte type = buffer.get();`
`205`	`205`	`switch (type) {`
`206`		`- default:`
`207`		`- break;`
`208`	`206`	`case NULL:`
`209`	`207`	`return null;`
`210`	`208`	`case STRING:`
`@@ -242,6 +240,7 @@ private <T> T deserialize(GrowableByteBuffer buffer, Class<T> clz) throws IOExce`
`242`	`240`	`if (clz == byte.class \|\| clz == Byte.class \|\| clz == Object.class) {`
`243`	`241`	`return (T) readByte(buffer);`
`244`	`242`	`}`
	`243`	`+ break;`
`245`	`244`	`case INT16:`
`246`	`245`	`if (clz == short.class \|\| clz == Short.class \|\| clz == Object.class) {`
`247`	`246`	`return (T) readInt16(buffer);`
`@@ -283,6 +282,8 @@ private <T> T deserialize(GrowableByteBuffer buffer, Class<T> clz) throws IOExce`
`283`	`282`	`return (T) readSet(buffer);`
`284`	`283`	`}`
`285`	`284`	`break;`
	`285`	`+ default:`
	`286`	`+ break;`
`286`	`287`	`}`
`287`	`288`	`throw new MotanServiceException("SimpleSerialization not support " + type + " with receiver type:" + clz);`
`288`	`289`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public static void setActiveSpan(Span span) {`
`47`	`47`	`RpcContext.getContext().putAttribute(ACTIVE_SPAN, span);`
`48`	`48`	`}`
`49`	`49`
`50`		`- public void setTracerFactory(TracerFactory tracerFactory) {`
	`50`	`+ public static void setTracerFactory(TracerFactory tracerFactory) {`
`51`	`51`	`OpenTracingContext.tracerFactory = tracerFactory;`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ private static BeanDefinition parse(Element element, ParserContext parserContext`
`129`	`129`	`\|\| setter.getParameterTypes().length != 1) {`
`130`	`130`	`continue;`
`131`	`131`	`}`
`132`		`- String property = (name.substring(3, 4).toLowerCase() + name.substring(4)).replaceAll("_", "-");`
	`132`	`+ String property = (name.substring(3, 4).toLowerCase() + name.substring(4)).replace("_", "-");`
`133`	`133`	`props.add(property);`
`134`	`134`	`if ("id".equals(property)) {`
`135`	`135`	`bd.getPropertyValues().addPropertyValue("id", id);`