mirror of
https://github.com/nosqlbench/nosqlbench.git
synced 2025-02-25 18:55:28 -06:00
return default value if needed
This commit is contained in:
parent
795d63aa63
commit
23de45ca63
@ -148,8 +148,9 @@ public class NBConfiguration {
|
|||||||
|
|
||||||
public <T> Optional<T> getOptional(Class<T> type, String... names) {
|
public <T> Optional<T> getOptional(Class<T> type, String... names) {
|
||||||
Object o = null;
|
Object o = null;
|
||||||
|
Param<?> param=null;
|
||||||
for (String name : names) {
|
for (String name : names) {
|
||||||
Param<?> param = model.getParam(names);
|
param = model.getParam(names);
|
||||||
if (param != null) {
|
if (param != null) {
|
||||||
for (String pname : param.getNames()) {
|
for (String pname : param.getNames()) {
|
||||||
o = data.get(pname);
|
o = data.get(pname);
|
||||||
@ -162,8 +163,12 @@ public class NBConfiguration {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (o == null) {
|
if (o == null) {
|
||||||
|
if (param!=null && param.isRequired()) {
|
||||||
|
o = param.getDefaultValue();
|
||||||
|
} else {
|
||||||
return Optional.empty();
|
return Optional.empty();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (type.isInstance(o)) {
|
if (type.isInstance(o)) {
|
||||||
return Optional.of((T) o);
|
return Optional.of((T) o);
|
||||||
} else if (type.isAssignableFrom(o.getClass())) {
|
} else if (type.isAssignableFrom(o.getClass())) {
|
||||||
|
Loading…
Reference in New Issue
Block a user