RATIS-1919 Fix some sonar code smell and bugs in ratis-client/common/…

…grpc (apache#951)
szetszwo · Oct 27, 2023 · 47e5b6a · 47e5b6a
1 parent 3e7f9e5
commit 47e5b6a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1 deletion.
diff --git a/ratis-client/src/main/java/org/apache/ratis/client/impl/BlockingImpl.java b/ratis-client/src/main/java/org/apache/ratis/client/impl/BlockingImpl.java
@@ -132,6 +132,7 @@ public RaftClientRequest newRequestImpl() {
       try {
         sleepTime.sleep();
       } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
         throw new InterruptedIOException("retry policy=" + retryPolicy);
       }
     }

diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/RaftPeerId.java b/ratis-common/src/main/java/org/apache/ratis/protocol/RaftPeerId.java
@@ -17,6 +17,7 @@
  */
 package org.apache.ratis.protocol;
 
+import javax.annotation.concurrent.Immutable;
 import org.apache.ratis.proto.RaftProtos.RaftPeerIdProto;
 import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
 import org.apache.ratis.util.JavaUtils;
@@ -33,6 +34,7 @@
  * <p>
  * This is a value-based class.
  */
+@Immutable
 public final class RaftPeerId {
   private static final Map<ByteString, RaftPeerId> BYTE_STRING_MAP = new ConcurrentHashMap<>();
   private static final Map<String, RaftPeerId> STRING_MAP = new ConcurrentHashMap<>();

diff --git a/ratis-common/src/main/java/org/apache/ratis/util/AutoCloseableLock.java b/ratis-common/src/main/java/org/apache/ratis/util/AutoCloseableLock.java
@@ -39,6 +39,7 @@ public static AutoCloseableLock acquire(final Lock lock) {
     return acquire(lock, null);
   }
 
+  @SuppressWarnings("java:S2222") // Locks should be release by calling {@link #close()}
   public static AutoCloseableLock acquire(final Lock lock, Runnable preUnlock) {
     lock.lock();
     return new AutoCloseableLock(lock, preUnlock);

diff --git a/ratis-common/src/main/java/org/apache/ratis/util/AwaitToRun.java b/ratis-common/src/main/java/org/apache/ratis/util/AwaitToRun.java
@@ -42,7 +42,7 @@ private RunnableImpl(Runnable runMethod) {
 
     @Override
     public void run() {
-      for (; ; ) {
+      while(!Thread.currentThread().isInterrupted()) {
         try {
           awaitForSignal.await();
         } catch (InterruptedException e) {

diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/util/StreamObserverWithTimeout.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/util/StreamObserverWithTimeout.java
@@ -84,6 +84,7 @@ private void acquire(StringSupplier request) {
       try {
         acquired = semaphore.tryAcquire(timeout.getDuration(), timeout.getUnit());
       } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
         throw new IllegalStateException("Interrupted onNext " + request, e);
       }
     }