From b3eecb4d65dbe81cf34ab06267a1d437eb473f3c Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 30 Jun 2020 20:38:16 -0500
Subject: [PATCH] clarify naming of statement fields

---
 .../api/activityconfig/rawyaml/RawStmtDef.java    |  4 ++--
 .../{BlockParams.java => RawStmtFields.java}      | 15 ++++++++++-----
 .../api/activityconfig/rawyaml/RawStmtsBlock.java |  3 +--
 .../api/activityconfig/rawyaml/RawStmtsDoc.java   |  3 +--
 4 files changed, 14 insertions(+), 11 deletions(-)
 rename engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/{BlockParams.java => RawStmtFields.java} (89%)

diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtDef.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtDef.java
index 2cfa5d1c1..90303d96b 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtDef.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtDef.java
@@ -21,7 +21,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Optional;
 
-public class RawStmtDef extends BlockParams {
+public class RawStmtDef extends RawStmtFields {
 
     private String statement;
 
@@ -74,7 +74,7 @@ public class RawStmtDef extends BlockParams {
             setName(defaultName);
         }
 
-        map.forEach((key, value) -> getParams().put(key, String.valueOf(value)));
+        map.forEach((key, value) -> getParams().put(key, value));
     }
 
     public String getStmt() {
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BlockParams.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtFields.java
similarity index 89%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BlockParams.java
rename to engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtFields.java
index 7a7eaddb2..e3bd50592 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BlockParams.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtFields.java
@@ -18,18 +18,17 @@
 package io.nosqlbench.engine.api.activityconfig.rawyaml;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class BlockParams extends Tags {
+public class RawStmtFields extends Tags {
 
     private String name = "";
     private String desc = "";
     private final Map<String, String> bindings = new LinkedHashMap<>();
     private final Map<String, Object> params = new LinkedHashMap<>();
 
-    public BlockParams() {
+    public RawStmtFields() {
     }
 
     public String getDesc() {
@@ -76,7 +75,7 @@ public class BlockParams extends Tags {
         this.params.putAll(config);
     }
 
-    public void applyBlockParams(BlockParams other) {
+    public void applyBlockParams(RawStmtFields other) {
         setName(other.getName());
         setBindings(other.getBindings());
         setTags(other.getTags());
@@ -110,7 +109,13 @@ public class BlockParams extends Tags {
         if (paramsObject!=null) {
             if (paramsObject instanceof Map) {
                 Map<Object,Object> paramsMap = (Map<Object,Object>) paramsObject;
-                paramsMap.forEach((ko,vo) -> params.put(ko.toString(),vo));
+                paramsMap.forEach(
+                        (ko,vo) -> {
+                            String paramkey = ko.toString();
+                            Object paramVal = vo;
+                            params.put(paramkey, paramVal);
+                        }
+                );
             } else {
                 throw new RuntimeException("Invalid type for params object:" + paramsObject.getClass().getCanonicalName());
             }
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtsBlock.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtsBlock.java
index e127a371e..2736e6d4a 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtsBlock.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtsBlock.java
@@ -17,12 +17,11 @@
 
 package io.nosqlbench.engine.api.activityconfig.rawyaml;
 
-import java.util.List;
 import java.util.Map;
 
 /**
  * A StmtsDef contains a list of rawStmts, as well as all of the optional
- * block parameters that can be assigned to {@link BlockParams}, which includes
+ * block parameters that can be assigned to {@link RawStmtFields}, which includes
  * a name, config values, data bindings, and filtering tags.
  */
 public class RawStmtsBlock extends StatementsOwner {
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtsDoc.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtsDoc.java
index 1a8ebcfef..d1205064c 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtsDoc.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtsDoc.java
@@ -20,12 +20,11 @@ package io.nosqlbench.engine.api.activityconfig.rawyaml;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * A statements doc can have both a list of statement blocks and/or a
  * list of statements. It can also have all the block parameters
- * assignable to {@link BlockParams}.
+ * assignable to {@link RawStmtFields}.
  * <p>
  * The reason for having support both statements or statement blocks
  * is merely convenience. If you do not need or want to deal with the