You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by pa...@apache.org on 2019/12/20 12:28:37 UTC
[commons-lang] branch master updated (325d9a9 -> c9ca06e)
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git.
from 325d9a9 EventListenerSupport: Fix string format of Validate#isTrue call in constructor.
new cb2ec37 Replace Character constructor (deprecated on Java 9+) calls in tests with Character#valueOf.
new c9ca06e Remove no longer necessary SpotBugs excludes.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
spotbugs-exclude-filter.xml | 10 ----------
.../org/apache/commons/lang3/ArrayUtilsTest.java | 18 +++++++++---------
.../java/org/apache/commons/lang3/CharUtilsTest.java | 20 ++++++++++----------
.../apache/commons/lang3/RandomStringUtilsTest.java | 4 ++--
.../apache/commons/lang3/StringEscapeUtilsTest.java | 4 ++--
5 files changed, 23 insertions(+), 33 deletions(-)
[commons-lang] 02/02: Remove no longer necessary SpotBugs excludes.
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit c9ca06e496dee2b22a3753652735c0bca60afc7e
Author: pascalschumacher <pa...@gmx.net>
AuthorDate: Fri Dec 20 13:28:20 2019 +0100
Remove no longer necessary SpotBugs excludes.
---
spotbugs-exclude-filter.xml | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/spotbugs-exclude-filter.xml b/spotbugs-exclude-filter.xml
index 2dd4c26..f24aa1d 100644
--- a/spotbugs-exclude-filter.xml
+++ b/spotbugs-exclude-filter.xml
@@ -100,11 +100,6 @@
<Bug pattern="CN_IDIOM_NO_SUPER_CALL" />
</Match>
- <!-- Reason: Testing shows that new Integer(...) etc is quicker than Integer.valueOf -->
- <Match>
- <Bug pattern="DM_NUMBER_CTOR" />
- </Match>
-
<!-- Reason: FindBugs 2.0.2 used in maven-findbugs-plugin 2.5.2 seems to have problems with detection of default cases
in switch statements. All the excluded methods have switch statements that conatin a default case. -->
<Match>
@@ -112,11 +107,6 @@
<Method name="createNumber" />
<Bug pattern="SF_SWITCH_NO_DEFAULT" />
</Match>
- <Match>
- <Class name="org.apache.commons.lang3.text.ExtendedMessageFormat"/>
- <Method name="insertFormats" />
- <Bug pattern="SF_SWITCH_NO_DEFAULT" />
- </Match>
<!-- Reason: FindBugs does not correctly recognize default branches in switch statements without break statements.
See, e.g., the report at https://sourceforge.net/p/findbugs/bugs/1298 -->
<Match>
[commons-lang] 01/02: Replace Character constructor (deprecated on
Java 9+) calls in tests with Character#valueOf.
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit cb2ec37bd393030b58b3aaf3129dcf83c5a0a6c6
Author: pascalschumacher <pa...@gmx.net>
AuthorDate: Fri Dec 20 13:08:50 2019 +0100
Replace Character constructor (deprecated on Java 9+) calls in tests with Character#valueOf.
---
.../org/apache/commons/lang3/ArrayUtilsTest.java | 18 +++++++++---------
.../java/org/apache/commons/lang3/CharUtilsTest.java | 20 ++++++++++----------
.../apache/commons/lang3/RandomStringUtilsTest.java | 4 ++--
.../apache/commons/lang3/StringEscapeUtilsTest.java | 4 ++--
4 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
index 3eb76c5..8dfcbcb 100644
--- a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
@@ -4340,11 +4340,11 @@ public class ArrayUtilsTest {
assertSame(ArrayUtils.EMPTY_CHAR_ARRAY, ArrayUtils.toPrimitive(new Character[0]));
- assertArrayEquals(new char[]{Character.MIN_VALUE, Character.MAX_VALUE, '0'}, ArrayUtils.toPrimitive(new Character[]{new Character(Character.MIN_VALUE),
- new Character(Character.MAX_VALUE), new Character('0')}));
+ assertArrayEquals(new char[]{Character.MIN_VALUE, Character.MAX_VALUE, '0'}, ArrayUtils.toPrimitive(new Character[]{Character.valueOf(Character.MIN_VALUE),
+ Character.valueOf(Character.MAX_VALUE), Character.valueOf('0')}));
assertThrows(NullPointerException.class,
- () -> ArrayUtils.toPrimitive(new Character[]{new Character(Character.MIN_VALUE), null}));
+ () -> ArrayUtils.toPrimitive(new Character[]{Character.valueOf(Character.MIN_VALUE), null}));
}
@Test
@@ -4355,12 +4355,12 @@ public class ArrayUtilsTest {
assertSame(ArrayUtils.EMPTY_CHAR_ARRAY,
ArrayUtils.toPrimitive(new Character[0], (char) 0));
- assertArrayEquals(new char[]{Character.MIN_VALUE, Character.MAX_VALUE, '0'}, ArrayUtils.toPrimitive(new Character[]{new Character(Character.MIN_VALUE),
- new Character(Character.MAX_VALUE), new Character('0')},
+ assertArrayEquals(new char[]{Character.MIN_VALUE, Character.MAX_VALUE, '0'}, ArrayUtils.toPrimitive(new Character[]{Character.valueOf(Character.MIN_VALUE),
+ Character.valueOf(Character.MAX_VALUE), Character.valueOf('0')},
Character.MIN_VALUE));
- assertArrayEquals(new char[]{Character.MIN_VALUE, Character.MAX_VALUE, '0'}, ArrayUtils.toPrimitive(new Character[]{new Character(Character.MIN_VALUE), null,
- new Character('0')}, Character.MAX_VALUE));
+ assertArrayEquals(new char[]{Character.MIN_VALUE, Character.MAX_VALUE, '0'}, ArrayUtils.toPrimitive(new Character[]{Character.valueOf(Character.MIN_VALUE), null,
+ Character.valueOf('0')}, Character.MAX_VALUE));
}
@Test
@@ -4371,8 +4371,8 @@ public class ArrayUtilsTest {
assertSame(ArrayUtils.EMPTY_CHARACTER_OBJECT_ARRAY,
ArrayUtils.toObject(new char[0]));
- assertArrayEquals(new Character[]{new Character(Character.MIN_VALUE),
- new Character(Character.MAX_VALUE), new Character('0')}, ArrayUtils.toObject(new char[]{Character.MIN_VALUE, Character.MAX_VALUE,
+ assertArrayEquals(new Character[]{Character.valueOf(Character.MIN_VALUE),
+ Character.valueOf(Character.MAX_VALUE), Character.valueOf('0')}, ArrayUtils.toObject(new char[]{Character.MIN_VALUE, Character.MAX_VALUE,
'0'}));
}
diff --git a/src/test/java/org/apache/commons/lang3/CharUtilsTest.java b/src/test/java/org/apache/commons/lang3/CharUtilsTest.java
index d4ba3e6..ae6be1c 100644
--- a/src/test/java/org/apache/commons/lang3/CharUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/CharUtilsTest.java
@@ -36,8 +36,8 @@ import org.junit.jupiter.api.Test;
public class CharUtilsTest {
private static final char CHAR_COPY = '\u00a9';
- private static final Character CHARACTER_A = new Character('A');
- private static final Character CHARACTER_B = new Character('B');
+ private static final Character CHARACTER_A = Character.valueOf('A');
+ private static final Character CHARACTER_B = Character.valueOf('B');
@Test
public void testCompare() {
@@ -229,7 +229,7 @@ public class CharUtilsTest {
@SuppressWarnings("deprecation") // intentional test of deprecated method
@Test
public void testToCharacterObject_char() {
- assertEquals(new Character('a'), CharUtils.toCharacterObject('a'));
+ assertEquals(Character.valueOf('a'), CharUtils.toCharacterObject('a'));
assertSame(CharUtils.toCharacterObject('a'), CharUtils.toCharacterObject('a'));
for (int i = 0; i < 128; i++) {
@@ -253,8 +253,8 @@ public class CharUtilsTest {
public void testToCharacterObject_String() {
assertNull(CharUtils.toCharacterObject(null));
assertNull(CharUtils.toCharacterObject(""));
- assertEquals(new Character('a'), CharUtils.toCharacterObject("a"));
- assertEquals(new Character('a'), CharUtils.toCharacterObject("abc"));
+ assertEquals(Character.valueOf('a'), CharUtils.toCharacterObject("a"));
+ assertEquals(Character.valueOf('a'), CharUtils.toCharacterObject("abc"));
assertSame(CharUtils.toCharacterObject("a"), CharUtils.toCharacterObject("a"));
}
@@ -282,17 +282,17 @@ public class CharUtilsTest {
@Test
public void testToIntValue_Character() {
- assertEquals(0, CharUtils.toIntValue(new Character('0')));
- assertEquals(3, CharUtils.toIntValue(new Character('3')));
+ assertEquals(0, CharUtils.toIntValue(Character.valueOf('0')));
+ assertEquals(3, CharUtils.toIntValue(Character.valueOf('3')));
assertThrows(IllegalArgumentException.class, () -> CharUtils.toIntValue(null));
assertThrows(IllegalArgumentException.class, () -> CharUtils.toIntValue(CHARACTER_A));
}
@Test
public void testToIntValue_Character_int() {
- assertEquals(0, CharUtils.toIntValue(new Character('0'), -1));
- assertEquals(3, CharUtils.toIntValue(new Character('3'), -1));
- assertEquals(-1, CharUtils.toIntValue(new Character('A'), -1));
+ assertEquals(0, CharUtils.toIntValue(Character.valueOf('0'), -1));
+ assertEquals(3, CharUtils.toIntValue(Character.valueOf('3'), -1));
+ assertEquals(-1, CharUtils.toIntValue(Character.valueOf('A'), -1));
assertEquals(-1, CharUtils.toIntValue(null, -1));
}
diff --git a/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java b/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java
index 35eddf6..d18e3c8 100644
--- a/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java
@@ -498,8 +498,8 @@ public class RandomStringUtilsTest {
final char o = orig.charAt(i);
final char c = copy.charAt(i);
assertEquals(o, c,
- "differs at " + i + "(" + Integer.toHexString(new Character(o).hashCode()) + "," +
- Integer.toHexString(new Character(c).hashCode()) + ")");
+ "differs at " + i + "(" + Integer.toHexString(Character.valueOf(o).hashCode()) + "," +
+ Integer.toHexString(Character.valueOf(c).hashCode()) + ")");
}
// compare length also
assertEquals(orig.length(), copy.length());
diff --git a/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java b/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java
index f016063..e04c20e 100644
--- a/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java
@@ -235,8 +235,8 @@ public class StringEscapeUtilsTest {
assertEquals("\u0080\u009F", StringEscapeUtils.unescapeHtml4("€Ÿ"), "hex number unescape");
// Test all Character values:
for (char i = Character.MIN_VALUE; i < Character.MAX_VALUE; i++) {
- final Character c1 = new Character(i);
- final Character c2 = new Character((char) (i+1));
+ final Character c1 = Character.valueOf(i);
+ final Character c2 = Character.valueOf((char) (i+1));
final String expected = c1.toString() + c2.toString();
final String escapedC1 = "&#x" + Integer.toHexString((c1.charValue())) + ";";
final String escapedC2 = "&#x" + Integer.toHexString((c2.charValue())) + ";";