From 28bf7b6e91901e41aa9683284a42a54b678402b1 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 10 Aug 2021 10:33:58 -0500
Subject: [PATCH] rehome some APIs to nb-api

---
 .../api/metrics/ThreadLocalNamedTimers.java   |  0
 drivers-api/pom.xml                           | 10 --------
 engine-api/pom.xml                            |  9 --------
 nb-api/pom.xml                                | 23 +++++++++++++++++++
 .../core/MetricRegistryService.java           |  0
 .../engine/api/activityimpl/ActivityDef.java  |  0
 .../engine/api/activityimpl/ParameterMap.java |  0
 .../engine/api/metrics/ActivityMetrics.java   |  0
 .../engine/api/metrics/CapabilityHook.java    |  0
 .../api/metrics/ClassicHistoListener.java     |  0
 .../api/metrics/ClassicTimerListener.java     |  0
 .../api/metrics/ConvenientSnapshot.java       |  8 +++----
 .../metrics/DeltaHdrHistogramReservoir.java   |  0
 .../api/metrics/DeltaHistogramSnapshot.java   |  0
 .../api/metrics/DeltaSnapshotReader.java      |  0
 .../engine/api/metrics/DeltaSnapshotter.java  |  0
 .../metrics/HdrDeltaHistogramAttachment.java  |  0
 .../metrics/HdrDeltaHistogramProvider.java    |  0
 .../api/metrics/HistoIntervalLogger.java      |  0
 .../api/metrics/HistoLogChartGenerator.java   |  0
 .../api/metrics/HistoStatsCSVWriter.java      |  0
 .../engine/api/metrics/HistoStatsLogger.java  |  0
 .../api/metrics/HistogramAttachment.java      |  0
 .../engine/api/metrics/MetricsCloseable.java  |  0
 .../api/metrics/MetricsRegistryMount.java     |  0
 .../engine/api/metrics/NicerHistogram.java    |  0
 .../engine/api/metrics/NicerTimer.java        |  0
 .../engine/api/metrics/PeriodicRunnable.java  |  0
 .../engine/api/metrics/TimerAttachment.java   |  0
 29 files changed, 27 insertions(+), 23 deletions(-)
 rename {engine-api => adapters-api}/src/main/java/io/nosqlbench/engine/api/metrics/ThreadLocalNamedTimers.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/activityapi/core/MetricRegistryService.java (100%)
 rename {drivers-api => nb-api}/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityDef.java (100%)
 rename {drivers-api => nb-api}/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/CapabilityHook.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/ClassicHistoListener.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/ClassicTimerListener.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/ConvenientSnapshot.java (95%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoir.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/DeltaHistogramSnapshot.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/DeltaSnapshotReader.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/DeltaSnapshotter.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/HdrDeltaHistogramAttachment.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/HdrDeltaHistogramProvider.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/HistoIntervalLogger.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/HistoLogChartGenerator.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsCSVWriter.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsLogger.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/HistogramAttachment.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/MetricsCloseable.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/MetricsRegistryMount.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/NicerHistogram.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/NicerTimer.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/PeriodicRunnable.java (100%)
 rename {engine-api => nb-api}/src/main/java/io/nosqlbench/engine/api/metrics/TimerAttachment.java (100%)

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 @@
             <version>4.15.52-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.graalvm.sdk</groupId>
-            <artifactId>graal-sdk</artifactId>
-        </dependency>
-
 
     </dependencies>
 
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 @@
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.mitchtalmadge</groupId>
-            <artifactId>ascii-data</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.hdrhistogram</groupId>
-            <artifactId>HdrHistogram</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
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 @@
             <artifactId>commons-codec</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.dropwizard.metrics</groupId>
+            <artifactId>metrics-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hdrhistogram</groupId>
+            <artifactId>HdrHistogram</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.mitchtalmadge</groupId>
+            <artifactId>ascii-data</artifactId>
+        </dependency>
+
+
+
+        <dependency>
+            <groupId>org.graalvm.sdk</groupId>
+            <artifactId>graal-sdk</artifactId>
+        </dependency>
+
+
 
     </dependencies>
 
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