make BundledApps implement primitive interface

adapter-cqld4/src/main/java/io/nosqlbench/analysis/RingAnalyzer.java

@@ -27,7 +27,7 @@ public class RingAnalyzer implements BundledApp {
     private final static Logger logger = LogManager.getLogger(RingAnalyzer.class);
 
     @Override
-    public int appMain(String[] args) {
+    public int applyAsInt(String[] args) {
         RingAnalyzerConfig cfg = new RingAnalyzerConfig();
         CommandLine cli = new CommandLine(cfg);
         CommandLine.ParseResult cl = cli.parseArgs(args);

adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGWorkloadExporter.java

@@ -86,11 +86,11 @@ public class CGWorkloadExporter implements BundledApp {
     private CGExporterConfig config;
 
     public static void main(String[] args) {
-        new CGWorkloadExporter().appMain(args);
+        new CGWorkloadExporter().applyAsInt(args);
     }
 
     @Override
-    public int appMain(String[] args) {
+    public int applyAsInt(String[] args) {
         this.config = new CGExporterConfig(args);
 
         logger.info("running CQL workload exporter with args:" + Arrays.toString(args));

adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/cql/parser/CqlParserHarnessTest.java

@@ -44,7 +44,7 @@ public class CqlParserHarnessTest {
     @Test
     public void testAllTypes() {
         CGWorkloadExporter exporter = new CGWorkloadExporter();
-        exporter.appMain(new String[]{"src/test/resources/testschemas/cql_alltypes.cql","_alltypes.yaml"});
+        exporter.applyAsInt(new String[]{"src/test/resources/testschemas/cql_alltypes.cql","_alltypes.yaml"});
         exporter.setNamingTemplate("[OPTYPE-][COLUMN-][TYPEDEF-][TABLE-]-[KEYSPACE]");
         var data = exporter.getWorkloadAsYaml();
 

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

@@ -34,7 +34,7 @@ public class NBWebServerApp implements BundledApp {
     private static final Logger logger = LogManager.getLogger(NBWebServerApp.class);
 
     public static void main(String[] args) {
-        new NBWebServerApp().appMain(args);
+        new NBWebServerApp().applyAsInt(args);
     }
 
     private static boolean deleteDirectory(File directoryToBeDeleted) {
@@ -144,7 +144,7 @@ public class NBWebServerApp implements BundledApp {
     }
 
     @Override
-    public int appMain(String[] args) {
+    public int applyAsInt(String[] args) {
         if (args.length > 0 && args[0].contains("help")) {
             showHelp();
         } else if (args.length > 0 && args[0].contains("generate")) {

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

@@ -182,7 +182,7 @@ public class NBCLI implements Function<String[], Integer> {
                 String[] appargs = Arrays.copyOfRange(args, 1, args.length);
                 logger.info("invoking bundled app '" + args[0] + "' (" + app.getClass().getSimpleName() + ").");
                 globalOptions.setWantsStackTraces(true);
-                int result = app.appMain(appargs);
+                int result = app.applyAsInt(appargs);
                 return result;
             }
         }

nb-api/src/main/java/io/nosqlbench/api/docsapi/docexporter/BundledMarkdownExporter.java

@@ -30,11 +30,11 @@ import java.util.List;
 public class BundledMarkdownExporter implements BundledApp {
 
     public static void main(String[] args) {
-        new BundledMarkdownExporter().appMain(args);
+        new BundledMarkdownExporter().applyAsInt(args);
 
     }
     @Override
-    public int appMain(String[] args) {
+    public int applyAsInt(String[] args) {
         final OptionParser parser = new OptionParser();
 
         OptionSpec<String> zipfileSpec = parser.accepts("zipfile", "zip file to write to")

nb-api/src/main/java/io/nosqlbench/api/markdown/exporter/MarkdownExporter.java

@@ -37,7 +37,7 @@ public class MarkdownExporter implements BundledApp, Runnable {
     private Set<DocScope> scopeSet;
 
     public static void main(String[] args) {
-        new MarkdownExporter().appMain(args);
+        new MarkdownExporter().applyAsInt(args);
     }
 
     @Override
@@ -48,7 +48,7 @@ public class MarkdownExporter implements BundledApp, Runnable {
 
 
     @Override
-    public int appMain(String[] args) {
+    public int applyAsInt(String[] args) {
         final OptionParser parser = new OptionParser();
 
         OptionSpec<String> basedir = parser.accepts("basedir", "base directory to write to")

nb-api/src/main/java/io/nosqlbench/api/spi/BundledApp.java

@@ -16,6 +16,8 @@
 
 package io.nosqlbench.api.spi;
 
-public interface BundledApp {
+import java.util.function.ToIntFunction;
-    int appMain(String[] args);
+
+public interface BundledApp extends ToIntFunction<String[]> {
+
 }

virtdata-userlibs/pom.xml

@@ -1,3 +1,19 @@
+<!--
+  ~ Copyright (c) 2022 nosqlbench
+  ~
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 

virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataMainApp.java

@@ -40,11 +40,11 @@ public class VirtDataMainApp implements BundledApp {
     }
 
     public static void main(String[] args) {
-        new VirtDataMainApp().appMain(args);
+        new VirtDataMainApp().applyAsInt(args);
     }
 
     @Override
-    public int appMain(String[] args) {
+    public int applyAsInt(String[] args) {
         if (args.length == 0) {
             System.out.println("Usage: app (" + APP_TESTMAPPER + "|" + APP_GENDOCS + "|" + APP_DIAGNOSE +")");
             return 1;

virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/VirtDataCheckPerfApp.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.nosqlbench.virtdata.userlibs.apps.valuesapp;
+package io.nosqlbench.virtdata.userlibs.apps.valuechecker;
 
 import io.nosqlbench.virtdata.core.bindings.ResolverDiagnostics;
 import io.nosqlbench.virtdata.core.bindings.VirtData;
@@ -59,7 +59,7 @@ public class VirtDataCheckPerfApp {
             runData = checker.call();
             System.out.println(runData.toString());
         } catch (Exception e) {
-            throw new RuntimeException("Error while checking performance: " + e.toString(), e);
+            throw new RuntimeException("Error while checking performance: " + e, e);
         }
 
     }