Skip to content

Commit aa3aad3

Browse files
committed
Java 9: Null check can be replaced with method call.
1 parent 2c7a72d commit aa3aad3

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

src/main/java/zmq/io/mechanism/curve/CurveServerMechanism.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import static zmq.io.Metadata.SOCKET_TYPE;
55

66
import java.nio.ByteBuffer;
7+
import java.util.Objects;
78

89
import zmq.Msg;
910
import zmq.Options;
@@ -510,12 +511,7 @@ private int produceError(Msg msg)
510511
assert (statusCode == null || statusCode.length() == 3);
511512

512513
msg.putShortString("ERROR");
513-
if (statusCode != null) {
514-
msg.putShortString(statusCode);
515-
}
516-
else {
517-
msg.putShortString("");
518-
}
514+
msg.putShortString(Objects.requireNonNullElse(statusCode, ""));
519515

520516
return 0;
521517
}

src/test/java/guide/clone.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.HashMap;
44
import java.util.Map;
5+
import java.util.Objects;
56

67
import org.zeromq.*;
78
import org.zeromq.ZMQ.Poller;
@@ -206,9 +207,7 @@ else if (command.equals("CONNECT")) {
206207
else if (command.equals("GET")) {
207208
String key = msg.popString();
208209
String value = kvmap.get(key);
209-
if (value != null)
210-
pipe.send(value);
211-
else pipe.send("");
210+
pipe.send(Objects.requireNonNullElse(value, ""));
212211
}
213212
msg.destroy();
214213

0 commit comments

Comments
 (0)