From 6c0886661b59541fd260ff6bcebb244d05ec289a Mon Sep 17 00:00:00 2001 From: strugcoder <74962533+strugcoder@users.noreply.github.com> Date: Tue, 9 Feb 2021 14:14:29 +0800 Subject: [PATCH] Simplity some code (#7179) --- .../main/java/org/apache/dubbo/common/utils/ArrayUtils.java | 6 ++---- .../metadata/store/failover/StrategyMetadataReport.java | 6 +++--- .../apache/dubbo/registry/multiple/MultipleRegistry.java | 4 ++-- .../remoting/transport/grizzly/GrizzlyCodecAdapter.java | 4 +--- .../apache/dubbo/rpc/protocol/nativethrift/DemoService.java | 4 ---- .../org/apache/dubbo/rpc/protocol/redis/RedisProtocol.java | 2 +- .../src/test/java/$__ClassNameTestDubboStub.java | 2 +- 7 files changed, 10 insertions(+), 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 index e648598867..33af1bc172 100644 --- 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 final class ArrayUtils { } 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 final class ArrayUtils { } } - return -1; } + return -1; } /** diff --git a/dubbo-metadata/dubbo-metadata-report-failover/src/main/java/org/apache/dubbo/metadata/store/failover/StrategyMetadataReport.java b/dubbo-metadata/dubbo-metadata-report-failover/src/main/java/org/apache/dubbo/metadata/store/failover/StrategyMetadataReport.java index 8c7156cec2..ef7636c916 100644 --- a/dubbo-metadata/dubbo-metadata-report-failover/src/main/java/org/apache/dubbo/metadata/store/failover/StrategyMetadataReport.java +++ b/dubbo-metadata/dubbo-metadata-report-failover/src/main/java/org/apache/dubbo/metadata/store/failover/StrategyMetadataReport.java @@ -60,7 +60,7 @@ public abstract class StrategyMetadataReport implements MetadataReport { * @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 @@ public abstract class StrategyMetadataReport implements MetadataReport { * @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 @@ public abstract class StrategyMetadataReport implements MetadataReport { * @return */ protected boolean isLocalDataCenter(URL url) { - return this.strategy == null ? true : this.strategy.isLocalDataCenter(url); + return this.strategy == null || this.strategy.isLocalDataCenter(url); } } \ No newline at end of file diff --git a/dubbo-registry/dubbo-registry-multiple/src/main/java/org/apache/dubbo/registry/multiple/MultipleRegistry.java b/dubbo-registry/dubbo-registry-multiple/src/main/java/org/apache/dubbo/registry/multiple/MultipleRegistry.java index 8ad2c10c94..2e4ca35879 100644 --- a/dubbo-registry/dubbo-registry-multiple/src/main/java/org/apache/dubbo/registry/multiple/MultipleRegistry.java +++ b/dubbo-registry/dubbo-registry-multiple/src/main/java/org/apache/dubbo/registry/multiple/MultipleRegistry.java @@ -118,7 +118,7 @@ public class MultipleRegistry extends AbstractRegistry { @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 class MultipleRegistry extends AbstractRegistry { return false; } - available = referenceRegistries.isEmpty() ? true : false; + available = referenceRegistries.isEmpty(); for (Registry referenceRegistry : referenceRegistries.values()) { if (referenceRegistry.isAvailable()) { available = true; diff --git a/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyCodecAdapter.java b/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyCodecAdapter.java index 39e6990c19..c720fd5693 100644 --- a/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyCodecAdapter.java +++ b/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyCodecAdapter.java @@ -128,10 +128,8 @@ public class GrizzlyCodecAdapter extends BaseFilter { } 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/dubbo-rpc/dubbo-rpc-native-thrift/src/test/java/org/apache/dubbo/rpc/protocol/nativethrift/DemoService.java b/dubbo-rpc/dubbo-rpc-native-thrift/src/test/java/org/apache/dubbo/rpc/protocol/nativethrift/DemoService.java index 97572f1c3b..7e1de88dd9 100644 --- a/dubbo-rpc/dubbo-rpc-native-thrift/src/test/java/org/apache/dubbo/rpc/protocol/nativethrift/DemoService.java +++ b/dubbo-rpc/dubbo-rpc-native-thrift/src/test/java/org/apache/dubbo/rpc/protocol/nativethrift/DemoService.java @@ -3680,8 +3680,6 @@ public class DemoService { public boolean equals(timeOut_result that) { if (that == null) return false; - if (this == that) - return true; return true; } @@ -3930,8 +3928,6 @@ public class DemoService { public boolean equals(customException_args that) { if (that == null) return false; - if (this == that) - return true; return true; } diff --git a/dubbo-rpc/dubbo-rpc-redis/src/main/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocol.java b/dubbo-rpc/dubbo-rpc-redis/src/main/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocol.java index b5081887c2..8c369bb6f4 100644 --- a/dubbo-rpc/dubbo-rpc-redis/src/main/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocol.java +++ b/dubbo-rpc/dubbo-rpc-redis/src/main/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocol.java @@ -150,7 +150,7 @@ public class RedisProtocol extends AbstractProtocol { } } 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 index c7f92d7b5e..348f151df3 100644 --- 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); }