This commit is contained in:
Looly 2020-01-09 10:52:43 +08:00
parent 15151f777e
commit 7ef693efbf
2 changed files with 39 additions and 15 deletions

View File

@ -22,6 +22,7 @@ public interface OptNullBasicTypeFromObjectGetter<K> extends OptNullBasicTypeGet
}
return Convert.toStr(obj, defaultValue);
}
@Override
default Integer getInt(K key, Integer defaultValue) {
final Object obj = getObj(key);
@ -30,6 +31,7 @@ public interface OptNullBasicTypeFromObjectGetter<K> extends OptNullBasicTypeGet
}
return Convert.toInt(obj, defaultValue);
}
@Override
default Short getShort(K key, Short defaultValue) {
final Object obj = getObj(key);
@ -38,6 +40,7 @@ public interface OptNullBasicTypeFromObjectGetter<K> extends OptNullBasicTypeGet
}
return Convert.toShort(obj, defaultValue);
}
@Override
default Boolean getBool(K key, Boolean defaultValue) {
final Object obj = getObj(key);
@ -46,6 +49,7 @@ public interface OptNullBasicTypeFromObjectGetter<K> extends OptNullBasicTypeGet
}
return Convert.toBool(obj, defaultValue);
}
@Override
default Long getLong(K key, Long defaultValue) {
final Object obj = getObj(key);
@ -54,6 +58,7 @@ public interface OptNullBasicTypeFromObjectGetter<K> extends OptNullBasicTypeGet
}
return Convert.toLong(obj, defaultValue);
}
@Override
default Character getChar(K key, Character defaultValue) {
final Object obj = getObj(key);
@ -62,6 +67,7 @@ public interface OptNullBasicTypeFromObjectGetter<K> extends OptNullBasicTypeGet
}
return Convert.toChar(obj, defaultValue);
}
@Override
default Float getFloat(K key, Float defaultValue) {
final Object obj = getObj(key);
@ -70,6 +76,7 @@ public interface OptNullBasicTypeFromObjectGetter<K> extends OptNullBasicTypeGet
}
return Convert.toFloat(obj, defaultValue);
}
@Override
default Double getDouble(K key, Double defaultValue) {
final Object obj = getObj(key);
@ -78,6 +85,7 @@ public interface OptNullBasicTypeFromObjectGetter<K> extends OptNullBasicTypeGet
}
return Convert.toDouble(obj, defaultValue);
}
@Override
default Byte getByte(K key, Byte defaultValue) {
final Object obj = getObj(key);
@ -86,6 +94,7 @@ public interface OptNullBasicTypeFromObjectGetter<K> extends OptNullBasicTypeGet
}
return Convert.toByte(obj, defaultValue);
}
@Override
default BigDecimal getBigDecimal(K key, BigDecimal defaultValue) {
final Object obj = getObj(key);
@ -94,6 +103,7 @@ public interface OptNullBasicTypeFromObjectGetter<K> extends OptNullBasicTypeGet
}
return Convert.toBigDecimal(obj, defaultValue);
}
@Override
default BigInteger getBigInteger(K key, BigInteger defaultValue) {
final Object obj = getObj(key);
@ -102,6 +112,7 @@ public interface OptNullBasicTypeFromObjectGetter<K> extends OptNullBasicTypeGet
}
return Convert.toBigInteger(obj, defaultValue);
}
@Override
default <E extends Enum<E>> E getEnum(Class<E> clazz, K key, E defaultValue) {
final Object obj = getObj(key);
@ -110,6 +121,7 @@ public interface OptNullBasicTypeFromObjectGetter<K> extends OptNullBasicTypeGet
}
return Convert.toEnum(clazz, obj, defaultValue);
}
@Override
default Date getDate(K key, Date defaultValue) {
final Object obj = getObj(key);

View File

@ -17,50 +17,62 @@ public interface OptNullBasicTypeFromStringGetter<K> extends OptNullBasicTypeGet
default Object getObj(K key, Object defaultValue) {
return getStr(key, null == defaultValue ? null : defaultValue.toString());
}
@Override
default Integer getInt(K key, Integer defaultValue) {
return Convert.toInt(getStr(key), defaultValue);
}
@Override
default Short getShort(K key, Short defaultValue) {
return Convert.toShort(getStr(key), defaultValue);
}
@Override
default Boolean getBool(K key, Boolean defaultValue) {
return Convert.toBool(getStr(key), defaultValue);
}
@Override
default Long getLong(K key, Long defaultValue) {
return Convert.toLong(getStr(key), defaultValue);
}
@Override
default Character getChar(K key, Character defaultValue) {
return Convert.toChar(getStr(key), defaultValue);
}
@Override
default Float getFloat(K key, Float defaultValue) {
return Convert.toFloat(getStr(key), defaultValue);
}
@Override
default Double getDouble(K key, Double defaultValue) {
return Convert.toDouble(getStr(key), defaultValue);
}
@Override
default Byte getByte(K key, Byte defaultValue) {
return Convert.toByte(getStr(key), defaultValue);
}
@Override
default BigDecimal getBigDecimal(K key, BigDecimal defaultValue) {
return Convert.toBigDecimal(getStr(key), defaultValue);
}
@Override
default BigInteger getBigInteger(K key, BigInteger defaultValue) {
return Convert.toBigInteger(getStr(key), defaultValue);
}
@Override
default <E extends Enum<E>> E getEnum(Class<E> clazz, K key, E defaultValue) {
return Convert.toEnum(clazz, getStr(key), defaultValue);
}
@Override
default Date getDate(K key, Date defaultValue) {
return Convert.toDate(getStr(key), defaultValue);