Simplity some code (#7179)

apache · Feb 9, 2021 · 6c08866 · 6c08866
1 parent f7c6396
commit 6c08866
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 18 deletions.
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ArrayUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ArrayUtils.java
@@ -50,9 +50,7 @@ public static boolean contains(final String[] array, String valueToFind) {
     }
 
     public static int indexOf(String[] array, String valueToFind, int startIndex) {
-        if (isEmpty(array) || valueToFind == null) {
-            return -1;
-        } else {
+        if (!isEmpty(array) && valueToFind != null) {
             if (startIndex < 0) {
                 startIndex = 0;
             }
@@ -63,8 +61,8 @@ public static int indexOf(String[] array, String valueToFind, int startIndex) {
                 }
             }
 
-            return -1;
         }
+        return -1;
     }
 
     /**

diff --git a/...ilover/src/main/java/org/apache/dubbo/metadata/store/failover/StrategyMetadataReport.java b/...ilover/src/main/java/org/apache/dubbo/metadata/store/failover/StrategyMetadataReport.java
@@ -60,7 +60,7 @@ protected void createFailoverStrategy(URL url) {
      * @return true store metadata to the specified URL.
      */
     protected boolean shouldRegister(URL url) {
-        return this.strategy == null ? true : this.strategy.shouldRegister(url);
+        return this.strategy == null || this.strategy.shouldRegister(url);
     }
 
     /**
@@ -70,7 +70,7 @@ protected boolean shouldRegister(URL url) {
      * @return true read metadata from specified URL.
      */
     protected boolean shouldQuery(URL url) {
-        return this.strategy == null ? true : this.strategy.shouldQuery(url);
+        return this.strategy == null || this.strategy.shouldQuery(url);
     }
 
     /**
@@ -82,7 +82,7 @@ protected boolean shouldQuery(URL url) {
      * @return
      */
     protected boolean isLocalDataCenter(URL url) {
-        return this.strategy == null ? true : this.strategy.isLocalDataCenter(url);
+        return this.strategy == null || this.strategy.isLocalDataCenter(url);
     }
 
 }
diff --git a/...-registry-multiple/src/main/java/org/apache/dubbo/registry/multiple/MultipleRegistry.java b/...-registry-multiple/src/main/java/org/apache/dubbo/registry/multiple/MultipleRegistry.java
@@ -118,7 +118,7 @@ public URL getUrl() {
 
     @Override
     public boolean isAvailable() {
-        boolean available = serviceRegistries.isEmpty() ? true : false;
+        boolean available = serviceRegistries.isEmpty();
         for (Registry serviceRegistry : serviceRegistries.values()) {
             if (serviceRegistry.isAvailable()) {
                 available = true;
@@ -128,7 +128,7 @@ public boolean isAvailable() {
             return false;
         }
 
-        available = referenceRegistries.isEmpty() ? true : false;
+        available = referenceRegistries.isEmpty();
         for (Registry referenceRegistry : referenceRegistries.values()) {
             if (referenceRegistry.isAvailable()) {
                 available = true;

diff --git a/...rizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyCodecAdapter.java b/...rizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyCodecAdapter.java
@@ -128,10 +128,8 @@ public NextAction handleRead(FilterChainContext context) throws IOException {
                         }
                         if (msg != null) {
                             context.setMessage(msg);
-                            return context.getInvokeAction();
-                        } else {
-                            return context.getInvokeAction();
                         }
+                        return context.getInvokeAction();
                     }
                 } while (frame.readable());
             } else { // Other events are passed down directly

diff --git a/...c-native-thrift/src/test/java/org/apache/dubbo/rpc/protocol/nativethrift/DemoService.java b/...c-native-thrift/src/test/java/org/apache/dubbo/rpc/protocol/nativethrift/DemoService.java
diff --git a/...-rpc/dubbo-rpc-redis/src/main/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocol.java b/...-rpc/dubbo-rpc-redis/src/main/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocol.java
@@ -150,7 +150,7 @@ protected Result doInvoke(Invocation invocation) throws Throwable {
                         }
                     } catch (Throwable t) {
                         RpcException re = new RpcException("Failed to invoke redis service method. interface: " + type.getName() + ", method: " + invocation.getMethodName() + ", url: " + url + ", cause: " + t.getMessage(), t);
-                        if (t instanceof TimeoutException || t instanceof SocketTimeoutException) {
+                        if (t instanceof SocketTimeoutException) {
                             re.setCode(RpcException.TIMEOUT_EXCEPTION);
                         } else if (t instanceof JedisConnectionException || t instanceof IOException) {
                             re.setCode(RpcException.NETWORK_EXCEPTION);

diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/$__ClassNameTestDubboStub.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/$__ClassNameTestDubboStub.java
@@ -35,7 +35,7 @@ public class $__ClassNameTestDubboStub {
 
     public interface Iface {
 
-        public String echo(String arg);
+        String echo(String arg);
 
     }