move annotations enums to package

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

@@ -21,7 +21,7 @@ import io.nosqlbench.engine.core.script.ScenariosExecutor;
 import io.nosqlbench.engine.core.script.ScriptParams;
 import io.nosqlbench.engine.docker.DockerMetricsManager;
 import io.nosqlbench.nb.api.annotations.Annotation;
-import io.nosqlbench.nb.api.Layer;
+import io.nosqlbench.nb.api.annotations.Layer;
 import io.nosqlbench.nb.api.content.Content;
 import io.nosqlbench.nb.api.content.NBIO;
 import io.nosqlbench.nb.api.errors.BasicError;

engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java

@@ -19,7 +19,7 @@ import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityimpl.ParameterMap;
 import io.nosqlbench.engine.api.activityimpl.input.ProgressCapable;
 import io.nosqlbench.engine.core.annotation.Annotators;
-import io.nosqlbench.nb.api.Layer;
+import io.nosqlbench.nb.api.annotations.Layer;
 import io.nosqlbench.nb.api.annotations.Annotation;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
@@ -55,13 +55,13 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
     private final List<Motor<?>> motors = new ArrayList<>();
     private final Activity activity;
     private final ActivityDef activityDef;
-    private ExecutorService executorService;
+    private final ExecutorService executorService;
     private RuntimeException stoppingException;
 
     private final static int waitTime = 10000;
     private String sessionId = "";
     private long startedAt = 0L;
-    private long stoppedAt = 0L;
+    private final long stoppedAt = 0L;
     private String[] annotatedCommand;
 
 //    private RunState intendedState = RunState.Uninitialized;
@@ -255,7 +255,7 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
     public synchronized void handleParameterMapUpdate(ParameterMap parameterMap) {
 
         if (activity instanceof ActivityDefObserver) {
-            ((ActivityDefObserver) activity).onActivityDefUpdate(activityDef);
+            activity.onActivityDefUpdate(activityDef);
         }
 
         // An activity must be initialized before the motors and other components are

engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java

@@ -21,7 +21,7 @@ import io.nosqlbench.engine.api.activityimpl.ParameterMap;
 import io.nosqlbench.engine.api.activityimpl.ProgressAndStateMeter;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.engine.core.annotation.Annotators;
-import io.nosqlbench.nb.api.Layer;
+import io.nosqlbench.nb.api.annotations.Layer;
 import io.nosqlbench.nb.api.annotations.Annotation;
 import io.nosqlbench.nb.api.errors.BasicError;
 import org.apache.logging.log4j.Logger;

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

@@ -25,7 +25,7 @@ import io.nosqlbench.engine.core.lifecycle.ScenarioController;
 import io.nosqlbench.engine.core.lifecycle.ScenarioResult;
 import io.nosqlbench.engine.core.annotation.Annotators;
 import io.nosqlbench.engine.core.metrics.PolyglotMetricRegistryBindings;
-import io.nosqlbench.nb.api.Layer;
+import io.nosqlbench.nb.api.annotations.Layer;
 import io.nosqlbench.nb.api.annotations.Annotation;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

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

@@ -1,7 +1,5 @@
 package io.nosqlbench.nb.api.annotations;
 
-import io.nosqlbench.nb.api.Layer;
-
 import java.util.Map;
 
 /**

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

@@ -1,7 +1,5 @@
 package io.nosqlbench.nb.api.annotations;
 
-import io.nosqlbench.nb.api.Layer;
-
 import java.time.ZoneId;
 import java.util.LinkedHashMap;
 import java.util.TimeZone;
@@ -13,7 +11,7 @@ public class AnnotationBuilder implements BuilderFacets.All {
     private final LinkedHashMap<String, String> labels = new LinkedHashMap<>();
     private final LinkedHashMap<String, String> details = new LinkedHashMap<>();
     private Layer layer;
-    private TimeZone timezone = TimeZone.getTimeZone(ZoneId.of("GMT"));
+    private final TimeZone timezone = TimeZone.getTimeZone(ZoneId.of("GMT"));
 
     @Override
     public AnnotationBuilder layer(Layer layer) {

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

@@ -1,7 +1,5 @@
 package io.nosqlbench.nb.api.annotations;
 
-import io.nosqlbench.nb.api.Layer;
-
 public interface BuilderFacets {
 
     interface All extends

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

@@ -1,4 +1,4 @@
-package io.nosqlbench.nb.api;
+package io.nosqlbench.nb.api.annotations;
 
 public enum Layer {
 
@@ -10,13 +10,13 @@ public enum Layer {
 
     /**
      * Events which describe scenario execution, such as parameters,
-     * lifecycle events, and critical errors
+     * lifecycle events, interruptions, and critical errors
      */
     Scenario,
 
     /**
-     * Events which describe scripting details, such as extensions,
-     * sending programmatic annotations, or critical errors
+     * Events which describe scripting details, such as commands,
+     * extension usages, sending programmatic annotations, or critical errors
      */
     Script,
 

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

@@ -3,7 +3,6 @@ package io.nosqlbench.nb.api.annotations;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
-import io.nosqlbench.nb.api.Layer;
 
 import java.time.Instant;
 import java.time.ZoneId;

nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java

@@ -1,6 +1,5 @@
 package io.nosqlbench.nb.api.annotations;
 
-import io.nosqlbench.nb.api.Layer;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;