IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2024-11-27 19:20:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

make parameter consumer consistent with protomap

Browse Source
This commit is contained in:
Jonathan Shook 2022-05-31 21:01:52 -05:00
parent 755ea768d5
commit 5cfe5e92ce
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,7 +228,11 @@ public class ParsedTemplateMap implements LongFunction<Map<String, ?>>, StaticFi
}
public <T> T takeStaticValue(String field, Class<T> classOfT) {
return (T) statics.remove(field);
if (statics.containsKey(field)) {
protomap.remove(field);
return (T) statics.remove(field);
}
return null;
}
/**
@ -317,6 +321,7 @@ public class ParsedTemplateMap implements LongFunction<Map<String, ?>>, StaticFi
public <T> T takeStaticConfigOr(String name, T defaultValue) {
if (statics.containsKey(name)) {
Object value = statics.remove(name);
protomap.remove(name);
return NBTypeConverter.convertOr(value, defaultValue);
}
for (Map<String, Object> cfgsource : cfgsources) {
@ -472,7 +477,7 @@ public class ParsedTemplateMap implements LongFunction<Map<String, ?>>, StaticFi
if (cfgsource.containsKey(name)) {
Object object = cfgsource.get(name);
if (type.isAssignableFrom(object.getClass())) {
return Optional.of((LongFunction<V>) cfgsource.get(name));
return Optional.of(l -> (V) cfgsource.get(name));
} else if (NBTypeConverter.canConvert(object, type)) {
return Optional.of(l -> NBTypeConverter.convert(cfgsource.get(name), type));
} else {