Skip to content

[java] Enhance Null Check in Exception Handling #14810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 4, 2024
Merged

[java] Enhance Null Check in Exception Handling #14810

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3214588
Reports null checks were replaced with a call to a static method fro…
iampopovich Nov 26, 2024
1fefaba
applied formatting
iampopovich Nov 26, 2024
e940f09
Merge branch 'trunk' into java-null-checks
iampopovich Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions java/src/org/openqa/selenium/internal/Require.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,8 @@ public static int positive(String argName, Integer number, String message) {
throw new IllegalArgumentException(String.format(MUST_BE_SET, argName));
}
if (number <= 0) {
if (message == null) {
throw new IllegalArgumentException(String.format(MUST_BE_POSITIVE, argName));
} else {
throw new IllegalArgumentException(message);
}
throw new IllegalArgumentException(
Objects.requireNonNullElseGet(message, () -> String.format(MUST_BE_POSITIVE, argName)));
}
return number;
}
Expand All @@ -143,11 +140,8 @@ public static double positive(String argName, Double number, String message) {
throw new IllegalArgumentException(String.format(MUST_BE_SET, argName));
}
if (number <= 0) {
if (message == null) {
throw new IllegalArgumentException(String.format(MUST_BE_POSITIVE, argName));
} else {
throw new IllegalArgumentException(message);
}
throw new IllegalArgumentException(
Objects.requireNonNullElseGet(message, () -> String.format(MUST_BE_POSITIVE, argName)));
}
return number;
}
Expand Down
Loading