From 8147bb0b46ea30fe4b07c050d6d3c3ceb42e3a61 Mon Sep 17 00:00:00 2001 From: Qiang Zhao Date: Sun, 8 Sep 2024 01:13:51 +0800 Subject: [PATCH] fix spotless and license --- .../oxia/client/AsyncOxiaClientImpl.java | 8 +- .../oxia/client/ClientConfig.java | 4 +- .../oxia/client/OxiaClientBuilderImpl.java | 1 - .../oxia/client/grpc/OxiaBackoffProvider.java | 37 ++++++--- .../oxia/client/grpc/OxiaStubManager.java | 4 +- .../oxia/client/lock/LockManagerImpl.java | 4 +- .../oxia/client/util/Backoff.java | 10 +-- .../oxia/client/batch/BatchTest.java | 3 +- .../oxia/client/grpc/OxiaStubTest.java | 76 ++++++++++--------- 9 files changed, 81 insertions(+), 66 deletions(-) diff --git a/client/src/main/java/io/streamnative/oxia/client/AsyncOxiaClientImpl.java b/client/src/main/java/io/streamnative/oxia/client/AsyncOxiaClientImpl.java index 2c9a1795..f4ddc57f 100644 --- a/client/src/main/java/io/streamnative/oxia/client/AsyncOxiaClientImpl.java +++ b/client/src/main/java/io/streamnative/oxia/client/AsyncOxiaClientImpl.java @@ -73,10 +73,12 @@ class AsyncOxiaClientImpl implements AsyncOxiaClient { static @NonNull CompletableFuture newInstance(@NonNull ClientConfig config) { ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(new DefaultThreadFactory("oxia-client")); - final var oxiaBackoffProvider = OxiaBackoffProvider - .create(config.connectionBackoffMinDelay(), config.connectionBackoffMaxDelay()); + final var oxiaBackoffProvider = + OxiaBackoffProvider.create( + config.connectionBackoffMinDelay(), config.connectionBackoffMaxDelay()); var stubManager = - new OxiaStubManager(config.namespace(), config.authentication(), config.enableTls(), oxiaBackoffProvider); + new OxiaStubManager( + config.namespace(), config.authentication(), config.enableTls(), oxiaBackoffProvider); var instrumentProvider = new InstrumentProvider(config.openTelemetry(), config.namespace()); var serviceAddrStub = stubManager.getStub(config.serviceAddress()); diff --git a/client/src/main/java/io/streamnative/oxia/client/ClientConfig.java b/client/src/main/java/io/streamnative/oxia/client/ClientConfig.java index 5a22237d..7c709a14 100644 --- a/client/src/main/java/io/streamnative/oxia/client/ClientConfig.java +++ b/client/src/main/java/io/streamnative/oxia/client/ClientConfig.java @@ -19,7 +19,6 @@ import io.streamnative.oxia.client.api.Authentication; import java.time.Duration; import javax.annotation.Nullable; - import lombok.NonNull; public record ClientConfig( @@ -35,5 +34,4 @@ public record ClientConfig( @Nullable Authentication authentication, boolean enableTls, @NonNull Duration connectionBackoffMinDelay, - @NonNull Duration connectionBackoffMaxDelay -) {} + @NonNull Duration connectionBackoffMaxDelay) {} diff --git a/client/src/main/java/io/streamnative/oxia/client/OxiaClientBuilderImpl.java b/client/src/main/java/io/streamnative/oxia/client/OxiaClientBuilderImpl.java index 2aef8523..7b111be2 100644 --- a/client/src/main/java/io/streamnative/oxia/client/OxiaClientBuilderImpl.java +++ b/client/src/main/java/io/streamnative/oxia/client/OxiaClientBuilderImpl.java @@ -70,7 +70,6 @@ public class OxiaClientBuilderImpl implements OxiaClientBuilder { @NonNull protected Duration connectionBackoffMinDelay = Duration.ofMillis(100); @NonNull protected Duration connectionBackoffMaxDelay = Duration.ofSeconds(30); - @Override public @NonNull OxiaClientBuilder requestTimeout(@NonNull Duration requestTimeout) { if (requestTimeout.isNegative() || requestTimeout.equals(ZERO)) { diff --git a/client/src/main/java/io/streamnative/oxia/client/grpc/OxiaBackoffProvider.java b/client/src/main/java/io/streamnative/oxia/client/grpc/OxiaBackoffProvider.java index 2b648741..86798cc8 100644 --- a/client/src/main/java/io/streamnative/oxia/client/grpc/OxiaBackoffProvider.java +++ b/client/src/main/java/io/streamnative/oxia/client/grpc/OxiaBackoffProvider.java @@ -1,26 +1,41 @@ +/* + * Copyright © 2022-2024 StreamNative Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package io.streamnative.oxia.client.grpc; import io.grpc.internal.BackoffPolicy; import io.streamnative.oxia.client.util.Backoff; - -import javax.annotation.concurrent.ThreadSafe; import java.time.Duration; import java.util.concurrent.TimeUnit; +import javax.annotation.concurrent.ThreadSafe; @ThreadSafe public final class OxiaBackoffProvider implements BackoffPolicy.Provider { - public static final BackoffPolicy.Provider DEFAULT = new OxiaBackoffProvider(Backoff.DEFAULT_INITIAL_DELAY_MILLIS, - TimeUnit.MILLISECONDS, Backoff.DEFAULT_MAX_DELAY_SECONDS, - TimeUnit.MILLISECONDS); + public static final BackoffPolicy.Provider DEFAULT = + new OxiaBackoffProvider( + Backoff.DEFAULT_INITIAL_DELAY_MILLIS, + TimeUnit.MILLISECONDS, + Backoff.DEFAULT_MAX_DELAY_SECONDS, + TimeUnit.MILLISECONDS); private final long initialDelay; private final TimeUnit unitInitialDelay; private final long maxDelay; private final TimeUnit unitMaxDelay; - OxiaBackoffProvider(long initialDelay, - TimeUnit unitInitialDelay, - long maxDelay, - TimeUnit unitMaxDelay) { + OxiaBackoffProvider( + long initialDelay, TimeUnit unitInitialDelay, long maxDelay, TimeUnit unitMaxDelay) { this.initialDelay = initialDelay; this.unitInitialDelay = unitInitialDelay; this.maxDelay = maxDelay; @@ -33,7 +48,7 @@ public BackoffPolicy get() { } public static BackoffPolicy.Provider create(Duration minDelay, Duration maxDelay) { - return new OxiaBackoffProvider(minDelay.getNano(), - TimeUnit.NANOSECONDS, maxDelay.getNano(), TimeUnit.NANOSECONDS); + return new OxiaBackoffProvider( + minDelay.getNano(), TimeUnit.NANOSECONDS, maxDelay.getNano(), TimeUnit.NANOSECONDS); } } diff --git a/client/src/main/java/io/streamnative/oxia/client/grpc/OxiaStubManager.java b/client/src/main/java/io/streamnative/oxia/client/grpc/OxiaStubManager.java index 121f6b4e..b04cd170 100644 --- a/client/src/main/java/io/streamnative/oxia/client/grpc/OxiaStubManager.java +++ b/client/src/main/java/io/streamnative/oxia/client/grpc/OxiaStubManager.java @@ -30,7 +30,9 @@ public class OxiaStubManager implements AutoCloseable { @Nullable private final BackoffPolicy.Provider backoffProvider; public OxiaStubManager( - String namespace, @Nullable Authentication authentication, boolean enableTls, + String namespace, + @Nullable Authentication authentication, + boolean enableTls, @Nullable BackoffPolicy.Provider backoffProvider) { this.namespace = namespace; this.authentication = authentication; diff --git a/client/src/main/java/io/streamnative/oxia/client/lock/LockManagerImpl.java b/client/src/main/java/io/streamnative/oxia/client/lock/LockManagerImpl.java index dbae9de4..b75b3bd9 100644 --- a/client/src/main/java/io/streamnative/oxia/client/lock/LockManagerImpl.java +++ b/client/src/main/java/io/streamnative/oxia/client/lock/LockManagerImpl.java @@ -26,7 +26,6 @@ import io.streamnative.oxia.client.api.OptionBackoff; import io.streamnative.oxia.client.metrics.Unit; import io.streamnative.oxia.client.util.Backoff; - import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -85,8 +84,7 @@ public AsyncLock getLightWeightLock(String key, OptionBackoff optionBackoff) { optionBackoff.initDelay(), optionBackoff.initDelayUnit(), optionBackoff.maxDelay(), - optionBackoff.maxDelayUnit() - ), + optionBackoff.maxDelayUnit()), optionAutoRevalidate)); } diff --git a/client/src/main/java/io/streamnative/oxia/client/util/Backoff.java b/client/src/main/java/io/streamnative/oxia/client/util/Backoff.java index 1b0e0392..d38f3827 100644 --- a/client/src/main/java/io/streamnative/oxia/client/util/Backoff.java +++ b/client/src/main/java/io/streamnative/oxia/client/util/Backoff.java @@ -16,7 +16,6 @@ package io.streamnative.oxia.client.util; import io.grpc.internal.BackoffPolicy; - import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; @@ -33,15 +32,11 @@ public Backoff() { DEFAULT_INITIAL_DELAY_MILLIS, TimeUnit.MILLISECONDS, DEFAULT_MAX_DELAY_SECONDS, - TimeUnit.SECONDS - ); + TimeUnit.SECONDS); } public Backoff( - long initialDelay, - TimeUnit unitInitialDelay, - long maxDelay, - TimeUnit unitMaxDelay) { + long initialDelay, TimeUnit unitInitialDelay, long maxDelay, TimeUnit unitMaxDelay) { this.initialDelayMillis = unitInitialDelay.toMillis(initialDelay); this.maxDelayMillis = unitMaxDelay.toMillis(maxDelay); this.nextDelayMillis = initialDelayMillis; @@ -62,7 +57,6 @@ public void reset() { this.nextDelayMillis = initialDelayMillis; } - @Override public long nextBackoffNanos() { return TimeUnit.MILLISECONDS.toNanos(nextDelayMillis()); diff --git a/client/src/test/java/io/streamnative/oxia/client/batch/BatchTest.java b/client/src/test/java/io/streamnative/oxia/client/batch/BatchTest.java index d725b7ad..b4876d30 100644 --- a/client/src/test/java/io/streamnative/oxia/client/batch/BatchTest.java +++ b/client/src/test/java/io/streamnative/oxia/client/batch/BatchTest.java @@ -170,7 +170,8 @@ public void setUp() throws Exception { new OxiaStub( InProcessChannelBuilder.forName(serverName).directExecutor().build(), "default", - authentication, OxiaBackoffProvider.DEFAULT); + authentication, + OxiaBackoffProvider.DEFAULT); clientByShardId = mock(OxiaStubProvider.class); lenient().when(clientByShardId.getStubForShard(anyLong())).thenReturn(stub); } diff --git a/client/src/test/java/io/streamnative/oxia/client/grpc/OxiaStubTest.java b/client/src/test/java/io/streamnative/oxia/client/grpc/OxiaStubTest.java index 90510cd1..80a2eaa4 100644 --- a/client/src/test/java/io/streamnative/oxia/client/grpc/OxiaStubTest.java +++ b/client/src/test/java/io/streamnative/oxia/client/grpc/OxiaStubTest.java @@ -1,3 +1,18 @@ +/* + * Copyright © 2022-2024 StreamNative Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package io.streamnative.oxia.client.grpc; import io.grpc.stub.StreamObserver; @@ -5,22 +20,14 @@ import io.streamnative.oxia.proto.ReadRequest; import io.streamnative.oxia.proto.ReadResponse; import io.streamnative.oxia.testcontainers.OxiaContainer; -import lombok.Cleanup; -import lombok.SneakyThrows; +import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; -import net.bytebuddy.implementation.bytecode.Throw; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import org.junit.jupiter.params.shadow.com.univocity.parsers.annotations.EnumOptions; import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; -import org.testcontainers.shaded.org.awaitility.Awaitility; - -import java.time.Duration; -import java.util.concurrent.CompletableFuture; @Testcontainers @Slf4j @@ -40,11 +47,9 @@ public enum BackoffType { public void testOxiaReconnectBackoff(BackoffType type) throws Exception { final OxiaStubManager stubManager; if (type == BackoffType.Oxia) { - stubManager = new OxiaStubManager("default", - null, false, OxiaBackoffProvider.DEFAULT); + stubManager = new OxiaStubManager("default", null, false, OxiaBackoffProvider.DEFAULT); } else { - stubManager = new OxiaStubManager("default", - null, false, null); + stubManager = new OxiaStubManager("default", null, false, null); } final OxiaStub stub = stubManager.getStub(oxia.getServiceAddress()); @@ -69,10 +74,9 @@ public void testOxiaReconnectBackoff(BackoffType type) throws Exception { oxia.start(); - startTime = System.currentTimeMillis(); elapse = 10 * 1000; - boolean success = false; + boolean success = false; while (System.currentTimeMillis() - startTime <= elapse) { try { sendMessage(stub).join(); @@ -90,29 +94,31 @@ public void testOxiaReconnectBackoff(BackoffType type) throws Exception { } private static CompletableFuture sendMessage(OxiaStub stub) { - final var readRequest = ReadRequest.newBuilder() - .setShardId(0) - .addGets(GetRequest.newBuilder() - .setKey("test") - .build()) - .build(); + final var readRequest = + ReadRequest.newBuilder() + .setShardId(0) + .addGets(GetRequest.newBuilder().setKey("test").build()) + .build(); final CompletableFuture f = new CompletableFuture<>(); - stub.async().read(readRequest, new StreamObserver<>() { - @Override - public void onNext(ReadResponse value) { - f.complete(null); - } + stub.async() + .read( + readRequest, + new StreamObserver<>() { + @Override + public void onNext(ReadResponse value) { + f.complete(null); + } - @Override - public void onError(Throwable t) { - f.completeExceptionally(t); - } + @Override + public void onError(Throwable t) { + f.completeExceptionally(t); + } - @Override - public void onCompleted() { - f.complete(null); - } - }); + @Override + public void onCompleted() { + f.complete(null); + } + }); return f; } }