natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplity some code (#7179)

This commit is contained in:
strugcoder 2021-02-09 14:14:29 +08:00 committed by GitHub
parent f7c639630e
commit 6c0886661b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dubbo-common/src/main/java/org/apache/dubbo/common/utils/ArrayUtils.java
View File

@ -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;
}
/**

6
dubbo-metadata/dubbo-metadata-report-failover/src/main/java/org/apache/dubbo/metadata/store/failover/StrategyMetadataReport.java
View File

@ -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);
}
}

4
dubbo-registry/dubbo-registry-multiple/src/main/java/org/apache/dubbo/registry/multiple/MultipleRegistry.java
View File

@ -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;

4
dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyCodecAdapter.java
View File

@ -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

4
dubbo-rpc/dubbo-rpc-native-thrift/src/test/java/org/apache/dubbo/rpc/protocol/nativethrift/DemoService.java
View File

@ -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;
}

2
dubbo-rpc/dubbo-rpc-redis/src/main/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocol.java
View File

@ -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);

2
dubbo-rpc/dubbo-rpc-thrift/src/test/java/$__ClassNameTestDubboStub.java
View File

@ -35,7 +35,7 @@ public class $__ClassNameTestDubboStub {
public interface Iface {
public String echo(String arg);
String echo(String arg);
}