structuring and naming changes

adapter-http/src/test/java/io/nosqlbench/adapter/http/cmds/HttpFormatParserTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.nosqlbench.activitytype.cmds;
+package io.nosqlbench.adapter.http.cmds;
 
 import io.nosqlbench.adapter.http.core.HttpFormatParser;
 import org.junit.jupiter.api.Test;

adapter-http/src/test/java/io/nosqlbench/adapter/http/cmds/ReadyHttpOpTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.nosqlbench.activitytype.cmds;
+package io.nosqlbench.adapter.http.cmds;
 
 public class ReadyHttpOpTest {
 

adapter-http/src/test/java/io/nosqlbench/adapter/http/statuscodes/HttpStatusCodesTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,8 @@
  * limitations under the License.
  */
 
-package io.nosqlbench.activitytype.http.statuscodes;
+package io.nosqlbench.adapter.http.statuscodes;
 
-import io.nosqlbench.adapter.http.statuscodes.HttpStatusCodes;
-import io.nosqlbench.adapter.http.statuscodes.HttpStatusRanges;
-import io.nosqlbench.adapter.http.statuscodes.IetfStatusCode;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.Test;

engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTemplateVarTest.java

@@ -19,13 +19,14 @@ package io.nosqlbench.engine.cli;
 import io.nosqlbench.adapters.api.activityconfig.OpsLoader;
 import io.nosqlbench.adapters.api.activityconfig.yaml.OpTemplate;
 import io.nosqlbench.adapters.api.activityconfig.yaml.OpsDocList;
+import io.nosqlbench.engine.cmdstream.Cmd;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class NBCLIScenarioParserTemplateVarTest {
+public class NBCLIScenarioPreprocessorTemplateVarTest {
 
     @Test
     public void testMultipleOccurencesOfSameTemplateVar() {
@@ -33,12 +34,12 @@ public class NBCLIScenarioParserTemplateVarTest {
         List<Cmd> cmds = opts.getCommands();
         cmds.forEach(System.out::println);
 
-        OpsDocList workload1 = OpsLoader.loadPath(cmds.get(0).getArg("workload"),cmds.get(0).getParams());
+        OpsDocList workload1 = OpsLoader.loadPath(cmds.get(0).getArgValue("workload"),cmds.get(0).getArgMap());
         OpTemplate optpl1 = workload1.getOps(true).get(0);
         System.out.println("op from cmd1:"+optpl1);
         assertThat(optpl1.getStmt()).contains("cycle {cycle} replaced replaced\n");
 
-        OpsDocList workload2 = OpsLoader.loadPath(cmds.get(1).getArg("workload"),cmds.get(1).getParams());
+        OpsDocList workload2 = OpsLoader.loadPath(cmds.get(1).getArgValue("workload"),cmds.get(1).getArgMap());
         OpTemplate optpl2 = workload2.getOps(true).get(0);
         System.out.println("op from cmd2:"+optpl2);
         assertThat(optpl2.getStmt()).contains("cycle {cycle} def1 def1\n");
@@ -50,7 +51,7 @@ public class NBCLIScenarioParserTemplateVarTest {
         List<Cmd> cmds = opts.getCommands();
         cmds.forEach(System.out::println);
 
-        OpsDocList workload1 = OpsLoader.loadPath(cmds.get(0).getArg("workload"),cmds.get(0).getParams());
+        OpsDocList workload1 = OpsLoader.loadPath(cmds.get(0).getArgValue("workload"),cmds.get(0).getArgMap());
         OpTemplate optpl1 = workload1.getOps(true).get(0);
         System.out.println("op from cmd1:"+optpl1);
         assertThat(optpl1.getStmt()).contains("cycle {cycle} overridden overridden\n");
@@ -62,8 +63,8 @@ public class NBCLIScenarioParserTemplateVarTest {
         List<Cmd> cmds = opts.getCommands();
         cmds.forEach(System.out::println);
         assertThat(cmds).hasSize(2);
-        assertThat(cmds.get(0).getParams().get("tvar3")).isEqualTo("tval3");
+        assertThat(cmds.get(0).getArgValueOrNull("tvar3")).isEqualTo("tval3");
-        assertThat(cmds.get(1).getParams().get("tvar3")).isEqualTo("tval3");
+        assertThat(cmds.get(1).getArgValueOrNull("tvar3")).isEqualTo("tval3");
     }
 
 }

engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTest.java

@@ -16,8 +16,9 @@
 
 package io.nosqlbench.engine.cli;
 
-import io.nosqlbench.api.errors.BasicError;
+import io.nosqlbench.engine.api.scenarios.NBCLIScenarioPreprocessor;
-import io.nosqlbench.engine.api.scenarios.NBCLIScenarioParser;
+import io.nosqlbench.engine.cmdstream.Cmd;
+import io.nosqlbench.nb.api.errors.BasicError;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -28,7 +29,7 @@ import java.util.Map;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-public class NBCLIScenarioParserTest {
+public class NBCLIScenarioPreprocessorTest {
 
     @Test
     public void providePathForScenario() {
@@ -46,7 +47,7 @@ public class NBCLIScenarioParserTest {
     public void defaultScenarioWithParams() {
         NBCLIOptions opts = new NBCLIOptions(new String[]{"scenario_test", "cycles=100"});
         List<Cmd> cmds = opts.getCommands();
-        assertThat(cmds.get(0).getArg("cycles")).isEqualTo("100");
+        assertThat(cmds.get(0).getArgValue("cycles")).isEqualTo("100");
     }
 
     @Test
@@ -59,26 +60,26 @@ public class NBCLIScenarioParserTest {
     public void namedScenarioWithParams() {
         NBCLIOptions opts = new NBCLIOptions(new String[]{"scenario_test", "schema_only", "cycles=100"});
         List<Cmd> cmds = opts.getCommands();
-        assertThat(cmds.get(0).getArg("cycles")).containsOnlyOnce("100");
+        assertThat(cmds.get(0).getArgValue("cycles")).containsOnlyOnce("100");
     }
 
     @Test
     public void testThatSilentFinalParametersPersist() {
         NBCLIOptions opts = new NBCLIOptions(new String[]{"scenario_test", "type=foo"});
         List<Cmd> cmds = opts.getCommands();
-        assertThat(cmds.get(0).getArg("driver")).isEqualTo("stdout");
+        assertThat(cmds.get(0).getArgValue("driver")).isEqualTo("stdout");
     }
 
     @Test
     public void testThatVerboseFinalParameterThrowsError() {
         assertThatExceptionOfType(BasicError.class)
-                .isThrownBy(() -> new NBCLIOptions(new String[]{"scenario_test", "workload=canttouchthis"}));
+            .isThrownBy(() -> new NBCLIOptions(new String[]{"scenario_test", "workload=canttouchthis"}));
     }
 
     @Test
     public void testThatMissingScenarioNameThrowsError() {
         assertThatExceptionOfType(BasicError.class)
-                .isThrownBy(() -> new NBCLIOptions(new String[]{"scenario_test", "missing_scenario"}));
+            .isThrownBy(() -> new NBCLIOptions(new String[]{"scenario_test", "missing_scenario"}));
     }
 
     @Test
@@ -93,9 +94,9 @@ public class NBCLIScenarioParserTest {
         NBCLIOptions opts = new NBCLIOptions(new String[]{"scenario_test", "template_test"});
         List<Cmd> cmds = opts.getCommands();
         assertThat(cmds.size()).isEqualTo(1);
-        assertThat(cmds.get(0).getArg("driver")).isEqualTo("stdout");
+        assertThat(cmds.get(0).getArgValue("driver")).isEqualTo("stdout");
-        assertThat(cmds.get(0).getArg("cycles")).isEqualTo("10");
+        assertThat(cmds.get(0).getArgValue("cycles")).isEqualTo("10");
-        assertThat(cmds.get(0).getArg("workload")).isEqualTo("scenario_test");
+        assertThat(cmds.get(0).getArgValue("workload")).isEqualTo("scenario_test");
     }
 
     @Test
@@ -103,13 +104,15 @@ public class NBCLIScenarioParserTest {
         NBCLIOptions opts = new NBCLIOptions(new String[]{"scenario_test", "template_test", "cycles-test=20"});
         List<Cmd> cmds = opts.getCommands();
         assertThat(cmds.size()).isEqualTo(1);
-        assertThat(cmds.get(0).getParams()).isEqualTo(Map.of(
+        assertThat(cmds.get(0).getArgMap()).isEqualTo(Map.of(
-                "alias", "with_template",
+            "alias", "with_template",
-                "cycles", "20",
+            "context", "template_test",
-                "cycles-test", "20",
+            "cycles", "20",
-                "driver", "stdout",
+            "cycles-test", "20",
-                "labels","workload:$scenario_test",
+            "driver", "stdout",
-                "workload", "scenario_test"
+            "labels", "workload:scenario_test,scenario:template_test",
+            "step", "with_template",
+            "workload", "scenario_test"
         ));
     }
 
@@ -118,18 +121,20 @@ public class NBCLIScenarioParserTest {
         NBCLIOptions opts = new NBCLIOptions(new String[]{"scenario_test", "schema_only", "cycles-test=20"});
         List<Cmd> cmds = opts.getCommands();
         assertThat(cmds.size()).isEqualTo(1);
-        assertThat(cmds.get(0).getParams()).isEqualTo(Map.of(
+        assertThat(cmds.get(0).getArgMap()).isEqualTo(Map.of(
-                "alias", "schema",
+            "alias", "schema",
-                "cycles-test", "20",
+            "context", "schema_only",
-                "driver", "stdout",
+            "cycles-test", "20",
-                "labels","workload:$scenario_test",
+            "driver", "stdout",
-                "tags", "block:\"schema.*\"",
+            "labels", "workload:scenario_test,scenario:schema_only",
-                "workload", "scenario_test"
+            "step", "schema",
+            "tags", "block:\"schema.*\"",
+            "workload", "scenario_test"
         ));
         NBCLIOptions opts1 = new NBCLIOptions(new String[]{"scenario_test", "schema_only", "doundef=20"});
         List<Cmd> cmds1 = opts1.getCommands();
         assertThat(cmds1.size()).isEqualTo(1);
-        assertThat(cmds1.get(0).getArg("cycles-test")).isNull();
+        assertThat(cmds1.get(0).getArgValueOrNull("cycles-test")).isNull();
     }
 
     @Test
@@ -161,7 +166,7 @@ public class NBCLIScenarioParserTest {
 
     @Test
     public void testSanitizer() {
-        String sanitized = NBCLIScenarioParser.sanitize("A-b,c_d");
+        String sanitized = NBCLIScenarioPreprocessor.sanitize("A-b,c_d");
         assertThat(sanitized).isEqualTo("A_bc_d");
     }
 
@@ -170,18 +175,20 @@ public class NBCLIScenarioParserTest {
         NBCLIOptions opts = new NBCLIOptions(new String[]{"scenario_test", "schema_only", "cycles-test=20"});
         List<Cmd> cmds = opts.getCommands();
         assertThat(cmds.size()).isEqualTo(1);
-        assertThat(cmds.get(0).getParams()).isEqualTo(Map.of(
+        assertThat(cmds.get(0).getArgMap()).isEqualTo(Map.of(
-                "alias", "schema",
+            "alias", "schema",
-                "cycles-test", "20",
+            "context", "schema_only",
-                "driver", "stdout",
+            "cycles-test", "20",
-                "labels","workload:$scenario_test",
+            "driver", "stdout",
-                "tags", "block:\"schema.*\"",
+            "labels", "workload:scenario_test,scenario:schema_only",
-                "workload", "scenario_test"
+            "step", "schema",
+            "tags", "block:\"schema.*\"",
+            "workload", "scenario_test"
         ));
         NBCLIOptions opts1 = new NBCLIOptions(new String[]{"local/example_scenarios", "namedsteps.one", "testparam1=testvalue2"});
         List<Cmd> cmds1 = opts1.getCommands();
         assertThat(cmds1.size()).isEqualTo(1);
-        assertThat(cmds1.get(0).getArg("cycles_test")).isNull();
+        assertThat(cmds1.get(0).getArgValueOrNull("cycles_test")).isNull();
 
     }
 }

engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java

@@ -16,9 +16,9 @@
 
 package io.nosqlbench.engine.api.activityapi.core;
 
-import io.nosqlbench.components.NBComponent;
+import io.nosqlbench.nb.api.components.NBComponent;
-import io.nosqlbench.api.engine.activityimpl.ActivityDef;
+import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef;
-import io.nosqlbench.api.engine.activityimpl.ParameterMap;
+import io.nosqlbench.nb.api.engine.activityimpl.ParameterMap;
 import io.nosqlbench.engine.api.activityapi.core.progress.ProgressCapable;
 import io.nosqlbench.engine.api.activityapi.core.progress.StateCapable;
 import io.nosqlbench.engine.api.activityapi.cyclelog.filters.IntPredicateDispenser;

engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityDefObserver.java

@@ -15,7 +15,7 @@
  */
 package io.nosqlbench.engine.api.activityapi.core;
 
-import io.nosqlbench.api.engine.activityimpl.ActivityDef;
+import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef;
 
 /**
  * Decorator interface for getting notified when an activities parameters are changed at runtime.

engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityType.java

@@ -16,8 +16,8 @@
 
 package io.nosqlbench.engine.api.activityapi.core;
 
-import io.nosqlbench.components.NBComponent;
+import io.nosqlbench.nb.api.components.NBComponent;
-import io.nosqlbench.api.engine.activityimpl.ActivityDef;
+import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityapi.input.InputDispenser;
 import io.nosqlbench.engine.api.activityapi.output.OutputDispenser;
 import io.nosqlbench.engine.api.activityimpl.CoreServices;

engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/BaseAsyncAction.java

@@ -17,8 +17,8 @@
 package io.nosqlbench.engine.api.activityapi.core;
 
 import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.TrackedOp;
-import io.nosqlbench.api.engine.activityimpl.ActivityDef;
+import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef;
-import io.nosqlbench.api.engine.activityimpl.ParameterMap;
+import io.nosqlbench.nb.api.engine.activityimpl.ParameterMap;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 

engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ComponentActivityInstrumentation.java

@@ -19,11 +19,11 @@ package io.nosqlbench.engine.api.activityapi.core;
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Timer;
-import io.nosqlbench.api.engine.activityimpl.ActivityDef;
+import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef;
-import io.nosqlbench.api.engine.activityimpl.ParameterMap;
+import io.nosqlbench.nb.api.engine.activityimpl.ParameterMap;
-import io.nosqlbench.api.engine.metrics.instruments.NBMetricCounter;
+import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricCounter;
-import io.nosqlbench.api.engine.metrics.instruments.NBMetricHistogram;
+import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricHistogram;
-import io.nosqlbench.api.engine.metrics.instruments.NBMetricTimer;
+import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricTimer;
 
 public class ComponentActivityInstrumentation implements ActivityInstrumentation {
 

engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/MotorDispenser.java

@@ -15,7 +15,7 @@
  */
 package io.nosqlbench.engine.api.activityapi.core;
 
-import io.nosqlbench.api.engine.activityimpl.ActivityDef;
+import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef;
 
 /**
  * A MotorDispenser is created for each Activity instance within a scenario.

engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImpl.java

@@ -18,7 +18,7 @@ package io.nosqlbench.engine.api.activityapi.core.ops.fluent;
 
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.Timer;
-import io.nosqlbench.api.engine.activityimpl.ActivityDef;
+import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityapi.core.Activity;
 import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver;
 import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.*;

engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ActivityMetricProgressMeter.java

@@ -17,7 +17,7 @@
 package io.nosqlbench.engine.api.activityapi.core.progress;
 
 import com.codahale.metrics.Timer;
-import io.nosqlbench.api.engine.util.Unit;
+import io.nosqlbench.nb.api.engine.util.Unit;
 import io.nosqlbench.engine.api.activityapi.core.Activity;
 
 import java.time.Instant;

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

@@ -18,7 +18,7 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.filters;
 
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable;
 import io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate.ResultFilteringSieve;
-import io.nosqlbench.api.filtering.TristateFilter;
+import io.nosqlbench.nb.api.filtering.TristateFilter;
 import io.nosqlbench.engine.api.util.ConfigTuples;
 import io.nosqlbench.nb.annotations.Service;
 

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

@@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.filters;
 import io.nosqlbench.engine.api.util.SimpleConfig;
 import io.nosqlbench.engine.api.activityapi.core.Activity;
 import io.nosqlbench.nb.annotations.Maturity;
-import io.nosqlbench.api.spi.SimpleServiceLoader;
+import io.nosqlbench.nb.api.spi.SimpleServiceLoader;
 
 import java.util.function.IntPredicate;
 

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

@@ -16,7 +16,7 @@
 
 package io.nosqlbench.engine.api.activityapi.cyclelog.filters;
 
-import io.nosqlbench.api.filtering.TristateFilter;
+import io.nosqlbench.nb.api.filtering.TristateFilter;
 import io.nosqlbench.engine.api.activityapi.input.Input;
 
 import java.util.function.IntPredicate;

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

@@ -17,7 +17,7 @@
 package io.nosqlbench.engine.api.activityapi.cyclelog.filters;
 
 import io.nosqlbench.nb.annotations.Maturity;
-import io.nosqlbench.api.spi.SimpleServiceLoader;
+import io.nosqlbench.nb.api.spi.SimpleServiceLoader;
 
 public interface ResultValueFilterType {
 

engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/CycleResultTristateFilter.java

@@ -16,7 +16,7 @@
 
 package io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate;
 
-import io.nosqlbench.api.filtering.TristateFilter;
+import io.nosqlbench.nb.api.filtering.TristateFilter;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult;
 
 public interface CycleResultTristateFilter extends TristateFilter<CycleResult> {

engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilter.java

@@ -16,7 +16,7 @@
 
 package io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate;
 
-import io.nosqlbench.api.filtering.TristateFilter;
+import io.nosqlbench.nb.api.filtering.TristateFilter;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;

engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/ResultFilterPhase.java

@@ -16,7 +16,7 @@
 
 package io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate;
 
-import io.nosqlbench.api.filtering.TristateFilter;
+import io.nosqlbench.nb.api.filtering.TristateFilter;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable;
 
 import java.util.function.Predicate;

engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/ResultFilteringSieve.java

@@ -16,7 +16,7 @@
 
 package io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate;
 
-import io.nosqlbench.api.filtering.TristateFilter;
+import io.nosqlbench.nb.api.filtering.TristateFilter;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable;
 
 import java.util.ArrayList;

engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/ResultMappingArrayFilter.java

@@ -16,7 +16,7 @@
 
 package io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate;
 
-import io.nosqlbench.api.filtering.TristateFilter;
+import io.nosqlbench.nb.api.filtering.TristateFilter;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable;
 
 import java.util.Arrays;

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

@@ -16,8 +16,8 @@
 
 package io.nosqlbench.engine.api.activityapi.cyclelog.inputs.cyclelog;
 
-import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.nb.api.labels.NBLabeledElement;
-import io.nosqlbench.api.labels.NBLabels;
+import io.nosqlbench.nb.api.labels.NBLabels;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegmentBuffer;

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

@@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.outputs.logger;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable;
 import io.nosqlbench.engine.api.activityapi.cyclelog.inputs.cyclelog.CanFilterResultValue;
 import io.nosqlbench.engine.api.activityapi.output.Output;
-import io.nosqlbench.api.engine.activityimpl.ActivityDef;
+import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 

engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/ErrorMetrics.java

@@ -16,9 +16,8 @@
 
 package io.nosqlbench.engine.api.activityapi.errorhandling;
 
-import io.nosqlbench.api.labels.NBLabeledElement;
+import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef;
-import io.nosqlbench.api.engine.activityimpl.ActivityDef;
+import io.nosqlbench.nb.api.components.NBComponent;
-import io.nosqlbench.components.NBComponent;
 import io.nosqlbench.engine.api.metrics.ExceptionCountMetrics;
 import io.nosqlbench.engine.api.metrics.ExceptionExpectedResultVerificationMetrics;
 import io.nosqlbench.engine.api.metrics.ExceptionHistoMetrics;