This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit aae5a3522fd585513693d6c550044247eae28a51
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Jul 5 09:00:04 2022 -0400
Use Objects#requireNonNull()
---
.../java/org/apache/commons/lang3/ArrayUtils.java | 7 ++-----
.../commons/lang3/exception/ExceptionUtils.java | 7 +++----
.../text/translate/CharSequenceTranslator.java | 15 +++++++-------
.../org/apache/commons/lang3/ArrayUtilsTest.java | 2 +-
.../commons/lang3/StringEscapeUtilsTest.java | 24 +++++++++++-----------
.../lang3/exception/ExceptionUtilsTest.java | 2 +-
6 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/ArrayUtils.java
b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
index a098b0d5b..f0a698f3c 100644
--- a/src/main/java/org/apache/commons/lang3/ArrayUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
@@ -26,6 +26,7 @@ import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import java.util.Random;
import java.util.concurrent.ThreadLocalRandom;
import java.util.function.IntFunction;
@@ -3794,14 +3795,10 @@ public class ArrayUtils {
* @since 3.4
*/
public static <T> boolean isSorted(final T[] array, final Comparator<T>
comparator) {
- if (comparator == null) {
- throw new IllegalArgumentException("Comparator should not be
null.");
- }
-
+ Objects.requireNonNull(comparator, "comparator");
if (array == null || array.length < 2) {
return true;
}
-
T previous = array[0];
final int n = array.length;
for (int i = 1; i < n; i++) {
diff --git
a/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
b/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
index 4de719fc3..2c3fa8531 100644
--- a/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
+++ b/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
@@ -716,13 +716,12 @@ public class ExceptionUtils {
*
* @param causeFrames stack trace of a cause throwable
* @param wrapperFrames stack trace of a wrapper throwable
- * @throws IllegalArgumentException if either argument is null
+ * @throws NullPointerException if either argument is null
* @since 2.0
*/
public static void removeCommonFrames(final List<String> causeFrames,
final List<String> wrapperFrames) {
- if (causeFrames == null || wrapperFrames == null) {
- throw new IllegalArgumentException("The List must not be null");
- }
+ Objects.requireNonNull(causeFrames, "causeFrames");
+ Objects.requireNonNull(wrapperFrames, "wrapperFrames");
int causeFrameIndex = causeFrames.size() - 1;
int wrapperFrameIndex = wrapperFrames.size() - 1;
while (causeFrameIndex >= 0 && wrapperFrameIndex >= 0) {
diff --git
a/src/main/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java
b/src/main/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java
index 3c30ff064..373a3d5be 100644
---
a/src/main/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java
+++
b/src/main/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import java.util.Locale;
+import java.util.Objects;
/**
* An API for translating text.
@@ -74,30 +75,28 @@ public abstract class CharSequenceTranslator {
* tightly coupled with the abstract method of this class.
*
* @param input CharSequence that is being translated
- * @param out Writer to translate the text to
+ * @param writer Writer to translate the text to
* @throws IOException if and only if the Writer produces an IOException
*/
- public final void translate(final CharSequence input, final Writer out)
throws IOException {
- if (out == null) {
- throw new IllegalArgumentException("The Writer must not be null");
- }
+ public final void translate(final CharSequence input, final Writer writer)
throws IOException {
+ Objects.requireNonNull(writer, "writer");
if (input == null) {
return;
}
int pos = 0;
final int len = input.length();
while (pos < len) {
- final int consumed = translate(input, pos, out);
+ final int consumed = translate(input, pos, writer);
if (consumed == 0) {
// inlined implementation of
Character.toChars(Character.codePointAt(input, pos))
// avoids allocating temp char arrays and duplicate checks
final char c1 = input.charAt(pos);
- out.write(c1);
+ writer.write(c1);
pos++;
if (Character.isHighSurrogate(c1) && pos < len) {
final char c2 = input.charAt(pos);
if (Character.isLowSurrogate(c2)) {
- out.write(c2);
+ writer.write(c2);
pos++;
}
}
diff --git a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
index c44419d7a..23a37bac1 100644
--- a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
@@ -1646,7 +1646,7 @@ public class ArrayUtilsTest {
@Test
public void testIsSortedNullComparator() {
- assertThrows(IllegalArgumentException.class, () ->
ArrayUtils.isSorted(null, null));
+ assertThrows(NullPointerException.class, () ->
ArrayUtils.isSorted(null, null));
}
@Test
diff --git a/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java
b/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java
index 80e04fbda..f6e1b44c1 100644
--- a/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java
@@ -55,8 +55,8 @@ public class StringEscapeUtilsTest {
@Test
public void testEscapeJava() throws IOException {
assertNull(StringEscapeUtils.escapeJava(null));
- assertThrows(IllegalArgumentException.class, () ->
StringEscapeUtils.ESCAPE_JAVA.translate(null, null));
- assertThrows(IllegalArgumentException.class, () ->
StringEscapeUtils.ESCAPE_JAVA.translate("", null));
+ assertThrows(NullPointerException.class, () ->
StringEscapeUtils.ESCAPE_JAVA.translate(null, null));
+ assertThrows(NullPointerException.class, () ->
StringEscapeUtils.ESCAPE_JAVA.translate("", null));
assertEscapeJava("empty string", "", "");
assertEscapeJava(FOO, FOO);
@@ -112,8 +112,8 @@ public class StringEscapeUtilsTest {
@Test
public void testUnescapeJava() throws IOException {
assertNull(StringEscapeUtils.unescapeJava(null));
- assertThrows(IllegalArgumentException.class, () ->
StringEscapeUtils.UNESCAPE_JAVA.translate(null, null));
- assertThrows(IllegalArgumentException.class, () ->
StringEscapeUtils.UNESCAPE_JAVA.translate("", null));
+ assertThrows(NullPointerException.class, () ->
StringEscapeUtils.UNESCAPE_JAVA.translate(null, null));
+ assertThrows(NullPointerException.class, () ->
StringEscapeUtils.UNESCAPE_JAVA.translate("", null));
assertThrows(RuntimeException.class, () ->
StringEscapeUtils.unescapeJava("\\u02-3"));
assertUnescapeJava("", "");
@@ -152,8 +152,8 @@ public class StringEscapeUtilsTest {
@Test
public void testEscapeEcmaScript() {
assertNull(StringEscapeUtils.escapeEcmaScript(null));
- assertThrows(IllegalArgumentException.class, () ->
StringEscapeUtils.ESCAPE_ECMASCRIPT.translate(null, null));
- assertThrows(IllegalArgumentException.class, () ->
StringEscapeUtils.ESCAPE_ECMASCRIPT.translate("", null));
+ assertThrows(NullPointerException.class, () ->
StringEscapeUtils.ESCAPE_ECMASCRIPT.translate(null, null));
+ assertThrows(NullPointerException.class, () ->
StringEscapeUtils.ESCAPE_ECMASCRIPT.translate("", null));
assertEquals("He didn\\'t say, \\\"stop!\\\"",
StringEscapeUtils.escapeEcmaScript("He didn't say, \"stop!\""));
assertEquals("document.getElementById(\\\"test\\\").value =
\\'<script>alert(\\'aaa\\');<\\/script>\\';",
@@ -163,8 +163,8 @@ public class StringEscapeUtilsTest {
@Test
public void testUnescapeEcmaScript() {
assertNull(StringEscapeUtils.escapeEcmaScript(null));
- assertThrows(IllegalArgumentException.class, () ->
StringEscapeUtils.UNESCAPE_ECMASCRIPT.translate(null, null));
- assertThrows(IllegalArgumentException.class, () ->
StringEscapeUtils.UNESCAPE_ECMASCRIPT.translate("", null));
+ assertThrows(NullPointerException.class, () ->
StringEscapeUtils.UNESCAPE_ECMASCRIPT.translate(null, null));
+ assertThrows(NullPointerException.class, () ->
StringEscapeUtils.UNESCAPE_ECMASCRIPT.translate("", null));
assertEquals("He didn't say, \"stop!\"",
StringEscapeUtils.unescapeEcmaScript("He didn\\'t say, \\\"stop!\\\""));
assertEquals("document.getElementById(\"test\").value =
'<script>alert('aaa');</script>';",
@@ -546,8 +546,8 @@ public class StringEscapeUtilsTest {
@Test
public void testEscapeJson() {
assertNull(StringEscapeUtils.escapeJson(null));
- assertThrows(IllegalArgumentException.class, () ->
StringEscapeUtils.ESCAPE_JSON.translate(null, null));
- assertThrows(IllegalArgumentException.class, () ->
StringEscapeUtils.ESCAPE_JSON.translate("", null));
+ assertThrows(NullPointerException.class, () ->
StringEscapeUtils.ESCAPE_JSON.translate(null, null));
+ assertThrows(NullPointerException.class, () ->
StringEscapeUtils.ESCAPE_JSON.translate("", null));
assertEquals("He didn't say, \\\"stop!\\\"",
StringEscapeUtils.escapeJson("He didn't say, \"stop!\""));
@@ -560,8 +560,8 @@ public class StringEscapeUtilsTest {
@Test
public void testUnescapeJson() {
assertNull(StringEscapeUtils.unescapeJson(null));
- assertThrows(IllegalArgumentException.class, () ->
StringEscapeUtils.UNESCAPE_JSON.translate(null, null));
- assertThrows(IllegalArgumentException.class, () ->
StringEscapeUtils.UNESCAPE_JSON.translate("", null));
+ assertThrows(NullPointerException.class, () ->
StringEscapeUtils.UNESCAPE_JSON.translate(null, null));
+ assertThrows(NullPointerException.class, () ->
StringEscapeUtils.UNESCAPE_JSON.translate("", null));
assertEquals("He didn't say, \"stop!\"",
StringEscapeUtils.unescapeJson("He didn't say, \\\"stop!\\\""));
diff --git
a/src/test/java/org/apache/commons/lang3/exception/ExceptionUtilsTest.java
b/src/test/java/org/apache/commons/lang3/exception/ExceptionUtilsTest.java
index ffe83c625..1b3747106 100644
--- a/src/test/java/org/apache/commons/lang3/exception/ExceptionUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/exception/ExceptionUtilsTest.java
@@ -666,7 +666,7 @@ public class ExceptionUtilsTest {
@Test
public void testRemoveCommonFrames_ListList() {
- assertThrows(IllegalArgumentException.class, () ->
ExceptionUtils.removeCommonFrames(null, null));
+ assertThrows(NullPointerException.class, () ->
ExceptionUtils.removeCommonFrames(null, null));
}
@Test
