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/06/25 00:59:44 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2605] Use method refer instead of lambda (#3129)
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 231a4c206 [SCB-2605] Use method refer instead of lambda (#3129)
231a4c206 is described below
commit 231a4c20659877b8bb234999798260386234b3f9
Author: TingTing Wang <19...@qq.com>
AuthorDate: Sat Jun 25 08:59:40 2022 +0800
[SCB-2605] Use method refer instead of lambda (#3129)
---
.../service/center/client/ServiceCenterDiscovery.java | 6 ++----
.../servicecomb/common/rest/AbstractRestInvocation.java | 2 +-
.../core/filter/impl/ProducerOperationFilterTest.java | 2 +-
.../metrics/publish/spectator/MeasurementGroupConfig.java | 2 +-
.../servicecomb/foundation/vertx/http/ReadStreamPart.java | 4 ++--
.../apache/servicecomb/governance/handler/RetryHandler.java | 2 +-
.../apache/servicecomb/governance/InstanceIsolationTest.java | 12 ++++++------
.../serviceregistry/client/http/WebsocketClientUtil.java | 4 +---
.../registry/cache/RefreshableServiceRegistryCache.java | 2 +-
9 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterDiscovery.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterDiscovery.java
index 6b5578e4e..c28af01f9 100644
--- a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterDiscovery.java
+++ b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterDiscovery.java
@@ -224,13 +224,11 @@ public class ServiceCenterDiscovery extends AbstractTask {
}
private synchronized void pullAllInstance() {
- instancesCache.forEach((k, v) -> {
- pullInstance(k, v);
- });
+ instancesCache.forEach(this::pullInstance);
if (failedInstances.isEmpty()) {
return;
}
- failedInstances.forEach(item -> instancesCache.remove(item));
+ failedInstances.forEach(instancesCache::remove);
failedInstances.clear();
}
diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java
index 1b638a93e..8899d0ca6 100644
--- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java
+++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java
@@ -248,7 +248,7 @@ public abstract class AbstractRestInvocation {
protected void doInvoke() throws Throwable {
invocation.onStartHandlersRequest();
- invocation.next(resp -> sendResponseQuietly(resp));
+ invocation.next(this::sendResponseQuietly);
}
public void sendFailResponse(Throwable throwable) {
diff --git a/core/src/test/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilterTest.java b/core/src/test/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilterTest.java
index 91cb0f832..58a6ea0d1 100644
--- a/core/src/test/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilterTest.java
+++ b/core/src/test/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilterTest.java
@@ -196,7 +196,7 @@ public class ProducerOperationFilterTest {
.withMessage("java.lang.IllegalArgumentException: wrong number of arguments");
InvocationException throwable = Exceptions
- .convert(invocation, catchThrowable(() -> future.get()), INTERNAL_SERVER_ERROR);
+ .convert(invocation, catchThrowable(future::get), INTERNAL_SERVER_ERROR);
assertThat(throwable).hasCauseInstanceOf(IllegalArgumentException.class);
CommonExceptionData data = (CommonExceptionData) throwable.getErrorData();
assertThat(data.getMessage()).isEqualTo("Parameters not valid or types not match.");
diff --git a/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/publish/spectator/MeasurementGroupConfig.java b/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/publish/spectator/MeasurementGroupConfig.java
index 0a025f29d..0942baf26 100644
--- a/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/publish/spectator/MeasurementGroupConfig.java
+++ b/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/publish/spectator/MeasurementGroupConfig.java
@@ -38,7 +38,7 @@ public class MeasurementGroupConfig {
Arrays
.asList(tagNameOrFinders)
.stream()
- .map(r -> TagFinder.build(r))
+ .map(TagFinder::build)
.collect(Collectors.toList()));
}
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/ReadStreamPart.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/ReadStreamPart.java
index 54a917f78..4f902697c 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/ReadStreamPart.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/ReadStreamPart.java
@@ -95,11 +95,11 @@ public class ReadStreamPart extends AbstractPart {
}
public CompletableFuture<byte[]> saveAsBytes() {
- return saveAs(buf -> buf.getBytes());
+ return saveAs(Buffer::getBytes);
}
public CompletableFuture<String> saveAsString() {
- return saveAs(buf -> buf.toString());
+ return saveAs(Buffer::toString);
}
public <T> CompletableFuture<T> saveAs(Function<Buffer, T> converter) {
diff --git a/governance/src/main/java/org/apache/servicecomb/governance/handler/RetryHandler.java b/governance/src/main/java/org/apache/servicecomb/governance/handler/RetryHandler.java
index ed79d1322..849bab243 100644
--- a/governance/src/main/java/org/apache/servicecomb/governance/handler/RetryHandler.java
+++ b/governance/src/main/java/org/apache/servicecomb/governance/handler/RetryHandler.java
@@ -65,7 +65,7 @@ public class RetryHandler extends AbstractGovernanceHandler<Retry, RetryPolicy>
RetryConfig config = RetryConfig.custom()
.maxAttempts(retryPolicy.getMaxAttempts() + 1)
.retryOnResult(response -> retryExtension.isFailedResult(retryPolicy.getRetryOnResponseStatus(), response))
- .retryOnException(e -> retryExtension.isFailedResult(e))
+ .retryOnException(retryExtension::isFailedResult)
.intervalFunction(getIntervalFunction(retryPolicy))
.failAfterMaxAttempts(retryPolicy.isFailAfterMaxAttempts())
.build();
diff --git a/governance/src/test/java/org/apache/servicecomb/governance/InstanceIsolationTest.java b/governance/src/test/java/org/apache/servicecomb/governance/InstanceIsolationTest.java
index 499cf69c1..cd8d317ec 100644
--- a/governance/src/test/java/org/apache/servicecomb/governance/InstanceIsolationTest.java
+++ b/governance/src/test/java/org/apache/servicecomb/governance/InstanceIsolationTest.java
@@ -76,14 +76,14 @@ public class InstanceIsolationTest {
// isolation from error
Assertions.assertEquals("test", ds.get());
- Assertions.assertThrows(ConnectException.class, () -> ds.get());
+ Assertions.assertThrows(ConnectException.class, ds::get);
- Assertions.assertThrows(CallNotPermittedException.class, () -> ds.get());
- Assertions.assertThrows(CallNotPermittedException.class, () -> ds.get());
+ Assertions.assertThrows(CallNotPermittedException.class, ds::get);
+ Assertions.assertThrows(CallNotPermittedException.class, ds::get);
- Assertions.assertThrows(CallNotPermittedException.class, () -> ds.get());
- Assertions.assertThrows(CallNotPermittedException.class, () -> ds.get());
- Assertions.assertThrows(CallNotPermittedException.class, () -> ds.get());
+ Assertions.assertThrows(CallNotPermittedException.class, ds::get);
+ Assertions.assertThrows(CallNotPermittedException.class, ds::get);
+ Assertions.assertThrows(CallNotPermittedException.class, ds::get);
// isolation do not influence other instances
GovernanceRequest request2 = new GovernanceRequest();
diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/WebsocketClientUtil.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/WebsocketClientUtil.java
index 2774a63b3..32bff8bec 100644
--- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/WebsocketClientUtil.java
+++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/WebsocketClientUtil.java
@@ -72,9 +72,7 @@ public final class WebsocketClientUtil {
LOGGER.error("ws close error.", err);
}
});
- asyncResult.result().closeHandler(v -> {
- onClose.handle(v);
- });
+ asyncResult.result().closeHandler(onClose::handle);
asyncResult.result().pongHandler(pong -> {
// ignore, just prevent NPE.
});
diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableServiceRegistryCache.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableServiceRegistryCache.java
index ca0c209b5..1619c7c07 100644
--- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableServiceRegistryCache.java
+++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableServiceRegistryCache.java
@@ -74,7 +74,7 @@ public class RefreshableServiceRegistryCache implements ServiceRegistryCache {
private List<MicroserviceCache> refreshInnerState() {
return microserviceCache.values().stream()
- .peek(cache -> cache.refresh())
+ .peek(RefreshableMicroserviceCache::refresh)
.filter(this::isRefreshedMicroserviceCache)
.peek(this::removeCacheIfServiceNotFound)
.collect(Collectors.toList());