diff --git a/nbr/src/main/java/io/nosqlbench/api/docsapi/docexporter/BundledMarkdownZipExporter.java b/nbr/src/main/java/io/nosqlbench/api/docsapi/docexporter/BundledMarkdownZipExporter.java index 5c2d752a2..9ab351ce3 100644 --- a/nbr/src/main/java/io/nosqlbench/api/docsapi/docexporter/BundledMarkdownZipExporter.java +++ b/nbr/src/main/java/io/nosqlbench/api/docsapi/docexporter/BundledMarkdownZipExporter.java @@ -33,9 +33,6 @@ import java.nio.file.StandardOpenOption; import java.util.Date; import java.util.Locale; import java.util.Map; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; import java.util.function.Function; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -65,10 +62,7 @@ public class BundledMarkdownZipExporter { } } - ExecutorService executorService = Executors.newSingleThreadExecutor(); - Future> future = executorService.submit(new VirtDataGenDocsApp(null)); - Map builderMap = future.get(); - executorService.shutdown(); + Map builderMap= new VirtDataGenDocsApp(null).call(); String bindingsPrefix ="bindings/"; for(Map.Entry entry : builderMap.entrySet()) { diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/VirtDataGenDocsApp.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/VirtDataGenDocsApp.java index dc872c7f4..2740e2410 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/VirtDataGenDocsApp.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/VirtDataGenDocsApp.java @@ -29,7 +29,6 @@ import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.FDocFuncs; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.io.FileWriter; import java.io.IOException; import java.io.Writer; import java.nio.charset.StandardCharsets; @@ -73,48 +72,6 @@ public class VirtDataGenDocsApp implements Callable> public Map call() { - /*LinkedList largs = new LinkedList<>(Arrays.asList(args)); - if (args.length > 0 && args[0].contains("help")) { - System.out.println( - "usage:\n" + - "[basefile ] [basedir ] [categories combined|split] [format json|markdown] " + - "[blurbsdirs [:...]]\n\n" - ); - return result; - } - while (largs.peekFirst() != null) { - String argtype = largs.removeFirst(); - if (largs.peekFirst() == null) { - throw new RuntimeException(VirtDataGenDocsApp.class + " expects args in param value couplets."); - } - - String argval = largs.removeFirst().toLowerCase(); - switch (argtype) { - case "basefile": - this.baseFileName = argval; - break; - case "basedir": - this.basedir = argval; - break; - case BLURBS_DIRS: - this.blurbsDirs = argval; - break; - case CATEGORIES: - if (!argval.equals(CATEGORIES_SPLIT) && !argval.equals(CATEGORIES_COMBINED)) { - throw new RuntimeException("categories must either be " + CATEGORIES_SPLIT + ", or " + CATEGORIES_COMBINED + "."); - } - this.categories = argval; - break; - case FORMAT: - if (!argval.equals(FORMAT_MARKDOWN) && !argval.equals(FORMAT_JSON)) { - throw new RuntimeException("format must either be " + FORMAT_MARKDOWN + ", or " + FORMAT_JSON + "."); - } - this.format = argval; - break; - default: - } - }*/ - Optional docsinfo = loadAllDocs(); if (!docsinfo.isPresent()) { @@ -180,6 +137,7 @@ public class VirtDataGenDocsApp implements Callable> logger.debug("writing blurb to " + outputname); builder.append(blurb); + break; } } }