Skip to content

Commit 237b7c0

Browse files
authored
RATIS-2182. Fix some Objects.requireNonNull messages (#1172)
1 parent bf15765 commit 237b7c0

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ public static SizeInBytes valueOf(long size) {
3333
}
3434

3535
public static SizeInBytes valueOf(long n, TraditionalBinaryPrefix prefix) {
36-
final long size = Objects.requireNonNull(prefix, "prefix = null").toLong(n);
36+
final long size = Objects.requireNonNull(prefix, "prefix == null").toLong(n);
3737
final String input = n + " " + prefix.getSymbol();
3838
final String description = input + " (=" + size + ")";
3939
return new SizeInBytes(size, input, description);
4040
}
4141

4242
public static SizeInBytes valueOf(String input) {
43-
input = Objects.requireNonNull(input, "input = null").trim();
43+
input = Objects.requireNonNull(input, "input == null").trim();
4444

4545
final int last = input.length() - 1;
4646
final String s = "b".equalsIgnoreCase(input.substring(last))?

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public static long parse(String timeString, TimeUnit targetUnit) {
144144
* @return a {@link TimeDuration} in the target unit.
145145
*/
146146
public static TimeDuration valueOf(String timeString, TimeUnit defaultUnit) {
147-
Objects.requireNonNull(timeString, "timeString = null");
147+
Objects.requireNonNull(timeString, "timeString == null");
148148
final String lower = timeString.trim().replace("_", "").toLowerCase();
149149
for(Abbreviation a : Abbreviation.values()) {
150150
for(String s : a.getSymbols()) {
@@ -172,7 +172,7 @@ public static TimeDuration valueOf(long duration, TimeUnit unit) {
172172

173173
private TimeDuration(long duration, TimeUnit unit) {
174174
this.duration = duration;
175-
this.unit = Objects.requireNonNull(unit, "unit = null");
175+
this.unit = Objects.requireNonNull(unit, "unit == null");
176176
}
177177

178178
/** @return the duration value. */

ratis-server-api/src/main/java/org/apache/ratis/statemachine/TransactionContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ public TransactionContext build() {
235235
return newTransactionContext(stateMachine, clientRequest,
236236
stateMachineLogEntry, logData, stateMachineData, stateMachineContext);
237237
} else {
238-
Objects.requireNonNull(logEntry, "logEntry MUST NOT be null since clientRequest == null");
238+
Objects.requireNonNull(logEntry, "logEntry must not be null since clientRequest == null");
239239
Preconditions.assertTrue(logEntry.hasStateMachineLogEntry(),
240240
() -> "Unexpected logEntry: stateMachineLogEntry not found, logEntry=" + logEntry);
241241
return newTransactionContext(serverRole, stateMachine, logEntry);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ RaftClientReply convert(RaftClientRequest q, RaftClientReply p) {
6464
}
6565

6666
TermIndex getTermIndex() {
67-
return Objects.requireNonNull(termIndex, "termIndex");
67+
return Objects.requireNonNull(termIndex, "termIndex == null");
6868
}
6969

7070
RaftClientRequest getRequest() {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static final class Builder {
5858
private Builder() {}
5959

6060
Builder setConf(PeerConfiguration conf) {
61-
Objects.requireNonNull(conf);
61+
Objects.requireNonNull(conf, "PeerConfiguration == null");
6262
Preconditions.assertTrue(this.conf == null, "conf is already set.");
6363
this.conf = conf;
6464
return this;
@@ -73,7 +73,7 @@ Builder setConf(Iterable<RaftPeer> peers, Iterable<RaftPeer> listeners) {
7373
}
7474

7575
Builder setConf(RaftConfigurationImpl transitionalConf) {
76-
Objects.requireNonNull(transitionalConf);
76+
Objects.requireNonNull(transitionalConf, "transitionalConf == null");
7777
Preconditions.assertTrue(transitionalConf.isTransitional());
7878

7979
Preconditions.assertTrue(!forceTransitional);
@@ -83,7 +83,7 @@ Builder setConf(RaftConfigurationImpl transitionalConf) {
8383

8484

8585
Builder setOldConf(PeerConfiguration oldConf) {
86-
Objects.requireNonNull(oldConf);
86+
Objects.requireNonNull(oldConf, "oldConf == null");
8787
Preconditions.assertTrue(this.oldConf == null, "oldConf is already set.");
8888
this.oldConf = oldConf;
8989
return this;
@@ -94,7 +94,7 @@ Builder setOldConf(Iterable<RaftPeer> oldPeers, Iterable<RaftPeer> oldListeners)
9494
}
9595

9696
Builder setOldConf(RaftConfigurationImpl stableConf) {
97-
Objects.requireNonNull(stableConf);
97+
Objects.requireNonNull(stableConf, "stableConf == null");
9898
Preconditions.assertTrue(stableConf.isStable());
9999

100100
Preconditions.assertTrue(!forceStable);
@@ -133,7 +133,7 @@ RaftConfigurationImpl build() {
133133

134134
private RaftConfigurationImpl(PeerConfiguration conf, PeerConfiguration oldConf,
135135
long logEntryIndex) {
136-
this.conf = Objects.requireNonNull(conf);
136+
this.conf = Objects.requireNonNull(conf, "PeerConfiguration == null");
137137
this.oldConf = oldConf;
138138
this.logEntryIndex = logEntryIndex;
139139
}

0 commit comments

Comments
 (0)