Skip to content

Commit b8d3820

Browse files
IcoreEgarydgregory
andauthored
[LANG-1804] Fix CharSet#getInstance returns null instead of EMPTY when input setStrs is null (#1530)
* Fix CharSet.getInstance(final String... setStrs) returns null instead of EMPTY when input setStrs is null * Remove unused import assertNull from CharSetTest Removed unused import statement for assertNull. --------- Co-authored-by: Gary Gregory <[email protected]>
1 parent 938587a commit b8d3820

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/main/java/org/apache/commons/lang3/CharSet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public class CharSet implements Serializable {
151151
*/
152152
public static CharSet getInstance(final String... setStrs) {
153153
if (setStrs == null) {
154-
return null;
154+
return EMPTY;
155155
}
156156
if (setStrs.length == 1) {
157157
final CharSet common = COMMON.get(setStrs[0]);

src/test/java/org/apache/commons/lang3/CharSetTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import static org.junit.jupiter.api.Assertions.assertEquals;
2222
import static org.junit.jupiter.api.Assertions.assertFalse;
2323
import static org.junit.jupiter.api.Assertions.assertNotEquals;
24-
import static org.junit.jupiter.api.Assertions.assertNull;
2524
import static org.junit.jupiter.api.Assertions.assertSame;
2625
import static org.junit.jupiter.api.Assertions.assertTrue;
2726

@@ -390,6 +389,8 @@ void testEquals_Object() {
390389
@Test
391390
void testGetInstance() {
392391
assertSame(CharSet.EMPTY, CharSet.getInstance((String) null));
392+
assertSame(CharSet.EMPTY, CharSet.getInstance((String[]) null));
393+
assertSame(CharSet.EMPTY, CharSet.getInstance(null));
393394
assertSame(CharSet.EMPTY, CharSet.getInstance(""));
394395
assertSame(CharSet.ASCII_ALPHA, CharSet.getInstance("a-zA-Z"));
395396
assertSame(CharSet.ASCII_ALPHA, CharSet.getInstance("A-Za-z"));
@@ -400,7 +401,7 @@ void testGetInstance() {
400401

401402
@Test
402403
void testGetInstance_Stringarray() {
403-
assertNull(CharSet.getInstance((String[]) null));
404+
assertEquals("[]", CharSet.getInstance((String[]) null).toString());
404405
assertEquals("[]", CharSet.getInstance().toString());
405406
assertEquals("[]", CharSet.getInstance(new String[] {null}).toString());
406407
assertEquals("[a-e]", CharSet.getInstance("a-e").toString());

0 commit comments

Comments
 (0)