This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis.git
The following commit(s) were added to refs/heads/master by this push:
new 21f9e5b70 RATIS-2180. Use Objects.requireNonNull instead of
Preconditions.assertNotNull (#1256)
21f9e5b70 is described below
commit 21f9e5b707265e9ff7c8be6c98d6704412f85eb2
Author: jianghuazhu <740087...@qq.com>
AuthorDate: Mon May 12 23:33:29 2025 +0800
RATIS-2180. Use Objects.requireNonNull instead of
Preconditions.assertNotNull (#1256)
---
.../main/java/org/apache/ratis/protocol/RaftClientMessage.java | 9 +++++----
ratis-common/src/main/java/org/apache/ratis/protocol/RaftId.java | 2 +-
.../java/org/apache/ratis/retry/ExponentialBackoffRetry.java | 4 ++--
ratis-common/src/main/java/org/apache/ratis/util/JavaUtils.java | 6 +++---
.../java/org/apache/ratis/util/ReferenceCountedLeakDetector.java | 3 ++-
.../main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java | 2 +-
.../main/java/org/apache/ratis/server/impl/RaftServerImpl.java | 3 ++-
.../main/java/org/apache/ratis/server/impl/ServerImplUtils.java | 5 +++--
.../ratis/server/raftlog/segmented/SegmentedRaftLogCache.java | 2 +-
ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java | 2 +-
.../src/test/java/org/apache/ratis/server/ServerBuilderTest.java | 4 ++--
.../server/raftlog/segmented/TestSegmentedRaftLogCache.java | 2 +-
12 files changed, 24 insertions(+), 20 deletions(-)
diff --git
a/ratis-common/src/main/java/org/apache/ratis/protocol/RaftClientMessage.java
b/ratis-common/src/main/java/org/apache/ratis/protocol/RaftClientMessage.java
index 8d3104a73..92ae77ce2 100644
---
a/ratis-common/src/main/java/org/apache/ratis/protocol/RaftClientMessage.java
+++
b/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;
}
diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/RaftId.java
b/ratis-common/src/main/java/org/apache/ratis/protocol/RaftId.java
index d8a3f73ab..d089c7d3c 100644
--- a/ratis-common/src/main/java/org/apache/ratis/protocol/RaftId.java
+++ b/ratis-common/src/main/java/org/apache/ratis/protocol/RaftId.java
@@ -85,7 +85,7 @@ public abstract class RaftId {
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),
diff --git
a/ratis-common/src/main/java/org/apache/ratis/retry/ExponentialBackoffRetry.java
b/ratis-common/src/main/java/org/apache/ratis/retry/ExponentialBackoffRetry.java
index bb2f50e43..d506c85c8 100644
---
a/ratis-common/src/main/java/org/apache/ratis/retry/ExponentialBackoffRetry.java
+++
b/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 final class ExponentialBackoffRetry implements
RetryPolicy {
}
public ExponentialBackoffRetry build() {
- Preconditions.assertNotNull(baseSleepTime, "baseSleepTime");
+ Objects.requireNonNull(baseSleepTime, "baseSleepTime == null");
return new ExponentialBackoffRetry(baseSleepTime, maxSleepTime,
maxAttempts);
}
diff --git a/ratis-common/src/main/java/org/apache/ratis/util/JavaUtils.java
b/ratis-common/src/main/java/org/apache/ratis/util/JavaUtils.java
index 7d1d75309..958e88cee 100644
--- a/ratis-common/src/main/java/org/apache/ratis/util/JavaUtils.java
+++ b/ratis-common/src/main/java/org/apache/ratis/util/JavaUtils.java
@@ -148,7 +148,7 @@ public interface JavaUtils {
* 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 @@ public interface JavaUtils {
* 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);
}
diff --git
a/ratis-common/src/main/java/org/apache/ratis/util/ReferenceCountedLeakDetector.java
b/ratis-common/src/main/java/org/apache/ratis/util/ReferenceCountedLeakDetector.java
index ec99eee58..271058e54 100644
---
a/ratis-common/src/main/java/org/apache/ratis/util/ReferenceCountedLeakDetector.java
+++
b/ratis-common/src/main/java/org/apache/ratis/util/ReferenceCountedLeakDetector.java
@@ -22,6 +22,7 @@ import org.slf4j.LoggerFactory;
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 final class ReferenceCountedLeakDetector {
}
if (released) {
- Preconditions.assertNotNull(removeMethod, () -> "Not yet retained
(removeMethod == null): " + valueClass);
+ Objects.requireNonNull(removeMethod, () -> "Not yet retained
(removeMethod == null): " + valueClass);
removeMethod.run();
}
return released;
diff --git
a/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java
b/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java
index 4a01637b0..c016dabfe 100644
--- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java
+++ b/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java
@@ -177,7 +177,7 @@ public class GrpcLogAppender extends LogAppenderBase {
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);
diff --git
a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
index 7c016752e..c7e29c539 100644
---
a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
+++
b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
@@ -1295,7 +1295,7 @@ class RaftServerImpl implements RaftServer.Division,
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 @@ class RaftServerImpl implements RaftServer.Division,
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);
diff --git
a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerImplUtils.java
b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerImplUtils.java
index ce4702d95..864b402a2 100644
---
a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerImplUtils.java
+++
b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerImplUtils.java
@@ -46,6 +46,7 @@ import java.util.List;
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 final class ServerImplUtils {
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);
diff --git
a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogCache.java
b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogCache.java
index 31e66d769..8d79c58d3 100644
---
a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogCache.java
+++
b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogCache.java
@@ -628,7 +628,7 @@ public class SegmentedRaftLogCache {
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);
}
diff --git a/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java
b/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java
index 1ce9afdf4..36b5f36bc 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java
@@ -152,7 +152,7 @@ public interface RaftTestUtil {
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);
diff --git
a/ratis-test/src/test/java/org/apache/ratis/server/ServerBuilderTest.java
b/ratis-test/src/test/java/org/apache/ratis/server/ServerBuilderTest.java
index 9360b9b84..58d553367 100644
--- a/ratis-test/src/test/java/org/apache/ratis/server/ServerBuilderTest.java
+++ b/ratis-test/src/test/java/org/apache/ratis/server/ServerBuilderTest.java
@@ -60,7 +60,7 @@ public class ServerBuilderTest extends BaseTest {
.build();
Assertions.fail("did not get expected exception");
} catch (IOException e) {
- Preconditions.assertInstanceOf(e.getCause(),
IllegalStateException.class);
+ Preconditions.assertInstanceOf(e.getCause(),
NullPointerException.class);
}
}
@@ -76,7 +76,7 @@ public class ServerBuilderTest extends BaseTest {
.build();
Assertions.fail("did not get expected exception");
} catch (IOException e) {
- Preconditions.assertInstanceOf(e.getCause(),
IllegalStateException.class);
+ Preconditions.assertInstanceOf(e.getCause(),
NullPointerException.class);
}
}
diff --git
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLogCache.java
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLogCache.java
index 7bc495438..1f5783b20 100644
---
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLogCache.java
+++
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLogCache.java
@@ -159,7 +159,7 @@ public class TestSegmentedRaftLogCache {
cache.appendEntry(Op.WRITE_CACHE_WITHOUT_STATE_MACHINE_CACHE,
ReferenceCountedObject.wrap(entry)
);
Assertions.fail("the open segment is null");
- } catch (IllegalStateException ignored) {
+ } catch (IllegalStateException | NullPointerException ignored) {
}
LogSegment openSegment = prepareLogSegment(100, 100, true);
