RATIS-2180. Use Objects.requireNonNull instead of Preconditions.assertNotNull (#1256)

Author: jianghuazhu

ratis-common/src/main/java/org/apache/ratis/protocol/RaftClientMessage.java

@@ -18,7 +18,8 @@
 package org.apache.ratis.protocol;
 
 import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.Preconditions;
+
+import java.util.Objects;
 
 public abstract class RaftClientMessage implements RaftRpcMessage {
   private final ClientId clientId;
@@ -27,9 +28,9 @@ public abstract class RaftClientMessage implements RaftRpcMessage {
   private final long callId;
 
   RaftClientMessage(ClientId clientId, RaftPeerId serverId, RaftGroupId groupId, long callId) {
-    this.clientId = Preconditions.assertNotNull(clientId, "clientId");
-    this.serverId = Preconditions.assertNotNull(serverId, "serverId");
-    this.groupId = Preconditions.assertNotNull(groupId, "groupId");
+    this.clientId = Objects.requireNonNull(clientId, "clientId == null");
+    this.serverId = Objects.requireNonNull(serverId, "serverId == null");
+    this.groupId = Objects.requireNonNull(groupId, "groupId == null");
     this.callId = callId;
   }
 

ratis-common/src/main/java/org/apache/ratis/protocol/RaftId.java

@@ -85,7 +85,7 @@ ID randomId() {
   private final Supplier<String> uuidString;
 
   RaftId(UUID uuid) {
-    this.uuid = Preconditions.assertNotNull(uuid, "uuid");
+    this.uuid = Objects.requireNonNull(uuid, "uuid == null");
     this.uuidBytes = JavaUtils.memoize(() -> toByteString(uuid));
     this.uuidString = JavaUtils.memoize(() -> createUuidString(uuid));
     Preconditions.assertTrue(ZERO_UUID == uuid || !uuid.equals(ZERO_UUID),

ratis-common/src/main/java/org/apache/ratis/retry/ExponentialBackoffRetry.java

@@ -17,9 +17,9 @@
  */
 package org.apache.ratis.retry;
 
-import org.apache.ratis.util.Preconditions;
 import org.apache.ratis.util.TimeDuration;
 
+import java.util.Objects;
 import java.util.concurrent.ThreadLocalRandom;
 
 /**
@@ -56,7 +56,7 @@ public Builder setMaxSleepTime(TimeDuration maxSleepTime) {
     }
 
     public ExponentialBackoffRetry build() {
-      Preconditions.assertNotNull(baseSleepTime, "baseSleepTime");
+      Objects.requireNonNull(baseSleepTime, "baseSleepTime == null");
       return new ExponentialBackoffRetry(baseSleepTime, maxSleepTime,
           maxAttempts);
     }

ratis-common/src/main/java/org/apache/ratis/util/JavaUtils.java

@@ -148,7 +148,7 @@ static <T> T doPrivileged(Supplier<T> action, Supplier<String> name) {
    *         otherwise, return system property value.
    */
   static String getSystemProperty(final String key) {
-    Preconditions.assertNotNull(key, "key");
+    Objects.requireNonNull(key, "key == null");
     Preconditions.assertTrue(!key.isEmpty(), "key is empty.");
     return doPrivileged(() -> System.getProperty(key), () -> "get system property " + key);
   }
@@ -166,9 +166,9 @@ static String getEnv(String variable) {
    * When there is a {@link SecurityException}, this becomes a NOOP.
    */
   static void setSystemProperty(String key, String value) {
-    Preconditions.assertNotNull(key, "key");
+    Objects.requireNonNull(key, "key == null");
     Preconditions.assertTrue(!key.isEmpty(), "key is empty.");
-    Preconditions.assertNotNull(value, "value");
+    Objects.requireNonNull(value, "value == null");
     doPrivileged(() -> System.setProperty(key, value), () -> "set system property " + key + " to " + value);
   }
 

ratis-common/src/main/java/org/apache/ratis/util/ReferenceCountedLeakDetector.java

@@ -22,6 +22,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
@@ -202,7 +203,7 @@ public synchronized boolean release() {
       }
 
       if (released) {
-        Preconditions.assertNotNull(removeMethod, () -> "Not yet retained (removeMethod == null): " + valueClass);
+        Objects.requireNonNull(removeMethod, () -> "Not yet retained (removeMethod == null): " + valueClass);
         removeMethod.run();
       }
       return released;

ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java

@@ -177,7 +177,7 @@ synchronized int process(Event event) {
   public GrpcLogAppender(RaftServer.Division server, LeaderState leaderState, FollowerInfo f) {
     super(server, leaderState, f);
 
-    Preconditions.assertNotNull(getServerRpc(), "getServerRpc()");
+    Objects.requireNonNull(getServerRpc(), "getServerRpc() == null");
 
     final RaftProperties properties = server.getRaftServer().getProperties();
     this.maxPendingRequestsNum = GrpcConfigKeys.Server.leaderOutstandingAppendsMax(properties);

ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java

@@ -1295,7 +1295,7 @@ CompletableFuture<RaftClientReply> takeSnapshotAsync(SnapshotManagementRequest r
     LOG.info("{}: takeSnapshotAsync {}", getMemberId(), request);
     assertLifeCycleState(LifeCycle.States.RUNNING);
     assertGroup(getMemberId(), request);
-    Preconditions.assertNotNull(request.getCreate(), "create");
+    Objects.requireNonNull(request.getCreate(), "create == null");
 
     final long creationGap = request.getCreate().getCreationGap();
     long minGapValue = creationGap > 0? creationGap : RaftServerConfigKeys.Snapshot.creationGap(proxy.getProperties());
@@ -1914,6 +1914,7 @@ CompletableFuture<Message> applyLogToStateMachine(ReferenceCountedObject<LogEntr
       break;
     case STATEMACHINELOGENTRY:
       TransactionContext trx = getTransactionContext(next, true);
+      Objects.requireNonNull(trx, "trx == null");
       final ClientInvocationId invocationId = ClientInvocationId.valueOf(next.getStateMachineLogEntry());
       writeIndexCache.add(invocationId.getClientId(), ((TransactionContextImpl) trx).getLogIndexFuture());
       ((TransactionContextImpl) trx).setDelegatedRef(nextRef);

ratis-server/src/main/java/org/apache/ratis/server/impl/ServerImplUtils.java

@@ -46,6 +46,7 @@
 import java.util.Map;
 import java.util.NavigableMap;
 import java.util.TreeMap;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 /** Server utilities for internal use. */
@@ -170,8 +171,8 @@ public static RaftServerProxy newRaftServer(
       ThreadGroup threadGroup, RaftProperties properties, Parameters parameters) throws IOException {
     RaftServer.LOG.debug("newRaftServer: {}, {}", id, group);
     if (group != null && !group.getPeers().isEmpty()) {
-      Preconditions.assertNotNull(id, "RaftPeerId %s is not in RaftGroup %s", id, group);
-      Preconditions.assertNotNull(group.getPeer(id), "RaftPeerId %s is not in RaftGroup %s", id, group);
+      Objects.requireNonNull(id, () -> "RaftPeerId " + id + " is not in RaftGroup " + group);
+      Objects.requireNonNull(group.getPeer(id), () -> "RaftPeerId " + id + " is not in RaftGroup " + group);
     }
     final RaftServerProxy proxy = newRaftServer(id, stateMachineRegistry, threadGroup, properties, parameters);
     proxy.initGroups(group, option);

ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogCache.java

@@ -628,7 +628,7 @@ TermIndex getLastTermIndex() {
   void appendEntry(LogSegment.Op op, ReferenceCountedObject<LogEntryProto> entry) {
     // SegmentedRaftLog does the segment creation/rolling work. Here we just
     // simply append the entry into the open segment.
-    Preconditions.assertNotNull(openSegment, "openSegment");
+    Objects.requireNonNull(openSegment, "openSegment == null");
     openSegment.appendToOpenSegment(op, entry);
   }
 

ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java

@@ -152,7 +152,7 @@ static RaftPeerId waitAndKillLeader(MiniRaftCluster cluster) throws InterruptedE
 
   static void waitFor(Supplier<Boolean> check, int checkEveryMillis,
       int waitForMillis) throws TimeoutException, InterruptedException {
-    Preconditions.assertNotNull(check, "check");
+    Objects.requireNonNull(check, "check == null");
     Preconditions.assertTrue(waitForMillis >= checkEveryMillis,
         () -> "waitFor: " + waitForMillis + " < checkEvery: " + checkEveryMillis);