IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix defaulting logic on NBConfiguration

Browse Source
This commit is contained in:
Jonathan Shook 2022-06-30 00:36:03 -05:00
parent 3a54725d66
commit ae7107916b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfiguration.java
View File

@ -102,7 +102,11 @@ public class NBConfiguration {
Object o = data.get(name); Object o = data.get(name);
if (o == null) { if (o == null) {
throw new NBConfigError("config param '" + name + "' was not defined."); if (param.getDefaultValue()==null) {
throw new NBConfigError("config param '" + name + "' was not defined.");
} else {
o= param.getDefaultValue();
}
} }
return ConfigModel.convertValueTo(this.getClass().getSimpleName(), name,o,type); return ConfigModel.convertValueTo(this.getClass().getSimpleName(), name,o,type);
// if (type.isAssignableFrom(o.getClass())) { // if (type.isAssignableFrom(o.getClass())) {

3
virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateMap.java
View File

@ -293,7 +293,8 @@ public class ParsedTemplateMap implements LongFunction<Map<String, ?>>, StaticFi
public <T> T takeStaticValue(String field, Class<T> classOfT) { public <T> T takeStaticValue(String field, Class<T> classOfT) {
if (statics.containsKey(field)) { if (statics.containsKey(field)) {
protomap.remove(field); protomap.remove(field);
return (T) statics.remove(field); T value = (T) statics.remove(field);
return value;
} else if (isConfig(field)) { } else if (isConfig(field)) {
return getConfig(field); return getConfig(field);
} }