From 24a0807cb00087ce1ce3d87fdc7b0745db3a488d Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 18:28:23 -0500 Subject: [PATCH] package sanity fixes --- .../datamappers/functions/long_string/ModuloCSVLineToUUID.java | 2 +- docsys/src/main/java/io/nosqlbench/docsys/api/Docs.java | 2 +- .../main/java/io/nosqlbench/engine/cli/NBCLIScenarioParser.java | 2 +- .../test/java/io/nosqlbench/engine/cli/TestNBCLIOptions.java | 2 +- .../io/nosqlbench/nb/api/{ => pathutil}/VirtDataResources.java | 2 +- .../io/nosqlbench/nb/api/{ => processors}/ServiceClassName.java | 2 +- .../virtdata/library/basics/core/lfsrs/MetaShift.java | 2 +- .../basics/shared/distributions/CSVFrequencySampler.java | 2 +- .../basics/shared/distributions/DelimFrequencySampler.java | 2 +- .../basics/shared/distributions/WeightedStringsFromCSV.java | 2 +- .../library/basics/shared/from_long/to_int/HashedLineToInt.java | 2 +- .../shared/from_long/to_string/HashedFileExtractToString.java | 2 +- .../basics/shared/from_long/to_string/HashedLineToString.java | 2 +- .../shared/from_long/to_string/ModuloCSVLineToString.java | 2 +- .../basics/shared/from_long/to_string/ModuloLineToString.java | 2 +- .../virtdata/library/random/RandomFileExtractToString.java | 2 +- .../io/nosqlbench/virtdata/library/random/RandomLineToInt.java | 2 +- .../nosqlbench/virtdata/library/random/RandomLineToString.java | 2 +- .../nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsApp.java | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) rename nb-api/src/main/java/io/nosqlbench/nb/api/{ => pathutil}/VirtDataResources.java (99%) rename nb-api/src/main/java/io/nosqlbench/nb/api/{ => processors}/ServiceClassName.java (85%) diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_string/ModuloCSVLineToUUID.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_string/ModuloCSVLineToUUID.java index 2119bf49a..068a7ce22 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_string/ModuloCSVLineToUUID.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_string/ModuloCSVLineToUUID.java @@ -21,7 +21,7 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.long_string; import io.nosqlbench.virtdata.api.annotations.Example; import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; -import io.nosqlbench.nb.api.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.VirtDataResources; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.ModuloLineToString; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; diff --git a/docsys/src/main/java/io/nosqlbench/docsys/api/Docs.java b/docsys/src/main/java/io/nosqlbench/docsys/api/Docs.java index 0f765b136..de4c57854 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/api/Docs.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/api/Docs.java @@ -1,6 +1,6 @@ package io.nosqlbench.docsys.api; -import io.nosqlbench.nb.api.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.VirtDataResources; import java.nio.file.Files; import java.nio.file.Path; diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScenarioParser.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScenarioParser.java index 240cd0884..7b34e5f18 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScenarioParser.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScenarioParser.java @@ -5,7 +5,7 @@ import io.nosqlbench.engine.api.activityconfig.StatementsLoader; import io.nosqlbench.engine.api.activityconfig.yaml.Scenarios; import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList; import io.nosqlbench.engine.api.exceptions.BasicError; -import io.nosqlbench.nb.api.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.VirtDataResources; import io.nosqlbench.nb.api.pathutil.NBFiles; import io.nosqlbench.engine.api.util.StrInterpolator; import org.slf4j.Logger; diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/TestNBCLIOptions.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/TestNBCLIOptions.java index 2b30b3786..bd0f69297 100644 --- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/TestNBCLIOptions.java +++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/TestNBCLIOptions.java @@ -1,7 +1,7 @@ package io.nosqlbench.engine.cli; import io.nosqlbench.docsys.core.PathWalker; -import io.nosqlbench.nb.api.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.VirtDataResources; import org.junit.Test; import java.net.URL; diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/VirtDataResources.java b/nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/VirtDataResources.java similarity index 99% rename from nb-api/src/main/java/io/nosqlbench/nb/api/VirtDataResources.java rename to nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/VirtDataResources.java index 4db418d3c..a1c2db34c 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/api/VirtDataResources.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/VirtDataResources.java @@ -15,7 +15,7 @@ * / */ -package io.nosqlbench.nb.api; +package io.nosqlbench.nb.api.pathutil; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/ServiceClassName.java b/nb-api/src/main/java/io/nosqlbench/nb/api/processors/ServiceClassName.java similarity index 85% rename from nb-api/src/main/java/io/nosqlbench/nb/api/ServiceClassName.java rename to nb-api/src/main/java/io/nosqlbench/nb/api/processors/ServiceClassName.java index 7fa7fb9b0..142d1fc38 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/api/ServiceClassName.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/processors/ServiceClassName.java @@ -1,4 +1,4 @@ -package io.nosqlbench.nb.api; +package io.nosqlbench.nb.api.processors; /** * Statically defined names which need to be visible for refactoring diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShift.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShift.java index 13f9650c4..bd4c51e5f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShift.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShift.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.core.lfsrs; -import io.nosqlbench.nb.api.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.VirtDataResources; 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/distributions/CSVFrequencySampler.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVFrequencySampler.java index e1e9076d4..f367fc9aa 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVFrequencySampler.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVFrequencySampler.java @@ -14,7 +14,7 @@ import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.stathelpers.AliasSamplerDoubleInt; import io.nosqlbench.virtdata.library.basics.core.stathelpers.EvProbD; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Hash; -import io.nosqlbench.nb.api.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.VirtDataResources; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; import org.apache.commons.math3.stat.Frequency; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/DelimFrequencySampler.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/DelimFrequencySampler.java index b4e3f70e4..9b4ec1f87 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/DelimFrequencySampler.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/DelimFrequencySampler.java @@ -14,7 +14,7 @@ import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.stathelpers.AliasSamplerDoubleInt; import io.nosqlbench.virtdata.library.basics.core.stathelpers.EvProbD; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Hash; -import io.nosqlbench.nb.api.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.VirtDataResources; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; import org.apache.commons.math3.stat.Frequency; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/WeightedStringsFromCSV.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/WeightedStringsFromCSV.java index 52f7b2678..652079dda 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/WeightedStringsFromCSV.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/WeightedStringsFromCSV.java @@ -6,7 +6,7 @@ import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.stathelpers.AliasSamplerDoubleInt; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Hash; import io.nosqlbench.virtdata.library.basics.core.stathelpers.EvProbD; -import io.nosqlbench.nb.api.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.VirtDataResources; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; 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 cc652ec39..4a519443c 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,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; -import io.nosqlbench.nb.api.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.VirtDataResources; 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/HashedFileExtractToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedFileExtractToString.java index 0679683d8..6b33041c7 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedFileExtractToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedFileExtractToString.java @@ -21,7 +21,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; import io.nosqlbench.virtdata.api.annotations.Example; import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_int.HashRange; -import io.nosqlbench.nb.api.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.VirtDataResources; 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 146c36210..fe4934e72 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,7 @@ 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.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.VirtDataResources; 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/ModuloCSVLineToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloCSVLineToString.java index ac13fa4e8..9dd681899 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloCSVLineToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloCSVLineToString.java @@ -20,7 +20,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; import io.nosqlbench.virtdata.api.annotations.Example; import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; -import io.nosqlbench.nb.api.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.VirtDataResources; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; import org.apache.logging.log4j.Logger; 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 cd18c070f..ddc2ad7c8 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,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; -import io.nosqlbench.nb.api.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.VirtDataResources; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomFileExtractToString.java b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomFileExtractToString.java index b4307bc0a..24c7cedaa 100644 --- a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomFileExtractToString.java +++ b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomFileExtractToString.java @@ -19,7 +19,7 @@ package io.nosqlbench.virtdata.library.random; import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; -import io.nosqlbench.nb.api.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.VirtDataResources; import org.apache.commons.math3.distribution.IntegerDistribution; import org.apache.commons.math3.distribution.UniformIntegerDistribution; import org.apache.commons.math3.random.MersenneTwister; diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToInt.java b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToInt.java index e8c5850d5..d73ec9adc 100644 --- a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToInt.java +++ b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToInt.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.random; import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; -import io.nosqlbench.nb.api.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.VirtDataResources; import org.apache.commons.math3.distribution.IntegerDistribution; import org.apache.commons.math3.distribution.UniformIntegerDistribution; import org.apache.commons.math3.random.MersenneTwister; diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToString.java b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToString.java index b7de4ae42..1a44cbe45 100644 --- a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToString.java +++ b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToString.java @@ -19,7 +19,7 @@ package io.nosqlbench.virtdata.library.random; import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; -import io.nosqlbench.nb.api.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.VirtDataResources; import org.apache.commons.math3.distribution.IntegerDistribution; import org.apache.commons.math3.distribution.UniformIntegerDistribution; import org.apache.commons.math3.random.MersenneTwister; diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsApp.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsApp.java index ab116cc00..8a49870e3 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsApp.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsApp.java @@ -4,7 +4,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import io.nosqlbench.virtdata.api.annotations.Category; import io.nosqlbench.virtdata.core.bindings.VirtDataDocs; -import io.nosqlbench.nb.api.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.VirtDataResources; import io.nosqlbench.virtdata.api.processors.DocFuncData; import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.FDoc; import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.FDocCat;