Skip to content

Commit 2ee94e0

Browse files
committed
Add U.defaultTo(value, defaultValue).
1 parent 397d580 commit 2ee94e0

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

src/main/java/com/github/underscore/U.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2874,6 +2874,13 @@ public static <T> T checkNotNull(T reference, Object errorMessage) {
28742874
return reference;
28752875
}
28762876

2877+
public static <T> T defaultTo(T value, T defaultValue) {
2878+
if (value == null) {
2879+
return defaultValue;
2880+
}
2881+
return value;
2882+
}
2883+
28772884
@SuppressWarnings("unchecked")
28782885
protected static <T> List<T> newArrayList() {
28792886
return new ArrayList<T>();

src/test/java/com/github/underscore/UnderscoreTest.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,16 @@ public void checkNotNullWithObjectAndMessage() {
447447
assertEquals("123", U.checkNotNull("123", "Error message"));
448448
}
449449

450+
@Test
451+
public void defaultTo() {
452+
assertNull(U.defaultTo(null, null));
453+
}
454+
455+
@Test
456+
public void defaultTo2() {
457+
assertEquals("123", U.defaultTo("123", "124"));
458+
}
459+
450460
@Test
451461
@SuppressWarnings("unchecked")
452462
public void and() {

0 commit comments

Comments
 (0)