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 synonym access in config

Browse Source
This commit is contained in:
Jonathan Shook 2021-07-23 02:54:37 -05:00
parent 4413152327
commit fa242c4ad1
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nb-api/src/main/java/io/nosqlbench/engine/api/util/SSLKsFactory.java
View File

@ -18,8 +18,6 @@
package io.nosqlbench.engine.api.util;
import io.nosqlbench.nb.api.config.standard.*;
import io.nosqlbench.nb.api.config.standard.ConfigModel;
import io.nosqlbench.nb.api.config.standard.NBConfigModel;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -38,6 +36,7 @@ import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
import java.security.spec.PKCS8EncodedKeySpec;
import java.util.Base64;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.regex.Pattern;
@ -147,7 +146,7 @@ public class SSLKsFactory implements NBMapConfigurable {
if (cert != null)
keyStore.setCertificateEntry("certFile", cert);
File keyFile = cfg.getOptional("keyFilePath", "keyfilepath").map(File::new)
File keyFile = cfg.getOptional("keyfilepath").map(File::new)
.orElse(null);
if (keyFile != null) {
@ -251,7 +250,7 @@ public class SSLKsFactory implements NBMapConfigurable {
Param.optional("keystore"),
Param.optional("truststore"),
Param.optional("tspass"),
Param.optional("keyFilePath"),
Param.optional(List.of("keyFilePath","keyfilepath")),
Param.optional("caCertFilePath"),
Param.optional("certFilePath")
).asReadOnly();

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

@ -104,7 +104,7 @@ public class NBConfiguration {
Param<?> param = model.getParam(names);
if (param!=null) {
for (String pname : param.getNames()) {
o =data.get(name);
o =data.get(pname);
if (o!=null) {
break;
}