You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2022/04/11 11:51:13 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2441] delete redundant local variables (#2770)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 3bcd0d36f [SCB-2441] delete redundant local variables (#2770)
3bcd0d36f is described below
commit 3bcd0d36fb1f1a7d6a9523f5da407be1888b794b
Author: david6969xin <86...@users.noreply.github.com>
AuthorDate: Mon Apr 11 19:51:08 2022 +0800
[SCB-2441] delete redundant local variables (#2770)
---
.../servicecomb/http/client/common/AbstractAddressManager.java | 3 +--
.../core/exception/converter/TimeoutExceptionConverterTest.java | 3 +--
.../apache/servicecomb/config/kie/KieConfigurationSourceImpl.java | 3 +--
.../java/org/apache/servicecomb/foundation/ssl/KeyStoreUtil.java | 6 ++----
.../java/org/apache/servicecomb/bizkeeper/BizkeeperCommand.java | 3 +--
.../org/apache/servicecomb/bizkeeper/ConsumerBizkeeperHandler.java | 3 +--
.../org/apache/servicecomb/bizkeeper/ProviderBizkeeperHanlder.java | 3 +--
.../java/org/apache/servicecomb/bizkeeper/TestBizkeeperHandler.java | 3 +--
.../loadbalance/exception/LoadbalanceExceptionUtils.java | 3 +--
.../java/org/apache/servicecomb/darklaunch/MicroserviceCache.java | 5 +----
.../org/apache/servicecomb/registry/lightweight/StoreService.java | 3 +--
11 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/clients/http-client-common/src/main/java/org/apache/servicecomb/http/client/common/AbstractAddressManager.java b/clients/http-client-common/src/main/java/org/apache/servicecomb/http/client/common/AbstractAddressManager.java
index 61ee57698..e8e5f6792 100644
--- a/clients/http-client-common/src/main/java/org/apache/servicecomb/http/client/common/AbstractAddressManager.java
+++ b/clients/http-client-common/src/main/java/org/apache/servicecomb/http/client/common/AbstractAddressManager.java
@@ -189,9 +189,8 @@ public class AbstractAddressManager {
}
private List<String> getAvailableAddress(List<String> endpoints) {
- List<String> list = endpoints.stream().filter(uri -> !history.containsKey(uri))
+ return endpoints.stream().filter(uri -> !history.containsKey(uri))
.collect(Collectors.toList());
- return list;
}
protected String normalizeUri(String endpoint) {
diff --git a/core/src/test/java/org/apache/servicecomb/core/exception/converter/TimeoutExceptionConverterTest.java b/core/src/test/java/org/apache/servicecomb/core/exception/converter/TimeoutExceptionConverterTest.java
index 6527bd5f6..e82e4636f 100644
--- a/core/src/test/java/org/apache/servicecomb/core/exception/converter/TimeoutExceptionConverterTest.java
+++ b/core/src/test/java/org/apache/servicecomb/core/exception/converter/TimeoutExceptionConverterTest.java
@@ -33,8 +33,7 @@ class TimeoutExceptionConverterTest {
TimeoutException timeoutException = new TimeoutException(
"The timeout period of 30000ms has been exceeded while executing GET /xxx for server 1.1.1.1:8080");
- InvocationException exception = Exceptions.convert(null, timeoutException, Status.BAD_REQUEST);
- return exception;
+ return Exceptions.convert(null, timeoutException, Status.BAD_REQUEST);
}
@Test
diff --git a/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieConfigurationSourceImpl.java b/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieConfigurationSourceImpl.java
index 183bd6a43..3a1e014a9 100644
--- a/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieConfigurationSourceImpl.java
+++ b/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieConfigurationSourceImpl.java
@@ -162,9 +162,8 @@ public class KieConfigurationSourceImpl implements ConfigCenterConfigurationSour
}
private KieAddressManager configKieAddressManager() {
- KieAddressManager kieAddressManager = new KieAddressManager(
+ return new KieAddressManager(
Arrays.asList(KieConfig.INSTANCE.getServerUri().split(",")), EventManager.getEventBus());
- return kieAddressManager;
}
private void updateConfiguration(WatchedUpdateResult result) {
diff --git a/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/KeyStoreUtil.java b/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/KeyStoreUtil.java
index 525cf913e..944761b55 100644
--- a/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/KeyStoreUtil.java
+++ b/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/KeyStoreUtil.java
@@ -87,8 +87,7 @@ public final class KeyStoreUtil {
CertificateFactory cf = CertificateFactory.getInstance("X.509");
is = new FileInputStream(crlfile);
Collection c = cf.generateCRLs(is);
- CRL[] crls = (CRL[]) c.toArray(new CRL[c.size()]);
- return crls;
+ return (CRL[]) c.toArray(new CRL[c.size()]);
} catch (CertificateException e) {
throw new IllegalArgumentException("bad cert file.");
} catch (FileNotFoundException e) {
@@ -124,8 +123,7 @@ public final class KeyStoreUtil {
TrustManagerFactory tmfactory =
TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
tmfactory.init(keystore);
- TrustManager[] trustmanagers = tmfactory.getTrustManagers();
- return trustmanagers;
+ return tmfactory.getTrustManagers();
} catch (Exception e) {
throw new IllegalArgumentException("Bad trust store."
+ e.getMessage());
diff --git a/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/BizkeeperCommand.java b/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/BizkeeperCommand.java
index 8c2f2f2d5..7b7703ebd 100644
--- a/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/BizkeeperCommand.java
+++ b/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/BizkeeperCommand.java
@@ -81,7 +81,7 @@ public abstract class BizkeeperCommand extends HystrixObservableCommand<Response
@Override
protected Observable<Response> construct() {
- Observable<Response> observable = Observable.create(f -> {
+ return Observable.create(f -> {
try {
invocation.next(resp -> {
if (isFailedResponse(resp)) {
@@ -105,7 +105,6 @@ public abstract class BizkeeperCommand extends HystrixObservableCommand<Response
f.onError(e);
}
});
- return observable;
}
protected abstract boolean isFailedResponse(Response resp);
diff --git a/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/ConsumerBizkeeperHandler.java b/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/ConsumerBizkeeperHandler.java
index 28848d5be..b665cd3a9 100644
--- a/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/ConsumerBizkeeperHandler.java
+++ b/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/ConsumerBizkeeperHandler.java
@@ -40,11 +40,10 @@ public class ConsumerBizkeeperHandler extends BizkeeperHandler {
.withRequestLogEnabled(false);
setCommonProperties(invocation, setter);
- BizkeeperCommand command = new ConsumerBizkeeperCommand(groupname, invocation,
+ return new ConsumerBizkeeperCommand(groupname, invocation,
HystrixObservableCommand.Setter
.withGroupKey(CommandKey.toHystrixCommandGroupKey(groupname, invocation))
.andCommandKey(CommandKey.toHystrixCommandKey(groupname, invocation))
.andCommandPropertiesDefaults(setter));
- return command;
}
}
diff --git a/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/ProviderBizkeeperHanlder.java b/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/ProviderBizkeeperHanlder.java
index 8f688a48a..ce8ca4a30 100644
--- a/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/ProviderBizkeeperHanlder.java
+++ b/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/ProviderBizkeeperHanlder.java
@@ -40,11 +40,10 @@ public class ProviderBizkeeperHanlder extends BizkeeperHandler {
.withRequestLogEnabled(false);
setCommonProperties(invocation, setter);
- BizkeeperCommand command = new ProviderBizkeeperCommand(groupname, invocation,
+ return new ProviderBizkeeperCommand(groupname, invocation,
HystrixObservableCommand.Setter
.withGroupKey(CommandKey.toHystrixCommandGroupKey(groupname, invocation))
.andCommandKey(CommandKey.toHystrixCommandKey(groupname, invocation))
.andCommandPropertiesDefaults(setter));
- return command;
}
}
diff --git a/handlers/handler-bizkeeper/src/test/java/org/apache/servicecomb/bizkeeper/TestBizkeeperHandler.java b/handlers/handler-bizkeeper/src/test/java/org/apache/servicecomb/bizkeeper/TestBizkeeperHandler.java
index 9f96eaba1..39414d536 100644
--- a/handlers/handler-bizkeeper/src/test/java/org/apache/servicecomb/bizkeeper/TestBizkeeperHandler.java
+++ b/handlers/handler-bizkeeper/src/test/java/org/apache/servicecomb/bizkeeper/TestBizkeeperHandler.java
@@ -116,12 +116,11 @@ public class TestBizkeeperHandler extends BizkeeperHandler {
.withRequestCacheEnabled(true)
.withRequestLogEnabled(false);
- BizkeeperCommand bizkeeperCommand = new ConsumerBizkeeperCommand("groupname", invocation,
+ return new ConsumerBizkeeperCommand("groupname", invocation,
HystrixObservableCommand.Setter
.withGroupKey(CommandKey.toHystrixCommandGroupKey("groupname", invocation))
.andCommandKey(CommandKey.toHystrixCommandKey("groupname", invocation))
.andCommandPropertiesDefaults(setter));
- return bizkeeperCommand;
}
@Test
diff --git a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/exception/LoadbalanceExceptionUtils.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/exception/LoadbalanceExceptionUtils.java
index 62c2db425..3a4bde530 100644
--- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/exception/LoadbalanceExceptionUtils.java
+++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/exception/LoadbalanceExceptionUtils.java
@@ -30,7 +30,6 @@ public class LoadbalanceExceptionUtils extends ExceptionUtils {
public static CseException createLoadbalanceException(String code, Throwable cause, Object... args) {
String msg = String.format(ERROR_DESC_MGR.ensureFindValue(code), args);
- CseException exception = new CseException(code, msg, cause);
- return exception;
+ return new CseException(code, msg, cause);
}
}
diff --git a/huawei-cloud/darklaunch/src/main/java/org/apache/servicecomb/darklaunch/MicroserviceCache.java b/huawei-cloud/darklaunch/src/main/java/org/apache/servicecomb/darklaunch/MicroserviceCache.java
index cd29fde98..1addf2a45 100644
--- a/huawei-cloud/darklaunch/src/main/java/org/apache/servicecomb/darklaunch/MicroserviceCache.java
+++ b/huawei-cloud/darklaunch/src/main/java/org/apache/servicecomb/darklaunch/MicroserviceCache.java
@@ -36,9 +36,6 @@ public final class MicroserviceCache {
}
public Microservice getService(String serviceId) {
- Microservice microservice = services.computeIfAbsent(serviceId, (k) -> {
- return RegistryUtils.getMicroservice(serviceId);
- });
- return microservice;
+ return services.computeIfAbsent(serviceId, (k) -> RegistryUtils.getMicroservice(serviceId));
}
}
diff --git a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/StoreService.java b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/StoreService.java
index 212f369bb..8b992ee08 100644
--- a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/StoreService.java
+++ b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/StoreService.java
@@ -108,13 +108,12 @@ public class StoreService {
info.getMicroservice().getSchemaMap().putAll(info.getSchemasById());
MicroserviceStore microserviceStore = store
.addMicroservice(info.getMicroservice(), request.getSchemasSummary());
- InstanceStore instanceStore = doAddInstance(microserviceStore, info.getInstance());
LOGGER.info("add microservice and instance, serviceId={}, instanceId={}, endpoints={}",
request.getServiceId(),
request.getInstanceId(),
request.getEndpoints());
- return instanceStore;
+ return doAddInstance(microserviceStore, info.getInstance());
});
}