[Minor] Improve return boolean expression

apache · Mar 4, 2025 · aa4a1ec · aa4a1ec
1 parent 413c852
commit aa4a1ec
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 47 deletions.
diff --git a/...rk/common/src/main/java/org/apache/uniffle/shuffle/manager/ShuffleManagerGrpcService.java b/...rk/common/src/main/java/org/apache/uniffle/shuffle/manager/ShuffleManagerGrpcService.java
@@ -408,10 +408,8 @@ public boolean resetStageAttemptIfNecessary(int stageAttemptNumber) {
               this.isShuffleServerAssignmented = false;
               this.isClearedMapTrackerBlock = false;
               return false;
-            } else if (this.stageAttemptNumber > stageAttemptNumber) {
-              return true;
             }
-            return false;
+            return this.stageAttemptNumber > stageAttemptNumber;
           });
     }
 
@@ -468,15 +466,10 @@ public boolean incWriteFailureForShuffleServer(
 
     public boolean isNeedReassignForLastStageNumber(int lastStageAttemptNumber) {
       return withReadLock(
-          () -> {
-            if (isStageNeedRetry
-                && !isShuffleServerAssignmented
-                && stageAttemptNumber == lastStageAttemptNumber - 1) {
-              return true;
-            } else {
-              return false;
-            }
-          });
+          () ->
+              isStageNeedRetry
+                  && !isShuffleServerAssignmented
+                  && stageAttemptNumber == lastStageAttemptNumber - 1);
     }
 
     public void setShuffleServerAssignmented(boolean isAssignmented) {
@@ -496,10 +489,7 @@ public void setClearedMapTrackerBlock(boolean isCleared) {
     }
 
     public boolean isClearedMapTrackerBlock() {
-      return withReadLock(
-          () -> {
-            return isClearedMapTrackerBlock;
-          });
+      return withReadLock(() -> isClearedMapTrackerBlock);
     }
   }
 
@@ -583,11 +573,7 @@ public boolean currentPartitionIsFetchFailed(
             if (this.stageAttempt != stageAttempt) {
               return false;
             } else {
-              if (this.partitions[partition] >= shuffleManager.getMaxFetchFailures()) {
-                return true;
-              } else {
-                return false;
-              }
+              return this.partitions[partition] >= shuffleManager.getMaxFetchFailures();
             }
           });
     }

diff --git a/client/src/test/java/org/apache/uniffle/client/ClientUtilsTest.java b/client/src/test/java/org/apache/uniffle/client/ClientUtilsTest.java
@@ -87,10 +87,7 @@ private List<CompletableFuture<Boolean>> getFutures(boolean fail) {
                   LOGGER.info("Finished index: " + index);
                   return true;
                 }
-                if (fail && index == 1) {
-                  return false;
-                }
-                return true;
+                return !fail || index != 1;
               },
               executorService);
       futures.add(future);

diff --git a/common/src/main/java/org/apache/uniffle/common/util/JavaUtils.java b/common/src/main/java/org/apache/uniffle/common/util/JavaUtils.java
@@ -34,12 +34,8 @@ public class JavaUtils {
   private static final String JAVA_9 = "JAVA_9";
 
   public static boolean isJavaVersionAtLeastJava9() {
-    if (Enums.getIfPresent(JavaVersion.class, JAVA_9).isPresent()
-        && SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)) {
-      return true;
-    } else {
-      return false;
-    }
+    return Enums.getIfPresent(JavaVersion.class, JAVA_9).isPresent()
+        && SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9);
   }
 
   /** Closes the given object, ignoring IOExceptions. */

diff --git a/server/src/main/java/org/apache/uniffle/server/LocalStorageChecker.java b/server/src/main/java/org/apache/uniffle/server/LocalStorageChecker.java
@@ -328,10 +328,7 @@ boolean checkStorageReadAndWrite() {
       } catch (Exception e) {
         LOG.error("Storage read and write error. Storage dir: {}", storageDir, e);
         // avoid check bad track failure due to lack of disk space
-        if (e.getMessage() != null && DEVICE_NO_SPACE_ERROR_MESSAGE.equals(e.getMessage())) {
-          return true;
-        }
-        return false;
+        return e.getMessage() != null && DEVICE_NO_SPACE_ERROR_MESSAGE.equals(e.getMessage());
       } finally {
         try {
           FileUtils.deleteDirectory(checkDir);

diff --git a/server/src/main/java/org/apache/uniffle/server/RegisterHeartBeat.java b/server/src/main/java/org/apache/uniffle/server/RegisterHeartBeat.java
@@ -97,10 +97,7 @@ public void startHeartBeat() {
 
   @VisibleForTesting
   public boolean sendHeartBeat(RssSendHeartBeatRequest request) {
-    if (coordinatorClient.sendHeartBeat(request).getStatusCode() == StatusCode.SUCCESS) {
-      return true;
-    }
-    return false;
+    return coordinatorClient.sendHeartBeat(request).getStatusCode() == StatusCode.SUCCESS;
   }
 
   public long getHeartBeatInterval() {

diff --git a/server/src/main/java/org/apache/uniffle/server/storage/SingleStorageManager.java b/server/src/main/java/org/apache/uniffle/server/storage/SingleStorageManager.java
@@ -121,10 +121,7 @@ public boolean canWrite(ShuffleDataFlushEvent event) {
     try {
       Storage storage = selectStorage(event);
       // if storage is null, appId may not be registered
-      if (storage == null || !storage.canWrite()) {
-        return false;
-      }
-      return true;
+      return storage != null && storage.canWrite();
     } catch (Exception e) {
       LOG.warn("Exception happened when select storage", e);
       return false;

diff --git a/server/src/test/java/org/apache/uniffle/server/StorageCheckerTest.java b/server/src/test/java/org/apache/uniffle/server/StorageCheckerTest.java
@@ -246,10 +246,7 @@ boolean checkStorageReadAndWrite() {
             throw new IOException("mock");
           }
         } catch (Exception e) {
-          if (e.getMessage() != null && DEVICE_NO_SPACE_ERROR_MESSAGE.equals(e.getMessage())) {
-            return true;
-          }
-          return false;
+          return e.getMessage() != null && DEVICE_NO_SPACE_ERROR_MESSAGE.equals(e.getMessage());
         } finally {
           try {
             FileUtils.deleteDirectory(checkDir);