api-modules

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivityType.java

@@ -4,7 +4,7 @@ package io.nosqlbench.activitytype.cql.core;
 import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 
 import java.util.Optional;
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/filtering/CQLResultFilterType.java

@@ -7,7 +7,7 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.filters.ResultValueFilterTy
 import io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate.EnumReadableMappingFilter;
 import io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate.TristateFilter;
 import io.nosqlbench.engine.api.util.ConfigTuples;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 
 import java.util.function.Predicate;
 

activitytype-cql/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -1,2 +1,2 @@
 io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor
-io.nosqlbench.virtdata.processors.ServiceProcessor
+io.nosqlbench.nb.api.processors.ServiceProcessor

activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivityType.java

@@ -3,7 +3,7 @@ package io.nosqlbench.activitytype.cqlverify;
 import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 
 @Service(ActivityType.class)
 public class CqlVerifyActivityType implements ActivityType<CqlVerifyActivity> {

activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivityType.java

@@ -18,7 +18,7 @@ package io.nosqlbench.activitytype.diag;
 import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-diag/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -1,2 +1,2 @@
 io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor
-io.nosqlbench.virtdata.processors.ServiceProcessor
+io.nosqlbench.nb.api.processors.ServiceProcessor

activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivityType.java

@@ -3,7 +3,7 @@ package io.nosqlbench.activitytype.http;
 import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivityType.java

@@ -4,7 +4,7 @@ import io.nosqlbench.engine.api.activityapi.core.Action;
 import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 
 import java.util.Optional;
 

activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivityType.java

@@ -23,7 +23,7 @@ import io.nosqlbench.engine.api.activityapi.core.Action;
 import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 
 @Service(ActivityType.class)
 public class TCPClientActivityType implements ActivityType<TCPClientActivity> {

activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivityType.java

@@ -23,7 +23,7 @@ import io.nosqlbench.engine.api.activityapi.core.Action;
 import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
 import io.nosqlbench.engine.api.activityapi.core.ActivityType;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 
 @Service(ActivityType.class)
 public class TCPServerActivityType implements ActivityType<TCPServerActivity> {

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

@@ -1,6 +1,6 @@
 package io.nosqlbench.docsys.core;
 
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 import io.nosqlbench.docsys.api.WebServiceObject;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;

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

@@ -1,6 +1,6 @@
 package io.nosqlbench.docsys.core;
 
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 import io.nosqlbench.docsys.api.DocsNameSpace;
 import io.nosqlbench.docsys.api.Docs;
 import io.nosqlbench.docsys.api.DocsBinder;

docsys/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -1,2 +1,2 @@
 io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor
-io.nosqlbench.virtdata.processors.ServiceProcessor
+io.nosqlbench.nb.api.processors.ServiceProcessor

engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/CoreResultValueFilter.java

@@ -21,7 +21,7 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReada
 import io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate.ResultFilteringSieve;
 import io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate.TristateFilter;
 import io.nosqlbench.engine.api.util.ConfigTuples;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 
 import java.util.function.Predicate;
 

engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/IncludeCodesTypeExperimental.java

@@ -18,7 +18,7 @@
 package io.nosqlbench.engine.api.activityapi.cyclelog.filters;
 
 import io.nosqlbench.engine.api.util.SimpleConfig;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 
 import java.util.Arrays;
 import java.util.function.IntPredicate;

engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputType.java

@@ -21,7 +21,7 @@ import io.nosqlbench.engine.api.activityapi.core.Activity;
 import io.nosqlbench.engine.api.activityapi.input.Input;
 import io.nosqlbench.engine.api.activityapi.input.InputDispenser;
 import io.nosqlbench.engine.api.activityapi.input.InputType;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 
 @Service(InputType.class)
 public class CycleLogInputType implements InputType {

engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutputType.java

@@ -23,7 +23,7 @@ import io.nosqlbench.engine.api.activityapi.input.Input;
 import io.nosqlbench.engine.api.activityapi.output.Output;
 import io.nosqlbench.engine.api.activityapi.output.OutputDispenser;
 import io.nosqlbench.engine.api.activityapi.output.OutputType;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java

@@ -20,7 +20,7 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.outputs.logger;
 import io.nosqlbench.engine.api.activityapi.core.Activity;
 import io.nosqlbench.engine.api.activityapi.output.Output;
 import io.nosqlbench.engine.api.activityapi.output.OutputDispenser;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/TargetRateInputType.java

@@ -21,7 +21,7 @@ import io.nosqlbench.engine.api.activityapi.core.Activity;
 import io.nosqlbench.engine.api.activityapi.input.Input;
 import io.nosqlbench.engine.api.activityapi.input.InputDispenser;
 import io.nosqlbench.engine.api.activityapi.input.InputType;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 
 @Service(InputType.class)
 public class TargetRateInputType implements InputType {

engine-api/src/test/java/io/nosqlbench/TestMetricsRegistry.java

@@ -19,7 +19,7 @@ package io.nosqlbench;
 
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.activityapi.core.MetricRegistryService;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 
 /**
  * Provide a local MetricRegistryService for tests

engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricsContext.java

@@ -19,7 +19,7 @@ package io.nosqlbench.engine.core.metrics;
 
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.activityapi.core.MetricRegistryService;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 
 @Service(MetricRegistryService.class)
 public class MetricsContext implements MetricRegistryService {

engine-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -1,2 +1,2 @@
 io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor
-io.nosqlbench.virtdata.processors.ServiceProcessor
+io.nosqlbench.nb.api.processors.ServiceProcessor

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

@@ -3,7 +3,7 @@ package io.nosqlbench.engine.docs;
 import io.nosqlbench.docsys.api.Docs;
 import io.nosqlbench.docsys.api.DocsBinder;
 import io.nosqlbench.docsys.api.DocsysDynamicManifest;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 
 @Service(DocsysDynamicManifest.class)
 public class NosqlbenchMarkdownManifest implements DocsysDynamicManifest {

engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetricsPluginData.java

@@ -19,7 +19,7 @@ package io.nosqlbench.engine.extensions.csvmetrics;
 
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 import org.slf4j.Logger;
 
 import javax.script.ScriptContext;

engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePluginData.java

@@ -19,7 +19,7 @@ package io.nosqlbench.engine.extensions.example;
 
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 import org.slf4j.Logger;
 
 import javax.script.ScriptContext;

engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccessPluginData.java

@@ -19,7 +19,7 @@ package io.nosqlbench.engine.extensions.files;
 
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 import org.slf4j.Logger;
 
 import javax.script.ScriptContext;

engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/GlobalVarsScriptingPluginData.java

@@ -2,7 +2,7 @@ package io.nosqlbench.engine.extensions.globalvars;
 
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;
 import org.slf4j.Logger;
 

engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histologger/HdrHistoLogPluginData.java

@@ -19,7 +19,7 @@ package io.nosqlbench.engine.extensions.histologger;
 
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 import org.slf4j.Logger;
 
 import javax.script.ScriptContext;

engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histostatslogger/HistoStatsPluginData.java

@@ -19,7 +19,7 @@ package io.nosqlbench.engine.extensions.histostatslogger;
 
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 import org.slf4j.Logger;
 
 import javax.script.ScriptContext;

engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerPluginData.java

@@ -19,7 +19,7 @@ package io.nosqlbench.engine.extensions.optimizers;
 
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 import org.slf4j.Logger;
 
 import javax.script.ScriptContext;

engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetricsPluginData.java

@@ -19,7 +19,7 @@ package io.nosqlbench.engine.extensions.scriptingmetrics;
 
 import com.codahale.metrics.MetricRegistry;
 import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo;
-import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.nb.api.annotations.Service;
 import org.slf4j.Logger;
 
 import javax.script.ScriptContext;

engine-extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -1,2 +1,2 @@
 io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor
-io.nosqlbench.virtdata.processors.ServiceProcessor
+io.nosqlbench.nb.api.processors.ServiceProcessor

nb-api/pom.xml

@@ -0,0 +1,65 @@
+<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>
+
+
+    <parent>
+        <artifactId>mvn-defaults</artifactId>
+        <groupId>io.nosqlbench</groupId>
+        <version>3.12.73-SNAPSHOT</version>
+        <relativePath>../mvn-defaults</relativePath>
+    </parent>
+
+    <artifactId>nb-api</artifactId>
+    <packaging>jar</packaging>
+    <name>${project.artifactId}</name>
+    <description>
+        The top level API module for NoSQLBench. This module should have no internal
+        module dependencies other than the mvn-default module.
+        All modules within NoSQLBench can safely depend on this module with circular
+        dependencies. This module provides cross-cutting code infrastracture, such as
+        path utilities and ways of describing services used between modules.
+        It is also the transitive aggregation point for system-wide library dependencies
+        for logging and testing or similar needs.
+    </description>
+
+    <dependencies>
+
+        <!-- logging -->
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+
+        <!-- perf testing -->
+
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+        </dependency>
+
+        <!-- unit testing -->
+
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core-java8</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>

nb-api/src/main/java/io/nosqlbench/nb/api/ServiceClassName.java

@@ -0,0 +1,10 @@
+package io.nosqlbench.nb.api;
+
+/**
+ * Statically defined names which need to be visible for refactoring
+ * and safe source manipulation.
+ */
+public class ServiceClassName {
+    public final static String Service =
+            "io.nosqlbench.nb.api.annotations.Service";
+}

nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Service.java

@@ -13,7 +13,7 @@
 *   limitations under the License.
 */
 
-package io.nosqlbench.virtdata.annotations;
+package io.nosqlbench.nb.api.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

nb-api/src/main/java/io/nosqlbench/nb/api/processors/ServiceProcessor.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.processors;
+package io.nosqlbench.nb.api.processors;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;
@@ -22,11 +22,12 @@ import java.util.stream.Collectors;
  */
 @SupportedSourceVersion(SourceVersion.RELEASE_12)
 public class ServiceProcessor extends AbstractProcessor {
+    public final static String SERVICE_NAME = io.nosqlbench.nb.api.annotations.Service.class.getCanonicalName();
 
     @Override
     public Set<String> getSupportedAnnotationTypes() {
         Set<String> supportedAnnotations = new HashSet<>();
-        supportedAnnotations.add(ProcessorClassNames.Service);
+        supportedAnnotations.add(SERVICE_NAME);
         return supportedAnnotations;
     }
 

nb/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -1,2 +1,2 @@
 io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor
-io.nosqlbench.virtdata.processors.ServiceProcessor
+io.nosqlbench.nb.api.processors.ServiceProcessor

pom.xml

@@ -23,6 +23,7 @@
     <module>mvn-defaults</module>
     <!-- web apps and service hooks -->
     <module>docsys</module>
+    <module>nb-api</module>
 
     <!-- ENGINE MODULES -->
     <module>engine-api</module>
@@ -46,7 +47,7 @@
     <module>virtdata-annotations</module>
     <module>virtdata-processors</module>
     <module>virtdata-lang</module>
-    <module>virtdata-api</module>
+    <module>virtdata-core</module>
     <module>virtdata-realdata</module>
     <module>virtdata-lib-basics</module>
     <module>virtdata-lib-random</module>

virtdata-core/pom.xml

@@ -1,7 +1,7 @@
 <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>
 
-    <artifactId>virtdata-api</artifactId>
+    <artifactId>virtdata-core</artifactId>
     <packaging>jar</packaging>
 
     <parent>
@@ -11,7 +11,7 @@
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
-    <name>virtdata-api</name>
+    <name>virtdata-core</name>
     <url>http://nosqlbench.io/</url>
 
     <dependencies>