typos, culling, and alignment

devdocs/docstructure/bundled_docs.md

@@ -9,7 +9,8 @@ can be used by the documentation system.
 
 ## MarkdownDocs Service
 
-The primary markdown service that is meant to be consumed by the documetnation system is known simply as
+The primary markdown service that is meant to be consumed by the
+ documentation system is known simply as
 
     MarkdownDocs
 

docsys/src/main/java/io/nosqlbench/docsys/core/DocServerApp.java

@@ -14,21 +14,6 @@ import java.util.Arrays;
 public class DocServerApp {
     private static final Logger logger = LogManager.getLogger(DocServerApp.class);
 
-//    static {
-//        // defer to an extant logger context if it is there, otherwise
-//        // assume a local and docserver specific logging configuration
-//
-//        LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
-//        if (context.getLoggerList().size() == 1 && context.getLoggerList().get(0).getName().equals("ROOT")) {
-//            configureDocServerLogging(context);
-//            logger = LoggerFactory.getLogger(DocServerApp.class);
-//            logger.info("Configured logging system from logback-docsys.xml");
-//        } else {
-//            logger = LoggerFactory.getLogger(DocServerApp.class);
-//            logger.info("Configured logging within existing logging context.");
-//        }
-//    }
-
     public static void main(String[] args) {
         if (args.length > 0 && args[0].contains("help")) {
             showHelp();

engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java

@@ -624,7 +624,7 @@ public class NBCLIOptions {
 
     private String readWordOrThrow(LinkedList<String> arglist, String required) {
         if (arglist.peekFirst() == null) {
-            throw new InvalidParameterException(required + " not found");
+            throw new InvalidParameterException(required + " is required after this option");
         }
         return arglist.removeFirst();
     }

engine-core/src/main/java/io/nosqlbench/engine/core/script/BufferAppender.java

@@ -1,49 +0,0 @@
-/*
- *
- *    Copyright 2016 jshook
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * /
- */
-
-package io.nosqlbench.engine.core.script;
-
-import ch.qos.logback.core.OutputStreamAppender;
-
-import java.io.CharArrayWriter;
-
-public class BufferAppender<E> extends OutputStreamAppender<E> {
-
-    private CharArrayWriter buffer = new CharArrayWriter(0);
-
-    @Override
-    public void start() {
-        buffer = new CharArrayWriter(0);
-        super.start();
-    }
-
-    @Override
-    public void stop() {
-        super.stop();
-        buffer.reset();
-    }
-
-    @Override
-    protected void append(E eventObject) {
-        super.append(eventObject);
-        buffer.append(eventObject.toString());
-    }
-
-    public String toString() {
-        return (buffer==null) ? "" : buffer.toString();
-    }
-}

engine-docs/src/main/java/io/nosqlbench/engine/docs/NosqlbenchMarkdownManifest.java

@@ -10,9 +10,10 @@ public class NosqlbenchMarkdownManifest implements DocsysDynamicManifest {
     @Override
     public DocsBinder getDocs() {
         return new Docs().namespace("docs-for-eb")
-                .addFirstFoundPath("engine-docs/src/main/resources/docs-for-nb/",
+                .addFirstFoundPath(
-                        "docs-for-nb/")
+                        "engine-docs/src/main/resources/docs-for-nb/",
-                .setEnabledByDefault(true)
+                        "docs-for-nb/"
+                ).setEnabledByDefault(true)
                 .asDocsBinder();
     }
 }

nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java

@@ -29,6 +29,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;