diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java index 024e2250c..776d89a24 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java @@ -7,7 +7,6 @@ import io.nosqlbench.activitytype.cql.core.CQLOptions; import io.nosqlbench.activitytype.cql.core.ProxyTranslator; import io.nosqlbench.engine.api.activityapi.core.Shutdownable; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import io.nosqlbench.engine.api.exceptions.BasicError; import io.nosqlbench.engine.api.metrics.ActivityMetrics; import io.nosqlbench.engine.api.scripting.NashornEvaluator; import io.nosqlbench.engine.api.util.SSLKsFactory; diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java index 83dab1c3a..fb53a4160 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java @@ -5,8 +5,9 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.outputs.cyclelog.CycleLogDu import io.nosqlbench.engine.api.activityapi.cyclelog.outputs.cyclelog.CycleLogImporterUtility; import io.nosqlbench.engine.api.activityapi.input.InputType; import io.nosqlbench.engine.api.activityapi.output.OutputType; -import io.nosqlbench.engine.api.exceptions.BasicError; -import io.nosqlbench.nb.api.pathutil.NBPaths; +import io.nosqlbench.nb.api.content.Content; +import io.nosqlbench.nb.api.content.NBIO; +import io.nosqlbench.nb.api.errors.BasicError; import io.nosqlbench.engine.core.MarkdownDocInfo; import io.nosqlbench.engine.core.ScenarioLogger; import io.nosqlbench.engine.core.ScenariosResults; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioController.java b/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioController.java index e229c00df..f8514a482 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioController.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioController.java @@ -19,7 +19,7 @@ import io.nosqlbench.engine.api.activityapi.core.ActivityType; import io.nosqlbench.engine.api.activityapi.core.ProgressMeter; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityimpl.ParameterMap; -import io.nosqlbench.engine.api.exceptions.BasicError; +import io.nosqlbench.nb.api.errors.BasicError; import io.nosqlbench.engine.api.metrics.ActivityMetrics; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java index 772ab141e..e09d36210 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java @@ -20,7 +20,7 @@ import io.nosqlbench.engine.core.ProgressIndicator; import io.nosqlbench.engine.core.ScenarioController; import io.nosqlbench.engine.core.ScenarioLogger; import io.nosqlbench.engine.core.ScenarioResult; -import io.nosqlbench.engine.api.exceptions.BasicError; +import io.nosqlbench.nb.api.errors.BasicError; import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo; import io.nosqlbench.engine.api.metrics.ActivityMetrics; import io.nosqlbench.engine.core.metrics.MetricRegistryBindings; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java index bcfb7dd41..02595951f 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.core.script; -import io.nosqlbench.engine.api.exceptions.BasicError; +import io.nosqlbench.nb.api.errors.BasicError; import io.nosqlbench.engine.core.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/RestHelper.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/RestHelper.java index c28013a5a..191e8b35b 100644 --- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/RestHelper.java +++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/RestHelper.java @@ -1,6 +1,6 @@ package io.nosqlbench.engine.docker; -import io.nosqlbench.engine.api.exceptions.BasicError; +import io.nosqlbench.nb.api.errors.BasicError; import io.nosqlbench.nb.api.pathutil.NBPaths; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/exceptions/BasicError.java b/nb-api/src/main/java/io/nosqlbench/nb/api/errors/BasicError.java similarity index 89% rename from engine-api/src/main/java/io/nosqlbench/engine/api/exceptions/BasicError.java rename to nb-api/src/main/java/io/nosqlbench/nb/api/errors/BasicError.java index eb0066e75..a994a2cc7 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/exceptions/BasicError.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/errors/BasicError.java @@ -1,4 +1,4 @@ -package io.nosqlbench.engine.api.exceptions; +package io.nosqlbench.nb.api.errors; /** * User exceptions are errors for which we know how to explain the cause to the user. diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashedLineToInt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashedLineToInt.java index 49a87ae9c..89cf27cca 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashedLineToInt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashedLineToInt.java @@ -1,7 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; -import io.nosqlbench.nb.api.pathutil.NBPaths; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLineToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLineToString.java index ef97eeea7..91ba7a44c 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLineToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLineToString.java @@ -20,7 +20,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_int.HashRange; -import io.nosqlbench.nb.api.pathutil.NBPaths; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloLineToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloLineToString.java index 29dedc8a8..f4da61f04 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloLineToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloLineToString.java @@ -19,7 +19,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; -import io.nosqlbench.nb.api.pathutil.NBPaths; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager;