replace javax with jakarta

Author: popduke

base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVRangeReader.java

@@ -13,12 +13,9 @@
 
 package com.baidu.bifromq.basekv.store.api;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 /**
- * Thread-Unsafe reader to access the consistent view of KVRange
+ * Thread-Unsafe reader to access the consistent view of KVRange.
  */
-@NotThreadSafe
 public interface IKVRangeReader extends IKVRangeMetadata {
 
     IKVReader newDataReader();

base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/hinter/LoadRecordWindow.java

@@ -24,10 +24,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
-import javax.annotation.concurrent.NotThreadSafe;
 
-
-@NotThreadSafe
 final class LoadRecordWindow {
     private final Function<ByteString, Optional<ByteString>> toSplitKey;
     private final AtomicInteger records = new AtomicInteger();

base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALStorageEngine.java

@@ -30,13 +30,11 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.concurrent.NotThreadSafe;
 import org.slf4j.Logger;
 
 /**
  * WALStore engine.
  */
-@NotThreadSafe
 public class KVRangeWALStorageEngine implements IKVRangeWALStoreEngine {
     private final Logger log;
     private final String clusterId;

base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/IRPCClient.java

@@ -17,11 +17,11 @@
 
 import io.grpc.MethodDescriptor;
 import io.reactivex.rxjava3.core.Observable;
+import jakarta.annotation.Nullable;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-import javax.annotation.Nullable;
 
 /**
  * The RPC client interface.
@@ -32,65 +32,13 @@ static RPCClientBuilder newBuilder() {
         return new RPCClientBuilder();
     }
 
-
-    /**
-     * The interface for managed request-response pipeline.
-     *
-     * @param <ReqT>  the request type
-     * @param <RespT> the response type
-     */
-    interface IRequestPipeline<ReqT, RespT> {
-        boolean isClosed();
-
-        CompletableFuture<RespT> invoke(ReqT req);
-
-        void close();
-    }
-
-    /**
-     * The interface for managed bi-di message stream, which will automatically handle load balance change.
-     *
-     * @param <MsgT> the message received from server
-     * @param <AckT> the ack send to server
-     */
-    interface IMessageStream<MsgT, AckT> {
-        boolean isClosed();
-
-        /**
-         * Send ack to server.
-         *
-         * @param ack the ack
-         */
-        void ack(AckT ack);
-
-        /**
-         * Register a message consumer.
-         *
-         * @param consumer the consumer
-         */
-        void onMessage(Consumer<MsgT> consumer);
-
-        /**
-         * Register a retarget event consumer.
-         *
-         * @param consumer the consumer
-         */
-        void onRetarget(Consumer<Long> consumer);
-
-        /**
-         * Close the stream.
-         */
-        void close();
-    }
-
     /**
      * The observable of live servers.
      *
      * @return an observable of connectable servers with a map of metadata attached
      */
     Observable<Map<String, Map<String, String>>> serverList();
 
-
     default <ReqT, RespT> CompletableFuture<RespT> invoke(String tenantId,
                                                           @Nullable String desiredServerId,
                                                           ReqT req,
@@ -172,9 +120,59 @@ <MsgT, AckT> IMessageStream<MsgT, AckT> createMessageStream(String tenantId,
                                                                 Supplier<Map<String, String>> metadataSupplier,
                                                                 MethodDescriptor<AckT, MsgT> methodDesc);
 
-
     /**
      * Close the client.
      */
     void stop();
+
+    /**
+     * The interface for managed request-response pipeline.
+     *
+     * @param <ReqT>  the request type
+     * @param <RespT> the response type
+     */
+    interface IRequestPipeline<ReqT, RespT> {
+        boolean isClosed();
+
+        CompletableFuture<RespT> invoke(ReqT req);
+
+        void close();
+    }
+
+
+    /**
+     * The interface for managed bi-di message stream, which will automatically handle load balance change.
+     *
+     * @param <MsgT> the message received from server
+     * @param <AckT> the ack send to server
+     */
+    interface IMessageStream<MsgT, AckT> {
+        boolean isClosed();
+
+        /**
+         * Send ack to server.
+         *
+         * @param ack the ack
+         */
+        void ack(AckT ack);
+
+        /**
+         * Register a message consumer.
+         *
+         * @param consumer the consumer
+         */
+        void onMessage(Consumer<MsgT> consumer);
+
+        /**
+         * Register a retarget event consumer.
+         *
+         * @param consumer the consumer
+         */
+        void onRetarget(Consumer<Long> consumer);
+
+        /**
+         * Close the stream.
+         */
+        void close();
+    }
 }

base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/IUnaryCaller.java

@@ -15,9 +15,9 @@
 
 import static java.util.Collections.emptyMap;
 
+import jakarta.annotation.Nullable;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nullable;
 
 /**
  * The caller for unary RPC.

base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ManagedBiDiStream.java

@@ -27,6 +27,7 @@
 import io.reactivex.rxjava3.functions.Action;
 import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.schedulers.Schedulers;
+import jakarta.annotation.Nullable;
 import java.time.Duration;
 import java.util.Map;
 import java.util.Optional;
@@ -36,7 +37,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
-import javax.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ManagedMessageStream.java

@@ -20,12 +20,12 @@
 import io.grpc.CallOptions;
 import io.grpc.MethodDescriptor;
 import io.reactivex.rxjava3.subjects.PublishSubject;
+import jakarta.annotation.Nullable;
 import java.util.Map;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-import javax.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ManagedRequestPipeline.java

@@ -23,6 +23,7 @@
 import com.baidu.bifromq.baserpc.metrics.RPCMetric;
 import io.grpc.CallOptions;
 import io.grpc.MethodDescriptor;
+import jakarta.annotation.Nullable;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -31,7 +32,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
-import javax.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/RPCClient.java

@@ -21,12 +21,12 @@
 import io.grpc.MethodDescriptor;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.disposables.Disposable;
+import jakarta.annotation.Nullable;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
-import javax.annotation.Nullable;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 

base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/UnaryCaller.java

@@ -30,13 +30,13 @@
 import io.grpc.Context;
 import io.grpc.MethodDescriptor;
 import io.grpc.stub.StreamObserver;
+import jakarta.annotation.Nullable;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
-import javax.annotation.Nullable;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;