From fa242c4ad159cafe94b37f2fe7343751ce0907da Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 23 Jul 2021 02:54:37 -0500
Subject: [PATCH] fix synonym access in config

---
 .../java/io/nosqlbench/engine/api/util/SSLKsFactory.java   | 7 +++----
 .../nosqlbench/nb/api/config/standard/NBConfiguration.java | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/nb-api/src/main/java/io/nosqlbench/engine/api/util/SSLKsFactory.java b/nb-api/src/main/java/io/nosqlbench/engine/api/util/SSLKsFactory.java
index 778392fa3..fd5b926fe 100644
--- a/nb-api/src/main/java/io/nosqlbench/engine/api/util/SSLKsFactory.java
+++ b/nb-api/src/main/java/io/nosqlbench/engine/api/util/SSLKsFactory.java
@@ -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();
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfiguration.java b/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfiguration.java
index d718aa0ff..414b3c2e7 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfiguration.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfiguration.java
@@ -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;
                     }