Skip to content

Commit 454ae25

Browse files
authored
[java] Enhance Null Check in Exception Handling (#14810)
1 parent 966bed6 commit 454ae25

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

java/src/org/openqa/selenium/internal/Require.java

+4-10
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,8 @@ public static int positive(String argName, Integer number, String message) {
129129
throw new IllegalArgumentException(String.format(MUST_BE_SET, argName));
130130
}
131131
if (number <= 0) {
132-
if (message == null) {
133-
throw new IllegalArgumentException(String.format(MUST_BE_POSITIVE, argName));
134-
} else {
135-
throw new IllegalArgumentException(message);
136-
}
132+
throw new IllegalArgumentException(
133+
Objects.requireNonNullElseGet(message, () -> String.format(MUST_BE_POSITIVE, argName)));
137134
}
138135
return number;
139136
}
@@ -143,11 +140,8 @@ public static double positive(String argName, Double number, String message) {
143140
throw new IllegalArgumentException(String.format(MUST_BE_SET, argName));
144141
}
145142
if (number <= 0) {
146-
if (message == null) {
147-
throw new IllegalArgumentException(String.format(MUST_BE_POSITIVE, argName));
148-
} else {
149-
throw new IllegalArgumentException(message);
150-
}
143+
throw new IllegalArgumentException(
144+
Objects.requireNonNullElseGet(message, () -> String.format(MUST_BE_POSITIVE, argName)));
151145
}
152146
return number;
153147
}

0 commit comments

Comments
 (0)