|
@@ -196,7 +196,7 @@ public final class StringUtils {
|
|
|
* @param <T> 字符串类型
|
|
|
* @return 非空字符串
|
|
|
*/
|
|
|
- public static <T extends CharSequence> T ifEmpty(T first, T second) {
|
|
|
+ public static <T> T ifEmpty(T first, T second) {
|
|
|
return isEmpty(first) ? second : first;
|
|
|
}
|
|
|
|
|
@@ -209,7 +209,7 @@ public final class StringUtils {
|
|
|
* @param <R> 适配目标对象类型
|
|
|
* @return 适配目标对象实例
|
|
|
*/
|
|
|
- public static <T extends CharSequence, R> R ifEmpty(T original, @NonNull Function<T, R> adapter) {
|
|
|
+ public static <T, R> R ifEmpty(T original, @NonNull Function<T, R> adapter) {
|
|
|
return isEmpty(original) ? null : adapter.apply(original);
|
|
|
}
|
|
|
|
|
@@ -222,7 +222,7 @@ public final class StringUtils {
|
|
|
* @param <R> 适配目标对象类型
|
|
|
* @return 适配目标对象实例
|
|
|
*/
|
|
|
- public static <T extends CharSequence, R> R ifEmpty(T original, @NonNull Function<T, R> adapter, R defaultValue) {
|
|
|
+ public static <T, R> R ifEmpty(T original, @NonNull Function<T, R> adapter, R defaultValue) {
|
|
|
R value = ifEmpty(original, adapter);
|
|
|
return isEmpty(value) ? defaultValue : value;
|
|
|
}
|
|
@@ -236,8 +236,7 @@ public final class StringUtils {
|
|
|
* @param <R> 适配目标对象类型
|
|
|
* @return 适配目标对象实例
|
|
|
*/
|
|
|
- public static <T extends CharSequence, R> R ifEmpty(T original, @NonNull Function<T, R> adapter,
|
|
|
- @NonNull Supplier<R> defaulter) {
|
|
|
+ public static <T, R> R ifEmpty(T original, @NonNull Function<T, R> adapter, @NonNull Supplier<R> defaulter) {
|
|
|
R value = ifEmpty(original, adapter);
|
|
|
return isEmpty(value) ? defaulter.get() : value;
|
|
|
}
|