diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ThreadLocalNamedTimers.java b/adapters-api/src/main/java/io/nosqlbench/engine/api/metrics/ThreadLocalNamedTimers.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ThreadLocalNamedTimers.java
rename to adapters-api/src/main/java/io/nosqlbench/engine/api/metrics/ThreadLocalNamedTimers.java
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
index ea4486040..59d1e2620 100644
--- a/drivers-api/pom.xml
+++ b/drivers-api/pom.xml
@@ -38,16 +38,6 @@
4.15.52-SNAPSHOT
-
- io.dropwizard.metrics
- metrics-core
-
-
-
- org.graalvm.sdk
- graal-sdk
-
-
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index 6e0b85d14..8d32f0fea 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -75,15 +75,6 @@
org.yaml
snakeyaml
-
- com.mitchtalmadge
- ascii-data
-
-
-
- org.hdrhistogram
- HdrHistogram
-
org.apache.commons
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 1dd9725ae..83bb9530e 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -87,6 +87,29 @@
commons-codec
+
+ io.dropwizard.metrics
+ metrics-core
+
+
+
+ org.hdrhistogram
+ HdrHistogram
+
+
+
+ com.mitchtalmadge
+ ascii-data
+
+
+
+
+
+ org.graalvm.sdk
+ graal-sdk
+
+
+
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/MetricRegistryService.java b/nb-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/MetricRegistryService.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/MetricRegistryService.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/MetricRegistryService.java
diff --git a/drivers-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityDef.java b/nb-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityDef.java
similarity index 100%
rename from drivers-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityDef.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityDef.java
diff --git a/drivers-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java b/nb-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java
similarity index 100%
rename from drivers-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/CapabilityHook.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/CapabilityHook.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/CapabilityHook.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/CapabilityHook.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ClassicHistoListener.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/ClassicHistoListener.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ClassicHistoListener.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/ClassicHistoListener.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ClassicTimerListener.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/ClassicTimerListener.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ClassicTimerListener.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/ClassicTimerListener.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ConvenientSnapshot.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/ConvenientSnapshot.java
similarity index 95%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ConvenientSnapshot.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/ConvenientSnapshot.java
index 7aa24229d..063ff24a7 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ConvenientSnapshot.java
+++ b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/ConvenientSnapshot.java
@@ -23,11 +23,11 @@ import java.io.OutputStream;
public class ConvenientSnapshot extends Snapshot {
- private double NS_PER_S = 1000000000.0D;
- private double NS_PER_MS = 1000000.0D;
- private double NS_PER_US = 1000.0D;
+ private final double NS_PER_S = 1000000000.0D;
+ private final double NS_PER_MS = 1000000.0D;
+ private final double NS_PER_US = 1000.0D;
- private Snapshot snapshot;
+ private final Snapshot snapshot;
ConvenientSnapshot(Snapshot snapshot) {
this.snapshot = snapshot;
}
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoir.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoir.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoir.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoir.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaHistogramSnapshot.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaHistogramSnapshot.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaHistogramSnapshot.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaHistogramSnapshot.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaSnapshotReader.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaSnapshotReader.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaSnapshotReader.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaSnapshotReader.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaSnapshotter.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaSnapshotter.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaSnapshotter.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/DeltaSnapshotter.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HdrDeltaHistogramAttachment.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/HdrDeltaHistogramAttachment.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HdrDeltaHistogramAttachment.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/HdrDeltaHistogramAttachment.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HdrDeltaHistogramProvider.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/HdrDeltaHistogramProvider.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HdrDeltaHistogramProvider.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/HdrDeltaHistogramProvider.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoIntervalLogger.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoIntervalLogger.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoIntervalLogger.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoIntervalLogger.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoLogChartGenerator.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoLogChartGenerator.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoLogChartGenerator.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoLogChartGenerator.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsCSVWriter.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsCSVWriter.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsCSVWriter.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsCSVWriter.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsLogger.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsLogger.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsLogger.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsLogger.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistogramAttachment.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/HistogramAttachment.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistogramAttachment.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/HistogramAttachment.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/MetricsCloseable.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/MetricsCloseable.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/MetricsCloseable.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/MetricsCloseable.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/MetricsRegistryMount.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/MetricsRegistryMount.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/MetricsRegistryMount.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/MetricsRegistryMount.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/NicerHistogram.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/NicerHistogram.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/NicerHistogram.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/NicerHistogram.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/NicerTimer.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/NicerTimer.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/NicerTimer.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/NicerTimer.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/PeriodicRunnable.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/PeriodicRunnable.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/PeriodicRunnable.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/PeriodicRunnable.java
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/TimerAttachment.java b/nb-api/src/main/java/io/nosqlbench/engine/api/metrics/TimerAttachment.java
similarity index 100%
rename from engine-api/src/main/java/io/nosqlbench/engine/api/metrics/TimerAttachment.java
rename to nb-api/src/main/java/io/nosqlbench/engine/api/metrics/TimerAttachment.java