From d3ff46536ad5fdb5af0aa6899a7de264167d15b2 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 12:27:25 -0500 Subject: [PATCH 01/17] api-modules --- .../cql/core/CqlActivityType.java | 2 +- .../cql/filtering/CQLResultFilterType.java | 2 +- .../javax.annotation.processing.Processor | 2 +- .../cqlverify/CqlVerifyActivityType.java | 2 +- .../activitytype/diag/DiagActivityType.java | 2 +- .../javax.annotation.processing.Processor | 2 +- .../activitytype/http/HttpActivityType.java | 2 +- .../stdout/StdoutActivityType.java | 2 +- .../tcpclient/TCPClientActivityType.java | 2 +- .../tcpserver/TCPServerActivityType.java | 2 +- .../docsys/core/DocServerStatusEndpoint.java | 2 +- .../docsys/core/DocsysMarkdownEndpoint.java | 2 +- .../javax.annotation.processing.Processor | 2 +- .../filters/CoreResultValueFilter.java | 2 +- .../filters/IncludeCodesTypeExperimental.java | 2 +- .../inputs/cyclelog/CycleLogInputType.java | 2 +- .../outputs/cyclelog/CycleLogOutputType.java | 2 +- .../logger/LoggingMarkerDispenser.java | 2 +- .../input/TargetRateInputType.java | 2 +- .../io/nosqlbench/TestMetricsRegistry.java | 2 +- .../engine/core/metrics/MetricsContext.java | 2 +- .../javax.annotation.processing.Processor | 2 +- .../docs/NosqlbenchMarkdownManifest.java | 2 +- .../csvmetrics/CSVMetricsPluginData.java | 2 +- .../extensions/example/ExamplePluginData.java | 2 +- .../files/FileAccessPluginData.java | 2 +- .../GlobalVarsScriptingPluginData.java | 2 +- .../histologger/HdrHistoLogPluginData.java | 2 +- .../HistoStatsPluginData.java | 2 +- .../optimizers/BobyqaOptimizerPluginData.java | 2 +- .../ScriptingMetricsPluginData.java | 2 +- .../javax.annotation.processing.Processor | 2 +- nb-api/pom.xml | 65 +++++++++++++++++++ .../nosqlbench/nb/api/ServiceClassName.java | 10 +++ .../nb/api}/annotations/Service.java | 2 +- .../nb/api}/processors/ServiceProcessor.java | 5 +- .../javax.annotation.processing.Processor | 2 +- pom.xml | 3 +- .../docs/types.puml | 0 {virtdata-api => virtdata-core}/pom.xml | 4 +- .../io/nosqlbench/virtdata/api/Binder.java | 0 .../io/nosqlbench/virtdata/api/Bindings.java | 0 .../virtdata/api/BindingsCache.java | 0 .../virtdata/api/BindingsTemplate.java | 0 .../virtdata/api/CompatibilityFixups.java | 0 .../virtdata/api/ContextualArrayBindings.java | 0 .../virtdata/api/ContextualBindings.java | 0 .../api/ContextualBindingsArrayTemplate.java | 0 .../api/ContextualBindingsTemplate.java | 0 .../virtdata/api/ContextualMapBindings.java | 0 .../nosqlbench/virtdata/api/DataMapper.java | 0 .../api/DataMapperFunctionMapper.java | 0 .../virtdata/api/DataMapperLibrary.java | 0 .../virtdata/api/DataMapperLibraryFinder.java | 0 .../nosqlbench/virtdata/api/FunctionType.java | 0 .../virtdata/api/FunctionTyper.java | 0 .../virtdata/api/LazyValuesMap.java | 0 .../io/nosqlbench/virtdata/api/Named.java | 0 .../virtdata/api/ResolvedFunction.java | 0 .../virtdata/api/ResolverDiagnostics.java | 0 .../virtdata/api/StringObjectPromoter.java | 0 .../io/nosqlbench/virtdata/api/VALUE.java | 0 .../io/nosqlbench/virtdata/api/ValueType.java | 0 .../virtdata/api/ValuesArrayBinder.java | 0 .../nosqlbench/virtdata/api/ValuesBinder.java | 0 .../virtdata/api/ValuesMapBinder.java | 0 .../io/nosqlbench/virtdata/api/VirtData.java | 0 .../virtdata/api/VirtDataComposer.java | 0 .../nosqlbench/virtdata/api/VirtDataDocs.java | 0 .../virtdata/api/VirtDataFunctionFinder.java | 0 .../virtdata/api/VirtDataFunctionLibrary.java | 0 .../api/VirtDataFunctionResolver.java | 0 .../virtdata/api/VirtDataFunctions.java | 0 .../virtdata/api/VirtDataLibraries.java | 0 .../virtdata/api/VirtDataLibrary.java | 0 .../virtdata/api/VirtDataResources.java | 0 .../composers/ComposerForDoubleFunction.java | 0 .../ComposerForDoubleToIntFunction.java | 0 .../ComposerForDoubleToLongFunction.java | 0 .../ComposerForDoubleUnaryOperator.java | 0 .../api/composers/ComposerForFunction.java | 0 .../api/composers/ComposerForIntFunction.java | 0 .../ComposerForIntToDoubleFunction.java | 0 .../ComposerForIntToLongFunction.java | 0 .../ComposerForIntUnaryOperator.java | 0 .../composers/ComposerForLongFunction.java | 0 .../ComposerForLongToDoubleFunction.java | 0 .../ComposerForLongToIntFunction.java | 0 .../ComposerForLongUnaryOperator.java | 0 .../api/composers/FunctionAssembly.java | 0 .../api/composers/FunctionComposer.java | 0 .../virtdata/api/config/ConfigAware.java | 0 .../virtdata/api/config/ConfigModel.java | 0 .../api/config/MutableConfigModel.java | 0 .../virtdata/api/murmur/Checksum128.java | 0 .../virtdata/api/murmur/Murmur3F.java | 0 .../virtdata/api/templates/BindPoint.java | 0 .../virtdata/api/templates/CSVBindings.java | 0 .../api/templates/CSVBindingsTemplate.java | 0 .../api/templates/ParsedTemplate.java | 0 .../api/templates/StringBindings.java | 0 .../api/templates/StringBindingsTemplate.java | 0 .../api/templates/StringCompositor.java | 0 .../api/templates/StringMapCompositor.java | 0 .../virtdata/annotations/ExampleDataTest.java | 0 .../virtdata/api/ValueTypeTest.java | 0 .../api/templates/ParsedTemplateTest.java | 0 .../templates/StringBindingsTemplateTest.java | 0 .../api/templates/StringCompositorTest.java | 0 .../FunctionAssemblerMatrixTest.java | 0 .../composers/FunctionAssemblerTest.java | 0 .../core/CompatibilityFixupsTest.java | 0 .../virtdata/core/ResolvedFunctionTest.java | 0 .../virtdata/core/VirtDataComposerTest.java | 0 .../virtdata/core/VirtDataTest.java | 0 .../testmappers/TestableTemplate.java | 0 .../testmappers/TestableTemplateTest.java | 0 .../virtdata/testmappers/TestingRepeater.java | 0 .../util/StringObjectPromoterTest.java | 0 .../virtdata/util/VirtDataFunctionsTest.java | 0 virtdata-lib-basics/pom.xml | 17 +++-- .../library/basics/core/lfsrs/MetaShift.java | 1 + .../javax.annotation.processing.Processor | 2 +- virtdata-lib-curves4/pom.xml | 11 ++-- .../javax.annotation.processing.Processor | 2 +- virtdata-lib-random/pom.xml | 2 +- .../javax.annotation.processing.Processor | 2 +- .../javax.annotation.processing.Processor | 2 +- virtdata-processors/pom.xml | 6 ++ .../processors/FunctionDocInfoWriter.java | 2 +- .../processors/ProcessorClassNames.java | 2 - virtdata-realdata/pom.xml | 10 +-- .../javax.annotation.processing.Processor | 2 +- virtdata-userlibs/pom.xml | 10 +-- .../userlibs/apps/VirtDataService.java | 2 +- .../apps/docsapp/AutoDocsWebService.java | 2 +- .../docinfo/VirtdataMarkdownManifest.java | 2 +- .../javax.annotation.processing.Processor | 2 +- 138 files changed, 162 insertions(+), 72 deletions(-) create mode 100644 nb-api/pom.xml create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/ServiceClassName.java rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => nb-api/src/main/java/io/nosqlbench/nb/api}/annotations/Service.java (96%) rename {virtdata-processors/src/main/java/io/nosqlbench/virtdata => nb-api/src/main/java/io/nosqlbench/nb/api}/processors/ServiceProcessor.java (95%) rename {virtdata-api => virtdata-core}/docs/types.puml (100%) rename {virtdata-api => virtdata-core}/pom.xml (96%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/Binder.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/Bindings.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/BindingsCache.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/BindingsTemplate.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/CompatibilityFixups.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/ContextualArrayBindings.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/ContextualBindings.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/ContextualBindingsArrayTemplate.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/ContextualBindingsTemplate.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/ContextualMapBindings.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/DataMapper.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/DataMapperFunctionMapper.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/DataMapperLibrary.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/DataMapperLibraryFinder.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/FunctionType.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/FunctionTyper.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/LazyValuesMap.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/Named.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/ResolvedFunction.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/StringObjectPromoter.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/VALUE.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/ValueType.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/ValuesArrayBinder.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/ValuesBinder.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/ValuesMapBinder.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/VirtData.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/VirtDataComposer.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/VirtDataDocs.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionFinder.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionLibrary.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctions.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibraries.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibrary.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/VirtDataResources.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleFunction.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleToIntFunction.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleToLongFunction.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleUnaryOperator.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForFunction.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntFunction.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntToDoubleFunction.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntToLongFunction.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntUnaryOperator.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongFunction.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongToDoubleFunction.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongToIntFunction.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongUnaryOperator.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionAssembly.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionComposer.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/config/ConfigAware.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/config/ConfigModel.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/config/MutableConfigModel.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/murmur/Checksum128.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/murmur/Murmur3F.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/templates/BindPoint.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/templates/CSVBindings.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/templates/CSVBindingsTemplate.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/templates/ParsedTemplate.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/templates/StringBindings.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/templates/StringBindingsTemplate.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/templates/StringCompositor.java (100%) rename {virtdata-api => virtdata-core}/src/main/java/io/nosqlbench/virtdata/api/templates/StringMapCompositor.java (100%) rename {virtdata-api => virtdata-core}/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java (100%) rename {virtdata-api => virtdata-core}/src/test/java/io/nosqlbench/virtdata/api/ValueTypeTest.java (100%) rename {virtdata-api => virtdata-core}/src/test/java/io/nosqlbench/virtdata/api/templates/ParsedTemplateTest.java (100%) rename {virtdata-api => virtdata-core}/src/test/java/io/nosqlbench/virtdata/api/templates/StringBindingsTemplateTest.java (100%) rename {virtdata-api => virtdata-core}/src/test/java/io/nosqlbench/virtdata/api/templates/StringCompositorTest.java (100%) rename {virtdata-api => virtdata-core}/src/test/java/io/nosqlbench/virtdata/composers/FunctionAssemblerMatrixTest.java (100%) rename {virtdata-api => virtdata-core}/src/test/java/io/nosqlbench/virtdata/composers/FunctionAssemblerTest.java (100%) rename {virtdata-api => virtdata-core}/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java (100%) rename {virtdata-api => virtdata-core}/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java (100%) rename {virtdata-api => virtdata-core}/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java (100%) rename {virtdata-api => virtdata-core}/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java (100%) rename {virtdata-api => virtdata-core}/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java (100%) rename {virtdata-api => virtdata-core}/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java (100%) rename {virtdata-api => virtdata-core}/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java (100%) rename {virtdata-api => virtdata-core}/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java (100%) rename {virtdata-api => virtdata-core}/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java (100%) diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivityType.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivityType.java index ae4c83d6c..c5e355edd 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivityType.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivityType.java @@ -4,7 +4,7 @@ package io.nosqlbench.activitytype.cql.core; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityapi.core.ActivityType; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import java.util.Optional; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/filtering/CQLResultFilterType.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/filtering/CQLResultFilterType.java index 28ee4b315..4b104cdfe 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/filtering/CQLResultFilterType.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/filtering/CQLResultFilterType.java @@ -7,7 +7,7 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.filters.ResultValueFilterTy import io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate.EnumReadableMappingFilter; import io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate.TristateFilter; import io.nosqlbench.engine.api.util.ConfigTuples; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import java.util.function.Predicate; diff --git a/activitytype-cql/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/activitytype-cql/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 0945c3443..77f0797f1 100644 --- a/activitytype-cql/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/activitytype-cql/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,2 @@ io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor -io.nosqlbench.virtdata.processors.ServiceProcessor +io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivityType.java b/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivityType.java index 31cc2591d..762eaa9c1 100644 --- a/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivityType.java +++ b/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivityType.java @@ -3,7 +3,7 @@ package io.nosqlbench.activitytype.cqlverify; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityapi.core.ActivityType; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; @Service(ActivityType.class) public class CqlVerifyActivityType implements ActivityType { diff --git a/activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivityType.java b/activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivityType.java index 1262a87ee..796302282 100644 --- a/activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivityType.java +++ b/activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivityType.java @@ -18,7 +18,7 @@ package io.nosqlbench.activitytype.diag; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityapi.core.ActivityType; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activitytype-diag/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/activitytype-diag/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 0945c3443..77f0797f1 100644 --- a/activitytype-diag/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/activitytype-diag/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,2 @@ io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor -io.nosqlbench.virtdata.processors.ServiceProcessor +io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivityType.java b/activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivityType.java index 8d502c0de..016d7d926 100644 --- a/activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivityType.java +++ b/activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivityType.java @@ -3,7 +3,7 @@ package io.nosqlbench.activitytype.http; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityapi.core.ActivityType; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivityType.java b/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivityType.java index 06da4a090..113b143a2 100644 --- a/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivityType.java +++ b/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivityType.java @@ -4,7 +4,7 @@ import io.nosqlbench.engine.api.activityapi.core.Action; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityapi.core.ActivityType; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import java.util.Optional; diff --git a/activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivityType.java b/activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivityType.java index 5ca961a3a..4dd9e03bd 100644 --- a/activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivityType.java +++ b/activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivityType.java @@ -23,7 +23,7 @@ import io.nosqlbench.engine.api.activityapi.core.Action; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityapi.core.ActivityType; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; @Service(ActivityType.class) public class TCPClientActivityType implements ActivityType { diff --git a/activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivityType.java b/activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivityType.java index 47214c16d..b72d6b1da 100644 --- a/activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivityType.java +++ b/activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivityType.java @@ -23,7 +23,7 @@ import io.nosqlbench.engine.api.activityapi.core.Action; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityapi.core.ActivityType; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; @Service(ActivityType.class) public class TCPServerActivityType implements ActivityType { diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/DocServerStatusEndpoint.java b/docsys/src/main/java/io/nosqlbench/docsys/core/DocServerStatusEndpoint.java index 849e0373b..cc87feeb5 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/core/DocServerStatusEndpoint.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/core/DocServerStatusEndpoint.java @@ -1,6 +1,6 @@ package io.nosqlbench.docsys.core; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import io.nosqlbench.docsys.api.WebServiceObject; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpoint.java b/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpoint.java index 8a0fbacfe..69fb79a92 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpoint.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpoint.java @@ -1,6 +1,6 @@ package io.nosqlbench.docsys.core; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import io.nosqlbench.docsys.api.DocsNameSpace; import io.nosqlbench.docsys.api.Docs; import io.nosqlbench.docsys.api.DocsBinder; diff --git a/docsys/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/docsys/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 0945c3443..77f0797f1 100644 --- a/docsys/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/docsys/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,2 @@ io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor -io.nosqlbench.virtdata.processors.ServiceProcessor +io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/CoreResultValueFilter.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/CoreResultValueFilter.java index a2b7772d2..55f41492a 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/CoreResultValueFilter.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/CoreResultValueFilter.java @@ -21,7 +21,7 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReada import io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate.ResultFilteringSieve; import io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate.TristateFilter; import io.nosqlbench.engine.api.util.ConfigTuples; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import java.util.function.Predicate; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/IncludeCodesTypeExperimental.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/IncludeCodesTypeExperimental.java index 90abf40bd..20effa3f7 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/IncludeCodesTypeExperimental.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/IncludeCodesTypeExperimental.java @@ -18,7 +18,7 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.filters; import io.nosqlbench.engine.api.util.SimpleConfig; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import java.util.Arrays; import java.util.function.IntPredicate; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputType.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputType.java index d500d3cb5..d9df2e10a 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputType.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputType.java @@ -21,7 +21,7 @@ import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.input.Input; import io.nosqlbench.engine.api.activityapi.input.InputDispenser; import io.nosqlbench.engine.api.activityapi.input.InputType; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; @Service(InputType.class) public class CycleLogInputType implements InputType { diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutputType.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutputType.java index 8c4967d4e..5904fc4d3 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutputType.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutputType.java @@ -23,7 +23,7 @@ import io.nosqlbench.engine.api.activityapi.input.Input; import io.nosqlbench.engine.api.activityapi.output.Output; import io.nosqlbench.engine.api.activityapi.output.OutputDispenser; import io.nosqlbench.engine.api.activityapi.output.OutputType; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java index a9b84f190..3c518fdd2 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java @@ -20,7 +20,7 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.outputs.logger; import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.output.Output; import io.nosqlbench.engine.api.activityapi.output.OutputDispenser; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/TargetRateInputType.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/TargetRateInputType.java index 5630a99b6..a7247d6c4 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/TargetRateInputType.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/TargetRateInputType.java @@ -21,7 +21,7 @@ import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.input.Input; import io.nosqlbench.engine.api.activityapi.input.InputDispenser; import io.nosqlbench.engine.api.activityapi.input.InputType; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; @Service(InputType.class) public class TargetRateInputType implements InputType { diff --git a/engine-api/src/test/java/io/nosqlbench/TestMetricsRegistry.java b/engine-api/src/test/java/io/nosqlbench/TestMetricsRegistry.java index ace79bfd3..bf5acfd75 100644 --- a/engine-api/src/test/java/io/nosqlbench/TestMetricsRegistry.java +++ b/engine-api/src/test/java/io/nosqlbench/TestMetricsRegistry.java @@ -19,7 +19,7 @@ package io.nosqlbench; import com.codahale.metrics.MetricRegistry; import io.nosqlbench.engine.api.activityapi.core.MetricRegistryService; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; /** * Provide a local MetricRegistryService for tests diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricsContext.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricsContext.java index 6141e643e..716f9797f 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricsContext.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricsContext.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.core.metrics; import com.codahale.metrics.MetricRegistry; import io.nosqlbench.engine.api.activityapi.core.MetricRegistryService; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; @Service(MetricRegistryService.class) public class MetricsContext implements MetricRegistryService { diff --git a/engine-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/engine-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 0945c3443..77f0797f1 100644 --- a/engine-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/engine-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,2 @@ io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor -io.nosqlbench.virtdata.processors.ServiceProcessor +io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/engine-docs/src/main/java/io/nosqlbench/engine/docs/NosqlbenchMarkdownManifest.java b/engine-docs/src/main/java/io/nosqlbench/engine/docs/NosqlbenchMarkdownManifest.java index 9b742049b..8d1412c77 100644 --- a/engine-docs/src/main/java/io/nosqlbench/engine/docs/NosqlbenchMarkdownManifest.java +++ b/engine-docs/src/main/java/io/nosqlbench/engine/docs/NosqlbenchMarkdownManifest.java @@ -3,7 +3,7 @@ package io.nosqlbench.engine.docs; import io.nosqlbench.docsys.api.Docs; import io.nosqlbench.docsys.api.DocsBinder; import io.nosqlbench.docsys.api.DocsysDynamicManifest; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; @Service(DocsysDynamicManifest.class) public class NosqlbenchMarkdownManifest implements DocsysDynamicManifest { diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetricsPluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetricsPluginData.java index bfcda9c7a..633135b87 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetricsPluginData.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetricsPluginData.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.extensions.csvmetrics; import com.codahale.metrics.MetricRegistry; import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import org.slf4j.Logger; import javax.script.ScriptContext; diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePluginData.java index 8e64d440e..d77c1cc73 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePluginData.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePluginData.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.extensions.example; import com.codahale.metrics.MetricRegistry; import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import org.slf4j.Logger; import javax.script.ScriptContext; diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccessPluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccessPluginData.java index 722cb6807..9998c899b 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccessPluginData.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccessPluginData.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.extensions.files; import com.codahale.metrics.MetricRegistry; import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import org.slf4j.Logger; import javax.script.ScriptContext; diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/GlobalVarsScriptingPluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/GlobalVarsScriptingPluginData.java index e486734a3..e92c10368 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/GlobalVarsScriptingPluginData.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/GlobalVarsScriptingPluginData.java @@ -2,7 +2,7 @@ package io.nosqlbench.engine.extensions.globalvars; import com.codahale.metrics.MetricRegistry; import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import org.slf4j.Logger; diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histologger/HdrHistoLogPluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histologger/HdrHistoLogPluginData.java index 996075ce8..bfc65ac08 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histologger/HdrHistoLogPluginData.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histologger/HdrHistoLogPluginData.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.extensions.histologger; import com.codahale.metrics.MetricRegistry; import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import org.slf4j.Logger; import javax.script.ScriptContext; diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histostatslogger/HistoStatsPluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histostatslogger/HistoStatsPluginData.java index b6903221a..6c4cbee4d 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histostatslogger/HistoStatsPluginData.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histostatslogger/HistoStatsPluginData.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.extensions.histostatslogger; import com.codahale.metrics.MetricRegistry; import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import org.slf4j.Logger; import javax.script.ScriptContext; diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerPluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerPluginData.java index 394c7d3ec..0970a350a 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerPluginData.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerPluginData.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.extensions.optimizers; import com.codahale.metrics.MetricRegistry; import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import org.slf4j.Logger; import javax.script.ScriptContext; diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetricsPluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetricsPluginData.java index ba9e304a5..7e81262d3 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetricsPluginData.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetricsPluginData.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.extensions.scriptingmetrics; import com.codahale.metrics.MetricRegistry; import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import org.slf4j.Logger; import javax.script.ScriptContext; diff --git a/engine-extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/engine-extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 0945c3443..77f0797f1 100644 --- a/engine-extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/engine-extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,2 @@ io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor -io.nosqlbench.virtdata.processors.ServiceProcessor +io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/nb-api/pom.xml b/nb-api/pom.xml new file mode 100644 index 000000000..f71ab8200 --- /dev/null +++ b/nb-api/pom.xml @@ -0,0 +1,65 @@ + + 4.0.0 + + + + mvn-defaults + io.nosqlbench + 3.12.73-SNAPSHOT + ../mvn-defaults + + + nb-api + jar + ${project.artifactId} + + The top level API module for NoSQLBench. This module should have no internal + module dependencies other than the mvn-default module. + All modules within NoSQLBench can safely depend on this module with circular + dependencies. This module provides cross-cutting code infrastracture, such as + path utilities and ways of describing services used between modules. + It is also the transitive aggregation point for system-wide library dependencies + for logging and testing or similar needs. + + + + + + + + org.slf4j + slf4j-api + + + + ch.qos.logback + logback-classic + + + + + + org.openjdk.jmh + jmh-core + + + org.openjdk.jmh + jmh-generator-annprocess + + + + + + org.testng + testng + test + + + org.assertj + assertj-core-java8 + test + + + + + diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/ServiceClassName.java b/nb-api/src/main/java/io/nosqlbench/nb/api/ServiceClassName.java new file mode 100644 index 000000000..7fa7fb9b0 --- /dev/null +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/ServiceClassName.java @@ -0,0 +1,10 @@ +package io.nosqlbench.nb.api; + +/** + * Statically defined names which need to be visible for refactoring + * and safe source manipulation. + */ +public class ServiceClassName { + public final static String Service = + "io.nosqlbench.nb.api.annotations.Service"; +} diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Service.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Service.java similarity index 96% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Service.java rename to nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Service.java index 734e76d44..af72bfd8e 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Service.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Service.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package io.nosqlbench.virtdata.annotations; +package io.nosqlbench.nb.api.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/ServiceProcessor.java b/nb-api/src/main/java/io/nosqlbench/nb/api/processors/ServiceProcessor.java similarity index 95% rename from virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/ServiceProcessor.java rename to nb-api/src/main/java/io/nosqlbench/nb/api/processors/ServiceProcessor.java index 2936e2280..ac34dae38 100644 --- a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/ServiceProcessor.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/processors/ServiceProcessor.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.processors; +package io.nosqlbench.nb.api.processors; import javax.annotation.processing.*; import javax.lang.model.SourceVersion; @@ -22,11 +22,12 @@ import java.util.stream.Collectors; */ @SupportedSourceVersion(SourceVersion.RELEASE_12) public class ServiceProcessor extends AbstractProcessor { + public final static String SERVICE_NAME = io.nosqlbench.nb.api.annotations.Service.class.getCanonicalName(); @Override public Set getSupportedAnnotationTypes() { Set supportedAnnotations = new HashSet<>(); - supportedAnnotations.add(ProcessorClassNames.Service); + supportedAnnotations.add(SERVICE_NAME); return supportedAnnotations; } diff --git a/nb/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/nb/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 0945c3443..77f0797f1 100644 --- a/nb/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/nb/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,2 @@ io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor -io.nosqlbench.virtdata.processors.ServiceProcessor +io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/pom.xml b/pom.xml index 55bc53c14..4eb937faf 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,7 @@ mvn-defaults docsys + nb-api engine-api @@ -46,7 +47,7 @@ virtdata-annotations virtdata-processors virtdata-lang - virtdata-api + virtdata-core virtdata-realdata virtdata-lib-basics virtdata-lib-random diff --git a/virtdata-api/docs/types.puml b/virtdata-core/docs/types.puml similarity index 100% rename from virtdata-api/docs/types.puml rename to virtdata-core/docs/types.puml diff --git a/virtdata-api/pom.xml b/virtdata-core/pom.xml similarity index 96% rename from virtdata-api/pom.xml rename to virtdata-core/pom.xml index fdbb769a2..b161d9ccd 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-core/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - virtdata-api + virtdata-core jar @@ -11,7 +11,7 @@ ../mvn-defaults - virtdata-api + virtdata-core http://nosqlbench.io/ diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/Binder.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Binder.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/Binder.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Binder.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/Bindings.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Bindings.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/Bindings.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Bindings.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/BindingsCache.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsCache.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/BindingsCache.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsCache.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/BindingsTemplate.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsTemplate.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/BindingsTemplate.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsTemplate.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/CompatibilityFixups.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/CompatibilityFixups.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/CompatibilityFixups.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/CompatibilityFixups.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ContextualArrayBindings.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualArrayBindings.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ContextualArrayBindings.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualArrayBindings.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ContextualBindings.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualBindings.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ContextualBindings.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualBindings.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ContextualBindingsArrayTemplate.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualBindingsArrayTemplate.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ContextualBindingsArrayTemplate.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualBindingsArrayTemplate.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ContextualBindingsTemplate.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualBindingsTemplate.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ContextualBindingsTemplate.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualBindingsTemplate.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ContextualMapBindings.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualMapBindings.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ContextualMapBindings.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualMapBindings.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/DataMapper.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapper.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/DataMapper.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapper.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/DataMapperFunctionMapper.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapperFunctionMapper.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/DataMapperFunctionMapper.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapperFunctionMapper.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/DataMapperLibrary.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapperLibrary.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/DataMapperLibrary.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapperLibrary.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/DataMapperLibraryFinder.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapperLibraryFinder.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/DataMapperLibraryFinder.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapperLibraryFinder.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/FunctionType.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/FunctionType.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/FunctionType.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/FunctionType.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/FunctionTyper.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/FunctionTyper.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/FunctionTyper.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/FunctionTyper.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/LazyValuesMap.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/LazyValuesMap.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/LazyValuesMap.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/LazyValuesMap.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/Named.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Named.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/Named.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Named.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ResolvedFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolvedFunction.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ResolvedFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolvedFunction.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/StringObjectPromoter.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/StringObjectPromoter.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/StringObjectPromoter.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/StringObjectPromoter.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VALUE.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VALUE.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VALUE.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VALUE.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ValueType.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValueType.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ValueType.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValueType.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ValuesArrayBinder.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValuesArrayBinder.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ValuesArrayBinder.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValuesArrayBinder.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ValuesBinder.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValuesBinder.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ValuesBinder.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValuesBinder.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ValuesMapBinder.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValuesMapBinder.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/ValuesMapBinder.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValuesMapBinder.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtData.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtData.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtData.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtData.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataComposer.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataComposer.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataComposer.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataComposer.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataDocs.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataDocs.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataDocs.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataDocs.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionFinder.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionFinder.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionFinder.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionFinder.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionLibrary.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionLibrary.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionLibrary.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionLibrary.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctions.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctions.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctions.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctions.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibraries.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibraries.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibraries.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibraries.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibrary.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibrary.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibrary.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibrary.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataResources.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataResources.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/VirtDataResources.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataResources.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleFunction.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleFunction.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleToIntFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleToIntFunction.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleToIntFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleToIntFunction.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleToLongFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleToLongFunction.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleToLongFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleToLongFunction.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleUnaryOperator.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleUnaryOperator.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleUnaryOperator.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleUnaryOperator.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForFunction.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForFunction.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntFunction.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntFunction.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntToDoubleFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntToDoubleFunction.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntToDoubleFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntToDoubleFunction.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntToLongFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntToLongFunction.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntToLongFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntToLongFunction.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntUnaryOperator.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntUnaryOperator.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntUnaryOperator.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntUnaryOperator.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongFunction.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongFunction.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongToDoubleFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongToDoubleFunction.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongToDoubleFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongToDoubleFunction.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongToIntFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongToIntFunction.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongToIntFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongToIntFunction.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongUnaryOperator.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongUnaryOperator.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongUnaryOperator.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongUnaryOperator.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionAssembly.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionAssembly.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionAssembly.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionAssembly.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionComposer.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionComposer.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionComposer.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionComposer.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/config/ConfigAware.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/config/ConfigAware.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/config/ConfigAware.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/config/ConfigAware.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/config/ConfigModel.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/config/ConfigModel.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/config/ConfigModel.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/config/ConfigModel.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/config/MutableConfigModel.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/config/MutableConfigModel.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/config/MutableConfigModel.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/config/MutableConfigModel.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/murmur/Checksum128.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/murmur/Checksum128.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/murmur/Checksum128.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/murmur/Checksum128.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/murmur/Murmur3F.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/murmur/Murmur3F.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/murmur/Murmur3F.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/murmur/Murmur3F.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/templates/BindPoint.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/BindPoint.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/templates/BindPoint.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/BindPoint.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/templates/CSVBindings.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/CSVBindings.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/templates/CSVBindings.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/CSVBindings.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/templates/CSVBindingsTemplate.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/CSVBindingsTemplate.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/templates/CSVBindingsTemplate.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/CSVBindingsTemplate.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/templates/ParsedTemplate.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/ParsedTemplate.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/templates/ParsedTemplate.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/ParsedTemplate.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/templates/StringBindings.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringBindings.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/templates/StringBindings.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringBindings.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/templates/StringBindingsTemplate.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringBindingsTemplate.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/templates/StringBindingsTemplate.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringBindingsTemplate.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/templates/StringCompositor.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringCompositor.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/templates/StringCompositor.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringCompositor.java diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/templates/StringMapCompositor.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringMapCompositor.java similarity index 100% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/templates/StringMapCompositor.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringMapCompositor.java diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java similarity index 100% rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/api/ValueTypeTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/api/ValueTypeTest.java similarity index 100% rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/api/ValueTypeTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/api/ValueTypeTest.java diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/api/templates/ParsedTemplateTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/api/templates/ParsedTemplateTest.java similarity index 100% rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/api/templates/ParsedTemplateTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/api/templates/ParsedTemplateTest.java diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/api/templates/StringBindingsTemplateTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/api/templates/StringBindingsTemplateTest.java similarity index 100% rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/api/templates/StringBindingsTemplateTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/api/templates/StringBindingsTemplateTest.java diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/api/templates/StringCompositorTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/api/templates/StringCompositorTest.java similarity index 100% rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/api/templates/StringCompositorTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/api/templates/StringCompositorTest.java diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/composers/FunctionAssemblerMatrixTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/composers/FunctionAssemblerMatrixTest.java similarity index 100% rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/composers/FunctionAssemblerMatrixTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/composers/FunctionAssemblerMatrixTest.java diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/composers/FunctionAssemblerTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/composers/FunctionAssemblerTest.java similarity index 100% rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/composers/FunctionAssemblerTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/composers/FunctionAssemblerTest.java diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java similarity index 100% rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java similarity index 100% rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java similarity index 100% rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java similarity index 100% rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java similarity index 100% rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java similarity index 100% rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java similarity index 100% rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java similarity index 100% rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java similarity index 100% rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index eef088ce1..b5afaaf1a 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -29,11 +29,18 @@ org.mvel mvel2 - - io.nosqlbench - virtdata-api - 3.12.73-SNAPSHOT - + + + + + + + + + io.nosqlbench + virtdata-core + 3.12.73-SNAPSHOT + org.apache.commons 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 1b747f661..717b9ed3c 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 @@ -6,6 +6,7 @@ import org.apache.logging.log4j.LogManager; import java.util.List; import java.util.function.LongUnaryOperator; +import java.util.logging.LogManager; public class MetaShift { private final static Logger logger = LogManager.getLogger(MetaShift.class);public static Func forSizeAndBank(long size, int selector) { diff --git a/virtdata-lib-basics/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/virtdata-lib-basics/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 0945c3443..77f0797f1 100644 --- a/virtdata-lib-basics/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/virtdata-lib-basics/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,2 @@ io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor -io.nosqlbench.virtdata.processors.ServiceProcessor +io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index e80ba66a9..d2ebf5c15 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -18,11 +18,12 @@ - - io.nosqlbench - virtdata-api - 3.12.73-SNAPSHOT - + + + + + + diff --git a/virtdata-lib-curves4/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/virtdata-lib-curves4/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 0945c3443..77f0797f1 100644 --- a/virtdata-lib-curves4/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/virtdata-lib-curves4/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,2 @@ io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor -io.nosqlbench.virtdata.processors.ServiceProcessor +io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 059836571..7f98151f1 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -19,7 +19,7 @@ io.nosqlbench - virtdata-api + virtdata-core 3.12.73-SNAPSHOT diff --git a/virtdata-lib-random/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/virtdata-lib-random/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 0945c3443..77f0797f1 100644 --- a/virtdata-lib-random/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/virtdata-lib-random/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,2 @@ io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor -io.nosqlbench.virtdata.processors.ServiceProcessor +io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/virtdata-lib-realer/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/virtdata-lib-realer/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 0945c3443..77f0797f1 100644 --- a/virtdata-lib-realer/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/virtdata-lib-realer/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,2 @@ io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor -io.nosqlbench.virtdata.processors.ServiceProcessor +io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/virtdata-processors/pom.xml b/virtdata-processors/pom.xml index 456329e4b..89bb25cb2 100644 --- a/virtdata-processors/pom.xml +++ b/virtdata-processors/pom.xml @@ -23,6 +23,12 @@ virtdata-annotations 3.12.73-SNAPSHOT + + io.nosqlbench + nb-api + 3.12.73-SNAPSHOT + compile + diff --git a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FunctionDocInfoWriter.java b/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FunctionDocInfoWriter.java index 4912dc928..d074819f3 100644 --- a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FunctionDocInfoWriter.java +++ b/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FunctionDocInfoWriter.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.processors; import com.squareup.javapoet.*; +import io.nosqlbench.nb.api.annotations.Service; import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Service; import javax.annotation.processing.Filer; import javax.annotation.processing.Messager; diff --git a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/ProcessorClassNames.java b/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/ProcessorClassNames.java index 4cc94d86a..38f2f26e6 100644 --- a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/ProcessorClassNames.java +++ b/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/ProcessorClassNames.java @@ -9,6 +9,4 @@ public class ProcessorClassNames { "io.nosqlbench.virtdata.annotations.ThreadSafeMapper"; public final static String PerThreadMapper = "io.nosqlbench.virtdata.annotations.PerThreadMapper"; - public final static String Service = - "io.nosqlbench.virtdata.annotations.Service"; } diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 323eaffe8..f4187fd0b 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -15,11 +15,11 @@ http://nosqlbench.io/ - - io.nosqlbench - virtdata-api - 3.12.73-SNAPSHOT - + + + + + org.apache.commons diff --git a/virtdata-realdata/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/virtdata-realdata/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 0945c3443..77f0797f1 100644 --- a/virtdata-realdata/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/virtdata-realdata/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,2 @@ io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor -io.nosqlbench.virtdata.processors.ServiceProcessor +io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 3116ac996..435a6dc8a 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -24,11 +24,11 @@ virtdata-lib-realer 3.12.73-SNAPSHOT - - io.nosqlbench - virtdata-api - 3.12.73-SNAPSHOT - + + + + + io.nosqlbench virtdata-lib-random diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataService.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataService.java index d83a9a3b0..07d072cac 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataService.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataService.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.userlibs.apps; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import io.nosqlbench.virtdata.api.DataMapper; import io.nosqlbench.virtdata.api.ResolverDiagnostics; import io.nosqlbench.virtdata.api.VirtData; diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsWebService.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsWebService.java index bc1e11d16..25168293a 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsWebService.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsWebService.java @@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.userlibs.apps.docsapp; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.jaxrs.annotation.JacksonFeatures; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import io.nosqlbench.virtdata.api.VirtDataDocs; import io.nosqlbench.docsys.api.WebServiceObject; import io.nosqlbench.virtdata.processors.DocFuncData; diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/docinfo/VirtdataMarkdownManifest.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/docinfo/VirtdataMarkdownManifest.java index ae22ad803..1a49f357c 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/docinfo/VirtdataMarkdownManifest.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/docinfo/VirtdataMarkdownManifest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.userlibs.docinfo; -import io.nosqlbench.virtdata.annotations.Service; +import io.nosqlbench.nb.api.annotations.Service; import io.nosqlbench.docsys.api.Docs; import io.nosqlbench.docsys.api.DocsBinder; import io.nosqlbench.docsys.api.DocsysDynamicManifest; diff --git a/virtdata-userlibs/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/virtdata-userlibs/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 0945c3443..77f0797f1 100644 --- a/virtdata-userlibs/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/virtdata-userlibs/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,2 @@ io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor -io.nosqlbench.virtdata.processors.ServiceProcessor +io.nosqlbench.nb.api.processors.ServiceProcessor From 0d063c2f3b5b9f881d67f13d55800c52100ce569 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 12:27:53 -0500 Subject: [PATCH 02/17] doc improvements --- .../docs-for-nb/nosqlbench/getting_support.md | 16 ++++++++-------- .../resources/docs-for-nb/nosqlbench/index.md | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/engine-docs/src/main/resources/docs-for-nb/nosqlbench/getting_support.md b/engine-docs/src/main/resources/docs-for-nb/nosqlbench/getting_support.md index 2c6a7238d..bac211c1b 100644 --- a/engine-docs/src/main/resources/docs-for-nb/nosqlbench/getting_support.md +++ b/engine-docs/src/main/resources/docs-for-nb/nosqlbench/getting_support.md @@ -3,7 +3,14 @@ title: Getting Support weight: 10 --- -# Built-In Docs +# Getting Support + +In general, our goals with NoSQLBench are to make the help systems and examples wrap around the users like a suit of +armor, so that they feel capable of doing most things without having to ask for help. Please keep this in mind when +looking for personal support form our community, and help us find those places where the docs are lacking. Maybe you can +help us by adding some missing docs! + +## Built-In Docs The documentation for NoSQLBench is quite thorough. On the command line, you can see a list of built-in docs with the command: @@ -17,13 +24,6 @@ To read any topic, simply use the command: The documentation system you are looking at right now includes the same docs you can find above already and more. They are automatically included when NoSQLBench is built. -# Getting Support - -In general, our goals with NoSQLBench are to make the help systems and examples wrap around the users like a suit of -armor, so that they feel capable of doing most things without having to ask for help. Please keep this in mind when -looking for personal support form our community, and help us find those places where the docs are lacking. Maybe you can -help us by adding some missing docs! - ## General Feedback These guidelines are mirrored at the diff --git a/engine-docs/src/main/resources/docs-for-nb/nosqlbench/index.md b/engine-docs/src/main/resources/docs-for-nb/nosqlbench/index.md index 08e88b16f..0dd3ad0b9 100644 --- a/engine-docs/src/main/resources/docs-for-nb/nosqlbench/index.md +++ b/engine-docs/src/main/resources/docs-for-nb/nosqlbench/index.md @@ -9,7 +9,7 @@ Welcome to the documentation for NoSQLBench. This is a power tool that emulates that you can fast-track performance, sizing and data model testing without writing your own testing harness. To get started right away, jump to the -[Quick Start Example](/index.html#/docs/02_getting_started.html) from the menu on the left. +[Quick Start Example](../getting_started/docs/index.md) from the menu on the left. To see the ways you can get NoSQLBench, check out the project site [DOWNLOADS.md](https://github.com/nosqlbench/nosqlbench/blob/master/DOWNLOADS.md). From f5855a0cfc7c0fc7f43421bfe91e3b2802f16e0b Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 12:28:00 -0500 Subject: [PATCH 03/17] temporarily force api disconnect --- docsys/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index edf30116a..7bfb60973 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -112,11 +112,11 @@ virtdata-annotations 3.12.73-SNAPSHOT - - io.nosqlbench - virtdata-api - 3.12.73-SNAPSHOT - + + + + + org.slf4j slf4j-api From ea2a71cc02cae292ba1770979eb312d691fd8237 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 12:41:45 -0500 Subject: [PATCH 04/17] formatting fix --- .../src/main/java/io/nosqlbench/docsys/core/DocServer.java | 4 +++- .../io/nosqlbench/docsys/core/DocsysMarkdownEndpoint.java | 3 ++- .../src/main/java/io/nosqlbench/docsys/core/PathWalker.java | 3 ++- .../java/io/nosqlbench/docsys/handlers/FavIconHandler.java | 3 ++- .../src/main/java/io/nosqlbench/virtdata/api/Bindings.java | 3 ++- .../java/io/nosqlbench/virtdata/api/BindingsTemplate.java | 3 ++- .../java/io/nosqlbench/virtdata/api/CompatibilityFixups.java | 4 +++- .../java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java | 4 +++- .../src/main/java/io/nosqlbench/virtdata/api/VirtData.java | 3 ++- .../java/io/nosqlbench/virtdata/api/VirtDataComposer.java | 3 ++- .../io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java | 3 ++- .../java/io/nosqlbench/virtdata/api/VirtDataLibraries.java | 3 ++- .../virtdata/api/composers/ComposerForLongFunction.java | 3 ++- .../nosqlbench/virtdata/api/composers/FunctionAssembly.java | 3 ++- .../io/nosqlbench/virtdata/api/templates/ParsedTemplate.java | 3 ++- .../io/nosqlbench/virtdata/lang/parser/VirtDataBuilder.java | 3 ++- .../virtdata/library/basics/core/lfsrs/MetaShift.java | 4 ++-- .../shared/from_long/to_bigdecimal/ModuloToBigDecimal.java | 5 +++-- .../basics/shared/from_long/to_bigint/ModuloToBigInt.java | 5 +++-- .../basics/shared/from_long/to_int/HashedLineToInt.java | 3 ++- .../basics/shared/from_long/to_long/ModuloToLong.java | 5 +++-- .../basics/shared/from_long/to_string/DirectoryLines.java | 4 +++- .../from_long/to_string/HashedFileExtractToString.java | 4 +++- .../shared/from_long/to_string/HashedLineToString.java | 3 ++- .../shared/from_long/to_string/ModuloLineToString.java | 3 ++- .../library/basics/shared/from_long/to_string/Template.java | 3 ++- .../library/basics/shared/unary_string/FieldExtractor.java | 4 +++- .../virtdata/library/random/RandomFileExtractToString.java | 4 +++- .../nosqlbench/virtdata/library/random/RandomLineToInt.java | 3 ++- .../virtdata/library/random/RandomLineToString.java | 3 ++- .../virtdata/userlibs/apps/valuesapp/ValuesCheckerApp.java | 4 +++- .../userlibs/apps/valuesapp/ValuesCheckerRunnable.java | 4 +++- 32 files changed, 76 insertions(+), 36 deletions(-) diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/DocServer.java b/docsys/src/main/java/io/nosqlbench/docsys/core/DocServer.java index 1d02df337..6babdbdd7 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/core/DocServer.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/core/DocServer.java @@ -43,7 +43,9 @@ import java.util.stream.Collectors; */ public class DocServer implements Runnable { - private final static Logger logger = LogManager.getLogger(DocServer.class);private final List basePaths = new ArrayList<>(); + private final static Logger logger = LogManager.getLogger(DocServer.class); + + private final List basePaths = new ArrayList<>(); private final List servletClasses = new ArrayList<>(); private ServletContextHandler contextHandler; private ServletHolder servletHolder; diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpoint.java b/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpoint.java index 69fb79a92..b46be9550 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpoint.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpoint.java @@ -22,7 +22,8 @@ import java.util.concurrent.atomic.AtomicLong; @Singleton @Path("/services/docs/") public class DocsysMarkdownEndpoint implements WebServiceObject { - private final static Logger logger = LogManager.getLogger(DocsysMarkdownEndpoint.class);private DocsBinder docsinfo; + private final static Logger logger = LogManager.getLogger(DocsysMarkdownEndpoint.class); + private DocsBinder docsinfo; private DocsBinder enabled; private DocsBinder disabled; diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/PathWalker.java b/docsys/src/main/java/io/nosqlbench/docsys/core/PathWalker.java index 5ecb2cd91..dbe3d0b76 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/core/PathWalker.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/core/PathWalker.java @@ -12,7 +12,8 @@ import java.util.ArrayList; import java.util.List; public class PathWalker { - private final static Logger logger = LogManager.getLogger(PathWalker.class);public static void walk(Path p, PathVisitor v) { + private final static Logger logger = LogManager.getLogger(PathWalker.class); + public static void walk(Path p, PathVisitor v) { walk(p,v,PathWalker.WALK_ALL); } diff --git a/docsys/src/main/java/io/nosqlbench/docsys/handlers/FavIconHandler.java b/docsys/src/main/java/io/nosqlbench/docsys/handlers/FavIconHandler.java index 89b4135b0..659004bd8 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/handlers/FavIconHandler.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/handlers/FavIconHandler.java @@ -18,7 +18,8 @@ import java.nio.file.Path; import java.security.InvalidParameterException; public class FavIconHandler extends AbstractHandler { - private final static Logger logger = LogManager.getLogger(FavIconHandler.class);private final Path faviconPath; + private final static Logger logger = LogManager.getLogger(FavIconHandler.class); + private final Path faviconPath; byte[] iconData; private long lastModified = 0L; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Bindings.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Bindings.java index 83af22627..da61a9ae3 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Bindings.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Bindings.java @@ -36,7 +36,8 @@ import java.util.*; * directly on your provided objects. See the detailed method docs for more information.

*/ public class Bindings { - private final static Logger logger = LogManager.getLogger(Bindings.class);private BindingsTemplate template; + private final static Logger logger = LogManager.getLogger(Bindings.class); + private BindingsTemplate template; private List> dataMappers = new ArrayList>(); private ThreadLocal>> nameCache; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsTemplate.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsTemplate.java index 94e052cfb..d9787e286 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsTemplate.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsTemplate.java @@ -38,7 +38,8 @@ import java.util.Optional; * bindings will be used in. */ public class BindingsTemplate { - private final static Logger logger = LogManager.getLogger(BindingsTemplate.class);private List bindPointNames = new ArrayList<>(); + private final static Logger logger = LogManager.getLogger(BindingsTemplate.class); + private List bindPointNames = new ArrayList<>(); private List specifiers = new ArrayList<>(); // public BindingsTemplate(Map specs) { diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/CompatibilityFixups.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/CompatibilityFixups.java index e6681828b..306602e74 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/CompatibilityFixups.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/CompatibilityFixups.java @@ -11,7 +11,9 @@ import java.util.regex.Pattern; public class CompatibilityFixups { - private final static Logger logger = LogManager.getLogger(CompatibilityFixups.class);// Not all of these are simple upper-case changes + private final static Logger logger = LogManager.getLogger(CompatibilityFixups.class); + + // Not all of these are simple upper-case changes private final static Map funcs = new HashMap() {{ put("log_normal","LogNormal"); put("normal", "Normal"); diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java index a43340968..e2720902f 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java @@ -9,7 +9,9 @@ import java.util.Optional; public class ResolverDiagnostics { - private final static Logger logger = LogManager.getLogger(ResolverDiagnostics.class);private ResolvedFunction resolvedFunction; + private final static Logger logger = LogManager.getLogger(ResolverDiagnostics.class); + + private ResolvedFunction resolvedFunction; private final StringBuilder log = new StringBuilder(); private Throwable error; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtData.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtData.java index 3a1471cd4..a66cb884f 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtData.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtData.java @@ -10,7 +10,8 @@ import org.apache.logging.log4j.LogManager; import java.util.*; public class VirtData { - private final static Logger logger = LogManager.getLogger(VirtData.class);/** + private final static Logger logger = LogManager.getLogger(VirtData.class); + /** * Create a bindings template from the pair-wise names and specifiers. * Each even-numbered (starting with zero) argument is a binding name, * and each odd-numbered (starting with one) argument is a binding spec. diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataComposer.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataComposer.java index 0348b17cf..87a06c7d9 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataComposer.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataComposer.java @@ -50,7 +50,8 @@ import java.util.stream.Collectors; public class VirtDataComposer { private final static String PREAMBLE = "compose "; - private final static Logger logger = LogManager.getLogger(DataMapperLibrary.class);private final static MethodHandles.Lookup lookup = MethodHandles.publicLookup(); + private final static Logger logger = LogManager.getLogger(DataMapperLibrary.class); + private final static MethodHandles.Lookup lookup = MethodHandles.publicLookup(); private final VirtDataFunctionLibrary functionLibrary; private final Map customElements = new HashMap<>(); diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java index 01b35b02c..216cdd529 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java @@ -16,7 +16,8 @@ import java.util.*; import java.util.stream.Collectors; public class VirtDataFunctionResolver { - private final static Logger logger = LogManager.getLogger(VirtDataFunctionResolver.class);private final static MethodHandles.Lookup lookup = MethodHandles.publicLookup(); + private final static Logger logger = LogManager.getLogger(VirtDataFunctionResolver.class); + private final static MethodHandles.Lookup lookup = MethodHandles.publicLookup(); private final VirtDataFunctionFinder virtDataFunctionFinder = new VirtDataFunctionFinder(); public List resolveFunctions(Class returnType, Class inputType, String functionName, Map customParameters, Object... parameters) { diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibraries.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibraries.java index 3fcc412ce..0dd20cf81 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibraries.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibraries.java @@ -9,7 +9,8 @@ import java.util.List; import java.util.Map; public class VirtDataLibraries implements VirtDataFunctionLibrary { - private final static Logger logger = LogManager.getLogger(VirtDataLibraries.class);private static VirtDataLibraries instance = new VirtDataLibraries(); + private final static Logger logger = LogManager.getLogger(VirtDataLibraries.class); + private static VirtDataLibraries instance = new VirtDataLibraries(); private final Map> threadSafeCache = new HashMap<>(); private final VirtDataFunctionResolver resolver = new VirtDataFunctionResolver(); diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongFunction.java index b3340fb05..47c9cf2b0 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongFunction.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongFunction.java @@ -8,7 +8,8 @@ import org.apache.logging.log4j.LogManager; import java.util.function.*; public class ComposerForLongFunction implements FunctionComposer> { - private final static Logger logger = LogManager.getLogger(ComposerForLongFunction.class);private final LongFunction inner; + private final static Logger logger = LogManager.getLogger(ComposerForLongFunction.class); + private final LongFunction inner; public ComposerForLongFunction(LongFunction inner) { this.inner = inner; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionAssembly.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionAssembly.java index 75c8ef390..ccbe8f93b 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionAssembly.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionAssembly.java @@ -7,7 +7,8 @@ import org.apache.logging.log4j.LogManager; import java.util.function.*; public class FunctionAssembly implements FunctionComposer { - private final static Logger logger = LogManager.getLogger(FunctionAssembly.class);private FunctionComposer composer = null; + private final static Logger logger = LogManager.getLogger(FunctionAssembly.class); + private FunctionComposer composer = null; @Override public Object getFunctionObject() { diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/ParsedTemplate.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/ParsedTemplate.java index 1141f677a..529126002 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/ParsedTemplate.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/ParsedTemplate.java @@ -87,7 +87,8 @@ public class ParsedTemplate { Pattern.compile("\\{(?\\w+[-_\\d\\w.]*)}"), Pattern.compile("\\?(?\\w+[-_\\d\\w.]*)") }; - private final static Logger logger = LogManager.getLogger(ParsedTemplate.class);private final Pattern[] patterns; + private final static Logger logger = LogManager.getLogger(ParsedTemplate.class); + private final Pattern[] patterns; // Spans is an even-odd form of (literal, variable, ..., ..., literal) private final String rawtemplate; private final String[] spans; diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/parser/VirtDataBuilder.java b/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/parser/VirtDataBuilder.java index 202edcc0b..f6c1db459 100644 --- a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/parser/VirtDataBuilder.java +++ b/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/parser/VirtDataBuilder.java @@ -16,7 +16,8 @@ import java.util.Stack; import java.util.regex.Pattern; public class VirtDataBuilder extends VirtDataBaseListener { - private final static Logger logger = LogManager.getLogger(VirtDataBuilder.class);private VirtDataAST model = new VirtDataAST(); + private final static Logger logger = LogManager.getLogger(VirtDataBuilder.class); + private VirtDataAST model = new VirtDataAST(); private List errorNodes = new ArrayList<>(); private Stack flowContexts = new Stack<>(); 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 717b9ed3c..21d8635d2 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 @@ -6,10 +6,10 @@ import org.apache.logging.log4j.LogManager; import java.util.List; import java.util.function.LongUnaryOperator; -import java.util.logging.LogManager; public class MetaShift { - private final static Logger logger = LogManager.getLogger(MetaShift.class);public static Func forSizeAndBank(long size, int selector) { + private final static Logger logger = LogManager.getLogger(MetaShift.class); + public static Func forSizeAndBank(long size, int selector) { GaloisData data = Masks.forPeriodAndBank(size, selector); return new Func(data); } diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ModuloToBigDecimal.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ModuloToBigDecimal.java index 17af399ae..1bcf654fd 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ModuloToBigDecimal.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ModuloToBigDecimal.java @@ -33,7 +33,8 @@ import java.util.function.LongFunction; @ThreadSafeMapper @Categories({Category.conversion}) public class ModuloToBigDecimal implements LongFunction { - private final static Logger logger = LogManager.getLogger(ModuloToBigDecimal.class);private final long modulo; + private final static Logger logger = LogManager.getLogger(ModuloToBigDecimal.class); + private final long modulo; public ModuloToBigDecimal() { this.modulo = Long.MAX_VALUE; @@ -48,4 +49,4 @@ public class ModuloToBigDecimal implements LongFunction { long ret = (value % modulo) & Long.MAX_VALUE; return BigDecimal.valueOf(ret); } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ModuloToBigInt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ModuloToBigInt.java index 5a862d47f..476f3eb27 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ModuloToBigInt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ModuloToBigInt.java @@ -33,7 +33,8 @@ import java.util.function.LongFunction; @ThreadSafeMapper @Categories({Category.conversion}) public class ModuloToBigInt implements LongFunction { - private final static Logger logger = LogManager.getLogger(ModuloToBigInt.class);private final long modulo; + private final static Logger logger = LogManager.getLogger(ModuloToBigInt.class); + private final long modulo; public ModuloToBigInt() { this.modulo = Long.MAX_VALUE; @@ -48,4 +49,4 @@ public class ModuloToBigInt implements LongFunction { long ret = (value % modulo) & Long.MAX_VALUE; return BigInteger.valueOf(ret); } -} \ No newline at end of file +} 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 01d86bb5f..79eb9a11f 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 @@ -14,7 +14,8 @@ import java.util.function.LongToIntFunction; */ @ThreadSafeMapper public class HashedLineToInt implements LongToIntFunction { - private final static Logger logger = LogManager.getLogger(HashedLineToInt.class);private int[] values; + private final static Logger logger = LogManager.getLogger(HashedLineToInt.class); + private int[] values; private final String filename; private final Hash intHash; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ModuloToLong.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ModuloToLong.java index 9c042623b..3ee36b8af 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ModuloToLong.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ModuloToLong.java @@ -29,7 +29,8 @@ import java.util.function.LongUnaryOperator; */ @ThreadSafeMapper public class ModuloToLong implements LongUnaryOperator { - private final static Logger logger = LogManager.getLogger(ModuloToLong.class);private final long modulo; + private final static Logger logger = LogManager.getLogger(ModuloToLong.class); + private final long modulo; public ModuloToLong(long modulo) { this.modulo=modulo; @@ -41,4 +42,4 @@ public class ModuloToLong implements LongUnaryOperator { return ret; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLines.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLines.java index 3e963ee23..5d78227b8 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLines.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLines.java @@ -25,7 +25,9 @@ import java.util.regex.Pattern; @ThreadSafeMapper public class DirectoryLines implements LongFunction { - private final static Logger logger = LogManager.getLogger(DirectoryLines.class);private final Pattern namePattern; + private final static Logger logger = LogManager.getLogger(DirectoryLines.class); + + private final Pattern namePattern; private final String basepath; private final List allFiles; private Iterator stringIterator; 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 a5daa267a..d55e5864c 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 @@ -37,7 +37,9 @@ import java.util.function.LongFunction; @ThreadSafeMapper public class HashedFileExtractToString implements LongFunction { - private final static Logger logger = LogManager.getLogger(HashedFileExtractToString.class);private static CharBuffer fileDataImage =null; + private final static Logger logger = LogManager.getLogger(HashedFileExtractToString.class); + + private static CharBuffer fileDataImage =null; private final HashRange sizeRange; private final HashRange positionRange; 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 26071eb43..8fe9eae47 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 @@ -34,7 +34,8 @@ import java.util.function.LongFunction; */ @ThreadSafeMapper public class HashedLineToString implements LongFunction { - private final static Logger logger = LogManager.getLogger(HashedLineToString.class);private final HashRange indexRange; + private final static Logger logger = LogManager.getLogger(HashedLineToString.class); + private final HashRange indexRange; private List lines = new ArrayList<>(); 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 499af58db..5e43e4c97 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 @@ -33,7 +33,8 @@ import java.util.function.LongFunction; */ @ThreadSafeMapper public class ModuloLineToString implements LongFunction { - private final static Logger logger = LogManager.getLogger(ModuloLineToString.class);private List lines = new ArrayList<>(); + private final static Logger logger = LogManager.getLogger(ModuloLineToString.class); + private List lines = new ArrayList<>(); private String filename; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java index 3ab8a7dd2..1b7eac9c3 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java @@ -35,7 +35,8 @@ import java.util.regex.Pattern; */ @ThreadSafeMapper public class Template implements LongFunction { - private final static Logger logger = LogManager.getLogger(Template.class);private static final String EXPR_BEGIN = "[["; + private final static Logger logger = LogManager.getLogger(Template.class); + private static final String EXPR_BEGIN = "[["; private static final String EXPR_END = "]]"; private final static ThreadLocal sb = ThreadLocal.withInitial(StringBuilder::new); private final String rawTemplate; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractor.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractor.java index 253579428..36f109536 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractor.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractor.java @@ -15,7 +15,9 @@ import java.util.function.Function; @ThreadSafeMapper public class FieldExtractor implements Function { - private final static Logger logger = LogManager.getLogger(FieldExtractor.class);private final String fields; + private final static Logger logger = LogManager.getLogger(FieldExtractor.class); + + private final String fields; private final String splitDelim; private final String printDelim; private final int maxIdx; 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 06cf2b9dc..b599a171e 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 @@ -32,7 +32,9 @@ import java.util.function.LongFunction; @DeprecatedFunction("random mappers are not deterministic. They will be replaced with hash-based functions.") public class RandomFileExtractToString implements LongFunction { - private final static Logger logger = LogManager.getLogger(RandomFileExtractToString.class);private static CharBuffer fileDataImage =null; + private final static Logger logger = LogManager.getLogger(RandomFileExtractToString.class); + + private static CharBuffer fileDataImage =null; private int minsize, maxsize; private final MersenneTwister rng; 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 8db47f349..d0399627a 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 @@ -13,7 +13,8 @@ import java.util.function.LongToIntFunction; @DeprecatedFunction("random mappers are not deterministic. They will be replaced with hash-based functions.") public class RandomLineToInt implements LongToIntFunction { - private final static Logger logger = LogManager.getLogger(RandomLineToInt.class);private final List lines; + private final static Logger logger = LogManager.getLogger(RandomLineToInt.class); + private final List lines; private final MersenneTwister rng; private final IntegerDistribution itemDistribution; 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 a258002ac..ddfc6d0ec 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 @@ -35,7 +35,8 @@ import java.util.function.LongFunction; */ @DeprecatedFunction("random mappers are not deterministic. They will be replaced with hash-based functions.") public class RandomLineToString implements LongFunction { - private final static Logger logger = LogManager.getLogger(RandomLineToString.class);private List lines = new ArrayList<>(); + private final static Logger logger = LogManager.getLogger(RandomLineToString.class); + private List lines = new ArrayList<>(); private final MersenneTwister rng; private final IntegerDistribution itemDistribution; diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerApp.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerApp.java index c5a1458b0..8c88bc60c 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerApp.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerApp.java @@ -5,7 +5,9 @@ import org.apache.logging.log4j.LogManager; public class ValuesCheckerApp { - private final static Logger logger = LogManager.getLogger(ValuesCheckerApp.class);public static void main(String[] args) { + private final static Logger logger = LogManager.getLogger(ValuesCheckerApp.class); + + public static void main(String[] args) { if (args.length<5) { System.out.println("ARGS: 'specifier' threads bufsize start end"); System.out.println("example: 'timeuuid()' 100 1000 0 10000"); diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerRunnable.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerRunnable.java index d538abfc1..14a5b880a 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerRunnable.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerRunnable.java @@ -13,7 +13,9 @@ import java.util.concurrent.locks.Lock; public class ValuesCheckerRunnable implements Runnable { - private final static Logger logger = LogManager.getLogger(ValuesCheckerRunnable.class);private final Condition goTime; + private final static Logger logger = LogManager.getLogger(ValuesCheckerRunnable.class); + + private final Condition goTime; private final Lock lock; private final long start; private final long end; From e9fbe352f28ecfe3f000288f920adda4b65cd118 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 13:06:33 -0500 Subject: [PATCH 05/17] include logging libs --- nb-api/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nb-api/pom.xml b/nb-api/pom.xml index f71ab8200..52af9f2ed 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -25,6 +25,7 @@ + org.slf4j @@ -36,6 +37,17 @@ logback-classic + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core + + + From 644ec7a0750b105ef807409ef2d0f499b617bbc1 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 13:06:55 -0500 Subject: [PATCH 06/17] move murmur override to owning module --- .../main/java/io/nosqlbench/virtdata}/murmur/Checksum128.java | 2 +- .../src/main/java/io/nosqlbench/virtdata}/murmur/Murmur3F.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename {virtdata-core/src/main/java/io/nosqlbench/virtdata/api => virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata}/murmur/Checksum128.java (97%) rename {virtdata-core/src/main/java/io/nosqlbench/virtdata/api => virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata}/murmur/Murmur3F.java (99%) diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/murmur/Checksum128.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/murmur/Checksum128.java similarity index 97% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/murmur/Checksum128.java rename to virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/murmur/Checksum128.java index 6cc148233..6ee6d4f14 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/murmur/Checksum128.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/murmur/Checksum128.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.virtdata.api.murmur; +package io.nosqlbench.virtdata.murmur; import java.math.BigInteger; import java.util.zip.Checksum; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/murmur/Murmur3F.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/murmur/Murmur3F.java similarity index 99% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/murmur/Murmur3F.java rename to virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/murmur/Murmur3F.java index 9b2a2030b..9afbd8e05 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/murmur/Murmur3F.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/murmur/Murmur3F.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.virtdata.api.murmur; +package io.nosqlbench.virtdata.murmur; import java.math.BigInteger; From 09824c1a5ed166b14c9c4f5494b5da830cce8d79 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 13:07:23 -0500 Subject: [PATCH 07/17] move murmur override to owning module --- pom.xml | 1 + virtdata-api/pom.xml | 76 +++++++++++++++++++ .../basics/shared/from_long/to_int/Hash.java | 2 +- .../shared/from_long/to_int/SignedHash.java | 2 +- .../shared/from_long/to_long/FullHash.java | 2 +- .../basics/shared/from_long/to_long/Hash.java | 2 +- .../shared/from_long/to_long/HostHash.java | 2 +- .../from_long/to_long/Murmur3DivToLong.java | 2 +- .../shared/from_long/to_long/SignedHash.java | 2 +- .../to_string/Murmur3DivToString.java | 2 +- .../library/basics/shared/unary_int/Hash.java | 2 +- .../basics/shared/unary_int/SignedHash.java | 2 +- virtdata-lib-curves4/pom.xml | 16 ++-- .../discrete/common/ThreadSafeHash.java | 2 +- virtdata-lib-random/pom.xml | 8 +- .../virtdata/library/random/Murmur3Time.java | 2 +- 16 files changed, 107 insertions(+), 18 deletions(-) create mode 100644 virtdata-api/pom.xml diff --git a/pom.xml b/pom.xml index 4eb937faf..82b64af38 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,7 @@ + virtdata-api virtdata-annotations virtdata-processors virtdata-lang diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml new file mode 100644 index 000000000..5140215da --- /dev/null +++ b/virtdata-api/pom.xml @@ -0,0 +1,76 @@ + + 4.0.0 + + virtdata-api + jar + + + io.nosqlbench + mvn-defaults + 3.12.73-SNAPSHOT + ../mvn-defaults + + + virtdata-api + http://nosqlbench.io/ + + The internal API module for Virtual Data Set modules. Each module that provides + mapping functions should only have to depend on this module to get all the dependencies + it needs. + + + + + + io.nosqlbench + nb-api + 3.12.73-SNAPSHOT + + + + io.nosqlbench + virtdata-processors + 3.12.73-SNAPSHOT + + + io.nosqlbench + virtdata-annotations + 3.12.73-SNAPSHOT + + + io.nosqlbench + virtdata-lang + 3.12.73-SNAPSHOT + + + + + org.apache.commons + commons-lang3 + + + + org.assertj + assertj-core-java8 + test + + + + org.junit.jupiter + junit-jupiter-api + test + + + + junit + junit + test + + + + org.apache.commons + commons-csv + + + + diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Hash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Hash.java index 59322585d..dcfa03e45 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Hash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Hash.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.murmur.Murmur3F; +import io.nosqlbench.virtdata.murmur.Murmur3F; import java.nio.ByteBuffer; import java.util.function.LongToIntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/SignedHash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/SignedHash.java index dbc6b17de..3f7c80a91 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/SignedHash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/SignedHash.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.murmur.Murmur3F; +import io.nosqlbench.virtdata.murmur.Murmur3F; import java.nio.ByteBuffer; import java.util.function.LongToIntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FullHash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FullHash.java index aef23fb8a..c36a38254 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FullHash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FullHash.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.murmur.Murmur3F; +import io.nosqlbench.virtdata.murmur.Murmur3F; import java.nio.ByteBuffer; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Hash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Hash.java index fa5120c57..d56fa8418 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Hash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Hash.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.murmur.Murmur3F; +import io.nosqlbench.virtdata.murmur.Murmur3F; import java.nio.ByteBuffer; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HostHash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HostHash.java index 06e5f5189..fd6f00fd8 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HostHash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HostHash.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.api.murmur.Murmur3F; +import io.nosqlbench.virtdata.murmur.Murmur3F; import java.net.InetAddress; import java.net.NetworkInterface; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Murmur3DivToLong.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Murmur3DivToLong.java index 3332c7762..fd29e6e04 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Murmur3DivToLong.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Murmur3DivToLong.java @@ -20,7 +20,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; import io.nosqlbench.virtdata.annotations.DeprecatedFunction; import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.murmur.Murmur3F; +import io.nosqlbench.virtdata.murmur.Murmur3F; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SignedHash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SignedHash.java index c614d8a8c..a7b536295 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SignedHash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SignedHash.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.murmur.Murmur3F; +import io.nosqlbench.virtdata.murmur.Murmur3F; import java.nio.ByteBuffer; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Murmur3DivToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Murmur3DivToString.java index 8d177c8c8..08d6cdfb0 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Murmur3DivToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Murmur3DivToString.java @@ -20,7 +20,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; import io.nosqlbench.virtdata.annotations.DeprecatedFunction; import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.murmur.Murmur3F; +import io.nosqlbench.virtdata.murmur.Murmur3F; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.DivideToLong; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Hash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Hash.java index b5b020d69..e52a08b81 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Hash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Hash.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.murmur.Murmur3F; +import io.nosqlbench.virtdata.murmur.Murmur3F; import java.nio.ByteBuffer; import java.util.function.IntUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/SignedHash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/SignedHash.java index 989a80204..d84f86c3c 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/SignedHash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/SignedHash.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.murmur.Murmur3F; +import io.nosqlbench.virtdata.murmur.Murmur3F; import java.nio.ByteBuffer; import java.util.function.IntUnaryOperator; diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index d2ebf5c15..8fcc5e617 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -19,11 +19,17 @@ - - - - - + + io.nosqlbench + virtdata-api + 3.12.73-SNAPSHOT + + + + io.nosqlbench + virtdata-lib-basics + 3.12.73-SNAPSHOT + diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHash.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHash.java index 0dd168fb6..dbe64781f 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHash.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHash.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.common; -import io.nosqlbench.virtdata.api.murmur.Murmur3F; +import io.nosqlbench.virtdata.murmur.Murmur3F; import java.nio.ByteBuffer; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 7f98151f1..70bae030a 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -19,7 +19,13 @@ io.nosqlbench - virtdata-core + virtdata-api + 3.12.73-SNAPSHOT + + + + io.nosqlbench + virtdata-lib-basics 3.12.73-SNAPSHOT diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/Murmur3Time.java b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/Murmur3Time.java index c18ed1286..3f11340ae 100644 --- a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/Murmur3Time.java +++ b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/Murmur3Time.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.random; -import io.nosqlbench.virtdata.api.murmur.Murmur3F; +import io.nosqlbench.virtdata.murmur.Murmur3F; import java.util.function.LongUnaryOperator; From d9113ea6f9a6c1ca536c218ee1b137aaeefc9535 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 13:07:37 -0500 Subject: [PATCH 08/17] retarget api dependency --- docsys/pom.xml | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 7bfb60973..6605f3a8c 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -14,6 +14,25 @@ + + + io.nosqlbench + virtdata-processors + 3.12.73-SNAPSHOT + + + + io.nosqlbench + virtdata-annotations + 3.12.73-SNAPSHOT + + + + io.nosqlbench + nb-api + 3.12.73-SNAPSHOT + + org.yaml snakeyaml @@ -102,16 +121,7 @@ javax.activation activation - - io.nosqlbench - virtdata-processors - 3.12.73-SNAPSHOT - - - io.nosqlbench - virtdata-annotations - 3.12.73-SNAPSHOT - + From 3036f971a6c589690e62fabef78e6c610511b2c1 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 15:24:29 -0500 Subject: [PATCH 09/17] refactor to junit 5 latest and repoint dependencies remove all testng references update annotations --- activitytype-cql/pom.xml | 8 +-- .../long_string/ModuloCSVLineToUUID.java | 2 +- .../datastax/ebdrivers/cql/CqlActionTest.java | 7 ++- .../CQLCQLStatementDefParserTest.java | 5 +- .../cql/statements/CQLOptionsTest.java | 5 +- activitytype-diag/pom.xml | 14 ++--- .../diag/DiagActivityTypeTest.java | 2 +- activitytype-http/pom.xml | 8 +-- .../http/HttpActivityTypeTest.java | 2 +- activitytype-stdout/pom.xml | 8 +-- .../stdout/StatementFormattersTest.java | 5 +- .../stdout/StdoutActivityTypeTest.java | 3 +- activitytype-tcp/pom.xml | 8 +-- docsys/pom.xml | 37 ++++-------- .../java/io/nosqlbench/docsys/api/Docs.java | 2 +- .../javax.annotation.processing.Processor | 1 - .../core/DocsysMarkdownEndpointTest.java | 4 +- .../docsys/core/PathWalkerTest.java | 7 --- engine-api/pom.xml | 13 +++-- .../nosqlbench/engine/api/util/NBFiles.java | 2 +- .../api/activityapi/ParameterMapTest.java | 6 +- .../core/ops/fluent/OpTrackerImplTest.java | 5 +- .../CycleResultsArraySegmentReadableTest.java | 5 +- .../CycleResultsRLEBufferReadableTest.java | 5 +- .../CycleResultsRLEBufferTargetTest.java | 6 +- .../CycleResultArraySegmentBufferTest.java | 5 +- .../EnumReadableMappingFilterTest.java | 5 +- .../inputs/cyclelog/CycleLogInputTest.java | 13 ++--- .../tristate/CoreResultFilterTest.java | 5 +- .../tristate/ResultFilteringSieveTest.java | 6 +- .../errorhandling/HashedErrorHandlerTest.java | 21 ++++--- .../planning/BucketSequencerTest.java | 1 - .../planning/ConcatSequencerTest.java | 2 +- .../{planning => }/IntervalSequencerTest.java | 5 +- .../activityapi/ratelimits/RateSpecTest.java | 8 ++- .../ratelimits/TestHybridRateLimiterPerf.java | 56 ++++++++++++------- .../ratelimits/TestRateLimiterPerf1E7.java | 16 +++++- .../ratelimits/TestRateLimiterPerf1E8.java | 16 +++++- .../ratelimits/TestRateLimiterPerfSingle.java | 37 +++++++----- .../activityapi/ratelimits/TokenPoolTest.java | 9 +-- .../sysperf/SysPerfBaselinerTest.java | 9 +-- .../api/activityapi/sysperf/SysPerfTest.java | 8 ++- .../activityconfig/MultiMapLookupTest.java | 4 +- .../rawyaml/BindingEscapingTest.java | 6 +- .../rawyaml/RawStmtDefDefsTest.java | 6 +- .../rawyaml/RawYamlStatementLoaderTest.java | 5 +- .../rawyaml/StmtEscapingTest.java | 12 ++-- .../rawyaml/StmtVariationTests.java | 5 +- .../activityconfig/yaml/ParsedStmtTest.java | 18 +++--- .../yaml/StmtDetailOverrideTest.java | 13 +---- .../activityconfig/yaml/StmtsDocListTest.java | 13 ++--- .../api/activityimpl/ActivityDefTest.java | 5 +- .../engine/api/activityimpl/CpuInfoTest.java | 4 +- .../activityimpl/input/AtomicInputTest.java | 4 +- .../input/CycleArrayBufferTest.java | 5 +- .../activityimpl/input/CycleArrayTest.java | 5 +- .../activityimpl/input/InputIntervalTest.java | 5 +- .../marker/ByteTrackerExtentTest.java | 5 +- .../marker/CoreOutputAtticTest.java | 5 +- .../activityimpl/marker/CoreOutputTest.java | 5 +- .../activityimpl/motor/ParamsParserTest.java | 3 +- .../tracking/LongTreeTrackerTest2.java | 13 +++-- .../tracking/TreeTracker1024Test.java | 4 +- .../api/metrics/ActivityMetricsTest.java | 4 +- .../DeltaHdrHistogramReservoirTest.java | 5 +- .../api/metrics/HistoIntervalLoggerTest.java | 3 +- .../api/metrics/NicerHistogramTest.java | 4 +- .../engine/api/metrics/TestHistoTypes.java | 7 ++- .../api/scripting/NashornEvaluatorTest.java | 5 +- .../engine/api/util/NBFilesTest.java | 3 +- .../engine/api/util/NBPathWalkerTest.java | 21 ------- .../engine/api/util/SimpleConfigTest.java | 5 +- .../engine/api/util/StrInterpolatorTest.java | 5 +- .../engine/api/util/TagFilterTest.java | 5 +- .../engine/api/util/UnitParserTests.java | 5 +- .../io/nosqlbench/testutils/BoundsTest.java | 7 ++- .../io/nosqlbench/testutils/PerfTest.java | 4 +- engine-cli/pom.xml | 8 +-- .../engine/cli/NBCLIScriptAssemblyTest.java | 2 +- .../engine/cli/SessionNamerTest.java | 6 +- .../engine/cli/TestNBCLIOptions.java | 23 +++----- engine-core/pom.xml | 13 ++--- .../nosqlbench/core/ActivityExecutorTest.java | 10 ++-- .../io/nosqlbench/core/CoreMotorTest.java | 5 +- .../java/io/nosqlbench/core/ScenarioTest.java | 4 +- .../script/ScenarioContextBufferTest.java | 4 +- .../core/script/ScenariosExecutorTest.java | 9 +-- engine-extensions/pom.xml | 8 +-- mvn-defaults/pom.xml | 29 ++++------ nb-api/pom.xml | 13 ++++- .../nosqlbench/nb}/api/VirtDataResources.java | 2 +- nb/pom.xml | 8 +-- .../testing/ExitStatusIntegrationTests.java | 3 +- .../script/AsyncScriptIntegrationTests.java | 11 ++-- .../core/script/MetricsIntegrationTest.java | 3 +- .../script/MetricsMapperIntegrationTest.java | 2 +- .../core/script/ScriptIntegrationTests.java | 9 ++- .../script/SpeedCheckIntegrationTests.java | 10 ++-- virtdata-api/pom.xml | 22 ++------ virtdata-core/pom.xml | 15 +---- virtdata-lang/pom.xml | 14 +++-- .../lang/parser/VirtdataBuilderTest.java | 9 +-- virtdata-lib-basics/pom.xml | 8 +-- .../library/basics/core/lfsrs/MetaShift.java | 2 +- .../distributions/CSVFrequencySampler.java | 2 +- .../distributions/DelimFrequencySampler.java | 2 +- .../distributions/WeightedStringsFromCSV.java | 2 +- .../from_long/to_int/HashedLineToInt.java | 2 +- .../to_string/HashedFileExtractToString.java | 2 +- .../to_string/HashedLineToString.java | 2 +- .../to_string/ModuloCSVLineToString.java | 3 +- .../to_string/ModuloLineToString.java | 2 +- .../to_bytebuffer/DigestToByteBufferTest.java | 6 +- virtdata-lib-curves4/pom.xml | 13 +++-- .../curves4/continuous/EnumeratedTest.java | 5 +- .../library/curves4/continuous/LevyTest.java | 5 +- .../RealDistributionsConcurrencyTests.java | 4 +- .../RealDistributionsValuesTest.java | 5 +- .../IntegerDistributionsBinomialSanity.java | 9 +-- .../IntegerDistributionsConcurrencyTest.java | 4 +- .../IntegerDistributionsValuesTest.java | 9 +-- .../discrete/common/ThreadSafeHashTest.java | 5 +- .../curves4/discrete/long_long/ZipfTest.java | 4 +- virtdata-lib-random/pom.xml | 8 +-- .../random/RandomFileExtractToString.java | 2 +- .../library/random/RandomLineToInt.java | 2 +- .../library/random/RandomLineToString.java | 2 +- virtdata-lib-realer/pom.xml | 7 +-- virtdata-processors/pom.xml | 5 ++ .../processors/FunctionDocInfoProcessor.java | 3 +- virtdata-realdata/pom.xml | 8 +-- virtdata-userlibs/pom.xml | 6 +- .../userlibs/apps/docsapp/AutoDocsApp.java | 2 +- .../core/VirtDataDocsIntegratedTest.java | 5 +- .../userlibs/apps/docsapp/FDocFuncsTest.java | 2 +- .../virtdata/IntegratedAliasMethodTests.java | 8 ++- .../io/virtdata/IntegratedBindingsTest.java | 7 +-- .../IntegratedComposerLibraryTest.java | 27 ++++++--- .../virtdata/IntegratedComposerLogicTest.java | 22 +++++--- .../io/virtdata/IntegratedCurvesTest.java | 3 +- .../io/virtdata/IntegratedRealerTests.java | 14 ++--- .../IntegratedStringCompositorTest.java | 7 +-- .../IntegratedTemporalExamplesTest.java | 4 +- 143 files changed, 522 insertions(+), 580 deletions(-) delete mode 100644 docsys/src/test/java/io/nosqlbench/docsys/core/PathWalkerTest.java rename engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/{planning => }/IntervalSequencerTest.java (94%) delete mode 100644 engine-api/src/test/java/io/nosqlbench/engine/api/util/NBPathWalkerTest.java rename {virtdata-core/src/main/java/io/nosqlbench/virtdata => nb-api/src/main/java/io/nosqlbench/nb}/api/VirtDataResources.java (99%) diff --git a/activitytype-cql/pom.xml b/activitytype-cql/pom.xml index 21161bb7f..96009b852 100644 --- a/activitytype-cql/pom.xml +++ b/activitytype-cql/pom.xml @@ -80,14 +80,14 @@ - org.testng - testng + org.assertj + assertj-core test - org.assertj - assertj-core-java8 + junit + junit test 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 2d009d500..642e5f2ea 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.annotations.Example; import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VirtDataResources; +import io.nosqlbench.nb.api.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/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java b/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java index 906a4f7f2..8faba74f3 100644 --- a/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java +++ b/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java @@ -3,12 +3,13 @@ package com.datastax.ebdrivers.cql; import io.nosqlbench.activitytype.cql.core.CqlAction; import io.nosqlbench.activitytype.cql.core.CqlActivity; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import org.testng.annotations.Test; +import org.junit.Ignore; +import org.junit.Test; -@Test public class CqlActionTest { - @Test(enabled = false) + @Test + @Ignore public void testCqlAction() { ActivityDef ad = ActivityDef.parseActivityDef("driver=ebdrivers;alias=foo;yaml=write-telemetry.yaml;"); CqlActivity cac = new CqlActivity(ad); diff --git a/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java b/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java index 7c93f6f76..af06c0675 100644 --- a/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java +++ b/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java @@ -1,14 +1,13 @@ package com.datastax.ebdrivers.cql.statements; import io.nosqlbench.activitytype.cql.statements.core.CQLStatementDefParser; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.HashMap; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -@Test public class CQLCQLStatementDefParserTest { // TODO: Implment support for default values in yaml @@ -59,4 +58,4 @@ public class CQLCQLStatementDefParserTest { assertThat(parseResult.getStatement()).isEqualTo("This is a test of ? and ?"); } -} \ No newline at end of file +} diff --git a/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java b/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java index 6824933b5..9b6805b72 100644 --- a/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java +++ b/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java @@ -6,11 +6,10 @@ import com.datastax.driver.core.SocketOptions; import com.datastax.driver.core.policies.LoadBalancingPolicy; import com.datastax.driver.core.policies.SpeculativeExecutionPolicy; import io.nosqlbench.activitytype.cql.core.CQLOptions; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class CQLOptionsTest { @Test @@ -68,4 +67,4 @@ public class CQLOptionsTest { assertThat(po3.getHeartbeatIntervalSeconds()).isEqualTo(100); } -} \ No newline at end of file +} diff --git a/activitytype-diag/pom.xml b/activitytype-diag/pom.xml index 424daec4a..24da926e7 100644 --- a/activitytype-diag/pom.xml +++ b/activitytype-diag/pom.xml @@ -30,12 +30,6 @@ - - org.testng - testng - test - - @@ -45,7 +39,13 @@ org.assertj - assertj-core-java8 + assertj-core + test + + + + junit + junit test diff --git a/activitytype-diag/src/test/java/io/nosqlbench/activitytype/diag/DiagActivityTypeTest.java b/activitytype-diag/src/test/java/io/nosqlbench/activitytype/diag/DiagActivityTypeTest.java index e2cf2023f..7b4384a15 100644 --- a/activitytype-diag/src/test/java/io/nosqlbench/activitytype/diag/DiagActivityTypeTest.java +++ b/activitytype-diag/src/test/java/io/nosqlbench/activitytype/diag/DiagActivityTypeTest.java @@ -4,7 +4,7 @@ import io.nosqlbench.engine.api.activityapi.core.Action; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityapi.core.SyncAction; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import org.testng.annotations.Test; +import org.junit.Test; /* * Copyright 2016 jshook diff --git a/activitytype-http/pom.xml b/activitytype-http/pom.xml index 251970888..373c03f1b 100644 --- a/activitytype-http/pom.xml +++ b/activitytype-http/pom.xml @@ -27,14 +27,14 @@ - org.testng - testng + org.assertj + assertj-core test - org.assertj - assertj-core-java8 + junit + junit test diff --git a/activitytype-http/src/test/java/io/nosqlbench/activitytype/http/HttpActivityTypeTest.java b/activitytype-http/src/test/java/io/nosqlbench/activitytype/http/HttpActivityTypeTest.java index 06935c37b..8d76d3f02 100644 --- a/activitytype-http/src/test/java/io/nosqlbench/activitytype/http/HttpActivityTypeTest.java +++ b/activitytype-http/src/test/java/io/nosqlbench/activitytype/http/HttpActivityTypeTest.java @@ -3,7 +3,7 @@ package io.nosqlbench.activitytype.http; import io.nosqlbench.engine.api.activityapi.core.Action; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/activitytype-stdout/pom.xml b/activitytype-stdout/pom.xml index 1f518bf55..eba3231e4 100644 --- a/activitytype-stdout/pom.xml +++ b/activitytype-stdout/pom.xml @@ -27,14 +27,14 @@ - org.testng - testng + org.assertj + assertj-core test - org.assertj - assertj-core-java8 + junit + junit test diff --git a/activitytype-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StatementFormattersTest.java b/activitytype-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StatementFormattersTest.java index d45e0a789..0d21ff10d 100644 --- a/activitytype-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StatementFormattersTest.java +++ b/activitytype-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StatementFormattersTest.java @@ -17,13 +17,12 @@ package io.nosqlbench.activitytype.stdout; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.Arrays; import static org.assertj.core.api.Assertions.assertThat; -@Test public class StatementFormattersTest { @Test @@ -56,4 +55,4 @@ public class StatementFormattersTest { assertThat(csv).isEqualTo("alpha : {alpha}\n beta : {beta}"); } -} \ No newline at end of file +} diff --git a/activitytype-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StdoutActivityTypeTest.java b/activitytype-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StdoutActivityTypeTest.java index 1a8e51d96..53847ca08 100644 --- a/activitytype-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StdoutActivityTypeTest.java +++ b/activitytype-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StdoutActivityTypeTest.java @@ -20,7 +20,7 @@ package io.nosqlbench.activitytype.stdout; import io.nosqlbench.engine.api.activityapi.core.Action; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -28,6 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; * Created by sebastianestevez on 5/5/17. */ public class StdoutActivityTypeTest { + @Test public void testDiagActivity() { StdoutActivityType stdoutAt = new StdoutActivityType(); diff --git a/activitytype-tcp/pom.xml b/activitytype-tcp/pom.xml index bd9b3a2c5..45aa4676c 100644 --- a/activitytype-tcp/pom.xml +++ b/activitytype-tcp/pom.xml @@ -34,15 +34,9 @@ - - org.testng - testng - test - - org.assertj - assertj-core-java8 + assertj-core test diff --git a/docsys/pom.xml b/docsys/pom.xml index 6605f3a8c..a6a6a0bc6 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -15,18 +15,6 @@ - - io.nosqlbench - virtdata-processors - 3.12.73-SNAPSHOT - - - - io.nosqlbench - virtdata-annotations - 3.12.73-SNAPSHOT - - io.nosqlbench nb-api @@ -38,22 +26,22 @@ snakeyaml - - org.assertj - assertj-core-java8 - test - - - org.junit.jupiter - junit-jupiter-api - test - + junit junit + test + + org.assertj + assertj-core + test + + + + org.eclipse.jetty jetty-server @@ -127,11 +115,6 @@ - - org.slf4j - slf4j-api - compile - 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 fc077631b..0f765b136 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.virtdata.api.VirtDataResources; +import io.nosqlbench.nb.api.VirtDataResources; import java.nio.file.Files; import java.nio.file.Path; diff --git a/docsys/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/docsys/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 77f0797f1..c8920310f 100644 --- a/docsys/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/docsys/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1 @@ -io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/docsys/src/test/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpointTest.java b/docsys/src/test/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpointTest.java index fc89a4f08..607551a54 100644 --- a/docsys/src/test/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpointTest.java +++ b/docsys/src/test/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpointTest.java @@ -2,8 +2,6 @@ package io.nosqlbench.docsys.core; import org.junit.Test; -import static org.junit.jupiter.api.Assertions.*; - public class DocsysMarkdownEndpointTest { @Test @@ -12,4 +10,4 @@ public class DocsysMarkdownEndpointTest { String markdownList = ep.getMarkdownList(true); } -} \ No newline at end of file +} diff --git a/docsys/src/test/java/io/nosqlbench/docsys/core/PathWalkerTest.java b/docsys/src/test/java/io/nosqlbench/docsys/core/PathWalkerTest.java deleted file mode 100644 index d7215f608..000000000 --- a/docsys/src/test/java/io/nosqlbench/docsys/core/PathWalkerTest.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.nosqlbench.docsys.core; - -import static org.junit.Assert.*; - -public class PathWalkerTest { - -} diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 210720961..419d401cc 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -19,6 +19,12 @@ + + io.nosqlbench + nb-api + 3.12.73-SNAPSHOT + + io.nosqlbench virtdata-userlibs @@ -93,14 +99,13 @@ - org.testng - testng + junit + junit test - org.assertj - assertj-core-java8 + assertj-core test diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/util/NBFiles.java b/engine-api/src/main/java/io/nosqlbench/engine/api/util/NBFiles.java index 3f70196c7..d77e125af 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/util/NBFiles.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/util/NBFiles.java @@ -21,7 +21,7 @@ import io.nosqlbench.docsys.core.PathWalker; 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.virtdata.api.VirtDataResources; +import io.nosqlbench.nb.api.VirtDataResources; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ParameterMapTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ParameterMapTest.java index d171624dd..fb938b8e2 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ParameterMapTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ParameterMapTest.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.activityapi; import io.nosqlbench.engine.api.activityimpl.ParameterMap; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.Optional; @@ -85,7 +85,7 @@ public class ParameterMapTest { assertThat(multiNames.get().getOptionalString("delta","gamma").orElse("missing")).isEqualTo("blue"); } - @Test(expectedExceptions = {RuntimeException.class}, expectedExceptionsMessageRegExp = ".*Multiple parameters are specified.*") + @Test(expected = RuntimeException.class) public void testAmbiguousMultiValueThrowsException() { Optional multiNames = ParameterMap.parseParams("alpha=blue;beta=red;delta=blue"); assertThat(multiNames).isPresent(); @@ -118,4 +118,4 @@ public class ParameterMapTest { public void testQuotedSemis() { ParameterMap abc = ParameterMap.parseOrException("a=1;b='two;three';"); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImplTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImplTest.java index f95202bdd..862382ab5 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImplTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImplTest.java @@ -6,9 +6,8 @@ import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.SucceededOp import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.EventedOpImpl; import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.StartedOp; import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.TrackedOp; -import org.testng.annotations.Test; +import org.junit.Test; -@Test public class OpTrackerImplTest { @Test @@ -20,4 +19,4 @@ public class OpTrackerImplTest { SucceededOp stop = started.succeed(23); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/CycleResultsArraySegmentReadableTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/CycleResultsArraySegmentReadableTest.java index 465d8e652..30bf42f86 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/CycleResultsArraySegmentReadableTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/CycleResultsArraySegmentReadableTest.java @@ -20,13 +20,12 @@ package io.nosqlbench.engine.api.activityapi.cyclelog; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultSegmentBuffer; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.stream.StreamSupport; import static org.assertj.core.api.Assertions.assertThat; -@Test public class CycleResultsArraySegmentReadableTest { @Test @@ -49,4 +48,4 @@ public class CycleResultsArraySegmentReadableTest { } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferReadableTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferReadableTest.java index a9d99b3ba..79ee0b95c 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferReadableTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferReadableTest.java @@ -21,7 +21,7 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleResultsRLEBufferReadable; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleResultsRLEBufferTarget; -import org.testng.annotations.Test; +import org.junit.Test; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -30,7 +30,6 @@ import java.util.stream.StreamSupport; import static org.assertj.core.api.Assertions.assertThat; -@Test(singleThreaded = true) public class CycleResultsRLEBufferReadableTest { @Test @@ -112,4 +111,4 @@ public class CycleResultsRLEBufferReadableTest { // } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferTargetTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferTargetTest.java index ff7adcb14..f6bed755f 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferTargetTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferTargetTest.java @@ -20,14 +20,13 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.buffers; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleResultsRLEBufferReadable; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleResultsRLEBufferTarget; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.ArrayList; import java.util.Iterator; import static org.assertj.core.api.Assertions.assertThat; -@Test public class CycleResultsRLEBufferTargetTest { @Test @@ -53,6 +52,7 @@ public class CycleResultsRLEBufferTargetTest { assertThat(resultValues).containsExactly(0,1); } + @Test public void testGappedIntervalRLEEncoding() { CycleResultsRLEBufferTarget tb = new CycleResultsRLEBufferTarget(100000); @@ -102,4 +102,4 @@ public class CycleResultsRLEBufferTargetTest { } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultArraySegmentBufferTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultArraySegmentBufferTest.java index f974e959a..3403c930a 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultArraySegmentBufferTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultArraySegmentBufferTest.java @@ -17,13 +17,12 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.stream.StreamSupport; import static org.assertj.core.api.Assertions.assertThat; -@Test public class CycleResultArraySegmentBufferTest { @Test @@ -43,4 +42,4 @@ public class CycleResultArraySegmentBufferTest { } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilterTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilterTest.java index e5df373ba..9ce44c9cd 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilterTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilterTest.java @@ -18,11 +18,10 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class EnumReadableMappingFilterTest { @Test @@ -66,4 +65,4 @@ public class EnumReadableMappingFilterTest { return resultCode; } } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputTest.java index 827917beb..37e9c40f3 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputTest.java @@ -19,21 +19,20 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.inputs.cyclelog; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment; import io.nosqlbench.engine.api.activityapi.cyclelog.outputs.cyclelog.CycleLogOutput; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; +import org.junit.BeforeClass; +import org.junit.Test; import java.io.File; import static org.assertj.core.api.Assertions.assertThat; -@Test public class CycleLogInputTest { private final static String filepath="cycle-log-reader-test"; - private File cyclefile; + private static File cyclefile; @BeforeClass - public void createTempFile() { + public static void createTempFile() { try { cyclefile = File.createTempFile(filepath, "cyclelog"); System.out.println("tmp file for testing:" + cyclefile.getPath()); @@ -73,8 +72,6 @@ public class CycleLogInputTest { c = i1.nextCycle(); assertThat(c).isEqualTo(5L); assertThat(i1.isExhausted()).isTrue(); - - } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/CoreResultFilterTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/CoreResultFilterTest.java index f4050d90a..afd4a597a 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/CoreResultFilterTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/CoreResultFilterTest.java @@ -22,13 +22,12 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.filters.CoreResultValueFilt import io.nosqlbench.engine.api.activityapi.cyclelog.filters.ResultFilterDispenser; import io.nosqlbench.engine.api.activityapi.cyclelog.filters.ResultValueFilterType; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.MutableCycleResult; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.function.Predicate; import static org.assertj.core.api.Assertions.assertThat; -@Test public class CoreResultFilterTest { @Test @@ -47,4 +46,4 @@ public class CoreResultFilterTest { } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/ResultFilteringSieveTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/ResultFilteringSieveTest.java index 9ae5f1ad6..5c2ea0294 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/ResultFilteringSieveTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/ResultFilteringSieveTest.java @@ -22,7 +22,7 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReada import io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate.ResultFilteringSieve; import io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate.TristateFilter; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.MutableCycleResult; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.ArrayList; import java.util.List; @@ -31,7 +31,6 @@ import java.util.stream.Collectors; import static org.assertj.core.api.Assertions.assertThat; -@Test public class ResultFilteringSieveTest { @Test @@ -58,6 +57,7 @@ public class ResultFilteringSieveTest { assertThat(sieve.apply(new MutableCycleResult(3L,10))).isEqualTo(TristateFilter.Policy.Keep); } + @Test public void testPredicateConversions() { MutableCycleResult c1 = new MutableCycleResult(1,1); MutableCycleResult c2 = new MutableCycleResult(2,2); @@ -89,4 +89,4 @@ public class ResultFilteringSieveTest { } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandlerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandlerTest.java index efc64da7b..a840f1d68 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandlerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandlerTest.java @@ -17,8 +17,8 @@ package io.nosqlbench.engine.api.activityapi.errorhandling; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; +import org.junit.Before; +import org.junit.Test; import java.security.InvalidParameterException; import java.util.ArrayList; @@ -27,17 +27,16 @@ import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; -@Test(singleThreaded = true) public class HashedErrorHandlerTest { HashedErrorHandler handler; - @BeforeMethod + @Before public void beforeTest() { handler = new HashedErrorHandler(); } - @Test(expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = ".*actually.*") + @Test(expected= RuntimeException.class) public void testDefaultHandlerThrowsException() { handler.handleError(1L, new InvalidParameterException("this is an invalid exception, actually")); } @@ -92,7 +91,7 @@ public class HashedErrorHandlerTest { assertThat(result).isFalse(); } - @Test(expectedExceptions = RuntimeException.class,expectedExceptionsMessageRegExp = ".*this is an error.*") + @Test(expected = RuntimeException.class) public void testNamedGroup() { handler.setGroup("test1",IndexOutOfBoundsException.class,ArrayIndexOutOfBoundsException.class); handler.setGroup("types",InvalidParameterException.class); @@ -103,20 +102,20 @@ public class HashedErrorHandlerTest { handler.handleError(5L,new InvalidParameterException("this is an error")); } - @Test(expectedExceptions = RuntimeException.class,expectedExceptionsMessageRegExp = ".*Found 2.*") + @Test(expected = RuntimeException.class) public void testFindVagueSingleSubmatchException() { handler.setGroup("index", IndexOutOfBoundsException.class, ArrayIndexOutOfBoundsException.class); handler.setHandlerForPattern("Index", CycleErrorHandlers.rethrow("12345 678910 11 12")); } - @Test(expectedExceptions = RuntimeException.class,expectedExceptionsMessageRegExp = ".*rethrown\\(Journey.*") + @Test(expected = RuntimeException.class) public void testFindMultipleRegex() { handler.setGroup("index", IndexOutOfBoundsException.class, ArrayIndexOutOfBoundsException.class); handler.setHandlerForPattern(".*Index.*", CycleErrorHandlers.rethrow("Journey through the klein bottle.")); Boolean result = handler.handleError(9L, new IndexOutOfBoundsException("9L was out of bounds")); } - @Test(expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = ".*Found no matching.*") + @Test(expected = RuntimeException.class) public void testNonMatchingSubstringException() { handler.setGroup("index", IndexOutOfBoundsException.class, ArrayIndexOutOfBoundsException.class); Set> groups = handler.getGroup("index"); @@ -126,7 +125,7 @@ public class HashedErrorHandlerTest { handler.setHandlerForPattern("Dyahwemo", CycleErrorHandlers.rethrow("Journey through the klein bottle.")); } - @Test(expectedExceptions=RuntimeException.class,expectedExceptionsMessageRegExp = ".*Group name 'outdex' was not found.*") + @Test(expected=RuntimeException.class) public void testSetHandlerForMissingGroupException() { handler.setGroup("index", IndexOutOfBoundsException.class, ArrayIndexOutOfBoundsException.class); handler.setHandlerForGroup("outdex", CycleErrorHandlers.rethrow("Journey through the klein bottle.")); @@ -140,4 +139,4 @@ public class HashedErrorHandlerTest { handler.resetAllClassHandlers(); assertThat(handler.getHandlers()).hasSize(0); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/BucketSequencerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/BucketSequencerTest.java index 98b90d262..802f4ab46 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/BucketSequencerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/BucketSequencerTest.java @@ -4,7 +4,6 @@ import org.junit.Test; import java.util.List; -import static org.junit.Assert.*; import static org.assertj.core.api.Assertions.assertThat; public class BucketSequencerTest { diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/ConcatSequencerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/ConcatSequencerTest.java index 3b312eaa2..12dd8a0a0 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/ConcatSequencerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/ConcatSequencerTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityapi.planning; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.Arrays; import java.util.List; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/planning/IntervalSequencerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencerTest.java similarity index 94% rename from engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/planning/IntervalSequencerTest.java rename to engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencerTest.java index cd89599b4..42b20a677 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/planning/IntervalSequencerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencerTest.java @@ -17,9 +17,7 @@ package io.nosqlbench.engine.api.activityapi.planning; -import io.nosqlbench.engine.api.activityapi.planning.ElementSequencer; -import io.nosqlbench.engine.api.activityapi.planning.IntervalSequencer; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.ArrayList; import java.util.List; @@ -27,7 +25,6 @@ import java.util.function.ToLongFunction; import static org.assertj.core.api.Assertions.assertThat; -@Test public class IntervalSequencerTest { private static ElementSequencer seqr = new IntervalSequencer<>(); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpecTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpecTest.java index c6f5d1099..6c3910072 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpecTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpecTest.java @@ -17,25 +17,27 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class RateSpecTest { + @Test public void testDefaultRateSpecPattern() { RateSpec r = new RateSpec("523"); assertThat(r.getRate()).isEqualTo(523.0d); assertThat(r.getBurstRatio()).isEqualTo(1.1d); } + @Test public void testBurstRatioPattern() { RateSpec r = new RateSpec("12345,1.3"); assertThat(r.getRate()).isEqualTo(12345.0d); assertThat(r.getBurstRatio()).isEqualTo(1.3d); } + @Test public void testTypeSelection() { RateSpec a = new RateSpec("12345,1.4,configure"); assertThat(a.getVerb()).isEqualTo(RateSpec.Verb.configure); @@ -44,4 +46,4 @@ public class RateSpecTest { RateSpec c = new RateSpec("12345,1.1"); assertThat(c.verb== RateSpec.Verb.start); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java index a140ed5e1..fb5a8f9d4 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java @@ -20,90 +20,104 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.testutils.Perf; import io.nosqlbench.testutils.Result; -import org.testng.annotations.Test; +import org.junit.Ignore; +import org.junit.Test; import java.util.function.Function; -@Test(singleThreaded = true, enabled = false) + public class TestHybridRateLimiterPerf { private Function rlFunction = rs -> new HybridRateLimiter(ActivityDef.parseActivityDef("alias=tokenrl"),"hybrid", rs.withVerb(RateSpec.Verb.start)); private RateLimiterPerfTestMethods methods = new RateLimiterPerfTestMethods(); - @Test(enabled=false) + @Test + @Ignore public void testPerf1e9() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E9, 1.1),10_000_000,0.01d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e8() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E8, 1.1),50_000_000,0.005d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e7() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E7, 1.1),5_000_000,0.01d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e6() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E6, 1.1),500_000,0.005d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e5() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E5, 1.1),50_000,0.01d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e4() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E4, 1.1),5_000,0.005d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e3() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E3, 1.1),500,0.005d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e2() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E2, 1.1),50,0.005d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e1() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E1, 1.1),5,0.005d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e0() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E0, 1.1),2,0.005d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testePerf1eN1() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E-1, 1.1),1,0.005d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void test100Mops_160threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 10_000_000,160); System.out.println(perf.getLastResult()); } - @Test(enabled=false) + @Test + @Ignore public void test100Mops_80threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 10_000_000,80); System.out.println(perf.getLastResult()); @@ -115,7 +129,8 @@ public class TestHybridRateLimiterPerf { // 800000000_ops 60.616158_S 13197801.155_ops_s, 76_ns_op // JVM 11.0.1 // 400000000_ops 33.622751_S 11896706.363_ops_s, 84_ns_op - @Test(enabled=false) + @Test + @Ignore public void test100Mops_40threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 10_000_000,40); System.out.println(perf.getLastResult()); @@ -134,7 +149,8 @@ public class TestHybridRateLimiterPerf { // 200000000_ops 15.915484_S 12566379.106_ops_s, 80_ns_op // 200000000_ops 17.691698_S 11304737.461_ops_s, 88_ns_op - @Test(enabled=false) + @Test + @Ignore public void test100Mops_20threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 10_000_000,20); System.out.println(perf.getLastResult()); @@ -146,7 +162,8 @@ public class TestHybridRateLimiterPerf { // 200000000_ops 16.744912_S 11943926.287_ops_s, 84_ns_op // 200000000_ops 17.474475_S 11445264.894_ops_s, 87_ns_op // 200000000_ops 14.089247_S 14195222.897_ops_s, 70_ns_op - @Test(enabled=false) + @Test + @Ignore public void test100Mops_10threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 10_000_000,10); System.out.println(perf.getLastResult()); @@ -159,7 +176,8 @@ public class TestHybridRateLimiterPerf { // 200000000_ops 10.624822_S 18823844.646_ops_s, 53_ns_op // JVM 11.0.1 // 200000000_ops 11.839666_S 16892368.438_ops_s, 59_ns_op - @Test(enabled=false) + @Test + @Ignore public void test100Mops_5threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 40_000_000,5); System.out.println(perf.getLastResult()); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java index fcb99bb4e..c59d8af12 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java @@ -19,7 +19,8 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.testutils.Perf; -import org.testng.annotations.Test; +import org.junit.Ignore; +import org.junit.Test; import java.util.function.Function; @@ -30,7 +31,6 @@ import java.util.function.Function; * * This set is for 10M ops/s at different levels of contention. */ -@Test(singleThreaded = true, enabled=false) public class TestRateLimiterPerf1E7 { private Function rlFunction = rs -> new HybridRateLimiter(ActivityDef.parseActivityDef("alias=tokenrl"),"hybrid", rs.withVerb(RateSpec.Verb.configure)); @@ -39,6 +39,8 @@ public class TestRateLimiterPerf1E7 { // 160 threads at 10_000_000 ops/s // JVM 11.0.1 // 160000000_ops 18.122886_S 8828615.971_ops_s, 113_ns_op + @Test + @Ignore public void test10Mops_160threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E7, 1.1), 20_000_000,160); System.out.println(perf.getLastResult()); @@ -47,6 +49,8 @@ public class TestRateLimiterPerf1E7 { // 80 threads at 10_000_000 ops/s // JVM 11.0.1 // 80000000_ops 8.354648_S 9575507.945_ops_s, 104_ns_op + @Test + @Ignore public void test10Mops_80threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E7, 1.1), 20_000_000,80); System.out.println(perf.getLastResult()); @@ -55,6 +59,8 @@ public class TestRateLimiterPerf1E7 { // 40 threads at 10_000_000 ops/s // JVM 11.0.1 // 40000000_ops 4.001661_S 9995849.116_ops_s, 100_ns_op + @Test + @Ignore public void test10Mops_40threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E7, 1.1), 20_000_000,40); System.out.println(perf.getLastResult()); @@ -63,6 +69,8 @@ public class TestRateLimiterPerf1E7 { // 20 threads at 10_000_000 ops/s // JVM 11.0.1 // 20000000_ops 1.914366_S 10447323.063_ops_s, 96_ns_op + @Test + @Ignore public void test10Mops_20threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E7, 10), 20_000_000,20); System.out.println(perf.getLastResult()); @@ -75,6 +83,8 @@ public class TestRateLimiterPerf1E7 { // 100000000_ops 9.842758_S 10159754.498_ops_s, 98_ns_op // 100000000_ops 10.123873_S 9877642.338_ops_s, 101_ns_op // 100000000_ops 10.078673_S 9921941.517_ops_s, 101_ns_op + @Test + @Ignore public void test10Mops_10threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E7, 1.1), 20_000_000,10); System.out.println(perf.getLastResult()); @@ -88,6 +98,8 @@ public class TestRateLimiterPerf1E7 { // 50000000_ops 4.924924_S 10152441.416_ops_s, 98_ns_op // 200000000_ops 19.761154_S 10120866.172_ops_s, 99_ns_op // 200000000_ops 19.928625_S 10035815.505_ops_s, 100_ns_op + @Test + @Ignore public void test10Mops_5threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E7, 1.1), 20_000_000,5); System.out.println(perf.getLastResult()); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java index b942b9502..aa7d7aa9e 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java @@ -19,7 +19,8 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.testutils.Perf; -import org.testng.annotations.Test; +import org.junit.Ignore; +import org.junit.Test; import java.util.function.Function; @@ -30,7 +31,6 @@ import java.util.function.Function; * * This set is for 100M ops/s at different levels of contention. */ -@Test(singleThreaded = true, enabled=false) public class TestRateLimiterPerf1E8 { private Function rlFunction = rs -> new HybridRateLimiter(ActivityDef.parseActivityDef("alias=tokenrl"),"hybrid", rs.withVerb(RateSpec.Verb.configure)); @@ -43,6 +43,8 @@ public class TestRateLimiterPerf1E8 { // 1600000000_ops 159.234501_S 10_048_073.673_ops_s, 100_ns_op // 1600000000_ops 158.224286_S 10_112_227.620_ops_s, 99_ns_op // + @Test + @Ignore public void test100Mops_160threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 100_000_000,160); System.out.println(perf.getLastResult()); @@ -52,6 +54,8 @@ public class TestRateLimiterPerf1E8 { // JVM 11.0.1, Intel(R) Core(TM) i7-4790 CPU @ 3.60GHz // 800000000_ops 74.104295_S 10795595.534_ops_s, 93_ns_op // 800000000_ops 74.155495_S 10788141.933_ops_s, 93_ns_op + @Test + @Ignore public void test100Mops_80threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 100_000_000,80); System.out.println(perf.getLastResult()); @@ -63,6 +67,8 @@ public class TestRateLimiterPerf1E8 { // 800000000_ops 60.616158_S 13197801.155_ops_s, 76_ns_op // JVM 11.0.1, Intel(R) Core(TM) i7-4790 CPU @ 3.60GHz // 400000000_ops 33.622751_S 11896706.363_ops_s, 84_ns_op + @Test + @Ignore public void test100Mops_40threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 100_000_000,40); System.out.println(perf.getLastResult()); @@ -81,6 +87,8 @@ public class TestRateLimiterPerf1E8 { // 200000000_ops 15.915484_S 12566379.106_ops_s, 80_ns_op // 200000000_ops 17.691698_S 11304737.461_ops_s, 88_ns_op + @Test + @Ignore public void test100Mops_20threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 100_000_000,20); System.out.println(perf.getLastResult()); @@ -95,6 +103,8 @@ public class TestRateLimiterPerf1E8 { // JVM 11.0.1, Intel(R) Core(TM) i7-4790 CPU @ 3.60GHz // 100000000_ops 7.751758_S 12900299.587_ops_s, 78_ns_op // 100000000_ops 7.864851_S 12714799.657_ops_s, 79_ns_op + @Test + @Ignore public void test100Mops_10threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 100_000_000,10); System.out.println(perf.getLastResult()); @@ -110,6 +120,8 @@ public class TestRateLimiterPerf1E8 { // 50000000_ops 2.390485_S 20916254.150_ops_s, 48_ns_op // 100000000_ops 6.317008_S 15830279.182_ops_s, 63_ns_op // 200000000_ops 13.551712_S 14758282.931_ops_s, 68_ns_op + @Test + @Ignore public void test100Mops_5threads() { Perf perf = methods.testRateLimiterMultiThreadedContention(rlFunction, new RateSpec(1E8, 1.1), 100_000_000,5); System.out.println(perf.getLastResult()); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java index d72823604..51eda2ac4 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java @@ -19,7 +19,8 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.testutils.Result; -import org.testng.annotations.Test; +import org.junit.Ignore; +import org.junit.Test; import java.util.function.Function; @@ -30,73 +31,83 @@ import java.util.function.Function; * * This set is for single-threaded (uncontended) baselines, at different op rates. */ -@Test(singleThreaded = true, enabled=false) public class TestRateLimiterPerfSingle { private Function rlFunction = rs -> new HybridRateLimiter(ActivityDef.parseActivityDef("alias=tokenrl"),"hybrid", rs.withVerb(RateSpec.Verb.start)); private RateLimiterPerfTestMethods methods = new RateLimiterPerfTestMethods(); - @Test(enabled=false) + @Test + @Ignore public void testPerf1e9() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E9, 1.1),10_000_000,0.01d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e8() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E8, 1.1),50_000_000,0.005d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e7() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E7, 1.1),5_000_000,0.01d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e6() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E6, 1.1),500_000,0.005d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e5() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E5, 1.1),50_000,0.01d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e4() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E4, 1.1),5_000,0.005d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e3() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E3, 1.1),500,0.005d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e2() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E2, 1.1),50,0.005d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e1() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E1, 1.1),5,0.005d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testPerf1e0() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E0, 1.1),2,0.005d); System.out.println(result); } - @Test(enabled=false) + @Test + @Ignore public void testePerf1eN1() { Result result = methods.rateLimiterSingleThreadedConvergence(rlFunction,new RateSpec(1E-1, 1.1),1,0.005d); System.out.println(result); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java index 41bcc46dc..09def25dc 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java @@ -17,13 +17,14 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; -import org.testng.annotations.Test; +import org.junit.Ignore; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class TokenPoolTest { + @Test public void testBackfillFullRate() { TokenPool p = new TokenPool(100, 1.1); assertThat(p.refill(100L)).isEqualTo(100L); @@ -37,7 +38,7 @@ public class TokenPoolTest { assertThat(p.takeUpTo(100)).isEqualTo(100L); } - + @Test public void testTakeRanges() { TokenPool p = new TokenPool(100, 10); p.refill(100); @@ -60,4 +61,4 @@ public class TokenPoolTest { } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaselinerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaselinerTest.java index b7efbd790..43e04fd30 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaselinerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaselinerTest.java @@ -17,16 +17,17 @@ package io.nosqlbench.engine.api.activityapi.sysperf; -import org.testng.annotations.Test; +import org.junit.Ignore; +import org.junit.Test; -@Test(enabled=false) public class SysPerfBaselinerTest { - @Test(enabled=false) + @Test + @Ignore public void testSysOpsNanoTime() { SysPerfBaseliner sbo = new SysPerfBaseliner(); SysPerfData perfdata = sbo.getSysPerfData(); System.out.println(perfdata); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfTest.java index ca55d4fff..55f11bd28 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfTest.java @@ -17,16 +17,18 @@ package io.nosqlbench.engine.api.activityapi.sysperf; -import org.testng.annotations.Test; +import org.junit.Ignore; +import org.junit.Test; import java.nio.file.attribute.FileTime; import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -@Test(singleThreaded = true, enabled = false) public class SysPerfTest { + @Test + @Ignore public void testForcedBench() { // SysPerf.get().reset(); @@ -51,4 +53,4 @@ public class SysPerfTest { assertThat(run2Time).isEqualTo(run3Time); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/MultiMapLookupTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/MultiMapLookupTest.java index 28e6b03a1..6a44f9d82 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/MultiMapLookupTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/MultiMapLookupTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityconfig; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.HashMap; import java.util.Map; @@ -35,4 +35,4 @@ public class MultiMapLookupTest { MultiMapLookup mml = new MultiMapLookup(m1, m2); assertThat(mml.get("a")).isEqualTo("1"); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BindingEscapingTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BindingEscapingTest.java index 3f0dbef33..fae41ae11 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BindingEscapingTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BindingEscapingTest.java @@ -21,19 +21,19 @@ import io.nosqlbench.virtdata.api.DataMapper; import io.nosqlbench.virtdata.api.VirtData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class BindingEscapingTest { private final static Logger logger = LoggerFactory.getLogger(BindingEscapingTest.class); + @Test public void testEscapedBindings() { DataMapper mapper = VirtData.getMapper("Template('\"-{}-\"Func(234)\\\"\\)',NumberNameToString());'",String.class); String s = mapper.get(234); assertThat(s).isEqualTo("\"-two hundred and thirty four-\"Func(234)\\\"\\)"); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtDefDefsTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtDefDefsTest.java index f38ae1727..38c31c422 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtDefDefsTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawStmtDefDefsTest.java @@ -24,16 +24,16 @@ import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDoc; import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -@Test public class RawStmtDefDefsTest { private final static Logger logger = LoggerFactory.getLogger(RawStmtDefDefsTest.class); + @Test public void testLayering() { @@ -78,4 +78,4 @@ public class RawStmtDefDefsTest { } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoaderTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoaderTest.java index d4220f734..eaf551e34 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoaderTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoaderTest.java @@ -19,13 +19,12 @@ package io.nosqlbench.engine.api.activityconfig.rawyaml; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -@Test public class RawYamlStatementLoaderTest { private final static Logger logger = LoggerFactory.getLogger(RawYamlStatementLoaderTest.class); @@ -76,8 +75,6 @@ public class RawYamlStatementLoaderTest { RawStmtsBlock rawStmtsBlock = blocks.get(0); assertThat(rawStmtsBlock.getName()).isEqualTo("block0"); - - } } diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtEscapingTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtEscapingTest.java index 28999691d..3b0e0b268 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtEscapingTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtEscapingTest.java @@ -22,23 +22,22 @@ import io.nosqlbench.engine.api.activityconfig.yaml.StmtDef; import io.nosqlbench.engine.api.activityconfig.yaml.StmtsBlock; import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDoc; import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList; +import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -@Test public class StmtEscapingTest { private final static Logger logger = LoggerFactory.getLogger(StmtEscapingTest.class); private static List defs; @BeforeClass - public void testLayering() { + public static void testLayering() { StmtsDocList all = StatementsLoader.load(logger, "testdocs/escaped_stmts.yaml"); assertThat(all).isNotNull(); @@ -56,19 +55,22 @@ public class StmtEscapingTest { defs = block1.getStmts(); } + @Test public void testBackslashEscape() { String s1 = defs.get(0).getStmt(); assertThat(s1).isEqualTo("This is a \"statement\""); } + @Test public void testBackslashInBlock() { String s2 = defs.get(1).getStmt(); assertThat(s2).isEqualTo("This is a \\\"statement\\\".\n"); } + @Test public void testTripleQuotesInBlock() { String s3 = defs.get(2).getStmt(); assertThat(s3).isEqualTo("This is a \"\"\"statement\"\"\".\n"); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtVariationTests.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtVariationTests.java index 9b426fcaa..7ff3ec404 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtVariationTests.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/StmtVariationTests.java @@ -17,15 +17,15 @@ package io.nosqlbench.engine.api.activityconfig.rawyaml; +import org.junit.Ignore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -@Test public class StmtVariationTests { private final static Logger logger = LoggerFactory.getLogger(StmtVariationTests.class); @@ -93,6 +93,7 @@ public class StmtVariationTests { assertThat(stmts.get(1).getStmt()).isEqualTo("statement two"); } + @Test public void testMixedForms() { RawYamlStatementLoader ysl = new RawYamlStatementLoader(); RawStmtsDocList docs = ysl.loadString(logger, diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/ParsedStmtTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/ParsedStmtTest.java index cb232fd9f..e15188746 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/ParsedStmtTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/ParsedStmtTest.java @@ -19,24 +19,23 @@ package io.nosqlbench.engine.api.activityconfig.yaml; import io.nosqlbench.engine.api.activityconfig.StatementsLoader; import io.nosqlbench.engine.api.activityconfig.ParsedStmt; +import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class ParsedStmtTest { private static final Logger logger = LoggerFactory.getLogger(ParsedStmtTest.class); - - private StmtsDocList doclist; + private static StmtsDocList doclist; @BeforeClass - public void testLoadYaml() { + public static void testLoadYaml() { doclist = StatementsLoader.load(logger, "testdocs/bindings.yaml"); } + @Test public void testBasicParser() { StmtsBlock block0 = doclist.getStmtDocs().get(0).getBlocks().get(0); StmtDef stmtDef0 = block0.getStmts().get(0); @@ -53,6 +52,7 @@ public class ParsedStmtTest { assertThat(parsed1.hasError()).isFalse(); } + @Test public void testMultipleBindingUsage() { StmtsBlock block2 = doclist.getStmtDocs().get(0).getBlocks().get(2); @@ -67,7 +67,7 @@ public class ParsedStmtTest { assertThat(parsed1.hasError()).isFalse(); } - + @Test public void testQuestionMarkAnchors() { StmtsBlock block2 = doclist.getStmtDocs().get(0).getBlocks().get(3); @@ -81,8 +81,6 @@ public class ParsedStmtTest { assertThat(parsed1.getMissingBindings().isEmpty()); assertThat(parsed1.hasError()).isFalse(); assertThat(parsed1.getSpecificBindings()).containsOnlyKeys("alpha"); - } - -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtDetailOverrideTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtDetailOverrideTest.java index e3b832271..8fc31bfbc 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtDetailOverrideTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtDetailOverrideTest.java @@ -18,24 +18,18 @@ package io.nosqlbench.engine.api.activityconfig.yaml; import io.nosqlbench.engine.api.activityconfig.StatementsLoader; +import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -@Test public class StmtDetailOverrideTest { private static final Logger logger = LoggerFactory.getLogger(StmtDetailOverrideTest.class); - - @BeforeClass - public void testLoadYaml() { - } - @Test public void testStmtOverrides() { @@ -89,6 +83,5 @@ public class StmtDetailOverrideTest { assertThat(s.getBindings()).hasSize(1); assertThat(s.getParams()).hasSize(1); - } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsDocListTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsDocListTest.java index 87b6e85a6..553cb27ba 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsDocListTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsDocListTest.java @@ -19,10 +19,10 @@ package io.nosqlbench.engine.api.activityconfig.yaml; import io.nosqlbench.engine.api.activityconfig.StatementsLoader; import org.assertj.core.data.MapEntry; +import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.LinkedHashMap; import java.util.List; @@ -30,11 +30,10 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -@Test public class StmtsDocListTest { - private static final Logger logger = LoggerFactory.getLogger(StmtsDocListTest.class); - private StmtsDocList doclist; + private static final Logger logger = LoggerFactory.getLogger(StmtsDocListTest.class); + private static StmtsDocList doclist; private LinkedHashMap doc0bindings = new LinkedHashMap() {{ put("b2", "b2d"); @@ -51,7 +50,7 @@ public class StmtsDocListTest { @BeforeClass - public void testLoadYaml() { + public static void testLoadYaml() { doclist = StatementsLoader.load(logger, "testdocs/docs_blocks_stmts.yaml"); } @@ -134,4 +133,4 @@ public class StmtsDocListTest { assertThat(stmts).hasSize(2); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/ActivityDefTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/ActivityDefTest.java index efa351430..f2de0eb77 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/ActivityDefTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/ActivityDefTest.java @@ -17,11 +17,10 @@ package io.nosqlbench.engine.api.activityimpl; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class ActivityDefTest { @Test @@ -39,4 +38,4 @@ public class ActivityDefTest { assertThat(d.getCycleCount()).isEqualTo(4000000); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/CpuInfoTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/CpuInfoTest.java index 7c3667f3e..11f12a568 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/CpuInfoTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/CpuInfoTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityimpl; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.Optional; @@ -32,4 +32,4 @@ public class CpuInfoTest { System.out.println(procDetails.get()); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java index fbca402f5..ae66c22c6 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.activityimpl.input; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -32,4 +32,4 @@ public class AtomicInputTest { assertThat(inputSegment).isNull(); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayBufferTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayBufferTest.java index 9f95a32d7..3e9379889 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayBufferTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayBufferTest.java @@ -19,11 +19,10 @@ package io.nosqlbench.engine.api.activityimpl.input; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleArray; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class CycleArrayBufferTest { @Test @@ -45,4 +44,4 @@ public class CycleArrayBufferTest { } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayTest.java index 4bb7b9a74..c5764cda0 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayTest.java @@ -19,11 +19,10 @@ package io.nosqlbench.engine.api.activityimpl.input; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleArray; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class CycleArrayTest { @Test @@ -57,4 +56,4 @@ public class CycleArrayTest { assertThat(s3).isNull(); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/InputIntervalTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/InputIntervalTest.java index e2cc9537c..e5f6a5cb0 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/InputIntervalTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/InputIntervalTest.java @@ -18,11 +18,10 @@ package io.nosqlbench.engine.api.activityimpl.input; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class InputIntervalTest { @Test @@ -50,4 +49,4 @@ public class InputIntervalTest { assertThat(ii.getInputSegment(1)).isNull(); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtentTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtentTest.java index 220ce3dcb..68a339faa 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtentTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtentTest.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.activityimpl.marker; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.ArrayList; import java.util.List; @@ -28,7 +28,6 @@ import java.util.stream.StreamSupport; import static org.assertj.core.api.Assertions.assertThat; -@Test public class ByteTrackerExtentTest { @Test @@ -78,4 +77,4 @@ public class ByteTrackerExtentTest { } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputAtticTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputAtticTest.java index 04b69acbf..346523e9d 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputAtticTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputAtticTest.java @@ -17,9 +17,8 @@ package io.nosqlbench.engine.api.activityimpl.marker; -import org.testng.annotations.Test; +import org.junit.Test; -@Test public class CoreOutputAtticTest { @Test @@ -143,4 +142,4 @@ public class CoreOutputAtticTest { // } // -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputTest.java index 9fabc4fc3..bbe16bee9 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputTest.java @@ -21,7 +21,7 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultSegmentBuffer; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; import io.nosqlbench.engine.api.activityapi.output.Output; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.ArrayList; import java.util.List; @@ -29,7 +29,6 @@ import java.util.stream.StreamSupport; import static org.assertj.core.api.Assertions.assertThat; -@Test public class CoreOutputTest { @Test @@ -67,4 +66,4 @@ public class CoreOutputTest { this.segments.add(segment); } } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java index 0dfc02420..3e2b21ca6 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java @@ -17,13 +17,12 @@ package io.nosqlbench.engine.api.activityimpl.motor; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -@Test public class ParamsParserTest { @Test diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/LongTreeTrackerTest2.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/LongTreeTrackerTest2.java index 99ea80d45..11494c0ab 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/LongTreeTrackerTest2.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/LongTreeTrackerTest2.java @@ -2,11 +2,11 @@ package io.nosqlbench.engine.api.activityimpl.tracking; import io.nosqlbench.engine.api.activityimpl.marker.longheap.LongTreeTracker; import io.nosqlbench.engine.api.activityimpl.marker.longheap.LongTreeTrackerAtomic; -import org.testng.annotations.Test; +import org.junit.Ignore; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class LongTreeTrackerTest2 { // @Test @@ -58,6 +58,7 @@ public class LongTreeTrackerTest2 { assertThat(t.getHighestCompleted()).isEqualTo(9L); } + @Test public void testTotalCompleted() { LongTreeTracker t; @@ -137,7 +138,8 @@ public class LongTreeTrackerTest2 { * */ - @Test(enabled=false) + @Test + @Ignore public void speedcheckThreadLocal() { long t1=System.nanoTime(); LongTreeTracker t = new LongTreeTracker(); @@ -156,7 +158,8 @@ public class LongTreeTrackerTest2 { System.out.format("rate/s: %f\n", rate * 1000.0d); } - @Test(enabled=false) + @Test + @Ignore public void speedcheckConcurrentLocal() { long t1=System.nanoTime(); LongTreeTracker t = new LongTreeTrackerAtomic(); @@ -175,4 +178,4 @@ public class LongTreeTrackerTest2 { System.out.format("rate/s: %f\n", rate * 1000.0d); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/TreeTracker1024Test.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/TreeTracker1024Test.java index 09846f5e5..f847fe232 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/TreeTracker1024Test.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/TreeTracker1024Test.java @@ -1,7 +1,7 @@ package io.nosqlbench.engine.api.activityimpl.tracking; import io.nosqlbench.engine.api.activityimpl.marker.longheap.TreeTracker1024; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -18,4 +18,4 @@ public class TreeTracker1024Test { tt.setPosition(1023); // assertThat(tt.isCycleCompleted()).isTrue().as("cycle: 1023"); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/ActivityMetricsTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/ActivityMetricsTest.java index c9984b9b7..74eca0c9c 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/ActivityMetricsTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/ActivityMetricsTest.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.metrics; import com.codahale.metrics.Metric; import com.codahale.metrics.MetricRegistry; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.Map; @@ -55,4 +55,4 @@ public class ActivityMetricsTest { } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoirTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoirTest.java index d81acd201..03cb09eb8 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoirTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoirTest.java @@ -1,9 +1,8 @@ package io.nosqlbench.engine.api.metrics; import com.codahale.metrics.Snapshot; -import org.testng.annotations.Test; +import org.junit.Test; -@Test public class DeltaHdrHistogramReservoirTest { // @Test @@ -51,4 +50,4 @@ public class DeltaHdrHistogramReservoirTest { Snapshot snapshot = dhhr.getSnapshot(); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java index a93b85543..4006cce39 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java @@ -20,7 +20,7 @@ package io.nosqlbench.engine.api.metrics; import org.HdrHistogram.EncodableHistogram; import org.HdrHistogram.Histogram; import org.HdrHistogram.HistogramLogReader; -import org.testng.annotations.Test; +import org.junit.Test; import java.io.File; import java.io.IOException; @@ -30,7 +30,6 @@ import java.util.regex.Pattern; import static org.assertj.core.api.Assertions.assertThat; -@Test public class HistoIntervalLoggerTest { @Test diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/NicerHistogramTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/NicerHistogramTest.java index 843bc97bc..2f269b53f 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/NicerHistogramTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/NicerHistogramTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.metrics; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -59,4 +59,4 @@ public class NicerHistogramTest { } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java index f19d8f696..88e1315a6 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java @@ -2,12 +2,13 @@ package io.nosqlbench.engine.api.metrics; import com.codahale.metrics.ExponentiallyDecayingReservoir; import com.codahale.metrics.Snapshot; -import org.testng.annotations.Test; +import org.junit.Ignore; +import org.junit.Test; -@Test public class TestHistoTypes { - @Test(enabled=false) + @Test + @Ignore public void compareHistos() { Clock c = new Clock(); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/scripting/NashornEvaluatorTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/scripting/NashornEvaluatorTest.java index 322bfc07c..f191b4f61 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/scripting/NashornEvaluatorTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/scripting/NashornEvaluatorTest.java @@ -17,13 +17,12 @@ package io.nosqlbench.engine.api.scripting; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.Date; import static org.assertj.core.api.Assertions.assertThat; -@Test public class NashornEvaluatorTest { @Test @@ -49,4 +48,4 @@ public class NashornEvaluatorTest { assertThat(result).isEqualTo("afirstnamealastname"); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBFilesTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBFilesTest.java index bde5c302f..13baacb43 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBFilesTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBFilesTest.java @@ -17,14 +17,13 @@ package io.nosqlbench.engine.api.util; -import org.testng.annotations.Test; +import org.junit.Test; import java.io.InputStream; import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -@Test public class NBFilesTest { @Test diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBPathWalkerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBPathWalkerTest.java deleted file mode 100644 index f369756f6..000000000 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBPathWalkerTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package io.nosqlbench.engine.api.util; - -import org.junit.Test; - -import java.nio.file.Path; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; - -public class NBPathWalkerTest { - -// @Test -// public void testBasicPathmatching() { -// List found = NBPathWalker.findEndMatching( -// Path.of("testdocs"), -// Path.of("identity.yaml") -// ); -// -// assertThat(found).containsExactly(Path.of("flsd")); -// } -} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/util/SimpleConfigTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/util/SimpleConfigTest.java index 2bb824342..0b94ea0c4 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/util/SimpleConfigTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/util/SimpleConfigTest.java @@ -17,11 +17,10 @@ package io.nosqlbench.engine.api.util; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class SimpleConfigTest { @Test @@ -30,4 +29,4 @@ public class SimpleConfigTest { assertThat(c.getString("a")).contains("1"); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/util/StrInterpolatorTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/util/StrInterpolatorTest.java index 2f7b274c5..94053a4dc 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/util/StrInterpolatorTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/util/StrInterpolatorTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.util; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.ArrayList; import java.util.HashMap; @@ -26,7 +26,6 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -@Test public class StrInterpolatorTest { private static List> abcd = new ArrayList>() {{ @@ -120,4 +119,4 @@ public class StrInterpolatorTest { assertThat(a).isEqualTo("'Key': 'Value'.'Stuff'"); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/util/TagFilterTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/util/TagFilterTest.java index 5f1ec45a7..0e4fc748a 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/util/TagFilterTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/util/TagFilterTest.java @@ -17,14 +17,13 @@ package io.nosqlbench.engine.api.util; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.HashMap; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -@Test public class TagFilterTest { @Test @@ -153,4 +152,4 @@ public class TagFilterTest { assertThat(tf.matches(itemtags).matched()).isTrue(); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/util/UnitParserTests.java b/engine-api/src/test/java/io/nosqlbench/engine/api/util/UnitParserTests.java index 912574541..747de0dc2 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/util/UnitParserTests.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/util/UnitParserTests.java @@ -18,11 +18,10 @@ package io.nosqlbench.engine.api.util; import org.assertj.core.data.Offset; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class UnitParserTests { @Test @@ -77,4 +76,4 @@ public class UnitParserTests { assertThat(Unit.bytesFor("1KiB").get()).isCloseTo(1024.0D,Offset.offset(0.00001D)); } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/testutils/BoundsTest.java b/engine-api/src/test/java/io/nosqlbench/testutils/BoundsTest.java index 7f50f7fd4..6eab91e3f 100644 --- a/engine-api/src/test/java/io/nosqlbench/testutils/BoundsTest.java +++ b/engine-api/src/test/java/io/nosqlbench/testutils/BoundsTest.java @@ -17,13 +17,13 @@ package io.nosqlbench.testutils; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class BoundsTest { + @Test public void testProgression2() { Bounds bounds = new Bounds(3000, 2); assertThat(bounds.getValue()).isEqualTo(3000L); @@ -35,6 +35,7 @@ public class BoundsTest { assertThat(bounds.getNextValue()).isEqualTo(15000L); } + @Test public void testProgression1() { Bounds bounds = new Bounds(100, 1); assertThat(bounds.getValue()).isEqualTo(100L); @@ -45,4 +46,4 @@ public class BoundsTest { } -} \ No newline at end of file +} diff --git a/engine-api/src/test/java/io/nosqlbench/testutils/PerfTest.java b/engine-api/src/test/java/io/nosqlbench/testutils/PerfTest.java index f0837c6e1..2a8284d73 100644 --- a/engine-api/src/test/java/io/nosqlbench/testutils/PerfTest.java +++ b/engine-api/src/test/java/io/nosqlbench/testutils/PerfTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.testutils; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -40,4 +40,4 @@ public class PerfTest { assertThat(p.isConverged(Result::getOpsPerSec,0.2d, 3)).isTrue(); } -} \ No newline at end of file +} diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 19baad00a..d6d60e516 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -26,12 +26,6 @@ 3.12.73-SNAPSHOT - - org.testng - testng - test - - junit junit @@ -40,7 +34,7 @@ org.assertj - assertj-core-java8 + assertj-core test diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScriptAssemblyTest.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScriptAssemblyTest.java index c3875e373..51c958478 100644 --- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScriptAssemblyTest.java +++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScriptAssemblyTest.java @@ -20,7 +20,7 @@ package io.nosqlbench.engine.cli; import io.nosqlbench.engine.cli.NBCLIOptions; import io.nosqlbench.engine.cli.NBCLIScriptAssembly; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/SessionNamerTest.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/SessionNamerTest.java index c66abeb1b..d49925345 100644 --- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/SessionNamerTest.java +++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/SessionNamerTest.java @@ -17,11 +17,10 @@ package io.nosqlbench.engine.cli; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class SessionNamerTest { @Test @@ -33,6 +32,7 @@ public class SessionNamerTest { assertThat(name2).matches("scenario_\\d{8}_\\d{6}_\\d{3}"); } + @Test public void testCustomFormat() { SessionNamer namer = new SessionNamer(); String name1 = namer.format("Custom_session_name"); @@ -42,4 +42,4 @@ public class SessionNamerTest { } -} \ No newline at end of file +} 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 4a4c2b8e3..2b30b3786 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,19 +1,17 @@ package io.nosqlbench.engine.cli; import io.nosqlbench.docsys.core.PathWalker; -import io.nosqlbench.virtdata.api.VirtDataResources; -import org.testng.annotations.Test; +import io.nosqlbench.nb.api.VirtDataResources; +import org.junit.Test; import java.net.URL; import java.nio.file.Path; -import java.nio.file.Paths; import java.security.InvalidParameterException; import java.util.List; import java.util.stream.Collectors; import static org.assertj.core.api.Assertions.assertThat; -@Test public class TestNBCLIOptions { @Test @@ -68,7 +66,7 @@ public class TestNBCLIOptions { assertThat(opts.wantsActivityTypes()).isFalse(); opts = new NBCLIOptions(new String[]{"--list-drivers"}); assertThat(opts.wantsActivityTypes()).isTrue(); - + } @Test @@ -88,7 +86,7 @@ public class TestNBCLIOptions { assertThat(opts.wantsTopicalHelp()).isFalse(); } - @Test(expectedExceptions = {InvalidParameterException.class}, expectedExceptionsMessageRegExp = ".*unrecognized option.*") + @Test(expected = InvalidParameterException.class) public void shouldErrorSanelyWhenNoMatch() { NBCLIOptions opts = new NBCLIOptions(new String[]{"unrecognizable command"}); } @@ -103,14 +101,12 @@ public class TestNBCLIOptions { assertThat(cmd.getCmdArgs().get("param1")).isEqualTo("value1"); } - @Test(expectedExceptions = {InvalidParameterException.class}, - expectedExceptionsMessageRegExp = ".*script name must precede.*") + @Test(expected = InvalidParameterException.class) public void testShouldErrorSanelyWhenScriptNameSkipped() { NBCLIOptions opts = new NBCLIOptions(new String[]{"script", "param1=value1"}); } - @Test(expectedExceptions = {InvalidParameterException.class}, - expectedExceptionsMessageRegExp = ".*script name not found.*") + @Test(expected = InvalidParameterException.class) public void testShouldErrorForMissingScriptName() { NBCLIOptions opts = new NBCLIOptions(new String[]{"script"}); } @@ -158,7 +154,7 @@ public class TestNBCLIOptions { } - @Test(expectedExceptions = InvalidParameterException.class) + @Test(expected = InvalidParameterException.class) public void shouldThrowErrorForInvalidStopActivity() { NBCLIOptions opts = new NBCLIOptions(new String[]{ "stop", "woah=woah" }); List cmds = opts.getCommands(); @@ -173,7 +169,7 @@ public class TestNBCLIOptions { } - @Test(expectedExceptions = InvalidParameterException.class) + @Test(expected = InvalidParameterException.class) public void shouldThrowErrorForInvalidAwaitActivity() { NBCLIOptions opts = new NBCLIOptions(new String[]{ "await", "awaitme=notvalid" }); List cmds = opts.getCommands(); @@ -189,14 +185,13 @@ public class TestNBCLIOptions { } - @Test(expectedExceptions = NumberFormatException.class) + @Test(expected = NumberFormatException.class) public void shouldThrowErrorForInvalidWaitMillisOperand() { NBCLIOptions opts = new NBCLIOptions(new String[]{ "waitmillis", "noway" }); List cmds = opts.getCommands(); } - @Test public void listWorkloads() { NBCLIOptions opts = new NBCLIOptions(new String[]{ "--list-workloads"}); diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 8cb3ef5ec..199a57fc9 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -63,12 +63,6 @@ - - org.testng - testng - test - - @@ -78,10 +72,15 @@ org.assertj - assertj-core-java8 + assertj-core test + + junit + junit + test + diff --git a/engine-core/src/test/java/io/nosqlbench/core/ActivityExecutorTest.java b/engine-core/src/test/java/io/nosqlbench/core/ActivityExecutorTest.java index 81d589065..6f2327e00 100644 --- a/engine-core/src/test/java/io/nosqlbench/core/ActivityExecutorTest.java +++ b/engine-core/src/test/java/io/nosqlbench/core/ActivityExecutorTest.java @@ -15,7 +15,7 @@ import io.nosqlbench.engine.api.activityimpl.motor.CoreMotorDispenser; import io.nosqlbench.engine.core.ActivityExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.Optional; @@ -35,7 +35,6 @@ import static org.assertj.core.api.Assertions.assertThat; * See the License for the specific language governing permissions and * limitations under the License. */ -@Test(enabled=true) public class ActivityExecutorTest { private static final Logger logger = LoggerFactory.getLogger(ActivityExecutorTest.class); @@ -61,8 +60,7 @@ public class ActivityExecutorTest { } - - @Test(enabled=true) + @Test public void testNewActivityExecutor() { ActivityDef ad = ActivityDef.parseActivityDef("driver=diag;alias=test;cycles=1000;"); Optional activityType = ActivityType.FINDER.get(ad.getActivityType()); @@ -98,8 +96,8 @@ public class ActivityExecutorTest { } - private MotorDispenser getActivityMotorFactory(final ActivityDef ad, Action lc, final Input ls) { - MotorDispenser cmf = new MotorDispenser() { + private MotorDispenser getActivityMotorFactory(final ActivityDef ad, Action lc, final Input ls) { + MotorDispenser cmf = new MotorDispenser<>() { @Override public Motor getMotor(ActivityDef activityDef, int slotId) { Activity activity = new SimpleActivity(activityDef); diff --git a/engine-core/src/test/java/io/nosqlbench/core/CoreMotorTest.java b/engine-core/src/test/java/io/nosqlbench/core/CoreMotorTest.java index 6e821ed15..7c88006b1 100644 --- a/engine-core/src/test/java/io/nosqlbench/core/CoreMotorTest.java +++ b/engine-core/src/test/java/io/nosqlbench/core/CoreMotorTest.java @@ -5,7 +5,7 @@ import io.nosqlbench.engine.core.fortesting.BlockingSegmentInput; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityimpl.SimpleActivity; import io.nosqlbench.engine.api.activityimpl.motor.CoreMotor; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLongArray; @@ -27,7 +27,6 @@ import static org.assertj.core.api.Assertions.assertThat; * See the License for the specific language governing permissions and * limitations under the License. */ -@Test public class CoreMotorTest { @Test @@ -130,4 +129,4 @@ public class CoreMotorTest { } return false; } -} \ No newline at end of file +} diff --git a/engine-core/src/test/java/io/nosqlbench/core/ScenarioTest.java b/engine-core/src/test/java/io/nosqlbench/core/ScenarioTest.java index 614540004..87307e058 100644 --- a/engine-core/src/test/java/io/nosqlbench/core/ScenarioTest.java +++ b/engine-core/src/test/java/io/nosqlbench/core/ScenarioTest.java @@ -2,7 +2,7 @@ package io.nosqlbench.core; import io.nosqlbench.engine.api.scripting.ScriptEnvBuffer; import io.nosqlbench.engine.core.script.Scenario; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -31,4 +31,4 @@ public class ScenarioTest { assertThat(env.getIOLog().get().get(0)).contains("loaded script environment..."); } -} \ No newline at end of file +} diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenarioContextBufferTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenarioContextBufferTest.java index 5209896d6..290d811df 100644 --- a/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenarioContextBufferTest.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenarioContextBufferTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.engine.core.script; import io.nosqlbench.engine.api.scripting.ScriptEnvBuffer; -import org.testng.annotations.Test; +import org.junit.Test; import java.io.IOException; @@ -30,4 +30,4 @@ public class ScenarioContextBufferTest { assertThat(seb.getStdoutText()).isEqualTo("out\n"); } -} \ No newline at end of file +} diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenariosExecutorTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenariosExecutorTest.java index f02927082..bd9bb7585 100644 --- a/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenariosExecutorTest.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/script/ScenariosExecutorTest.java @@ -18,12 +18,13 @@ package io.nosqlbench.engine.core.script; import io.nosqlbench.engine.core.ScenariosResults; -import org.testng.annotations.Test; +import org.junit.Ignore; +import org.junit.Test; -@Test public class ScenariosExecutorTest { - @Test(enabled=false) + @Test + @Ignore public void testAwaitOnTime() { ScenariosExecutor e = new ScenariosExecutor(ScenariosExecutorTest.class.getSimpleName(), 1); Scenario s = new Scenario("testing"); @@ -34,4 +35,4 @@ public class ScenariosExecutorTest { -} \ No newline at end of file +} diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index c8cd50493..a18454086 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -26,14 +26,14 @@ - org.testng - testng + org.assertj + assertj-core test - org.assertj - assertj-core-java8 + junit + junit test diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 1ca5ac301..a2cf88360 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -55,7 +55,6 @@ 1.7.29 1.23 1.1.2.6 - 6.13.1 4.8 @@ -75,6 +74,7 @@ 3.2.1 3.0.1 3.0.0-M4 + 3.15.0 ${project.artifactId} @@ -415,23 +415,12 @@ - - org.testng - testng - ${testng.version} - - - org.assertj - assertj-core-java8 - ${assertj.java8.version} - - - - org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.version} - + + + + + junit @@ -439,6 +428,12 @@ ${junit.version} + + org.assertj + assertj-core + ${assertj.version} + + diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 52af9f2ed..80cfd3ea0 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -62,16 +62,23 @@ - org.testng - testng + junit + junit test + org.assertj - assertj-core-java8 + assertj-core test + + + org.apache.commons + commons-csv + + diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataResources.java b/nb-api/src/main/java/io/nosqlbench/nb/api/VirtDataResources.java similarity index 99% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataResources.java rename to nb-api/src/main/java/io/nosqlbench/nb/api/VirtDataResources.java index 546540e4b..4db418d3c 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataResources.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/VirtDataResources.java @@ -15,7 +15,7 @@ * / */ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.nb.api; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; diff --git a/nb/pom.xml b/nb/pom.xml index d92c2128d..261561e76 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -96,14 +96,14 @@ - org.testng - testng + org.assertj + assertj-core test - org.assertj - assertj-core-java8 + junit + junit test diff --git a/nb/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java b/nb/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java index bc1cc496a..f85fba685 100644 --- a/nb/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java +++ b/nb/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java @@ -17,13 +17,12 @@ package io.nosqlbench.cli.testing; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.stream.Collectors; import static org.assertj.core.api.Assertions.assertThat; -@Test public class ExitStatusIntegrationTests { private final static String JARNAME = "target/nb.jar"; diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java index fd67bd685..6111bb8af 100644 --- a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java +++ b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java @@ -21,8 +21,9 @@ import io.nosqlbench.engine.core.ScenarioLogger; import io.nosqlbench.engine.core.ScenarioResult; import io.nosqlbench.engine.core.ScenariosResults; import org.assertj.core.data.Offset; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; import java.io.IOException; import java.nio.file.Files; @@ -36,7 +37,6 @@ import java.util.stream.Collectors; import static org.assertj.core.api.Assertions.assertThat; -@Test(singleThreaded = true) public class AsyncScriptIntegrationTests { public static ScenarioResult runScenario(String scriptname, String... params) { @@ -63,7 +63,7 @@ public class AsyncScriptIntegrationTests { } @BeforeClass - public void logit() { + public static void logit() { System.out.println("Running ASYNC version of Script Integration Tests."); } @@ -245,7 +245,8 @@ public class AsyncScriptIntegrationTests { } - @Test(enabled=false) + @Test + @Ignore public void testCycleRateChangeOldMetrics() { ScenarioResult scenarioResult = runScenario("cycle_rate_change_deprecated"); String ioLog = scenarioResult.getIOLog(); diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/MetricsIntegrationTest.java b/nb/src/test/java/io/nosqlbench/engine/core/script/MetricsIntegrationTest.java index ff61b8edf..43695f462 100644 --- a/nb/src/test/java/io/nosqlbench/engine/core/script/MetricsIntegrationTest.java +++ b/nb/src/test/java/io/nosqlbench/engine/core/script/MetricsIntegrationTest.java @@ -20,13 +20,12 @@ package io.nosqlbench.engine.core.script; import com.codahale.metrics.Histogram; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.engine.api.metrics.ActivityMetrics; -import org.testng.annotations.Test; +import org.junit.Test; import java.io.File; import static org.assertj.core.api.Assertions.assertThat; -@Test public class MetricsIntegrationTest { @Test diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/MetricsMapperIntegrationTest.java b/nb/src/test/java/io/nosqlbench/engine/core/script/MetricsMapperIntegrationTest.java index 6f65d86a2..bfe88d93c 100644 --- a/nb/src/test/java/io/nosqlbench/engine/core/script/MetricsMapperIntegrationTest.java +++ b/nb/src/test/java/io/nosqlbench/engine/core/script/MetricsMapperIntegrationTest.java @@ -15,7 +15,7 @@ package io.nosqlbench.engine.core.script; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java index 0f57753dc..f0aa9003d 100644 --- a/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java +++ b/nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java @@ -21,8 +21,8 @@ import io.nosqlbench.engine.core.ScenarioLogger; import io.nosqlbench.engine.core.ScenarioResult; import io.nosqlbench.engine.core.ScenariosResults; import org.assertj.core.data.Offset; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; +import org.junit.BeforeClass; +import org.junit.Test; import java.util.HashMap; import java.util.Map; @@ -31,7 +31,6 @@ import java.util.regex.Pattern; import static org.assertj.core.api.Assertions.assertThat; -@Test(singleThreaded = true) public class ScriptIntegrationTests { public static ScenarioResult runScenario(String scriptname, String... params) { @@ -59,7 +58,7 @@ public class ScriptIntegrationTests { @BeforeClass - public void logit() { + public static void logit() { System.out.println("Running SYNC version of Script Integration Tests."); } @@ -261,4 +260,4 @@ public class ScriptIntegrationTests { // ); // } -} \ No newline at end of file +} diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/SpeedCheckIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/SpeedCheckIntegrationTests.java index bcad366af..370ee3210 100644 --- a/nb/src/test/java/io/nosqlbench/engine/core/script/SpeedCheckIntegrationTests.java +++ b/nb/src/test/java/io/nosqlbench/engine/core/script/SpeedCheckIntegrationTests.java @@ -15,22 +15,24 @@ package io.nosqlbench.engine.core.script; import io.nosqlbench.engine.core.ScenarioResult; -import org.testng.annotations.Test; +import org.junit.Ignore; +import org.junit.Test; /** * These is here for experimentation on microbench scripts without requiring * them to be included in builds */ -@Test public class SpeedCheckIntegrationTests { - @Test(enabled = false) + @Test + @Ignore public void testSpeedSanity() { ScenarioResult scenarioResult = ScriptIntegrationTests.runScenario("speedcheck"); } - @Test(enabled = false) + @Test + @Ignore public void testThreadSpeeds() { ScenarioResult scenarioResult = ScriptIntegrationTests.runScenario("threadspeeds"); } diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 5140215da..b1e900d86 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -32,11 +32,11 @@ virtdata-processors 3.12.73-SNAPSHOT - - io.nosqlbench - virtdata-annotations - 3.12.73-SNAPSHOT - + + + + + io.nosqlbench virtdata-lang @@ -51,13 +51,7 @@ org.assertj - assertj-core-java8 - test - - - - org.junit.jupiter - junit-jupiter-api + assertj-core test @@ -67,10 +61,6 @@ test - - org.apache.commons - commons-csv - diff --git a/virtdata-core/pom.xml b/virtdata-core/pom.xml index b161d9ccd..c22481b13 100644 --- a/virtdata-core/pom.xml +++ b/virtdata-core/pom.xml @@ -17,12 +17,7 @@ io.nosqlbench - virtdata-processors - 3.12.73-SNAPSHOT - - - io.nosqlbench - virtdata-annotations + virtdata-api 3.12.73-SNAPSHOT @@ -48,13 +43,7 @@ org.assertj - assertj-core-java8 - test - - - - org.junit.jupiter - junit-jupiter-api + assertj-core test diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 10836cd03..b65f95746 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -15,16 +15,18 @@ http://nosqlbench.io/ - - org.testng - testng - test - org.assertj - assertj-core-java8 + assertj-core test + + + junit + junit + test + + org.antlr antlr4-runtime diff --git a/virtdata-lang/src/test/java/io/nosqlbench/virtdata/lang/parser/VirtdataBuilderTest.java b/virtdata-lang/src/test/java/io/nosqlbench/virtdata/lang/parser/VirtdataBuilderTest.java index a775427e4..8f1ac7f1b 100644 --- a/virtdata-lang/src/test/java/io/nosqlbench/virtdata/lang/parser/VirtdataBuilderTest.java +++ b/virtdata-lang/src/test/java/io/nosqlbench/virtdata/lang/parser/VirtdataBuilderTest.java @@ -6,7 +6,7 @@ import io.nosqlbench.virtdata.lang.generated.VirtDataParser; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CodePointCharStream; import org.antlr.v4.runtime.CommonTokenStream; -import org.testng.annotations.Test; +import org.junit.Test; import java.io.BufferedReader; import java.io.IOException; @@ -20,7 +20,6 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -@Test public class VirtdataBuilderTest { private static char[] readFile(String filename) { @@ -43,7 +42,7 @@ public class VirtdataBuilderTest { } @Test - private void testFullSyntax() { + public void testFullSyntax() { char[] chars = readFile("test-syntax.virtdata"); CodePointCharStream ais = CharStreams.fromString(new String(chars)); String inputString = new String(chars); @@ -99,6 +98,7 @@ public class VirtdataBuilderTest { } + @Test public void testEscapedDoubleQuotedLiteralISEscaped() { VirtDataDSL.ParseResult r = VirtDataDSL.parse( "Template(\"A \\value\")" @@ -116,6 +116,7 @@ public class VirtdataBuilderTest { } + @Test public void testEscapedSingleQuotedLiteralIsNotEscaped() { VirtDataDSL.ParseResult r = VirtDataDSL.parse( "Template('{\"q\":\"*:*\", \"fq\":\"point:\\\"IsWithin(BUFFER(POINT(40.71 74.3), 50.0))}');" @@ -169,4 +170,4 @@ public class VirtdataBuilderTest { } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index b5afaaf1a..cb78009e6 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -62,14 +62,10 @@ org.assertj - assertj-core-java8 - test - - - org.junit.jupiter - junit-jupiter-api + assertj-core test + junit junit 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 21d8635d2..13f9650c4 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.virtdata.api.VirtDataResources; +import io.nosqlbench.nb.api.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 a97fccd00..1857c9f86 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.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.virtdata.api.VirtDataResources; +import io.nosqlbench.nb.api.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 3b1e5e825..95457319c 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.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.virtdata.api.VirtDataResources; +import io.nosqlbench.nb.api.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 6b1263668..586ed4de6 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.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.virtdata.api.VirtDataResources; +import io.nosqlbench.nb.api.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 79eb9a11f..87125127c 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.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VirtDataResources; +import io.nosqlbench.nb.api.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 d55e5864c..f90315b44 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.annotations.Example; import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_int.HashRange; -import io.nosqlbench.virtdata.api.VirtDataResources; +import io.nosqlbench.nb.api.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 8fe9eae47..ee916e068 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.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_int.HashRange; -import io.nosqlbench.virtdata.api.VirtDataResources; +import io.nosqlbench.nb.api.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 11719df58..3f039b56a 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,13 +20,12 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; import io.nosqlbench.virtdata.annotations.Example; import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VirtDataResources; +import io.nosqlbench.nb.api.VirtDataResources; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import java.security.InvalidParameterException; import java.util.ArrayList; import java.util.List; import java.util.Map; 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 5e43e4c97..b7950db7e 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.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VirtDataResources; +import io.nosqlbench.nb.api.VirtDataResources; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBufferTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBufferTest.java index 97c0fb781..11f5ca316 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBufferTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBufferTest.java @@ -15,7 +15,6 @@ public class DigestToByteBufferTest { public void testWithMD5() { DigestToByteBuffer d1 = new DigestToByteBuffer(MessageDigestAlgorithms.MD5); ByteBuffer digest = d1.apply(233423L); - System.out.println(Hex.encodeHexString(digest)); byte[] bytes; try { bytes = Hex.decodeHex("8413891ca0f1e9e927c480b72a3844e6"); @@ -23,13 +22,13 @@ public class DigestToByteBufferTest { throw new RuntimeException(e); } assertThat(digest).isEqualTo(ByteBuffer.wrap(bytes)); + System.out.println(Hex.encodeHexString(digest)); } @Test public void testWithSHA1() { DigestToByteBuffer d1 = new DigestToByteBuffer(MessageDigestAlgorithms.SHA_1); ByteBuffer digest = d1.apply(233423L); - System.out.println(Hex.encodeHexString(digest)); byte[] bytes; try { bytes = Hex.decodeHex("2cffb2670c40af12487f5ecb39f394f1556bd4c8"); @@ -37,6 +36,7 @@ public class DigestToByteBufferTest { throw new RuntimeException(e); } assertThat(digest).isEqualTo(ByteBuffer.wrap(bytes)); + System.out.println(Hex.encodeHexString(digest)); } @Test(expected = RuntimeException.class) @@ -46,4 +46,4 @@ public class DigestToByteBufferTest { assertThat(digest).isEqualTo(ByteBuffer.wrap(new byte[] {0x32})); } -} \ No newline at end of file +} diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 8fcc5e617..71c8c5833 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -31,6 +31,12 @@ 3.12.73-SNAPSHOT + + junit + junit + test + + @@ -50,14 +56,9 @@ - - org.testng - testng - test - org.assertj - assertj-core-java8 + assertj-core test diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/EnumeratedTest.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/EnumeratedTest.java index b57f017aa..2fabebbd4 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/EnumeratedTest.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/EnumeratedTest.java @@ -1,14 +1,13 @@ package io.nosqlbench.virtdata.library.curves4.continuous; import io.nosqlbench.virtdata.library.curves4.continuous.long_double.Enumerated; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.Arrays; import java.util.stream.LongStream; import static org.assertj.core.api.Assertions.assertThat; -@Test public class EnumeratedTest { @Test @@ -30,4 +29,4 @@ public class EnumeratedTest { private static LongStream longs(long... v) { return Arrays.stream(v); } -} \ No newline at end of file +} diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/LevyTest.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/LevyTest.java index 8cc605a6f..b0aa6d0ed 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/LevyTest.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/LevyTest.java @@ -2,11 +2,10 @@ package io.nosqlbench.virtdata.library.curves4.continuous; import io.nosqlbench.virtdata.library.curves4.continuous.long_double.Levy; import org.assertj.core.data.Offset; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class LevyTest { @Test @@ -15,4 +14,4 @@ public class LevyTest { assertThat(levy.applyAsDouble(10L)).isCloseTo(2.938521849905433, Offset.offset(0.000001d)); } -} \ No newline at end of file +} diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsConcurrencyTests.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsConcurrencyTests.java index e799ec4c2..bd1658465 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsConcurrencyTests.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsConcurrencyTests.java @@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.library.curves4.continuous; import io.nosqlbench.virtdata.api.DataMapper; import io.nosqlbench.virtdata.api.VirtData; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.ArrayList; import java.util.List; @@ -108,4 +108,4 @@ public class RealDistributionsConcurrencyTests { } } -} \ No newline at end of file +} diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsValuesTest.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsValuesTest.java index f37010335..1bb9908ae 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsValuesTest.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsValuesTest.java @@ -4,7 +4,7 @@ import io.nosqlbench.virtdata.library.curves4.continuous.long_double.Normal; import io.nosqlbench.virtdata.library.curves4.continuous.long_double.Uniform; import org.apache.commons.math4.stat.descriptive.DescriptiveStatistics; import org.assertj.core.data.Offset; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.Formatter; import java.util.Locale; @@ -12,7 +12,6 @@ import java.util.function.LongToDoubleFunction; import static org.assertj.core.api.Assertions.assertThat; -@Test public class RealDistributionsValuesTest { @@ -129,4 +128,4 @@ public class RealDistributionsValuesTest { } -} \ No newline at end of file +} diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsBinomialSanity.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsBinomialSanity.java index 569a5bc01..65dfdaac9 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsBinomialSanity.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsBinomialSanity.java @@ -3,13 +3,13 @@ package io.nosqlbench.virtdata.library.curves4.discrete; import io.nosqlbench.virtdata.library.curves4.discrete.common.DiscreteLongLongSampler; import io.nosqlbench.virtdata.library.curves4.discrete.common.IntegerDistributionICDSource; import org.apache.commons.statistics.distribution.BinomialDistribution; -import org.testng.annotations.Test; +import org.junit.Ignore; +import org.junit.Test; import java.util.Arrays; import static org.assertj.core.api.Assertions.assertThat; -@Test public class IntegerDistributionsBinomialSanity { private static double[] binomial85steps = new double[]{ @@ -56,7 +56,8 @@ public class IntegerDistributionsBinomialSanity { } - @Test(enabled=false) + @Ignore + @Test public void showBinomialICDF() { DiscreteLongLongSampler b85 = new DiscreteLongLongSampler(new IntegerDistributionICDSource( new BinomialDistribution(8,0.5D)),false); @@ -68,4 +69,4 @@ public class IntegerDistributionsBinomialSanity { } -} \ No newline at end of file +} diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsConcurrencyTest.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsConcurrencyTest.java index deef0c1fc..97f15072b 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsConcurrencyTest.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsConcurrencyTest.java @@ -4,7 +4,7 @@ import io.nosqlbench.virtdata.api.DataMapper; import io.nosqlbench.virtdata.api.VirtData; import org.apache.commons.statistics.distribution.BinomialDistribution; import org.assertj.core.data.Offset; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.ArrayList; import java.util.Arrays; @@ -158,4 +158,4 @@ public class IntegerDistributionsConcurrencyTest { } } -} \ No newline at end of file +} diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsValuesTest.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsValuesTest.java index 46ba5b0a3..486f8caa4 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsValuesTest.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsValuesTest.java @@ -4,7 +4,8 @@ import io.nosqlbench.virtdata.library.curves4.continuous.long_double.Uniform; import io.nosqlbench.virtdata.library.curves4.discrete.long_long.Zipf; import org.apache.commons.math4.stat.descriptive.DescriptiveStatistics; import org.assertj.core.data.Offset; -import org.testng.annotations.Test; +import org.junit.Ignore; +import org.junit.Test; import java.util.Formatter; import java.util.Locale; @@ -13,10 +14,10 @@ import java.util.function.LongUnaryOperator; import static org.assertj.core.api.Assertions.assertThat; -@Test public class IntegerDistributionsValuesTest { - @Test(enabled=false) + @Ignore + @Test public void testComputedZipf() { RunData runData = iterateMapperLong(new Zipf(10000,2.0), 10000); System.out.println(runData.toString()); @@ -148,4 +149,4 @@ public class IntegerDistributionsValuesTest { } -} \ No newline at end of file +} diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHashTest.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHashTest.java index 19ac5ffb9..8a2238730 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHashTest.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHashTest.java @@ -1,10 +1,9 @@ package io.nosqlbench.virtdata.library.curves4.discrete.common; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class ThreadSafeHashTest { @Test @@ -18,4 +17,4 @@ public class ThreadSafeHashTest { assertThat(threadSafeHash.applyAsLong(v)).isNotNegative(); } } -} \ No newline at end of file +} diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/ZipfTest.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/ZipfTest.java index 7157cd15b..520d13e73 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/ZipfTest.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/ZipfTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.curves4.discrete.long_long; -import org.testng.annotations.Ignore; -import org.testng.annotations.Test; +import org.junit.Ignore; +import org.junit.Test; public class ZipfTest { diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 70bae030a..4403a2d91 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -46,14 +46,10 @@ com.elega9t number-to-words - - org.testng - testng - test - + org.assertj - assertj-core-java8 + assertj-core test 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 b599a171e..7fc6be3d1 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.annotations.DeprecatedFunction; -import io.nosqlbench.virtdata.api.VirtDataResources; +import io.nosqlbench.nb.api.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 d0399627a..c8372de79 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.annotations.DeprecatedFunction; -import io.nosqlbench.virtdata.api.VirtDataResources; +import io.nosqlbench.nb.api.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 ddfc6d0ec..11ffd75d1 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.annotations.DeprecatedFunction; -import io.nosqlbench.virtdata.api.VirtDataResources; +import io.nosqlbench.nb.api.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-realer/pom.xml b/virtdata-lib-realer/pom.xml index 243252e98..23b35b28f 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -16,14 +16,9 @@ With inspiration from other libraries - - org.testng - testng - test - org.assertj - assertj-core-java8 + assertj-core test diff --git a/virtdata-processors/pom.xml b/virtdata-processors/pom.xml index 89bb25cb2..24de8c9db 100644 --- a/virtdata-processors/pom.xml +++ b/virtdata-processors/pom.xml @@ -23,6 +23,11 @@ virtdata-annotations 3.12.73-SNAPSHOT + + + + + io.nosqlbench nb-api diff --git a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FunctionDocInfoProcessor.java b/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FunctionDocInfoProcessor.java index 2c18e01fe..697723561 100644 --- a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FunctionDocInfoProcessor.java +++ b/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FunctionDocInfoProcessor.java @@ -1,5 +1,6 @@ package io.nosqlbench.virtdata.processors; - +//io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor +//io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor import io.nosqlbench.virtdata.annotations.*; import javax.annotation.processing.*; diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index f4187fd0b..c5f1ab0dc 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -41,14 +41,10 @@ com.elega9t number-to-words - - org.testng - testng - test - + org.assertj - assertj-core-java8 + assertj-core test diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 435a6dc8a..7b7b2bddc 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -62,13 +62,13 @@ - org.testng - testng + junit + junit test org.assertj - assertj-core-java8 + assertj-core test 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 8ae42c22c..fb0de7b19 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.annotations.Category; import io.nosqlbench.virtdata.api.VirtDataDocs; -import io.nosqlbench.virtdata.api.VirtDataResources; +import io.nosqlbench.nb.api.VirtDataResources; import io.nosqlbench.virtdata.processors.DocFuncData; import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.FDoc; import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.FDocCat; diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/core/VirtDataDocsIntegratedTest.java b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/core/VirtDataDocsIntegratedTest.java index 30abd2ebc..3b636e1a6 100644 --- a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/core/VirtDataDocsIntegratedTest.java +++ b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/core/VirtDataDocsIntegratedTest.java @@ -2,11 +2,10 @@ package io.nosqlbench.virtdata.core; import io.nosqlbench.virtdata.api.VirtDataDocs; import io.nosqlbench.virtdata.processors.DocFuncData; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.List; -@Test public class VirtDataDocsIntegratedTest { @Test @@ -18,4 +17,4 @@ public class VirtDataDocsIntegratedTest { public void testGetAllDocs() { List allDocs = VirtDataDocs.getAllDocs(); } -} \ No newline at end of file +} diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/FDocFuncsTest.java b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/FDocFuncsTest.java index b006f9a8e..fb0e43f2e 100644 --- a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/FDocFuncsTest.java +++ b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/FDocFuncsTest.java @@ -5,7 +5,7 @@ import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.ExampleDocFunc1; import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.ExampleDocFunc2; import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.FDocFunc; import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.FDocFuncs; -import org.testng.annotations.Test; +import org.junit.Test; public class FDocFuncsTest { diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java index d63433b96..124703ddf 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java @@ -3,11 +3,10 @@ package io.virtdata; import io.nosqlbench.virtdata.library.basics.shared.distributions.DelimFrequencySampler; import io.nosqlbench.virtdata.library.basics.shared.distributions.WeightedStringsFromCSV; import io.nosqlbench.virtdata.library.basics.shared.distributions.CSVFrequencySampler; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class IntegratedAliasMethodTests { @Test @@ -16,12 +15,15 @@ public class IntegratedAliasMethodTests { String n = surnames.apply(2343); assertThat(n).isEqualTo("Conaway"); } + + @Test public void testCSVFrequencySampler() { CSVFrequencySampler names= new CSVFrequencySampler("data/countries", "COUNTRY_CODE" ); String n = names.apply(23); assertThat(n).isEqualTo("CZ"); } + @Test public void testDelimFrequencySampler() { DelimFrequencySampler names= new DelimFrequencySampler( "data/countries", @@ -31,4 +33,4 @@ public class IntegratedAliasMethodTests { String n = names.apply(23); assertThat(n).isEqualTo("CZ"); } -} \ No newline at end of file +} diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java index 38ea4ea33..ec30b4f18 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java @@ -18,7 +18,7 @@ package io.virtdata; import io.nosqlbench.virtdata.api.DataMapper; import io.nosqlbench.virtdata.api.Bindings; import io.nosqlbench.virtdata.api.VirtData; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.LinkedHashMap; import java.util.List; @@ -28,7 +28,6 @@ import java.util.function.LongUnaryOperator; import static org.assertj.core.api.Assertions.assertThat; -@Test public class IntegratedBindingsTest { @Test @@ -59,7 +58,7 @@ public class IntegratedBindingsTest { assertThat(map.get("mod71")).isEqualTo(5L); } - + @Test public void testIteratedMaps() { Bindings bindings = VirtData.getTemplate( "mod5", "Mod(5)", @@ -246,4 +245,4 @@ public class IntegratedBindingsTest { assertThat(o).isEqualTo("bar"); } -} \ No newline at end of file +} diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLibraryTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLibraryTest.java index 48b38201d..2d5dc7153 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLibraryTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLibraryTest.java @@ -20,19 +20,19 @@ import io.nosqlbench.virtdata.api.Bindings; import io.nosqlbench.virtdata.api.BindingsTemplate; import io.nosqlbench.virtdata.api.ResolverDiagnostics; import io.nosqlbench.virtdata.api.VirtData; -import org.testng.annotations.Test; +import org.junit.Ignore; +import org.junit.Test; import java.util.Optional; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -@Test public class IntegratedComposerLibraryTest { // The deprecated functions are not being included in the next release, so this test's purpose has been // reversed. - @Test(expectedExceptions = {RuntimeException.class}, expectedExceptionsMessageRegExp = ".*Unable to find.*") + @Test(expected=RuntimeException.class) public void testArgumentMatchingViaMainLib() { BindingsTemplate bt = new BindingsTemplate(); bt.addFieldBinding("param","RandomLineToString('data/variable_words.txt')"); @@ -44,14 +44,14 @@ public class IntegratedComposerLibraryTest { assertThat(o.getClass()).isEqualTo(String.class); } - @Test(enabled=true) + @Test public void testChainedTypeResolutionForLong() { BindingsTemplate bt = new BindingsTemplate(); bt.addFieldBinding("longchain", "compose CycleRange(123456789) ; Div(3); Mod(7) -> long"); Bindings bindings = bt.resolveBindings(); } - @Test(enabled=true) + @Test public void testChainedTypeResolutionForWithInternalLong() { BindingsTemplate bt = new BindingsTemplate(); bt.addFieldBinding("longchain", "compose HashRange(1234,6789) -> long; Mod(3) -> int;"); @@ -60,7 +60,7 @@ public class IntegratedComposerLibraryTest { assertThat(n1).isOfAnyClassIn(Integer.class); } - @Test(enabled=true) + @Test public void testChainedTypeResolutionForInt() { BindingsTemplate bt = new BindingsTemplate(); bt.addFieldBinding("intchain", "compose ToInt() ; CycleRange(123456789) ; Div(3) ; Mod(7) -> int"); @@ -82,7 +82,8 @@ public class IntegratedComposerLibraryTest { } // TODO: Fix this test - @Test(enabled=false) + @Test + @Ignore public void testTypeCoercionWhenNeeded() { BindingsTemplate bt = new BindingsTemplate(); bt.addFieldBinding("mod_to_string", "compose Mod(3) ; Suffix('0000000000') -> String"); @@ -96,13 +97,15 @@ public class IntegratedComposerLibraryTest { } // TODO: Fix this test - @Test(enabled=false) + @Test + @Ignore public void testBasicRange() { BindingsTemplate bt = new BindingsTemplate(); bt.addFieldBinding("phone","HashRange(1000000000, 9999999999)"); Bindings bindings = bt.resolveBindings(); } + @Test public void testUUIDChain() { Optional> dm = VirtData.getOptionalMapper("compose Mod(1000); ToHashedUUID() -> java.util.UUID"); @@ -111,12 +114,14 @@ public class IntegratedComposerLibraryTest { assertThat(o).isEqualTo(UUID.fromString("3df498b1-9568-4584-96fd-76f6081da01a")); } + @Test public void testNormalDoubleAdd() { Optional> dm = VirtData.getOptionalMapper("compose Normal(0.0,5.0); Add(5.0) -> double"); assertThat(dm).isPresent(); } + @Test public void testDistInCompose() { Optional> dm = VirtData.getOptionalMapper("compose Hash(); Uniform(0,100); ToString() -> String"); @@ -126,6 +131,7 @@ public class IntegratedComposerLibraryTest { assertThat(s).isEqualTo("78"); } + @Test public void testComposeSingleFuncTypeCoercion() { Optional> longMapper = VirtData.getOptionalMapper("compose Uniform(1,10) -> long"); @@ -157,6 +163,7 @@ public class IntegratedComposerLibraryTest { assertThat(o).isEqualTo(expected); } + @Test public void testChainedHashRanges() { final int initialCycle = 0; final int intermediateCycle = 39; @@ -172,6 +179,7 @@ public class IntegratedComposerLibraryTest { assertInteger(finalChainedValue, finalCycle); } + @Test public void testLeadingIdentityDoesNotImpactTypes() { final int initialCycle = 0; @@ -184,6 +192,7 @@ public class IntegratedComposerLibraryTest { assertInteger(o2, finalCycle); } + @Test public void testTemplateBindingConversion() { ResolverDiagnostics diag; diag = VirtData.getMapperDiagnostics("Uniform(0.0,1.0)"); @@ -193,4 +202,4 @@ public class IntegratedComposerLibraryTest { System.out.println(diag.toString()); } -} \ No newline at end of file +} diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java index 1b9c341f3..c8e51af24 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java @@ -6,7 +6,7 @@ import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Identity; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.NumberNameToString; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.Template; import org.apache.commons.lang3.ClassUtils; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.Optional; import java.util.function.Function; @@ -15,7 +15,6 @@ import java.util.function.LongUnaryOperator; import static org.assertj.core.api.Assertions.assertThat; -@Test public class IntegratedComposerLogicTest { @Test @@ -25,6 +24,7 @@ public class IntegratedComposerLogicTest { assertThat(o).isOfAnyClassIn(Long.class); } + @Test public void testSignatureMapping() { Optional> dataMapper = VirtData.getOptionalMapper( "compose HashRange(1000000000,9999999999L); ToString() -> String" @@ -35,6 +35,7 @@ public class IntegratedComposerLogicTest { assertThat(v).isNotNull(); } + @Test public void testIntegratedComposer() { Optional> dataMapper = VirtData.getOptionalMapper( "binomial(8,0.5); ToDate() -> java.util.Date" @@ -44,6 +45,7 @@ public class IntegratedComposerLogicTest { assertThat(dataMapper.get().get(1)).isNotNull(); } + @Test public void testComplexComposition() { Optional> dataMapper = VirtData.getOptionalMapper( "Hash(); Normal(50,10.0,'map'); Add(50); ToString(); Suffix('avgdays') -> String" @@ -56,11 +58,13 @@ public class IntegratedComposerLogicTest { // } } + @Test public void testComposerOnly() { Optional> dataMapper = VirtData.getOptionalMapper("Add(5)"); assertThat(dataMapper.isPresent()).isTrue(); } + @Test public void testResourceLoader() { Optional> dataMapper = VirtData.getOptionalMapper(" ModuloLineToString('data/variable_words.txt') -> String"); assertThat(dataMapper).isPresent(); @@ -70,12 +74,7 @@ public class IntegratedComposerLogicTest { assertThat(dataMapper.get().get(1)).isEqualToComparingFieldByField("completion_count"); } -// public void testPOJOTypeSpecializer() { -// Optional> dataMapper = VirtData.getOptionalMapper("compose LongToLongPOJO() -> io.virtdata.testing.ARandomPOJO"); -// assertThat(dataMapper).isPresent(); -// assertThat(dataMapper.get().get(1)).isOfAnyClassIn(ARandomPOJO.class); -// } - + @Test public void testNestedFunction() { Template t = new Template("_{}_{}_", (Function) String::valueOf, (LongFunction) String::valueOf); String r = t.apply(5); @@ -87,6 +86,7 @@ public class IntegratedComposerLogicTest { } + @Test public void testBrokenTemplate() { Optional> m2 = VirtData.getOptionalMapper("Template('{\"alt1-{}\",\"alt2-{}\"}',ToLongFunction(Identity()),ToLongFunction(Identity()))"); assertThat(m2).isPresent(); @@ -95,6 +95,7 @@ public class IntegratedComposerLogicTest { } + @Test public void testNegativeLongs() { Optional> mo = VirtData.getOptionalMapper("HashRange(-2147483648L,2147483647L) -> long"); assertThat(mo).isPresent(); @@ -104,12 +105,14 @@ public class IntegratedComposerLogicTest { assertThat(result).isEqualTo(1398623797L); } + @Test public void testBrokenFlow() { Optional> mo = VirtData.getOptionalMapper("HashRange(-2147483648L,2147483647L) -> long"); assertThat(mo).isPresent(); } + @Test public void testConversionMatchingManual() { Optional> tm = VirtData.getOptionalMapper("ToEpochTimeUUID(); java.lang.Object -> ToString() -> String"); assertThat(tm).isPresent(); @@ -117,6 +120,7 @@ public class IntegratedComposerLogicTest { assertThat(s).isEqualTo("1389a470-1dd2-11b2-8000-000000000000"); } + @Test public void testConversionMatchingAuto() { Optional> tm = VirtData.getOptionalMapper("ToEpochTimeUUID(); ToString()"); assertThat(tm).isPresent(); @@ -138,7 +142,7 @@ public class IntegratedComposerLogicTest { } - @Test(expectedExceptions = {RuntimeException.class}, expectedExceptionsMessageRegExp = ".*but this type is not assignable.*") + @Test(expected = RuntimeException.class) public void testVirtDataTypeVarianceError() { DataMapper mapper = VirtData.getMapper("Uniform(0.0D,1.0D) -> java.lang.String", long.class); } diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedCurvesTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedCurvesTest.java index cf8680b59..2d31b783d 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedCurvesTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedCurvesTest.java @@ -4,7 +4,7 @@ import io.nosqlbench.virtdata.api.DataMapper; import io.nosqlbench.virtdata.api.VirtData; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import org.assertj.core.data.Offset; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.Formatter; import java.util.Locale; @@ -13,7 +13,6 @@ import static org.assertj.core.api.Assertions.assertThat; //import org.apache.commons.math4.stat.descriptive.DescriptiveStatistics; -@Test public class IntegratedCurvesTest { @Test diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedRealerTests.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedRealerTests.java index c20de71f0..7fbdc727f 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedRealerTests.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedRealerTests.java @@ -2,31 +2,31 @@ package io.virtdata; import io.nosqlbench.virtdata.api.DataMapper; import io.nosqlbench.virtdata.api.VirtData; -import org.testng.annotations.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@Test public class IntegratedRealerTests { + @Test public void testLastNames() { - DataMapper mapper = VirtData.getOptionalMapper("LastNames()").orElse(null); + DataMapper mapper = VirtData.getOptionalMapper("LastNames()").orElse(null); assertThat(mapper).isNotNull(); assertThat(mapper.get(0L)).isEqualTo("Miracle"); } + @Test public void testFirstNames() { - DataMapper mapper = VirtData.getOptionalMapper("FirstNames()").orElse(null); + DataMapper mapper = VirtData.getOptionalMapper("FirstNames()").orElse(null); assertThat(mapper).isNotNull(); assertThat(mapper.get(0L)).isEqualTo("Norman"); } + @Test public void testFullNames() { - DataMapper mapper = VirtData.getOptionalMapper("FullNames()").orElse(null); + DataMapper mapper = VirtData.getOptionalMapper("FullNames()").orElse(null); assertThat(mapper).isNotNull(); assertThat(mapper.get(0L)).isEqualTo("Norman Wolf"); } - - } diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedStringCompositorTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedStringCompositorTest.java index 67efb60eb..33125669a 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedStringCompositorTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedStringCompositorTest.java @@ -3,14 +3,13 @@ package io.virtdata; import io.nosqlbench.virtdata.api.Bindings; import io.nosqlbench.virtdata.api.BindingsTemplate; import io.nosqlbench.virtdata.api.templates.StringCompositor; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; +import org.junit.BeforeClass; +import org.junit.Test; import java.util.function.Function; import static org.assertj.core.api.Assertions.assertThat; -@Test public class IntegratedStringCompositorTest { private BindingsTemplate template; @@ -65,4 +64,4 @@ public class IntegratedStringCompositorTest { assertThat(s).isEqualTo("A'3'C"); } -} \ No newline at end of file +} diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedTemporalExamplesTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedTemporalExamplesTest.java index 034a02b5d..23108bae7 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedTemporalExamplesTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedTemporalExamplesTest.java @@ -4,7 +4,7 @@ import io.nosqlbench.virtdata.api.DataMapper; import io.nosqlbench.virtdata.api.VirtData; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.Date; import java.util.UUID; @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; * values. This demonstrates that the functions act as idempotent operations. * They are pure functions, even though not always one-to-one functions. */ -@Test(singleThreaded = true) + public class IntegratedTemporalExamplesTest { /** From 81c6869c3c1d67809d5e101a34418d912ed0bf88 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 17:08:15 -0500 Subject: [PATCH 10/17] collapse virtdata-annotations and virtdata-processors into virtdata-api --- .../collectionclobs/StringMapClob.java | 8 ++-- .../functions/collections/ListMapper.java | 8 ++-- .../functions/contrib/WrappedClustering.java | 4 +- .../functions/diagnostics/ToCqlType.java | 2 +- .../functions/geometry/Distance.java | 2 +- .../functions/geometry/LineString.java | 2 +- .../datamappers/functions/geometry/Point.java | 2 +- .../functions/geometry/Polygon.java | 2 +- .../functions/geometry/PolygonOnGrid.java | 4 +- .../EpochMillisToCqlLocalDate.java | 4 +- .../EpochMillisToJavaLocalDate.java | 6 +-- .../EpochMillisToJavaLocalDateTime.java | 4 +- .../long_localdate/LongToLocalDateDays.java | 6 +-- .../long_string/ModuloCSVLineToUUID.java | 4 +- .../functions/long_uuid/ToTimeUUIDMax.java | 6 +-- .../functions/long_uuid/ToTimeUUIDMin.java | 6 +-- .../functions/rainbow/TokenMapFileCycle.java | 2 +- .../rainbow/TokenMapFileNextCycle.java | 2 +- .../rainbow/TokenMapFileNextToken.java | 2 +- .../functions/rainbow/TokenMapFileToken.java | 2 +- .../functions/string_string/SnappyComp.java | 2 +- .../to_daterange/DateRangeDuring.java | 8 ++-- .../functions/to_daterange/DateRangeFunc.java | 8 ++-- .../to_daterange/DateRangeOnOrAfter.java | 8 ++-- .../to_daterange/DateRangeOnOrBefore.java | 8 ++-- .../to_daterange/DateRangeParser.java | 8 ++-- .../statements/binders/CqlBinderTypes.java | 2 +- .../binders/DiagnosticPreparedBinder.java | 2 +- .../binders/DirectArrayValuesBinder.java | 2 +- .../binders/SimpleStatementValuesBinder.java | 2 +- .../binders/UnsettableValuesBinder.java | 4 +- .../statements/core/ReadyCQLStatement.java | 2 +- .../core/ReadyCQLStatementTemplate.java | 6 +-- .../javax.annotation.processing.Processor | 3 +- .../cqlverify/CqlVerifyActivity.java | 4 +- .../cqlverify/RowDifferencer.java | 2 +- .../activitytype/diag/DiagActivity.java | 2 +- .../javax.annotation.processing.Processor | 3 +- .../activitytype/http/HttpAction.java | 4 +- .../activitytype/http/HttpActivity.java | 6 +-- .../stdout/AsyncStdoutAction.java | 2 +- .../activitytype/stdout/StdoutAction.java | 4 +- .../activitytype/stdout/StdoutActivity.java | 6 +-- .../activitytype/stdout/StdoutOpContext.java | 2 +- .../engine/api/activityconfig/ParsedStmt.java | 4 +- .../rawyaml/BindingEscapingTest.java | 4 +- .../javax.annotation.processing.Processor | 3 +- .../javax.annotation.processing.Processor | 3 +- .../javax.annotation.processing.Processor | 3 +- pom.xml | 2 - virtdata-annotations/pom.xml | 16 -------- virtdata-api/pom.xml | 15 +++---- .../virtdata/api}/annotations/Categories.java | 2 +- .../virtdata/api}/annotations/Category.java | 2 +- .../api}/annotations/DeprecatedFunction.java | 2 +- .../api}/annotations/Description.java | 2 +- .../virtdata/api}/annotations/Example.java | 2 +- .../api}/annotations/ExampleData.java | 2 +- .../virtdata/api}/annotations/Examples.java | 2 +- .../virtdata/api}/annotations/Input.java | 2 +- .../virtdata/api}/annotations/Output.java | 2 +- .../api}/annotations/PerThreadMapper.java | 2 +- .../virtdata/api}/annotations/Range.java | 2 +- .../virtdata/api}/annotations/See.java | 2 +- .../virtdata/api}/annotations/SeeList.java | 2 +- .../api}/annotations/ThreadSafeMapper.java | 2 +- .../virtdata/api}/processors/DocCtorData.java | 2 +- .../virtdata/api}/processors/DocForFunc.java | 4 +- .../api}/processors/DocForFuncCtor.java | 4 +- .../virtdata/api}/processors/DocFuncData.java | 4 +- .../api}/processors/ExampleDocData.java | 4 +- .../api}/processors/ExampleManifest.java | 2 +- .../api}/processors/FuncEnumerator.java | 4 +- .../processors/FunctionDocInfoProcessor.java | 23 ++++++----- .../processors/FunctionDocInfoWriter.java | 6 +-- .../processors/FunctionManifestProcessor.java | 10 ++--- .../api}/processors/ProcessorClassNames.java | 2 +- virtdata-core/docs/types.puml | 13 ------- .../{api => core/bindings}/Binder.java | 2 +- .../{api => core/bindings}/Bindings.java | 2 +- .../{api => core/bindings}/BindingsCache.java | 2 +- .../bindings}/BindingsTemplate.java | 4 +- .../bindings}/CompatibilityFixups.java | 2 +- .../bindings}/ContextualArrayBindings.java | 2 +- .../bindings}/ContextualBindings.java | 2 +- .../ContextualBindingsArrayTemplate.java | 2 +- .../bindings}/ContextualBindingsTemplate.java | 2 +- .../bindings}/ContextualMapBindings.java | 2 +- .../{api => core/bindings}/DataMapper.java | 2 +- .../bindings}/DataMapperFunctionMapper.java | 5 +-- .../bindings}/DataMapperLibrary.java | 2 +- .../bindings}/DataMapperLibraryFinder.java | 3 +- .../{api => core/bindings}/FunctionType.java | 2 +- .../{api => core/bindings}/FunctionTyper.java | 2 +- .../{api => core/bindings}/LazyValuesMap.java | 2 +- .../{api => core/bindings}/Named.java | 2 +- .../bindings}/ResolvedFunction.java | 2 +- .../bindings}/ResolverDiagnostics.java | 2 +- .../bindings}/StringObjectPromoter.java | 2 +- .../{api => core/bindings}/VALUE.java | 2 +- .../{api => core/bindings}/ValueType.java | 2 +- .../bindings}/ValuesArrayBinder.java | 4 +- .../{api => core/bindings}/ValuesBinder.java | 2 +- .../bindings}/ValuesMapBinder.java | 2 +- .../{api => core/bindings}/VirtData.java | 4 +- .../bindings}/VirtDataComposer.java | 4 +- .../{api => core/bindings}/VirtDataDocs.java | 10 ++--- .../bindings}/VirtDataFunctionFinder.java | 6 +-- .../bindings}/VirtDataFunctionLibrary.java | 2 +- .../bindings}/VirtDataFunctionResolver.java | 6 +-- .../bindings}/VirtDataFunctions.java | 2 +- .../bindings}/VirtDataLibraries.java | 2 +- .../bindings}/VirtDataLibrary.java | 2 +- .../composers/ComposerForDoubleFunction.java | 6 +-- .../ComposerForDoubleToIntFunction.java | 4 +- .../ComposerForDoubleToLongFunction.java | 4 +- .../ComposerForDoubleUnaryOperator.java | 4 +- .../composers/ComposerForFunction.java | 6 +-- .../composers/ComposerForIntFunction.java | 6 +-- .../ComposerForIntToDoubleFunction.java | 4 +- .../ComposerForIntToLongFunction.java | 4 +- .../ComposerForIntUnaryOperator.java | 4 +- .../composers/ComposerForLongFunction.java | 6 +-- .../ComposerForLongToDoubleFunction.java | 4 +- .../ComposerForLongToIntFunction.java | 4 +- .../ComposerForLongUnaryOperator.java | 4 +- .../composers/FunctionAssembly.java | 4 +- .../composers/FunctionComposer.java | 10 ++--- .../{api => core}/config/ConfigAware.java | 2 +- .../{api => core}/config/ConfigModel.java | 2 +- .../config/MutableConfigModel.java | 2 +- .../{api => core}/templates/BindPoint.java | 2 +- .../{api => core}/templates/CSVBindings.java | 6 +-- .../templates/CSVBindingsTemplate.java | 6 +-- .../templates/ParsedTemplate.java | 2 +- .../templates/StringBindings.java | 6 +-- .../templates/StringBindingsTemplate.java | 6 +-- .../templates/StringCompositor.java | 6 +-- .../templates/StringMapCompositor.java | 4 +- .../virtdata/annotations/ExampleDataTest.java | 3 +- .../core/CompatibilityFixupsTest.java | 4 +- .../virtdata/core/ResolvedFunctionTest.java | 4 +- .../virtdata/core/VirtDataComposerTest.java | 6 +-- .../virtdata/core/VirtDataTest.java | 6 +-- .../FunctionAssemblerMatrixTest.java | 12 +++--- .../composers/FunctionAssemblerTest.java | 10 ++--- .../templates/ParsedTemplateTest.java | 6 ++- .../templates/StringBindingsTemplateTest.java | 8 ++-- .../templates/StringCompositorTest.java | 5 ++- .../templates}/ValueTypeTest.java | 5 ++- .../testmappers/TestableTemplate.java | 2 +- .../virtdata/testmappers/TestingRepeater.java | 2 +- .../util/StringObjectPromoterTest.java | 4 +- .../virtdata/util/VirtDataFunctionsTest.java | 2 +- .../from_bytebuffer/DigestToByteBuffer.java | 6 +-- .../from_bytebuffer/ToHexString.java | 6 +-- .../conversions/from_double/ToBoolean.java | 6 +-- .../conversions/from_double/ToByte.java | 6 +-- .../conversions/from_double/ToByteBuffer.java | 6 +-- .../conversions/from_double/ToFloat.java | 6 +-- .../shared/conversions/from_double/ToInt.java | 6 +-- .../conversions/from_double/ToLong.java | 6 +-- .../conversions/from_double/ToShort.java | 6 +-- .../conversions/from_double/ToString.java | 8 ++-- .../conversions/from_float/ToBoolean.java | 6 +-- .../shared/conversions/from_float/ToByte.java | 6 +-- .../conversions/from_float/ToByteBuffer.java | 6 +-- .../shared/conversions/from_float/ToInt.java | 6 +-- .../shared/conversions/from_float/ToLong.java | 6 +-- .../conversions/from_float/ToShort.java | 6 +-- .../conversions/from_float/ToString.java | 6 +-- .../conversions/from_int/ToBoolean.java | 6 +-- .../shared/conversions/from_int/ToByte.java | 6 +-- .../conversions/from_int/ToByteBuffer.java | 6 +-- .../shared/conversions/from_int/ToFloat.java | 6 +-- .../shared/conversions/from_int/ToShort.java | 6 +-- .../shared/conversions/from_int/ToString.java | 6 +-- .../shared/conversions/from_long/ToByte.java | 6 +-- .../conversions/from_long/ToByteBuffer.java | 6 +-- .../shared/conversions/from_long/ToFloat.java | 6 +-- .../conversions/from_long/ToHexString.java | 6 +-- .../shared/conversions/from_long/ToInt.java | 8 ++-- .../shared/conversions/from_long/ToShort.java | 6 +-- .../conversions/from_long/ToString.java | 6 +-- .../shared/conversions/from_short/ToByte.java | 6 +-- .../conversions/from_short/ToByteBuffer.java | 6 +-- .../conversions/from_short/ToFloat.java | 6 +-- .../conversions/from_string/ToByte.java | 6 +-- .../conversions/from_string/ToByteBuffer.java | 6 +-- .../conversions/from_string/ToFloat.java | 6 +-- .../shared/conversions/from_string/ToInt.java | 6 +-- .../conversions/from_string/ToLong.java | 6 +-- .../conversions/from_string/ToShort.java | 6 +-- .../basics/shared/diagnostics/TypeOf.java | 6 +-- .../distributions/CSVFrequencySampler.java | 8 ++-- .../distributions/DelimFrequencySampler.java | 8 ++-- .../distributions/WeightedStringsFromCSV.java | 6 +-- .../shared/formatting/DecimalFormat.java | 4 +- .../basics/shared/formatting/Format.java | 8 ++-- .../shared/from_double/to_double/Add.java | 2 +- .../shared/from_double/to_double/Clamp.java | 4 +- .../shared/from_double/to_double/Div.java | 2 +- .../from_double/to_double/DoubleFlow.java | 2 +- .../shared/from_double/to_double/Expr.java | 2 +- .../shared/from_double/to_double/Load.java | 8 ++-- .../shared/from_double/to_double/Max.java | 2 +- .../shared/from_double/to_double/Min.java | 2 +- .../shared/from_double/to_double/Mul.java | 2 +- .../shared/from_double/to_double/Save.java | 8 ++-- .../from_double/to_float/DoubleToFloat.java | 2 +- .../from_double/to_other/NullIfCloseTo.java | 8 ++-- .../shared/from_double/to_other/NullIfEq.java | 8 ++-- .../shared/from_double/to_other/NullIfGe.java | 8 ++-- .../shared/from_double/to_other/NullIfGt.java | 8 ++-- .../shared/from_double/to_other/NullIfLe.java | 8 ++-- .../shared/from_double/to_other/NullIfLt.java | 8 ++-- .../from_double/to_other/NullIfWithin.java | 8 ++-- .../from_double/to_unset/UnsetIfCloseTo.java | 10 ++--- .../from_double/to_unset/UnsetIfEq.java | 8 ++-- .../from_double/to_unset/UnsetIfGe.java | 10 ++--- .../from_double/to_unset/UnsetIfGt.java | 10 ++--- .../from_double/to_unset/UnsetIfLe.java | 10 ++--- .../from_double/to_unset/UnsetIfLt.java | 10 ++--- .../from_double/to_unset/UnsetIfWithin.java | 10 ++--- .../to_bigdecimal/ModuloToBigDecimal.java | 6 +-- .../from_long/to_bigint/ModuloToBigInt.java | 6 +-- .../shared/from_long/to_bigint/ToBigInt.java | 6 +-- .../from_long/to_boolean/ModuloToBoolean.java | 6 +-- .../from_long/to_boolean/ToBoolean.java | 6 +-- .../shared/from_long/to_byte/LongToByte.java | 8 ++-- .../from_long/to_byte/ModuloToByte.java | 6 +-- .../to_bytebuffer/DigestToByteBuffer.java | 6 +-- .../to_bytebuffer/HashedToByteBuffer.java | 2 +- .../to_bytebuffer/ToMD5ByteBuffer.java | 8 ++-- .../to_collection/HashedLineToStringList.java | 6 +-- .../to_collection/HashedLineToStringSet.java | 8 ++-- .../HashedLineToStringStringMap.java | 6 +-- .../to_collection/HashedRangeToLongList.java | 6 +-- .../shared/from_long/to_collection/List.java | 8 ++-- .../shared/from_long/to_collection/Map.java | 2 +- .../shared/from_long/to_collection/Set.java | 8 ++-- .../from_long/to_collection/StringList.java | 8 ++-- .../from_long/to_collection/StringMap.java | 5 ++- .../from_long/to_collection/StringSet.java | 8 ++-- .../to_double/HashedDoubleRange.java | 2 +- .../HashedRangedToNonuniformDouble.java | 4 +- .../from_long/to_double/Interpolate.java | 4 +- .../shared/from_long/to_double/ToDouble.java | 6 +-- .../to_inetaddress/ToInetAddress.java | 6 +-- .../basics/shared/from_long/to_int/Add.java | 2 +- .../from_long/to_int/AddCycleRange.java | 2 +- .../shared/from_long/to_int/AddHashRange.java | 2 +- .../shared/from_long/to_int/CycleRange.java | 2 +- .../basics/shared/from_long/to_int/Div.java | 4 +- .../basics/shared/from_long/to_int/Expr.java | 2 +- .../shared/from_long/to_int/FixedValue.java | 4 +- .../shared/from_long/to_int/FixedValues.java | 2 +- .../basics/shared/from_long/to_int/Hash.java | 2 +- .../shared/from_long/to_int/HashRange.java | 4 +- .../from_long/to_int/HashRangeScaled.java | 2 +- .../from_long/to_int/HashedLineToInt.java | 2 +- .../basics/shared/from_long/to_int/Mod.java | 2 +- .../from_long/to_int/ModuloToInteger.java | 4 +- .../basics/shared/from_long/to_int/Mul.java | 2 +- .../basics/shared/from_long/to_int/Scale.java | 2 +- .../shared/from_long/to_int/SignedHash.java | 2 +- .../basics/shared/from_long/to_int/ToInt.java | 6 +-- .../basics/shared/from_long/to_long/Add.java | 2 +- .../from_long/to_long/AddCycleRange.java | 2 +- .../from_long/to_long/AddHashRange.java | 2 +- .../shared/from_long/to_long/Clamp.java | 4 +- .../shared/from_long/to_long/CycleRange.java | 2 +- .../basics/shared/from_long/to_long/Div.java | 4 +- .../from_long/to_long/DivideToLong.java | 4 +- .../basics/shared/from_long/to_long/Expr.java | 2 +- .../shared/from_long/to_long/FixedValue.java | 2 +- .../shared/from_long/to_long/FixedValues.java | 4 +- .../shared/from_long/to_long/FullHash.java | 2 +- .../basics/shared/from_long/to_long/Hash.java | 2 +- .../shared/from_long/to_long/HashRange.java | 2 +- .../from_long/to_long/HashRangeScaled.java | 2 +- .../shared/from_long/to_long/HostHash.java | 2 +- .../shared/from_long/to_long/Identity.java | 2 +- .../shared/from_long/to_long/Interpolate.java | 4 +- .../basics/shared/from_long/to_long/Load.java | 8 ++-- .../shared/from_long/to_long/LongFlow.java | 8 ++-- .../basics/shared/from_long/to_long/Max.java | 4 +- .../basics/shared/from_long/to_long/Min.java | 2 +- .../basics/shared/from_long/to_long/Mod.java | 2 +- .../from_long/to_long/ModuloToLong.java | 2 +- .../basics/shared/from_long/to_long/Mul.java | 2 +- .../from_long/to_long/Murmur3DivToLong.java | 4 +- .../basics/shared/from_long/to_long/Save.java | 8 ++-- .../shared/from_long/to_long/Shuffle.java | 6 +-- .../shared/from_long/to_long/SignedHash.java | 2 +- .../basics/shared/from_long/to_long/Swap.java | 4 +- .../from_long/to_long/WeightedLongs.java | 4 +- .../shared/from_long/to_object/CoinFunc.java | 10 ++--- .../from_long/to_object/WeightedFuncs.java | 8 ++-- .../shared/from_long/to_other/NullIfEq.java | 8 ++-- .../shared/from_long/to_other/NullIfGe.java | 8 ++-- .../shared/from_long/to_other/NullIfGt.java | 8 ++-- .../shared/from_long/to_other/NullIfLe.java | 8 ++-- .../shared/from_long/to_other/NullIfLt.java | 8 ++-- .../from_long/to_short/LongToShort.java | 8 ++-- .../from_long/to_short/ModuloToShort.java | 8 ++-- .../to_string/AlphaNumericString.java | 2 +- .../from_long/to_string/Combinations.java | 4 +- .../from_long/to_string/DirectoryLines.java | 4 +- .../to_string/DivideToLongToString.java | 6 +-- .../shared/from_long/to_string/Expr.java | 2 +- .../to_string/HashedFileExtractToString.java | 4 +- .../to_string/HashedLineToString.java | 2 +- .../HashedLinesToKeyValueString.java | 2 +- .../to_string/HashedLoremExtractToString.java | 2 +- .../from_long/to_string/JoinTemplate.java | 4 +- .../from_long/to_string/ListTemplate.java | 4 +- .../from_long/to_string/LongToString.java | 4 +- .../from_long/to_string/MD5HexString.java | 8 ++-- .../to_string/ModuloCSVLineToString.java | 4 +- .../to_string/ModuloLineToString.java | 2 +- .../to_string/Murmur3DivToString.java | 4 +- .../to_string/NumberNameToString.java | 2 +- .../to_string/StaticStringMapper.java | 2 +- .../to_string/StringDateWrapper.java | 6 +-- .../shared/from_long/to_string/Template.java | 6 +-- .../from_long/to_string/ToBase64String.java | 8 ++-- .../from_long/to_string/WeightedStrings.java | 2 +- .../to_time_types/StartingEpochMillis.java | 8 ++-- .../from_long/to_time_types/ToDate.java | 6 +-- .../from_long/to_time_types/ToDateTime.java | 8 ++-- .../to_time_types/ToEpochTimeUUID.java | 8 ++-- .../to_time_types/ToFinestTimeUUID.java | 8 ++-- .../to_time_types/ToJodaDateTime.java | 6 +-- .../joda/ToMillisAtStartOfDay.java | 8 ++-- .../joda/ToMillisAtStartOfHour.java | 8 ++-- .../joda/ToMillisAtStartOfMinute.java | 8 ++-- .../joda/ToMillisAtStartOfMonth.java | 8 ++-- .../joda/ToMillisAtStartOfNamedWeekDay.java | 8 ++-- .../joda/ToMillisAtStartOfNextDay.java | 8 ++-- .../ToMillisAtStartOfNextNamedWeekDay.java | 8 ++-- .../joda/ToMillisAtStartOfSecond.java | 8 ++-- .../joda/ToMillisAtStartOfYear.java | 8 ++-- .../shared/from_long/to_unset/Unset.java | 8 ++-- .../shared/from_long/to_unset/UnsetIfEq.java | 10 ++--- .../shared/from_long/to_unset/UnsetIfGe.java | 10 ++--- .../shared/from_long/to_unset/UnsetIfGt.java | 10 ++--- .../shared/from_long/to_unset/UnsetIfLe.java | 10 ++--- .../shared/from_long/to_unset/UnsetIfLt.java | 10 ++--- .../basics/shared/from_long/to_uuid/Expr.java | 2 +- .../from_long/to_uuid/ToHashedUUID.java | 2 +- .../shared/from_long/to_uuid/ToUUID.java | 2 +- .../basics/shared/from_string/MatchFunc.java | 10 ++--- .../basics/shared/from_string/MatchRegex.java | 4 +- .../from_string/to_epoch/DateTimeParser.java | 8 ++-- .../from_string/to_unset/NullIfEmpty.java | 6 +-- .../to_unset/NullIfNullOrEmpty.java | 8 ++-- .../from_string/to_unset/UnsetIfEmpty.java | 8 ++-- .../to_unset/UnsetIfNullOrEmpty.java | 10 ++--- .../from_string/to_unset/UnsetIfStringEq.java | 8 ++-- .../from_string/to_unset/UnsetIfStringNe.java | 8 ++-- .../basics/shared/functionadapters/Flow.java | 14 +++---- .../functionadapters/ToLongFunction.java | 6 +-- .../functionadapters/ToLongUnaryOperator.java | 6 +-- .../nondeterministic/ThreadNumToInteger.java | 4 +- .../nondeterministic/ThreadNumToLong.java | 4 +- .../nondeterministic/to_int/ThreadNum.java | 4 +- .../nondeterministic/to_long/ThreadNum.java | 2 +- .../library/basics/shared/stateful/Clear.java | 8 ++-- .../library/basics/shared/stateful/Load.java | 8 ++-- .../basics/shared/stateful/LoadDouble.java | 8 ++-- .../basics/shared/stateful/LoadElement.java | 10 ++--- .../basics/shared/stateful/LoadFloat.java | 8 ++-- .../basics/shared/stateful/LoadInteger.java | 8 ++-- .../basics/shared/stateful/LoadLong.java | 8 ++-- .../basics/shared/stateful/LoadString.java | 8 ++-- .../basics/shared/stateful/NullOrLoad.java | 6 +-- .../basics/shared/stateful/NullOrPass.java | 6 +-- .../library/basics/shared/stateful/Save.java | 8 ++-- .../basics/shared/stateful/SaveDouble.java | 8 ++-- .../basics/shared/stateful/SaveFloat.java | 8 ++-- .../basics/shared/stateful/SaveInteger.java | 8 ++-- .../basics/shared/stateful/SaveLong.java | 8 ++-- .../basics/shared/stateful/SaveString.java | 8 ++-- .../library/basics/shared/stateful/Show.java | 8 ++-- .../library/basics/shared/stateful/Swap.java | 8 ++-- .../basics/shared/stateful/UnsetOrLoad.java | 8 ++-- .../basics/shared/stateful/UnsetOrPass.java | 8 ++-- .../shared/stateful/from_long/Clear.java | 8 ++-- .../shared/stateful/from_long/Load.java | 8 ++-- .../shared/stateful/from_long/LoadDouble.java | 8 ++-- .../shared/stateful/from_long/LoadFloat.java | 8 ++-- .../stateful/from_long/LoadInteger.java | 8 ++-- .../shared/stateful/from_long/LoadLong.java | 8 ++-- .../shared/stateful/from_long/LoadString.java | 8 ++-- .../shared/stateful/from_long/Save.java | 8 ++-- .../shared/stateful/from_long/SaveDouble.java | 8 ++-- .../shared/stateful/from_long/SaveFloat.java | 8 ++-- .../stateful/from_long/SaveInteger.java | 8 ++-- .../shared/stateful/from_long/SaveLong.java | 8 ++-- .../shared/stateful/from_long/SaveString.java | 8 ++-- .../shared/stateful/from_long/Show.java | 8 ++-- .../shared/stateful/from_long/Swap.java | 8 ++-- .../library/basics/shared/unary_int/Add.java | 4 +- .../shared/unary_int/AddCycleRange.java | 2 +- .../basics/shared/unary_int/AddHashRange.java | 2 +- .../basics/shared/unary_int/Clamp.java | 4 +- .../basics/shared/unary_int/CycleRange.java | 4 +- .../library/basics/shared/unary_int/Div.java | 4 +- .../library/basics/shared/unary_int/Expr.java | 2 +- .../library/basics/shared/unary_int/Hash.java | 2 +- .../basics/shared/unary_int/HashRange.java | 2 +- .../shared/unary_int/HashRangeScaled.java | 2 +- .../basics/shared/unary_int/IntFlow.java | 6 +-- .../library/basics/shared/unary_int/Load.java | 8 ++-- .../library/basics/shared/unary_int/Max.java | 2 +- .../library/basics/shared/unary_int/Min.java | 2 +- .../library/basics/shared/unary_int/Mod.java | 2 +- .../library/basics/shared/unary_int/Mul.java | 2 +- .../library/basics/shared/unary_int/Save.java | 8 ++-- .../basics/shared/unary_int/Scale.java | 2 +- .../basics/shared/unary_int/SignedHash.java | 2 +- .../basics/shared/unary_int/ToInt.java | 6 +-- .../shared/unary_string/FieldExtractor.java | 4 +- .../basics/shared/unary_string/Load.java | 8 ++-- .../basics/shared/unary_string/Prefix.java | 4 +- .../basics/shared/unary_string/Save.java | 8 ++-- .../shared/unary_string/StringFlow.java | 6 +-- .../basics/shared/unary_string/Suffix.java | 4 +- .../shared/unary_string/ToBase64String.java | 8 ++-- .../basics/shared/unary_string/ToString.java | 2 +- .../basics/shared/unary_string/Trim.java | 2 +- .../javax.annotation.processing.Processor | 2 +- .../libraryimpl/BasicDataMappersTest.java | 6 +-- .../curves4/continuous/int_double/Beta.java | 6 +-- .../curves4/continuous/int_double/Cauchy.java | 6 +-- .../continuous/int_double/ChiSquared.java | 6 +-- .../int_double/ConstantContinuous.java | 6 +-- .../continuous/int_double/Enumerated.java | 8 ++-- .../continuous/int_double/Exponential.java | 6 +-- .../curves4/continuous/int_double/F.java | 6 +-- .../curves4/continuous/int_double/Gamma.java | 6 +-- .../curves4/continuous/int_double/Gumbel.java | 6 +-- .../continuous/int_double/Laplace.java | 6 +-- .../curves4/continuous/int_double/Levy.java | 6 +-- .../continuous/int_double/LogNormal.java | 6 +-- .../continuous/int_double/Logistic.java | 6 +-- .../continuous/int_double/Nakagami.java | 6 +-- .../curves4/continuous/int_double/Normal.java | 6 +-- .../curves4/continuous/int_double/Pareto.java | 6 +-- .../curves4/continuous/int_double/T.java | 6 +-- .../continuous/int_double/Triangular.java | 6 +-- .../continuous/int_double/Uniform.java | 6 +-- .../continuous/int_double/Weibull.java | 6 +-- .../curves4/continuous/long_double/Beta.java | 2 +- .../continuous/long_double/Cauchy.java | 2 +- .../continuous/long_double/ChiSquared.java | 2 +- .../long_double/ConstantContinuous.java | 2 +- .../continuous/long_double/Enumerated.java | 4 +- .../continuous/long_double/Exponential.java | 2 +- .../curves4/continuous/long_double/F.java | 2 +- .../curves4/continuous/long_double/Gamma.java | 2 +- .../continuous/long_double/Gumbel.java | 2 +- .../continuous/long_double/Laplace.java | 2 +- .../curves4/continuous/long_double/Levy.java | 2 +- .../continuous/long_double/LogNormal.java | 2 +- .../continuous/long_double/Logistic.java | 2 +- .../continuous/long_double/Nakagami.java | 2 +- .../continuous/long_double/Normal.java | 2 +- .../continuous/long_double/Pareto.java | 2 +- .../curves4/continuous/long_double/T.java | 2 +- .../continuous/long_double/Triangular.java | 2 +- .../continuous/long_double/Uniform.java | 2 +- .../continuous/long_double/Weibull.java | 2 +- .../curves4/discrete/int_int/Binomial.java | 6 +-- .../curves4/discrete/int_int/Geometric.java | 6 +-- .../discrete/int_int/Hypergeometric.java | 6 +-- .../curves4/discrete/int_int/Pascal.java | 6 +-- .../curves4/discrete/int_int/Poisson.java | 6 +-- .../curves4/discrete/int_int/Uniform.java | 6 +-- .../curves4/discrete/int_int/Zipf.java | 6 +-- .../curves4/discrete/int_long/Binomial.java | 2 +- .../curves4/discrete/int_long/Geometric.java | 2 +- .../discrete/int_long/Hypergeometric.java | 2 +- .../curves4/discrete/int_long/Pascal.java | 2 +- .../curves4/discrete/int_long/Poisson.java | 2 +- .../curves4/discrete/int_long/Uniform.java | 2 +- .../curves4/discrete/int_long/Zipf.java | 2 +- .../curves4/discrete/long_int/Binomial.java | 2 +- .../curves4/discrete/long_int/Geometric.java | 2 +- .../discrete/long_int/Hypergeometric.java | 2 +- .../curves4/discrete/long_int/Pascal.java | 2 +- .../curves4/discrete/long_int/Poisson.java | 2 +- .../curves4/discrete/long_int/Uniform.java | 2 +- .../curves4/discrete/long_int/Zipf.java | 2 +- .../curves4/discrete/long_long/Binomial.java | 2 +- .../curves4/discrete/long_long/Geometric.java | 2 +- .../discrete/long_long/Hypergeometric.java | 2 +- .../curves4/discrete/long_long/Pascal.java | 2 +- .../curves4/discrete/long_long/Poisson.java | 2 +- .../curves4/discrete/long_long/Uniform.java | 2 +- .../curves4/discrete/long_long/Zipf.java | 2 +- .../javax.annotation.processing.Processor | 3 +- .../RealDistributionsConcurrencyTests.java | 4 +- .../IntegerDistributionsConcurrencyTest.java | 4 +- .../random/RandomFileExtractToString.java | 2 +- .../library/random/RandomLineToInt.java | 2 +- .../library/random/RandomLineToString.java | 2 +- .../library/random/RandomLineToStringMap.java | 2 +- .../random/RandomLinesToKeyValueString.java | 2 +- .../library/random/RandomLongToString.java | 2 +- .../random/RandomLoremExtractToString.java | 2 +- .../library/random/RandomRangedToDouble.java | 4 +- .../library/random/RandomRangedToInt.java | 2 +- .../library/random/RandomRangedToLong.java | 2 +- .../library/random/RandomRangedToString.java | 2 +- .../library/random/RandomToByteBuffer.java | 2 +- .../javax.annotation.processing.Processor | 3 +- .../virtdata/library/realer/FirstNames.java | 8 ++-- .../virtdata/library/realer/FullNames.java | 6 +-- .../virtdata/library/realer/LastNames.java | 8 ++-- .../javax.annotation.processing.Processor | 3 +- virtdata-processors/pom.xml | 39 ------------------- .../javax.annotation.processing.Processor | 3 +- .../userlibs/apps/VirtDataService.java | 6 +-- .../userlibs/apps/docsapp/AutoDocsApp.java | 6 +-- .../userlibs/apps/docsapp/AutoDocsJson.java | 2 +- .../apps/docsapp/AutoDocsWebService.java | 4 +- .../userlibs/apps/docsapp/fdocs/FDocCtor.java | 2 +- .../userlibs/apps/docsapp/fdocs/FDocFunc.java | 6 +-- .../apps/docsapp/fdocs/FDocFuncs.java | 2 +- .../valuesapp/ValuesCheckerCoordinator.java | 6 +-- .../apps/valuesapp/ValuesCheckerRunnable.java | 4 +- .../javax.annotation.processing.Processor | 3 +- .../core/VirtDataDocsIntegratedTest.java | 4 +- .../apps/docsapp/fdocs/ExampleDocFunc1.java | 6 +-- .../apps/docsapp/fdocs/ExampleDocFunc2.java | 6 +-- .../io/virtdata/IntegratedBindingsTest.java | 6 +-- .../IntegratedComposerLibraryTest.java | 10 ++--- .../virtdata/IntegratedComposerLogicTest.java | 4 +- .../io/virtdata/IntegratedCurvesTest.java | 4 +- .../io/virtdata/IntegratedRealerTests.java | 4 +- .../IntegratedStringCompositorTest.java | 6 +-- .../IntegratedTemporalExamplesTest.java | 4 +- 544 files changed, 1304 insertions(+), 1356 deletions(-) delete mode 100644 virtdata-annotations/pom.xml rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/annotations/Categories.java (87%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/annotations/Category.java (77%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/annotations/DeprecatedFunction.java (94%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/annotations/Description.java (85%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/annotations/Example.java (88%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/annotations/ExampleData.java (98%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/annotations/Examples.java (85%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/annotations/Input.java (95%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/annotations/Output.java (95%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/annotations/PerThreadMapper.java (95%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/annotations/Range.java (94%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/annotations/See.java (94%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/annotations/SeeList.java (87%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/annotations/ThreadSafeMapper.java (95%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/processors/DocCtorData.java (92%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/processors/DocForFunc.java (95%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/processors/DocForFuncCtor.java (92%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/processors/DocFuncData.java (92%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/processors/ExampleDocData.java (95%) rename {virtdata-annotations/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/processors/ExampleManifest.java (95%) rename {virtdata-processors/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/processors/FuncEnumerator.java (95%) rename {virtdata-processors/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/processors/FunctionDocInfoProcessor.java (91%) rename {virtdata-processors/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/processors/FunctionDocInfoWriter.java (97%) rename {virtdata-processors/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/processors/FunctionManifestProcessor.java (87%) rename {virtdata-processors/src/main/java/io/nosqlbench/virtdata => virtdata-api/src/main/java/io/nosqlbench/virtdata/api}/processors/ProcessorClassNames.java (88%) delete mode 100644 virtdata-core/docs/types.puml rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/Binder.java (89%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/Bindings.java (99%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/BindingsCache.java (97%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/BindingsTemplate.java (98%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/CompatibilityFixups.java (98%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/ContextualArrayBindings.java (97%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/ContextualBindings.java (97%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/ContextualBindingsArrayTemplate.java (96%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/ContextualBindingsTemplate.java (96%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/ContextualMapBindings.java (97%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/DataMapper.java (56%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/DataMapperFunctionMapper.java (96%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/DataMapperLibrary.java (99%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/DataMapperLibraryFinder.java (97%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/FunctionType.java (98%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/FunctionTyper.java (97%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/LazyValuesMap.java (98%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/Named.java (81%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/ResolvedFunction.java (99%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/ResolverDiagnostics.java (97%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/StringObjectPromoter.java (99%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/VALUE.java (87%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/ValueType.java (98%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/ValuesArrayBinder.java (92%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/ValuesBinder.java (95%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/ValuesMapBinder.java (95%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/VirtData.java (99%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/VirtDataComposer.java (99%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/VirtDataDocs.java (81%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/VirtDataFunctionFinder.java (85%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/VirtDataFunctionLibrary.java (99%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/VirtDataFunctionResolver.java (98%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/VirtDataFunctions.java (99%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/VirtDataLibraries.java (96%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core/bindings}/VirtDataLibrary.java (88%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/composers/ComposerForDoubleFunction.java (98%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/composers/ComposerForDoubleToIntFunction.java (97%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/composers/ComposerForDoubleToLongFunction.java (97%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/composers/ComposerForDoubleUnaryOperator.java (97%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/composers/ComposerForFunction.java (99%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/composers/ComposerForIntFunction.java (99%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/composers/ComposerForIntToDoubleFunction.java (97%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/composers/ComposerForIntToLongFunction.java (97%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/composers/ComposerForIntUnaryOperator.java (97%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/composers/ComposerForLongFunction.java (99%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/composers/ComposerForLongToDoubleFunction.java (97%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/composers/ComposerForLongToIntFunction.java (97%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/composers/ComposerForLongUnaryOperator.java (97%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/composers/FunctionAssembly.java (96%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/composers/FunctionComposer.java (72%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/config/ConfigAware.java (75%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/config/ConfigModel.java (88%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/config/MutableConfigModel.java (93%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/templates/BindPoint.java (95%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/templates/CSVBindings.java (80%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/templates/CSVBindingsTemplate.java (68%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/templates/ParsedTemplate.java (99%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/templates/StringBindings.java (83%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/templates/StringBindingsTemplate.java (88%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/templates/StringCompositor.java (96%) rename virtdata-core/src/main/java/io/nosqlbench/virtdata/{api => core}/templates/StringMapCompositor.java (96%) rename virtdata-core/src/test/java/io/nosqlbench/virtdata/{ => core}/composers/FunctionAssemblerMatrixTest.java (96%) rename virtdata-core/src/test/java/io/nosqlbench/virtdata/{ => core}/composers/FunctionAssemblerTest.java (94%) rename virtdata-core/src/test/java/io/nosqlbench/virtdata/{api => core}/templates/ParsedTemplateTest.java (96%) rename virtdata-core/src/test/java/io/nosqlbench/virtdata/{api => core}/templates/StringBindingsTemplateTest.java (69%) rename virtdata-core/src/test/java/io/nosqlbench/virtdata/{api => core}/templates/StringCompositorTest.java (88%) rename virtdata-core/src/test/java/io/nosqlbench/virtdata/{api => core/templates}/ValueTypeTest.java (73%) delete mode 100644 virtdata-processors/pom.xml diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collectionclobs/StringMapClob.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collectionclobs/StringMapClob.java index 7ad2b24ac..a3e3b8b52 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collectionclobs/StringMapClob.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collectionclobs/StringMapClob.java @@ -1,9 +1,9 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.collectionclobs; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; import java.util.function.LongToIntFunction; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collections/ListMapper.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collections/ListMapper.java index 8c21a50cc..3b3ae5e13 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collections/ListMapper.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collections/ListMapper.java @@ -1,9 +1,9 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.collections; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.DataMapper; -import io.nosqlbench.virtdata.api.VirtData; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.DataMapper; +import io.nosqlbench.virtdata.core.bindings.VirtData; import java.util.ArrayList; import java.util.List; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/contrib/WrappedClustering.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/contrib/WrappedClustering.java index 59bcf2207..e02431297 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/contrib/WrappedClustering.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/contrib/WrappedClustering.java @@ -1,7 +1,7 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.contrib; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntUnaryOperator; @@ -20,4 +20,4 @@ public class WrappedClustering implements IntUnaryOperator { else return (int) (integerMin - (sign * (longOperandTimes15 % integerMax))); } -} \ No newline at end of file +} diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/diagnostics/ToCqlType.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/diagnostics/ToCqlType.java index afce8c7a7..4483a4351 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/diagnostics/ToCqlType.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/diagnostics/ToCqlType.java @@ -4,7 +4,7 @@ import com.datastax.driver.core.DataType; import com.datastax.driver.core.LocalDate; import com.datastax.driver.core.TupleValue; import com.datastax.driver.core.UDTValue; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Distance.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Distance.java index 1121621f0..c77628f7f 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Distance.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Distance.java @@ -1,7 +1,7 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.geometry; import com.datastax.driver.dse.geometry.Point; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; import java.util.function.LongToDoubleFunction; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/LineString.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/LineString.java index fd7c7c077..4eee5dc41 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/LineString.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/LineString.java @@ -2,7 +2,7 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.geometry; //import com.datastax.driver.dse.geometry.Point; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; import java.util.function.LongToDoubleFunction; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Point.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Point.java index 27d08695d..d699b759f 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Point.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Point.java @@ -1,6 +1,6 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.geometry; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; import java.util.function.LongToDoubleFunction; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Polygon.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Polygon.java index 3dd4635df..e29e61ca1 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Polygon.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Polygon.java @@ -1,7 +1,7 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.geometry; import com.datastax.driver.dse.geometry.Point; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; import java.util.function.LongToDoubleFunction; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/PolygonOnGrid.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/PolygonOnGrid.java index 381d7c659..6fdf02413 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/PolygonOnGrid.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/PolygonOnGrid.java @@ -2,8 +2,8 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.geometry; import com.datastax.driver.dse.geometry.Point; import com.datastax.driver.dse.geometry.Polygon; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.curves4.discrete.long_int.Uniform; import java.util.function.LongFunction; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToCqlLocalDate.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToCqlLocalDate.java index 8cd48667b..11aae6320 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToCqlLocalDate.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToCqlLocalDate.java @@ -1,8 +1,8 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.long_localdate; import com.datastax.driver.core.LocalDate; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDate.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDate.java index 0c4b3a39b..656d72176 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDate.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDate.java @@ -1,7 +1,7 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.long_localdate; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.time.Instant; import java.time.LocalDate; @@ -18,7 +18,7 @@ import java.util.function.LongFunction; * Short form ZoneId values like 'CST' can be used, although US Domestic names * which specify the daylight savings hours are not supported. The full list of * short Ids at @see JavaSE ZoneId Ids - * + * * Any timezone specifier may be used which can be read by {@link ZoneId#of(String)} */ @ThreadSafeMapper diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTime.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTime.java index 40eeaa2c2..8df7c36bf 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTime.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTime.java @@ -1,7 +1,7 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.long_localdate; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.time.Instant; import java.time.LocalDateTime; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/LongToLocalDateDays.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/LongToLocalDateDays.java index c72f958ba..43d2c51ef 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/LongToLocalDateDays.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/LongToLocalDateDays.java @@ -1,8 +1,8 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.long_localdate; import com.datastax.driver.core.LocalDate; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; @@ -15,7 +15,7 @@ public class LongToLocalDateDays implements LongFunction { public LocalDate apply(long value) { return LocalDate.fromDaysSinceEpoch((int) value % Integer.MAX_VALUE); } - + @Example({"LongToLocalDateDays()","take the cycle number and turn it into a LocalDate based on days since 1970"}) public LongToLocalDateDays (){ } 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 642e5f2ea..2119bf49a 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 @@ -19,8 +19,8 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.long_string; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.nb.api.VirtDataResources; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.ModuloLineToString; import org.apache.commons.csv.CSVParser; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMax.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMax.java index 4bf84f07f..88e593938 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMax.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMax.java @@ -1,9 +1,9 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.long_uuid; import com.datastax.driver.core.utils.UUIDs; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.UUID; import java.util.function.LongFunction; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMin.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMin.java index 30211884f..91755bd36 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMin.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMin.java @@ -1,9 +1,9 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.long_uuid; import com.datastax.driver.core.utils.UUIDs; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.UUID; import java.util.function.LongFunction; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileCycle.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileCycle.java index 25464df2d..6505a6516 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileCycle.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileCycle.java @@ -1,6 +1,6 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.rainbow; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; @ThreadSafeMapper public class TokenMapFileCycle extends TokenMapFileBaseFunction { diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextCycle.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextCycle.java index 7ae205ca6..a995a7d32 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextCycle.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextCycle.java @@ -1,6 +1,6 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.rainbow; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; @ThreadSafeMapper public class TokenMapFileNextCycle extends TokenMapFileBaseFunction { diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextToken.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextToken.java index 503ccb95e..3c3d23338 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextToken.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextToken.java @@ -1,6 +1,6 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.rainbow; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; @ThreadSafeMapper public class TokenMapFileNextToken extends TokenMapFileBaseFunction { diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileToken.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileToken.java index f453351c2..82af07c55 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileToken.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileToken.java @@ -1,6 +1,6 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.rainbow; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; @ThreadSafeMapper public class TokenMapFileToken extends TokenMapFileBaseFunction { diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/string_string/SnappyComp.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/string_string/SnappyComp.java index f32799299..a7e9a7577 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/string_string/SnappyComp.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/string_string/SnappyComp.java @@ -1,6 +1,6 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.string_string; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.xerial.snappy.Snappy; import java.io.IOException; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeDuring.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeDuring.java index db41b496f..05f5f7d11 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeDuring.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeDuring.java @@ -1,10 +1,10 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.to_daterange; import com.datastax.driver.dse.search.DateRange; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.Date; import java.util.function.Function; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFunc.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFunc.java index 489060f14..b17329deb 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFunc.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFunc.java @@ -1,10 +1,10 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.to_daterange; import com.datastax.driver.dse.search.DateRange; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.Date; import java.util.function.Function; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrAfter.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrAfter.java index 37c54ca02..437ddcb06 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrAfter.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrAfter.java @@ -1,10 +1,10 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.to_daterange; import com.datastax.driver.dse.search.DateRange; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.Date; import java.util.function.Function; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrBefore.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrBefore.java index cb167d806..9576b17c6 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrBefore.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrBefore.java @@ -1,10 +1,10 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.to_daterange; import com.datastax.driver.dse.search.DateRange; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.Date; import java.util.function.Function; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeParser.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeParser.java index 6f5b3bd5e..015652dfd 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeParser.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeParser.java @@ -1,10 +1,10 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.to_daterange; import com.datastax.driver.dse.search.DateRange; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.text.ParseException; import java.util.Date; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/CqlBinderTypes.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/CqlBinderTypes.java index df7939a4e..c1a017d17 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/CqlBinderTypes.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/CqlBinderTypes.java @@ -3,7 +3,7 @@ package io.nosqlbench.activitytype.cql.statements.binders; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; import com.datastax.driver.core.Statement; -import io.nosqlbench.virtdata.api.ValuesArrayBinder; +import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder; public enum CqlBinderTypes { direct_array, diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DiagnosticPreparedBinder.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DiagnosticPreparedBinder.java index 3510d5f87..2c7a2fe2f 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DiagnosticPreparedBinder.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DiagnosticPreparedBinder.java @@ -2,7 +2,7 @@ package io.nosqlbench.activitytype.cql.statements.binders; import com.datastax.driver.core.*; import io.nosqlbench.activitytype.cql.core.CQLBindHelper; -import io.nosqlbench.virtdata.api.ValuesArrayBinder; +import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DirectArrayValuesBinder.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DirectArrayValuesBinder.java index c4ac9655d..7d9a1aa3b 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DirectArrayValuesBinder.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DirectArrayValuesBinder.java @@ -2,7 +2,7 @@ package io.nosqlbench.activitytype.cql.statements.binders; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Statement; -import io.nosqlbench.virtdata.api.ValuesArrayBinder; +import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/SimpleStatementValuesBinder.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/SimpleStatementValuesBinder.java index 5418cf6bf..3b89e254c 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/SimpleStatementValuesBinder.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/SimpleStatementValuesBinder.java @@ -2,7 +2,7 @@ package io.nosqlbench.activitytype.cql.statements.binders; import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; -import io.nosqlbench.virtdata.api.ValuesArrayBinder; +import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder; /** * This binder is not meant to be used with anything but DDL or statements diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/UnsettableValuesBinder.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/UnsettableValuesBinder.java index 3a5d95a34..b8f8dbcfc 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/UnsettableValuesBinder.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/UnsettableValuesBinder.java @@ -1,8 +1,8 @@ package io.nosqlbench.activitytype.cql.statements.binders; import com.datastax.driver.core.*; -import io.nosqlbench.virtdata.api.VALUE; -import io.nosqlbench.virtdata.api.ValuesArrayBinder; +import io.nosqlbench.virtdata.core.bindings.VALUE; +import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatement.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatement.java index 74dc0c094..c70681cea 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatement.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatement.java @@ -7,7 +7,7 @@ import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator; import io.nosqlbench.activitytype.cql.api.RowCycleOperator; -import io.nosqlbench.virtdata.api.ContextualArrayBindings; +import io.nosqlbench.virtdata.core.bindings.ContextualArrayBindings; import java.io.IOException; import java.io.Writer; diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementTemplate.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementTemplate.java index 9f761bb01..c529e7d24 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementTemplate.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementTemplate.java @@ -12,9 +12,9 @@ import io.nosqlbench.activitytype.cql.core.CqlActivity; import io.nosqlbench.activitytype.cql.statements.binders.CqlBinderTypes; import io.nosqlbench.activitytype.cql.statements.binders.SimpleStatementValuesBinder; import io.nosqlbench.engine.api.metrics.ActivityMetrics; -import io.nosqlbench.virtdata.api.BindingsTemplate; -import io.nosqlbench.virtdata.api.ContextualBindingsArrayTemplate; -import io.nosqlbench.virtdata.api.ValuesArrayBinder; +import io.nosqlbench.virtdata.core.bindings.BindingsTemplate; +import io.nosqlbench.virtdata.core.bindings.ContextualBindingsArrayTemplate; +import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activitytype-cql/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/activitytype-cql/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 77f0797f1..fcb692d9f 100644 --- a/activitytype-cql/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/activitytype-cql/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,3 @@ -io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor +io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor + io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java b/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java index e11393123..195dc4064 100644 --- a/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java +++ b/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java @@ -3,8 +3,8 @@ package io.nosqlbench.activitytype.cqlverify; import io.nosqlbench.activitytype.cql.core.CqlActivity; import io.nosqlbench.activitytype.cql.statements.rsoperators.AssertSingleRowResultSet; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import io.nosqlbench.virtdata.api.Bindings; -import io.nosqlbench.virtdata.api.BindingsTemplate; +import io.nosqlbench.virtdata.core.bindings.Bindings; +import io.nosqlbench.virtdata.core.bindings.BindingsTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/RowDifferencer.java b/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/RowDifferencer.java index edf593da4..349ec476c 100644 --- a/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/RowDifferencer.java +++ b/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/RowDifferencer.java @@ -3,7 +3,7 @@ package io.nosqlbench.activitytype.cqlverify; import com.datastax.driver.core.*; import io.nosqlbench.activitytype.cql.api.RowCycleOperator; import io.nosqlbench.activitytype.cql.errorhandling.exceptions.RowVerificationException; -import io.nosqlbench.virtdata.api.Bindings; +import io.nosqlbench.virtdata.core.bindings.Bindings; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivity.java b/activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivity.java index cd76e02d4..182f000b1 100644 --- a/activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivity.java +++ b/activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivity.java @@ -24,7 +24,7 @@ import io.nosqlbench.engine.api.activityapi.ratelimits.RateSpec; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityimpl.SimpleActivity; import io.nosqlbench.engine.api.metrics.ActivityMetrics; -import io.nosqlbench.virtdata.api.VirtData; +import io.nosqlbench.virtdata.core.bindings.VirtData; import java.util.function.LongToIntFunction; import java.util.function.LongUnaryOperator; diff --git a/activitytype-diag/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/activitytype-diag/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 77f0797f1..fcb692d9f 100644 --- a/activitytype-diag/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/activitytype-diag/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,3 @@ -io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor +io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor + io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java b/activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java index 226cb1204..f29011b85 100644 --- a/activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java +++ b/activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java @@ -4,7 +4,7 @@ import com.codahale.metrics.Timer; import io.nosqlbench.engine.api.activityapi.core.SyncAction; import io.nosqlbench.engine.api.activityapi.planning.OpSequence; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import io.nosqlbench.virtdata.api.templates.StringBindings; +import io.nosqlbench.virtdata.core.templates.StringBindings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -122,4 +122,4 @@ public class HttpAction implements SyncAction { protected HttpActivity getHttpActivity() { return httpActivity; } -} \ No newline at end of file +} diff --git a/activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivity.java b/activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivity.java index a152c1094..92efdf41b 100644 --- a/activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivity.java +++ b/activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivity.java @@ -15,9 +15,9 @@ import io.nosqlbench.engine.api.activityapi.planning.SequencerType; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityimpl.SimpleActivity; import io.nosqlbench.engine.api.metrics.ActivityMetrics; -import io.nosqlbench.virtdata.api.BindingsTemplate; -import io.nosqlbench.virtdata.api.templates.StringBindings; -import io.nosqlbench.virtdata.api.templates.StringBindingsTemplate; +import io.nosqlbench.virtdata.core.bindings.BindingsTemplate; +import io.nosqlbench.virtdata.core.templates.StringBindings; +import io.nosqlbench.virtdata.core.templates.StringBindingsTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/AsyncStdoutAction.java b/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/AsyncStdoutAction.java index d38cb88ab..67f2f91b6 100644 --- a/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/AsyncStdoutAction.java +++ b/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/AsyncStdoutAction.java @@ -6,7 +6,7 @@ import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.StartedOp; import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.TrackedOp; import io.nosqlbench.engine.api.activityapi.planning.OpSequence; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import io.nosqlbench.virtdata.api.templates.StringBindings; +import io.nosqlbench.virtdata.core.templates.StringBindings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutAction.java b/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutAction.java index 2233fb8f8..14ff703a6 100644 --- a/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutAction.java +++ b/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutAction.java @@ -20,7 +20,7 @@ package io.nosqlbench.activitytype.stdout; import com.codahale.metrics.Timer; import io.nosqlbench.engine.api.activityapi.core.SyncAction; import io.nosqlbench.engine.api.activityapi.planning.OpSequence; -import io.nosqlbench.virtdata.api.templates.StringBindings; +import io.nosqlbench.virtdata.core.templates.StringBindings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,4 +65,4 @@ public class StdoutAction implements SyncAction { return 0; } -} \ No newline at end of file +} diff --git a/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivity.java b/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivity.java index 71bb7f3bc..1dcdb2570 100644 --- a/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivity.java +++ b/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivity.java @@ -33,9 +33,9 @@ import io.nosqlbench.engine.api.activityimpl.SimpleActivity; import io.nosqlbench.engine.api.metrics.ActivityMetrics; import io.nosqlbench.engine.api.metrics.ExceptionMeterMetrics; import io.nosqlbench.engine.api.util.StrInterpolator; -import io.nosqlbench.virtdata.api.BindingsTemplate; -import io.nosqlbench.virtdata.api.templates.StringBindings; -import io.nosqlbench.virtdata.api.templates.StringBindingsTemplate; +import io.nosqlbench.virtdata.core.bindings.BindingsTemplate; +import io.nosqlbench.virtdata.core.templates.StringBindings; +import io.nosqlbench.virtdata.core.templates.StringBindingsTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutOpContext.java b/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutOpContext.java index 69dc5d89c..f4931c7d1 100644 --- a/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutOpContext.java +++ b/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutOpContext.java @@ -1,6 +1,6 @@ package io.nosqlbench.activitytype.stdout; -import io.nosqlbench.virtdata.api.templates.StringBindings; +import io.nosqlbench.virtdata.core.templates.StringBindings; public class StdoutOpContext { StringBindings stringBindings; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/ParsedStmt.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/ParsedStmt.java index 6b2938dff..0e2f5e73b 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/ParsedStmt.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/ParsedStmt.java @@ -18,8 +18,8 @@ package io.nosqlbench.engine.api.activityconfig; import io.nosqlbench.engine.api.activityconfig.yaml.StmtDef; -import io.nosqlbench.virtdata.api.templates.BindPoint; -import io.nosqlbench.virtdata.api.templates.ParsedTemplate; +import io.nosqlbench.virtdata.core.templates.BindPoint; +import io.nosqlbench.virtdata.core.templates.ParsedTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BindingEscapingTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BindingEscapingTest.java index fae41ae11..a1abf0750 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BindingEscapingTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BindingEscapingTest.java @@ -17,8 +17,8 @@ package io.nosqlbench.engine.api.activityconfig.rawyaml; -import io.nosqlbench.virtdata.api.DataMapper; -import io.nosqlbench.virtdata.api.VirtData; +import io.nosqlbench.virtdata.core.bindings.DataMapper; +import io.nosqlbench.virtdata.core.bindings.VirtData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.junit.Test; diff --git a/engine-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/engine-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 77f0797f1..fcb692d9f 100644 --- a/engine-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/engine-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,3 @@ -io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor +io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor + io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/engine-extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/engine-extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 77f0797f1..fcb692d9f 100644 --- a/engine-extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/engine-extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,3 @@ -io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor +io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor + io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/nb/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/nb/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 77f0797f1..fcb692d9f 100644 --- a/nb/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/nb/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,3 @@ -io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor +io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor + io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/pom.xml b/pom.xml index 82b64af38..3231d2311 100644 --- a/pom.xml +++ b/pom.xml @@ -45,8 +45,6 @@ virtdata-api - virtdata-annotations - virtdata-processors virtdata-lang virtdata-core virtdata-realdata diff --git a/virtdata-annotations/pom.xml b/virtdata-annotations/pom.xml deleted file mode 100644 index 61b2be3f4..000000000 --- a/virtdata-annotations/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - 4.0.0 - - virtdata-annotations - jar - - - mvn-defaults - io.nosqlbench - 3.12.73-SNAPSHOT - ../mvn-defaults - - - virtdata-annotations - - diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index b1e900d86..d27f90e92 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -27,16 +27,6 @@ 3.12.73-SNAPSHOT - - io.nosqlbench - virtdata-processors - 3.12.73-SNAPSHOT - - - - - - io.nosqlbench virtdata-lang @@ -61,6 +51,11 @@ test + + com.squareup + javapoet + + diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Categories.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Categories.java similarity index 87% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Categories.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Categories.java index 1bad865e0..a995d0ec3 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Categories.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Categories.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.annotations; +package io.nosqlbench.virtdata.api.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Category.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Category.java similarity index 77% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Category.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Category.java index 33c61b019..78d641bda 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Category.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Category.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.annotations; +package io.nosqlbench.virtdata.api.annotations; public enum Category { datetime, diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/DeprecatedFunction.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/DeprecatedFunction.java similarity index 94% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/DeprecatedFunction.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/DeprecatedFunction.java index 79f623696..019a54453 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/DeprecatedFunction.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/DeprecatedFunction.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.annotations;/* +package io.nosqlbench.virtdata.api.annotations;/* * Copyright 2016 jshook * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Description.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Description.java similarity index 85% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Description.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Description.java index 3285bb7e6..2c719e13b 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Description.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Description.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.annotations; +package io.nosqlbench.virtdata.api.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Example.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Example.java similarity index 88% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Example.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Example.java index 5e4c62c55..4c36832d8 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Example.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Example.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.annotations; +package io.nosqlbench.virtdata.api.annotations; import java.lang.annotation.Repeatable; diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/ExampleData.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ExampleData.java similarity index 98% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/ExampleData.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ExampleData.java index ad0c02e06..9ab73c2b0 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/ExampleData.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ExampleData.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.annotations; +package io.nosqlbench.virtdata.api.annotations; import java.util.Arrays; import java.util.List; diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Examples.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Examples.java similarity index 85% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Examples.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Examples.java index a96ce04f3..7394378e7 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Examples.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Examples.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.annotations; +package io.nosqlbench.virtdata.api.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Input.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Input.java similarity index 95% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Input.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Input.java index 5a99a563d..d45c6b54e 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Input.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Input.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.annotations;/* +package io.nosqlbench.virtdata.api.annotations;/* * Copyright 2016 jshook * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Output.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Output.java similarity index 95% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Output.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Output.java index c3af2bbf9..f2ddf33e2 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Output.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Output.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.annotations;/* +package io.nosqlbench.virtdata.api.annotations;/* * Copyright 2016 jshook * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/PerThreadMapper.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/PerThreadMapper.java similarity index 95% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/PerThreadMapper.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/PerThreadMapper.java index ac68e48d6..cce4b2f38 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/PerThreadMapper.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/PerThreadMapper.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.annotations;/* +package io.nosqlbench.virtdata.api.annotations;/* * Copyright 2016 jshook * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Range.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Range.java similarity index 94% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Range.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Range.java index 5d0502d6e..c01663c61 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/Range.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Range.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.annotations; +package io.nosqlbench.virtdata.api.annotations; public enum Range { NonNegativeLongs("All positive long values and zero: 0L.." + Long.MAX_VALUE), diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/See.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/See.java similarity index 94% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/See.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/See.java index 1d220454b..5a2fe8eff 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/See.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/See.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package io.nosqlbench.virtdata.annotations; +package io.nosqlbench.virtdata.api.annotations; import java.lang.annotation.*; diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/SeeList.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/SeeList.java similarity index 87% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/SeeList.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/SeeList.java index 713f40b14..62d57df79 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/SeeList.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/SeeList.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.annotations; +package io.nosqlbench.virtdata.api.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/ThreadSafeMapper.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ThreadSafeMapper.java similarity index 95% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/ThreadSafeMapper.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ThreadSafeMapper.java index cd70d7ab6..7e5e624e9 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/annotations/ThreadSafeMapper.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ThreadSafeMapper.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.annotations;/* +package io.nosqlbench.virtdata.api.annotations;/* * Copyright 2016 jshook * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/DocCtorData.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocCtorData.java similarity index 92% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/DocCtorData.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocCtorData.java index 03d4f7e74..073a33dd7 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/DocCtorData.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocCtorData.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.processors; +package io.nosqlbench.virtdata.api.processors; import java.util.List; import java.util.Map; diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/DocForFunc.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFunc.java similarity index 95% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/DocForFunc.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFunc.java index 50c432fee..da67d24fc 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/DocForFunc.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFunc.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.processors; +package io.nosqlbench.virtdata.api.processors; -import io.nosqlbench.virtdata.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Category; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/DocForFuncCtor.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFuncCtor.java similarity index 92% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/DocForFuncCtor.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFuncCtor.java index 308d59edb..2fb40ead4 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/DocForFuncCtor.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFuncCtor.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.processors; +package io.nosqlbench.virtdata.api.processors; -import io.nosqlbench.virtdata.annotations.ExampleData; +import io.nosqlbench.virtdata.api.annotations.ExampleData; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/DocFuncData.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocFuncData.java similarity index 92% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/DocFuncData.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocFuncData.java index d921c7d7d..0ee0a2853 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/DocFuncData.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocFuncData.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.processors; +package io.nosqlbench.virtdata.api.processors; -import io.nosqlbench.virtdata.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Category; import java.util.List; diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/ExampleDocData.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleDocData.java similarity index 95% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/ExampleDocData.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleDocData.java index 65c1e28d5..27577e902 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/ExampleDocData.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleDocData.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.processors; +package io.nosqlbench.virtdata.api.processors; -import io.nosqlbench.virtdata.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Category; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/ExampleManifest.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleManifest.java similarity index 95% rename from virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/ExampleManifest.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleManifest.java index f206e80e6..18fd78b84 100644 --- a/virtdata-annotations/src/main/java/io/nosqlbench/virtdata/processors/ExampleManifest.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleManifest.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.processors; +package io.nosqlbench.virtdata.api.processors; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FuncEnumerator.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FuncEnumerator.java similarity index 95% rename from virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FuncEnumerator.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FuncEnumerator.java index fce938b0a..e20763e5d 100644 --- a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FuncEnumerator.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FuncEnumerator.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.processors; +package io.nosqlbench.virtdata.api.processors; -import io.nosqlbench.virtdata.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Category; import javax.annotation.processing.Filer; import javax.lang.model.util.Elements; diff --git a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FunctionDocInfoProcessor.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoProcessor.java similarity index 91% rename from virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FunctionDocInfoProcessor.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoProcessor.java index 697723561..e72d0c1aa 100644 --- a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FunctionDocInfoProcessor.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoProcessor.java @@ -1,7 +1,12 @@ -package io.nosqlbench.virtdata.processors; -//io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor -//io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor -import io.nosqlbench.virtdata.annotations.*; +package io.nosqlbench.virtdata.api.processors; +//io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor + +//io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor + + +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; import javax.annotation.processing.*; import javax.lang.model.SourceVersion; @@ -13,10 +18,8 @@ import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static io.nosqlbench.virtdata.processors.ProcessorClassNames.PerThreadMapper; -import static io.nosqlbench.virtdata.processors.ProcessorClassNames.ThreadSafeMapper; - -/** +import static io.nosqlbench.virtdata.api.processors.ProcessorClassNames.PerThreadMapper; +import static io.nosqlbench.virtdata.api.processors.ProcessorClassNames.ThreadSafeMapper;/** * This documentation processor is responsible for finding all the enumerated that feed documentation * manifests. It simply calls listener interfaces to do the rest of the work. */ @@ -61,8 +64,8 @@ public class FunctionDocInfoProcessor extends AbstractProcessor { List ts = new ArrayList<>(); - ts.addAll(roundEnv.getElementsAnnotatedWith(ThreadSafeMapper.class)); - ts.addAll(roundEnv.getElementsAnnotatedWith(PerThreadMapper.class)); + ts.addAll(roundEnv.getElementsAnnotatedWith(io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper.class)); + ts.addAll(roundEnv.getElementsAnnotatedWith(io.nosqlbench.virtdata.api.annotations.PerThreadMapper.class)); for (Element classElem : ts) { diff --git a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FunctionDocInfoWriter.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoWriter.java similarity index 97% rename from virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FunctionDocInfoWriter.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoWriter.java index d074819f3..b6da257c4 100644 --- a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FunctionDocInfoWriter.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoWriter.java @@ -1,8 +1,8 @@ -package io.nosqlbench.virtdata.processors; +package io.nosqlbench.virtdata.api.processors; import com.squareup.javapoet.*; import io.nosqlbench.nb.api.annotations.Service; -import io.nosqlbench.virtdata.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Category; import javax.annotation.processing.Filer; import javax.annotation.processing.Messager; @@ -115,7 +115,7 @@ public class FunctionDocInfoWriter implements FuncEnumerator.Listener { .returns(ArrayTypeName.of(Category.class)) .addStatement("return new $T[] { " + Arrays.stream(doc.getCategories()).map(c -> "Category." + c) - .collect(Collectors.joining(","))+" }",Category.class).build(); + .collect(Collectors.joining(","))+" }", Category.class).build(); methods.add(getCategoriesMethod); MethodSpec getCtorsMethod = MethodSpec.methodBuilder("getCtors") diff --git a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FunctionManifestProcessor.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java similarity index 87% rename from virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FunctionManifestProcessor.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java index db3d8f2c3..e917b514d 100644 --- a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/FunctionManifestProcessor.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.processors; +package io.nosqlbench.virtdata.api.processors; import javax.annotation.processing.*; import javax.lang.model.SourceVersion; @@ -12,14 +12,14 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import static io.nosqlbench.virtdata.processors.ProcessorClassNames.PerThreadMapper; -import static io.nosqlbench.virtdata.processors.ProcessorClassNames.ThreadSafeMapper; +import static io.nosqlbench.virtdata.api.processors.ProcessorClassNames.PerThreadMapper; +import static io.nosqlbench.virtdata.api.processors.ProcessorClassNames.ThreadSafeMapper; /** * This annotation processor is responsible for finding all annotated functions and adding * them to the manifest file for the current project. - * Specifically, any class annotated as {@link io.nosqlbench.virtdata.annotations.ThreadSafeMapper} - * or {@link io.nosqlbench.virtdata.annotations.PerThreadMapper} are recorded in + * Specifically, any class annotated as {@link io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper} + * or {@link io.nosqlbench.virtdata.api.annotations.PerThreadMapper} are recorded in * 
classes/META-INF/functions
* * This operates slightly differently than the service loader facility. The point is to diff --git a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/ProcessorClassNames.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ProcessorClassNames.java similarity index 88% rename from virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/ProcessorClassNames.java rename to virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ProcessorClassNames.java index 38f2f26e6..c19a3c5ef 100644 --- a/virtdata-processors/src/main/java/io/nosqlbench/virtdata/processors/ProcessorClassNames.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ProcessorClassNames.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.processors; +package io.nosqlbench.virtdata.api.processors; /** * Statically defined names which need to be visible for refactoring diff --git a/virtdata-core/docs/types.puml b/virtdata-core/docs/types.puml deleted file mode 100644 index 9a9b8c2d1..000000000 --- a/virtdata-core/docs/types.puml +++ /dev/null @@ -1,13 +0,0 @@ -@startuml -scale 350 width -[*] --> long -long --> long -long --> int -long --> double -int --> String -double --> String -long --> String -long --> Date -long --> Bytes -long --> T -@enduml \ No newline at end of file diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Binder.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/Binder.java similarity index 89% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Binder.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/Binder.java index d52396f45..341b827c4 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Binder.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/Binder.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; /*** * A Binder is a type that knows how to return a result object given a long value diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Bindings.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/Bindings.java similarity index 99% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Bindings.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/Bindings.java index da61a9ae3..9693df751 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Bindings.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/Bindings.java @@ -16,7 +16,7 @@ * */ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; // diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsCache.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsCache.java similarity index 97% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsCache.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsCache.java index 5f459f8f1..0747b2920 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsCache.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsCache.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; import java.util.HashMap; import java.util.Map; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsTemplate.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsTemplate.java similarity index 98% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsTemplate.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsTemplate.java index d9787e286..e75b465fe 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsTemplate.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsTemplate.java @@ -16,11 +16,11 @@ * */ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; // -import io.nosqlbench.virtdata.api.templates.BindPoint; +import io.nosqlbench.virtdata.core.templates.BindPoint; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/CompatibilityFixups.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/CompatibilityFixups.java similarity index 98% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/CompatibilityFixups.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/CompatibilityFixups.java index 306602e74..ab104491c 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/CompatibilityFixups.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/CompatibilityFixups.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualArrayBindings.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualArrayBindings.java similarity index 97% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualArrayBindings.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualArrayBindings.java index d13d40d63..8f60a8321 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualArrayBindings.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualArrayBindings.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; /** *

A thread-local template that describes a set of data mappers, a context object, diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualBindings.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindings.java similarity index 97% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualBindings.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindings.java index 7ba5678fc..7580242d0 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualBindings.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindings.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; /** *

A thread-local template that describes a set of data mappers, a context object, and a method for applying diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualBindingsArrayTemplate.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsArrayTemplate.java similarity index 96% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualBindingsArrayTemplate.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsArrayTemplate.java index cee73cb8d..b3691ae80 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualBindingsArrayTemplate.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsArrayTemplate.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; /** * A template that maps a set of specifiers, a context object, and a method for applying diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualBindingsTemplate.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsTemplate.java similarity index 96% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualBindingsTemplate.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsTemplate.java index db95f45ce..dce75b82b 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualBindingsTemplate.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsTemplate.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; /** * A template that maps a set of specifiers, a context object, and a method for applying diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualMapBindings.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualMapBindings.java similarity index 97% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualMapBindings.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualMapBindings.java index 07224bb42..f8d2d649e 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ContextualMapBindings.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualMapBindings.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; import java.util.HashMap; import java.util.Map; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapper.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapper.java similarity index 56% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapper.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapper.java index d59519377..aefc9b7c8 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapper.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapper.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; public interface DataMapper { R get(long input); diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapperFunctionMapper.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperFunctionMapper.java similarity index 96% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapperFunctionMapper.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperFunctionMapper.java index 81cc7e771..eabb672aa 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapperFunctionMapper.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperFunctionMapper.java @@ -1,7 +1,4 @@ -package io.nosqlbench.virtdata.api; - -import io.nosqlbench.virtdata.api.FunctionType; -import io.nosqlbench.virtdata.api.DataMapper; +package io.nosqlbench.virtdata.core.bindings; import java.util.function.*; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapperLibrary.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibrary.java similarity index 99% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapperLibrary.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibrary.java index 7d970235f..b58ed6e01 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapperLibrary.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibrary.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; import java.util.List; import java.util.Optional; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapperLibraryFinder.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibraryFinder.java similarity index 97% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapperLibraryFinder.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibraryFinder.java index 02085bbd2..1f5cd0bba 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/DataMapperLibraryFinder.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibraryFinder.java @@ -12,9 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; -import io.nosqlbench.virtdata.api.DataMapperLibrary; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/FunctionType.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java similarity index 98% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/FunctionType.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java index 4c61b2b0d..4557f3895 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/FunctionType.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; import java.util.function.*; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/FunctionTyper.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionTyper.java similarity index 97% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/FunctionTyper.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionTyper.java index a69b37161..52e47d9fd 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/FunctionTyper.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionTyper.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/LazyValuesMap.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/LazyValuesMap.java similarity index 98% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/LazyValuesMap.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/LazyValuesMap.java index 240b6494e..d418c3ef8 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/LazyValuesMap.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/LazyValuesMap.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; import java.util.*; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Named.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/Named.java similarity index 81% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Named.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/Named.java index 6ab7c8a25..f16b593c6 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Named.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/Named.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; public interface Named { /** diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolvedFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolvedFunction.java similarity index 99% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolvedFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolvedFunction.java index b41ef9cc0..2d6d7661b 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolvedFunction.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolvedFunction.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; import java.lang.invoke.MethodHandles; import java.lang.reflect.Method; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolverDiagnostics.java similarity index 97% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolverDiagnostics.java index e2720902f..aebe96396 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolverDiagnostics.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/StringObjectPromoter.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/StringObjectPromoter.java similarity index 99% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/StringObjectPromoter.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/StringObjectPromoter.java index 969b6bc07..1866d406d 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/StringObjectPromoter.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/StringObjectPromoter.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VALUE.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VALUE.java similarity index 87% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VALUE.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VALUE.java index 074c7eed0..6bc616ed0 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VALUE.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VALUE.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; /** * A public class which holds global values. This is used for holding diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValueType.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java similarity index 98% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValueType.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java index 45050bdab..021c6b6da 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValueType.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api;/* +package io.nosqlbench.virtdata.core.bindings;/* * Copyright 2016 jshook * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValuesArrayBinder.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesArrayBinder.java similarity index 92% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValuesArrayBinder.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesArrayBinder.java index 93a35c500..b8038f61d 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValuesArrayBinder.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesArrayBinder.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; -import io.nosqlbench.virtdata.api.templates.StringCompositor; +import io.nosqlbench.virtdata.core.templates.StringCompositor; /** *

ValuesArrayBinder provides a way to apply an array of object values to a template diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValuesBinder.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesBinder.java similarity index 95% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValuesBinder.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesBinder.java index 55a2d00ce..1c06efb89 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValuesBinder.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesBinder.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; /** *

ValuesBinder provides a way to apply an map of named object values to a template diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValuesMapBinder.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesMapBinder.java similarity index 95% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValuesMapBinder.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesMapBinder.java index 3486f166c..a67235b5e 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ValuesMapBinder.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesMapBinder.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; import java.util.Map; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtData.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtData.java similarity index 99% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtData.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtData.java index a66cb884f..3d8fd62b4 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtData.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtData.java @@ -1,8 +1,8 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; import io.nosqlbench.virtdata.lang.ast.VirtDataFlow; import io.nosqlbench.virtdata.lang.parser.VirtDataDSL; -import io.nosqlbench.virtdata.api.templates.BindPoint; +import io.nosqlbench.virtdata.core.templates.BindPoint; import org.apache.commons.lang3.ClassUtils; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataComposer.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataComposer.java similarity index 99% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataComposer.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataComposer.java index 87a06c7d9..ccdee57be 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataComposer.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataComposer.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; -import io.nosqlbench.virtdata.api.composers.FunctionAssembly; +import io.nosqlbench.virtdata.core.composers.FunctionAssembly; import io.nosqlbench.virtdata.lang.ast.FunctionCall; import io.nosqlbench.virtdata.lang.ast.VirtDataFlow; import io.nosqlbench.virtdata.lang.parser.VirtDataDSL; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataDocs.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataDocs.java similarity index 81% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataDocs.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataDocs.java index 0f4e9a9d3..db30c3d85 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataDocs.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataDocs.java @@ -1,7 +1,7 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; -import io.nosqlbench.virtdata.processors.DocFuncData; -import io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor; +import io.nosqlbench.virtdata.api.processors.DocFuncData; +import io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -11,8 +11,8 @@ import java.util.List; /** * This is the top-level API supporting access to the documentation models - * for all known {@link io.nosqlbench.virtdata.annotations.ThreadSafeMapper} and - * {@link io.nosqlbench.virtdata.annotations.PerThreadMapper} instances in the runtime. + * for all known {@link io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper} and + * {@link io.nosqlbench.virtdata.api.annotations.PerThreadMapper} instances in the runtime. */ public class VirtDataDocs { diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionFinder.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionFinder.java similarity index 85% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionFinder.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionFinder.java index 7eeade3f5..12fbc54a9 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionFinder.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionFinder.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; -import io.nosqlbench.virtdata.processors.DocFuncData; +import io.nosqlbench.virtdata.api.processors.DocFuncData; import java.util.ArrayList; import java.util.List; @@ -19,4 +19,4 @@ public class VirtDataFunctionFinder { List cleaned = names.stream().sorted().distinct().collect(Collectors.toList()); return cleaned; } -} \ No newline at end of file +} diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionLibrary.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionLibrary.java similarity index 99% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionLibrary.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionLibrary.java index 617e65130..86926c236 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionLibrary.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionLibrary.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; import io.nosqlbench.virtdata.lang.ast.Expression; import io.nosqlbench.virtdata.lang.ast.FunctionCall; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolver.java similarity index 98% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolver.java index 216cdd529..1ce09120f 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolver.java @@ -1,7 +1,7 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.config.ConfigAware; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.config.ConfigAware; import org.apache.commons.lang3.ClassUtils; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctions.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctions.java similarity index 99% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctions.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctions.java index fc2803e61..e22119c95 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctions.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctions.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; import org.apache.commons.lang3.ClassUtils; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibraries.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibraries.java similarity index 96% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibraries.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibraries.java index 0dd20cf81..6b500e4d5 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibraries.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibraries.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibrary.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibrary.java similarity index 88% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibrary.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibrary.java index 755a393ee..15f997d17 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibrary.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibrary.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.bindings; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleFunction.java similarity index 98% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleFunction.java index 5f564a1cc..53f247469 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleFunction.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleFunction.java @@ -1,7 +1,7 @@ -package io.nosqlbench.virtdata.api.composers; +package io.nosqlbench.virtdata.core.composers; -import io.nosqlbench.virtdata.api.FunctionType; -import io.nosqlbench.virtdata.api.ValueType; +import io.nosqlbench.virtdata.core.bindings.FunctionType; +import io.nosqlbench.virtdata.core.bindings.ValueType; import java.util.function.*; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleToIntFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToIntFunction.java similarity index 97% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleToIntFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToIntFunction.java index c23d922af..a9b1794bd 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleToIntFunction.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToIntFunction.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.api.composers; +package io.nosqlbench.virtdata.core.composers; -import io.nosqlbench.virtdata.api.FunctionType; +import io.nosqlbench.virtdata.core.bindings.FunctionType; import java.util.function.*; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleToLongFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToLongFunction.java similarity index 97% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleToLongFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToLongFunction.java index 2190e7107..2050e17d9 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleToLongFunction.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToLongFunction.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.api.composers; +package io.nosqlbench.virtdata.core.composers; -import io.nosqlbench.virtdata.api.FunctionType; +import io.nosqlbench.virtdata.core.bindings.FunctionType; import java.util.function.*; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleUnaryOperator.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleUnaryOperator.java similarity index 97% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleUnaryOperator.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleUnaryOperator.java index 212fdd08c..e8c4914b6 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForDoubleUnaryOperator.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleUnaryOperator.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.api.composers; +package io.nosqlbench.virtdata.core.composers; -import io.nosqlbench.virtdata.api.FunctionType; +import io.nosqlbench.virtdata.core.bindings.FunctionType; import java.util.function.*; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForFunction.java similarity index 99% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForFunction.java index b37137be6..b699b080a 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForFunction.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForFunction.java @@ -1,7 +1,7 @@ -package io.nosqlbench.virtdata.api.composers; +package io.nosqlbench.virtdata.core.composers; -import io.nosqlbench.virtdata.api.FunctionType; -import io.nosqlbench.virtdata.api.ValueType; +import io.nosqlbench.virtdata.core.bindings.FunctionType; +import io.nosqlbench.virtdata.core.bindings.ValueType; import java.util.function.*; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntFunction.java similarity index 99% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntFunction.java index c65538f3a..41198c0fe 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntFunction.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntFunction.java @@ -1,7 +1,7 @@ -package io.nosqlbench.virtdata.api.composers; +package io.nosqlbench.virtdata.core.composers; -import io.nosqlbench.virtdata.api.FunctionType; -import io.nosqlbench.virtdata.api.ValueType; +import io.nosqlbench.virtdata.core.bindings.FunctionType; +import io.nosqlbench.virtdata.core.bindings.ValueType; import java.util.function.*; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntToDoubleFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToDoubleFunction.java similarity index 97% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntToDoubleFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToDoubleFunction.java index b154e12ca..057028ba3 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntToDoubleFunction.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToDoubleFunction.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.api.composers; +package io.nosqlbench.virtdata.core.composers; -import io.nosqlbench.virtdata.api.FunctionType; +import io.nosqlbench.virtdata.core.bindings.FunctionType; import java.util.function.*; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntToLongFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToLongFunction.java similarity index 97% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntToLongFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToLongFunction.java index 7145e958c..40c6c40f9 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntToLongFunction.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToLongFunction.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.api.composers; +package io.nosqlbench.virtdata.core.composers; -import io.nosqlbench.virtdata.api.FunctionType; +import io.nosqlbench.virtdata.core.bindings.FunctionType; import java.util.function.*; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntUnaryOperator.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntUnaryOperator.java similarity index 97% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntUnaryOperator.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntUnaryOperator.java index 4589f9ec9..52c293b59 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForIntUnaryOperator.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntUnaryOperator.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.api.composers; +package io.nosqlbench.virtdata.core.composers; -import io.nosqlbench.virtdata.api.FunctionType; +import io.nosqlbench.virtdata.core.bindings.FunctionType; import java.util.function.*; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongFunction.java similarity index 99% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongFunction.java index 47c9cf2b0..a65bb168a 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongFunction.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongFunction.java @@ -1,7 +1,7 @@ -package io.nosqlbench.virtdata.api.composers; +package io.nosqlbench.virtdata.core.composers; -import io.nosqlbench.virtdata.api.FunctionType; -import io.nosqlbench.virtdata.api.ValueType; +import io.nosqlbench.virtdata.core.bindings.FunctionType; +import io.nosqlbench.virtdata.core.bindings.ValueType; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongToDoubleFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToDoubleFunction.java similarity index 97% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongToDoubleFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToDoubleFunction.java index df37b3c47..b48b40905 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongToDoubleFunction.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToDoubleFunction.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.api.composers; +package io.nosqlbench.virtdata.core.composers; -import io.nosqlbench.virtdata.api.FunctionType; +import io.nosqlbench.virtdata.core.bindings.FunctionType; import java.util.function.*; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongToIntFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToIntFunction.java similarity index 97% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongToIntFunction.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToIntFunction.java index f730510fb..8388cf52a 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongToIntFunction.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToIntFunction.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.api.composers; +package io.nosqlbench.virtdata.core.composers; -import io.nosqlbench.virtdata.api.FunctionType; +import io.nosqlbench.virtdata.core.bindings.FunctionType; import java.util.function.*; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongUnaryOperator.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongUnaryOperator.java similarity index 97% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongUnaryOperator.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongUnaryOperator.java index 8d9a62939..539f351ca 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongUnaryOperator.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongUnaryOperator.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.api.composers; +package io.nosqlbench.virtdata.core.composers; -import io.nosqlbench.virtdata.api.FunctionType; +import io.nosqlbench.virtdata.core.bindings.FunctionType; import java.util.function.*; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionAssembly.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionAssembly.java similarity index 96% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionAssembly.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionAssembly.java index ccbe8f93b..785f24eba 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionAssembly.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionAssembly.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.api.composers; +package io.nosqlbench.virtdata.core.composers; -import io.nosqlbench.virtdata.api.FunctionType; +import io.nosqlbench.virtdata.core.bindings.FunctionType; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionComposer.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionComposer.java similarity index 72% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionComposer.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionComposer.java index 674ae6d2d..f2a02f175 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionComposer.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionComposer.java @@ -1,9 +1,9 @@ -package io.nosqlbench.virtdata.api.composers; +package io.nosqlbench.virtdata.core.composers; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.DataMapper; -import io.nosqlbench.virtdata.api.DataMapperFunctionMapper; -import io.nosqlbench.virtdata.api.ResolvedFunction; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.DataMapper; +import io.nosqlbench.virtdata.core.bindings.DataMapperFunctionMapper; +import io.nosqlbench.virtdata.core.bindings.ResolvedFunction; public interface FunctionComposer { diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/config/ConfigAware.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/config/ConfigAware.java similarity index 75% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/config/ConfigAware.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/config/ConfigAware.java index eedc0b474..ce69c5419 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/config/ConfigAware.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/config/ConfigAware.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api.config; +package io.nosqlbench.virtdata.core.config; import java.util.Map; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/config/ConfigModel.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/config/ConfigModel.java similarity index 88% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/config/ConfigModel.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/config/ConfigModel.java index 2926ac4ff..8d97a9de9 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/config/ConfigModel.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/config/ConfigModel.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api.config; +package io.nosqlbench.virtdata.core.config; import java.util.List; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/config/MutableConfigModel.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/config/MutableConfigModel.java similarity index 93% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/config/MutableConfigModel.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/config/MutableConfigModel.java index 712466bda..04cd1b7f7 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/config/MutableConfigModel.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/config/MutableConfigModel.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api.config; +package io.nosqlbench.virtdata.core.config; import java.util.ArrayList; import java.util.Collections; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/BindPoint.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java similarity index 95% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/BindPoint.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java index f236aa0a0..63dde339a 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/BindPoint.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.api.templates; +package io.nosqlbench.virtdata.core.templates; import java.util.Objects; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/CSVBindings.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindings.java similarity index 80% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/CSVBindings.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindings.java index a3f11aec2..8313b12d6 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/CSVBindings.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindings.java @@ -1,7 +1,7 @@ -package io.nosqlbench.virtdata.api.templates; +package io.nosqlbench.virtdata.core.templates; -import io.nosqlbench.virtdata.api.Binder; -import io.nosqlbench.virtdata.api.Bindings; +import io.nosqlbench.virtdata.core.bindings.Binder; +import io.nosqlbench.virtdata.core.bindings.Bindings; public class CSVBindings implements Binder { diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/CSVBindingsTemplate.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindingsTemplate.java similarity index 68% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/CSVBindingsTemplate.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindingsTemplate.java index 3d31850a1..0de65d3b8 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/CSVBindingsTemplate.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindingsTemplate.java @@ -1,7 +1,7 @@ -package io.nosqlbench.virtdata.api.templates; +package io.nosqlbench.virtdata.core.templates; -import io.nosqlbench.virtdata.api.Bindings; -import io.nosqlbench.virtdata.api.BindingsTemplate; +import io.nosqlbench.virtdata.core.bindings.Bindings; +import io.nosqlbench.virtdata.core.bindings.BindingsTemplate; public class CSVBindingsTemplate { diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/ParsedTemplate.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/ParsedTemplate.java similarity index 99% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/ParsedTemplate.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/ParsedTemplate.java index 529126002..af8eaa788 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/ParsedTemplate.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/ParsedTemplate.java @@ -15,7 +15,7 @@ * / */ -package io.nosqlbench.virtdata.api.templates; +package io.nosqlbench.virtdata.core.templates; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringBindings.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindings.java similarity index 83% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringBindings.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindings.java index 311b7f327..5fae7a23c 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringBindings.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindings.java @@ -1,7 +1,7 @@ -package io.nosqlbench.virtdata.api.templates; +package io.nosqlbench.virtdata.core.templates; -import io.nosqlbench.virtdata.api.Binder; -import io.nosqlbench.virtdata.api.Bindings; +import io.nosqlbench.virtdata.core.bindings.Binder; +import io.nosqlbench.virtdata.core.bindings.Bindings; /** * Allows the generation of strings from a string template and bindings template. diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringBindingsTemplate.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplate.java similarity index 88% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringBindingsTemplate.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplate.java index 9afaa1fc0..963b967d9 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringBindingsTemplate.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplate.java @@ -1,7 +1,7 @@ -package io.nosqlbench.virtdata.api.templates; +package io.nosqlbench.virtdata.core.templates; -import io.nosqlbench.virtdata.api.Bindings; -import io.nosqlbench.virtdata.api.BindingsTemplate; +import io.nosqlbench.virtdata.core.bindings.Bindings; +import io.nosqlbench.virtdata.core.bindings.BindingsTemplate; import java.util.HashSet; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringCompositor.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/StringCompositor.java similarity index 96% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringCompositor.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/StringCompositor.java index 2731ce2fb..e5721dfda 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringCompositor.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/StringCompositor.java @@ -1,7 +1,7 @@ -package io.nosqlbench.virtdata.api.templates; +package io.nosqlbench.virtdata.core.templates; -import io.nosqlbench.virtdata.api.ValuesBinder; -import io.nosqlbench.virtdata.api.Bindings; +import io.nosqlbench.virtdata.core.bindings.ValuesBinder; +import io.nosqlbench.virtdata.core.bindings.Bindings; import java.util.ArrayList; import java.util.Collections; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringMapCompositor.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/StringMapCompositor.java similarity index 96% rename from virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringMapCompositor.java rename to virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/StringMapCompositor.java index c65c7a7f2..5715fd9ac 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/StringMapCompositor.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/core/templates/StringMapCompositor.java @@ -1,6 +1,6 @@ -package io.nosqlbench.virtdata.api.templates; +package io.nosqlbench.virtdata.core.templates; -import io.nosqlbench.virtdata.api.ValuesArrayBinder; +import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder; import java.util.ArrayList; import java.util.List; diff --git a/virtdata-core/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java index 8c2b24152..0f254e459 100644 --- a/virtdata-core/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java +++ b/virtdata-core/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java @@ -1,5 +1,6 @@ package io.nosqlbench.virtdata.annotations; +import io.nosqlbench.virtdata.api.annotations.ExampleData; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -27,4 +28,4 @@ public class ExampleDataTest { assertThat(afew).containsExactly(1L,2L,-3L); } -} \ No newline at end of file +} diff --git a/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java index a3070c7c9..45fd14d57 100644 --- a/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java +++ b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/CompatibilityFixupsTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.core; -import io.nosqlbench.virtdata.api.CompatibilityFixups; +import io.nosqlbench.virtdata.core.bindings.CompatibilityFixups; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -33,4 +33,4 @@ public class CompatibilityFixupsTest { } -} \ No newline at end of file +} diff --git a/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java index b1eef52b5..36ae7b867 100644 --- a/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java +++ b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.core; -import io.nosqlbench.virtdata.api.ResolvedFunction; +import io.nosqlbench.virtdata.core.bindings.ResolvedFunction; import org.junit.Test; import java.util.function.LongUnaryOperator; @@ -48,4 +48,4 @@ public class ResolvedFunctionTest { return a + operand; } } -} \ No newline at end of file +} diff --git a/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java index 1bfb7fb79..6992bcf88 100644 --- a/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java +++ b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.core; -import io.nosqlbench.virtdata.api.ResolverDiagnostics; -import io.nosqlbench.virtdata.api.VirtDataComposer; +import io.nosqlbench.virtdata.core.bindings.ResolverDiagnostics; +import io.nosqlbench.virtdata.core.bindings.VirtDataComposer; import org.junit.Test; public class VirtDataComposerTest { @@ -19,4 +19,4 @@ public class VirtDataComposerTest { @Test public void testResolveFunctionFlow1() { } -} \ No newline at end of file +} diff --git a/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java index a65d7b068..713f564c3 100644 --- a/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java +++ b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.core; -import io.nosqlbench.virtdata.api.BindingsTemplate; -import io.nosqlbench.virtdata.api.VirtData; +import io.nosqlbench.virtdata.core.bindings.BindingsTemplate; +import io.nosqlbench.virtdata.core.bindings.VirtData; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -14,4 +14,4 @@ public class VirtDataTest { assertThat(bt).isNotNull(); } -} \ No newline at end of file +} diff --git a/virtdata-core/src/test/java/io/nosqlbench/virtdata/composers/FunctionAssemblerMatrixTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java similarity index 96% rename from virtdata-core/src/test/java/io/nosqlbench/virtdata/composers/FunctionAssemblerMatrixTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java index 937f841cf..456868083 100644 --- a/virtdata-core/src/test/java/io/nosqlbench/virtdata/composers/FunctionAssemblerMatrixTest.java +++ b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java @@ -1,10 +1,10 @@ -package io.nosqlbench.virtdata.composers; +package io.nosqlbench.virtdata.core.composers; -import io.nosqlbench.virtdata.api.DataMapper; -import io.nosqlbench.virtdata.api.FunctionType; -import io.nosqlbench.virtdata.api.composers.FunctionAssembly; -import io.nosqlbench.virtdata.api.composers.FunctionComposer; -import io.nosqlbench.virtdata.api.DataMapperFunctionMapper; +import io.nosqlbench.virtdata.core.bindings.DataMapper; +import io.nosqlbench.virtdata.core.bindings.FunctionType; +import io.nosqlbench.virtdata.core.composers.FunctionAssembly; +import io.nosqlbench.virtdata.core.composers.FunctionComposer; +import io.nosqlbench.virtdata.core.bindings.DataMapperFunctionMapper; import org.junit.Test; import java.util.ArrayList; diff --git a/virtdata-core/src/test/java/io/nosqlbench/virtdata/composers/FunctionAssemblerTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java similarity index 94% rename from virtdata-core/src/test/java/io/nosqlbench/virtdata/composers/FunctionAssemblerTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java index 501738cf0..e47ae75d3 100644 --- a/virtdata-core/src/test/java/io/nosqlbench/virtdata/composers/FunctionAssemblerTest.java +++ b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java @@ -1,8 +1,8 @@ -package io.nosqlbench.virtdata.composers; +package io.nosqlbench.virtdata.core.composers; -import io.nosqlbench.virtdata.api.DataMapper; -import io.nosqlbench.virtdata.api.composers.FunctionAssembly; -import io.nosqlbench.virtdata.api.composers.FunctionComposer; +import io.nosqlbench.virtdata.core.bindings.DataMapper; +import io.nosqlbench.virtdata.core.composers.FunctionAssembly; +import io.nosqlbench.virtdata.core.composers.FunctionComposer; import org.junit.Test; import java.util.function.Function; @@ -129,4 +129,4 @@ public class FunctionAssemblerTest { } } -} \ No newline at end of file +} diff --git a/virtdata-core/src/test/java/io/nosqlbench/virtdata/api/templates/ParsedTemplateTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java similarity index 96% rename from virtdata-core/src/test/java/io/nosqlbench/virtdata/api/templates/ParsedTemplateTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java index 65d1985d4..dd5e37864 100644 --- a/virtdata-core/src/test/java/io/nosqlbench/virtdata/api/templates/ParsedTemplateTest.java +++ b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java @@ -1,5 +1,7 @@ -package io.nosqlbench.virtdata.api.templates; +package io.nosqlbench.virtdata.core.templates; +import io.nosqlbench.virtdata.core.templates.BindPoint; +import io.nosqlbench.virtdata.core.templates.ParsedTemplate; import org.junit.Test; import java.security.InvalidParameterException; @@ -114,4 +116,4 @@ public class ParsedTemplateTest { } -} \ No newline at end of file +} diff --git a/virtdata-core/src/test/java/io/nosqlbench/virtdata/api/templates/StringBindingsTemplateTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java similarity index 69% rename from virtdata-core/src/test/java/io/nosqlbench/virtdata/api/templates/StringBindingsTemplateTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java index d4e45f81b..c6d8dbdd2 100644 --- a/virtdata-core/src/test/java/io/nosqlbench/virtdata/api/templates/StringBindingsTemplateTest.java +++ b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java @@ -1,6 +1,8 @@ -package io.nosqlbench.virtdata.api.templates; +package io.nosqlbench.virtdata.core.templates; -import io.nosqlbench.virtdata.api.BindingsTemplate; +import io.nosqlbench.virtdata.core.bindings.BindingsTemplate; +import io.nosqlbench.virtdata.core.templates.StringBindings; +import io.nosqlbench.virtdata.core.templates.StringBindingsTemplate; import org.junit.Test; public class StringBindingsTemplateTest { @@ -15,4 +17,4 @@ public class StringBindingsTemplateTest { StringBindings resolved = sbt.resolve(); } -} \ No newline at end of file +} diff --git a/virtdata-core/src/test/java/io/nosqlbench/virtdata/api/templates/StringCompositorTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java similarity index 88% rename from virtdata-core/src/test/java/io/nosqlbench/virtdata/api/templates/StringCompositorTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java index 4c58a0e78..1b025bc3d 100644 --- a/virtdata-core/src/test/java/io/nosqlbench/virtdata/api/templates/StringCompositorTest.java +++ b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java @@ -1,5 +1,6 @@ -package io.nosqlbench.virtdata.api.templates; +package io.nosqlbench.virtdata.core.templates; +import io.nosqlbench.virtdata.core.templates.StringCompositor; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -28,4 +29,4 @@ public class StringCompositorTest { // assertThat(spans).containsExactly("A\\{B}C"); // } -} \ No newline at end of file +} diff --git a/virtdata-core/src/test/java/io/nosqlbench/virtdata/api/ValueTypeTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java similarity index 73% rename from virtdata-core/src/test/java/io/nosqlbench/virtdata/api/ValueTypeTest.java rename to virtdata-core/src/test/java/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java index 1667bbff7..0b66a4876 100644 --- a/virtdata-core/src/test/java/io/nosqlbench/virtdata/api/ValueTypeTest.java +++ b/virtdata-core/src/test/java/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java @@ -1,5 +1,6 @@ -package io.nosqlbench.virtdata.api; +package io.nosqlbench.virtdata.core.templates; +import io.nosqlbench.virtdata.core.bindings.ValueType; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -13,4 +14,4 @@ public class ValueTypeTest { } -} \ No newline at end of file +} diff --git a/virtdata-core/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java index 51833063b..ab2a757ee 100644 --- a/virtdata-core/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java +++ b/virtdata-core/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.testmappers; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; diff --git a/virtdata-core/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java index fe33b82fd..4ffede008 100644 --- a/virtdata-core/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java +++ b/virtdata-core/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.testmappers; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-core/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java index b17e7190e..4feae2e4a 100644 --- a/virtdata-core/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java +++ b/virtdata-core/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.util; -import io.nosqlbench.virtdata.api.StringObjectPromoter; +import io.nosqlbench.virtdata.core.bindings.StringObjectPromoter; import org.junit.Test; import java.math.BigDecimal; @@ -79,4 +79,4 @@ public class StringObjectPromoterTest { assertThat(o).isInstanceOf(String.class); assertThat(o).isEqualTo("234cavebabel"); } -} \ No newline at end of file +} diff --git a/virtdata-core/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java b/virtdata-core/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java index bc3481fbb..46856a6af 100644 --- a/virtdata-core/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java +++ b/virtdata-core/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.util; -import io.nosqlbench.virtdata.api.VirtDataFunctions; +import io.nosqlbench.virtdata.core.bindings.VirtDataFunctions; import org.junit.Test; import java.security.InvalidParameterException; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/DigestToByteBuffer.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/DigestToByteBuffer.java index cf7c02c88..261d9ad01 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/DigestToByteBuffer.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/DigestToByteBuffer.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_bytebuffer; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.codec.digest.MessageDigestAlgorithms; import java.nio.ByteBuffer; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/ToHexString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/ToHexString.java index 11c76d1d3..1f6d3e5cd 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/ToHexString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/ToHexString.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_bytebuffer; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.codec.binary.Hex; import java.nio.ByteBuffer; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToBoolean.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToBoolean.java index 013830666..c738eea23 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToBoolean.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToBoolean.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToByte.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToByte.java index c067fd22f..1e6d41a43 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToByte.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToByte.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToByteBuffer.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToByteBuffer.java index 396f660cf..79b204977 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToByteBuffer.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToByteBuffer.java @@ -18,9 +18,9 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.nio.ByteBuffer; import java.util.function.DoubleFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToFloat.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToFloat.java index 5b1364385..39595b1ec 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToFloat.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToFloat.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToInt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToInt.java index 6ad811039..9bd70d60f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToInt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToInt.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleToIntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToLong.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToLong.java index 90639db16..49288321a 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToLong.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToLong.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleToLongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToShort.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToShort.java index ff2a0b2c6..51dc5f5a9 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToShort.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToShort.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToString.java index d0d5baa6b..593d99286 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToString.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleFunction; import java.util.function.DoubleUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToBoolean.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToBoolean.java index 7470b68b4..9d7d295e3 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToBoolean.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToBoolean.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_float; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToByte.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToByte.java index b57f2a654..f455fcb06 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToByte.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToByte.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_float; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToByteBuffer.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToByteBuffer.java index b85c4da08..8cddb35f2 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToByteBuffer.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToByteBuffer.java @@ -18,9 +18,9 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_float; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.nio.ByteBuffer; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToInt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToInt.java index 8af70e66a..1e264e1f8 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToInt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToInt.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_float; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToLong.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToLong.java index 66ca2e066..d0e2e677a 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToLong.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToLong.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_float; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToShort.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToShort.java index 157e2993e..daacfe1d0 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToShort.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToShort.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_float; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToString.java index 315146501..56709e908 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToString.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_float; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToBoolean.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToBoolean.java index bf63f6a78..899c17061 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToBoolean.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToBoolean.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToByte.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToByte.java index e6ff048c8..240c1e081 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToByte.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToByte.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToByteBuffer.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToByteBuffer.java index c72316cb9..a7fc858d6 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToByteBuffer.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToByteBuffer.java @@ -18,9 +18,9 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.nio.ByteBuffer; import java.util.function.IntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToFloat.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToFloat.java index e81d24f50..8aa226f3b 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToFloat.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToFloat.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToShort.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToShort.java index 45bdf08c9..c63fe186f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToShort.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToShort.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToString.java index 1a4081c12..49755084a 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToString.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByte.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByte.java index 1ba53d1a3..64664f309 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByte.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByte.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBuffer.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBuffer.java index c1c140a16..307782c84 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBuffer.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBuffer.java @@ -18,9 +18,9 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.nio.ByteBuffer; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToFloat.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToFloat.java index 02a0f0958..9902d8b68 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToFloat.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToFloat.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToHexString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToHexString.java index 6d4223947..29b5c9742 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToHexString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToHexString.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToInt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToInt.java index 1992f6ffb..f57030530 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToInt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToInt.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongToIntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToShort.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToShort.java index 09aa50646..3bb8da9de 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToShort.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToShort.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToString.java index 9bcd89dc7..70914218f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToString.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_byte.LongToByte; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_short.LongToShort; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToByte.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToByte.java index 7b078516c..cc9edde75 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToByte.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToByte.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_short; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToByteBuffer.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToByteBuffer.java index 46bda7898..e877fef55 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToByteBuffer.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToByteBuffer.java @@ -18,9 +18,9 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_short; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.nio.ByteBuffer; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToFloat.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToFloat.java index d0bd4c40e..9ac2b0559 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToFloat.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToFloat.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_short; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToByte.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToByte.java index 351dd5358..11445f079 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToByte.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToByte.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_string; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToByteBuffer.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToByteBuffer.java index ff2b857ee..3205bde44 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToByteBuffer.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToByteBuffer.java @@ -18,9 +18,9 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_string; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToFloat.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToFloat.java index 05da4bf13..b206827b9 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToFloat.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToFloat.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_string; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToInt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToInt.java index 945ae910f..824c9a2e2 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToInt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToInt.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_string; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToLong.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToLong.java index e5ffb73e5..f8f19f127 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToLong.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToLong.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_string; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToShort.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToShort.java index c32f22375..92275e9c1 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToShort.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToShort.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.conversions.from_string; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/diagnostics/TypeOf.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/diagnostics/TypeOf.java index 778d958cd..95577a63b 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/diagnostics/TypeOf.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/diagnostics/TypeOf.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.diagnostics; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; 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 1857c9f86..e1e9076d4 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 @@ -7,10 +7,10 @@ package io.nosqlbench.virtdata.library.basics.shared.distributions; */ -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +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; 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 95457319c..b4e3f70e4 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 @@ -7,10 +7,10 @@ package io.nosqlbench.virtdata.library.basics.shared.distributions; */ -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +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; 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 586ed4de6..52f7b2678 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 @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.distributions; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +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; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/formatting/DecimalFormat.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/formatting/DecimalFormat.java index 603988d99..d8bec428a 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/formatting/DecimalFormat.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/formatting/DecimalFormat.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.formatting; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/formatting/Format.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/formatting/Format.java index 39a058bf9..91aa90cd8 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/formatting/Format.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/formatting/Format.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.formatting; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Add.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Add.java index 4b7b28fca..85f3be425 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Add.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Add.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Clamp.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Clamp.java index 5c595f544..680f32caf 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Clamp.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Clamp.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_double; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Div.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Div.java index 8f4fe81fb..2d69b2bb7 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Div.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Div.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/DoubleFlow.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/DoubleFlow.java index 53eacd690..736ad9912 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/DoubleFlow.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/DoubleFlow.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_double; -import io.nosqlbench.virtdata.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.Example; import java.util.function.DoubleUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Expr.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Expr.java index c0f37a491..c28d9cd23 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Expr.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Expr.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.MVELExpr; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import org.mvel2.MVEL; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Load.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Load.java index e6946b47e..e3271a387 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Load.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Load.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Max.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Max.java index 8baf1527b..3d1343fdf 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Max.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Max.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Min.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Min.java index 4cdb15442..4fd7b5ca0 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Min.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Min.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Mul.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Mul.java index 61beaf79b..ebfea56b6 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Mul.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Mul.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Save.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Save.java index 18f43d3f1..c57d027a1 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Save.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Save.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.function.DoubleUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_float/DoubleToFloat.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_float/DoubleToFloat.java index 030ffa5b4..a235b7b5d 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_float/DoubleToFloat.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_float/DoubleToFloat.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_float; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfCloseTo.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfCloseTo.java index 52357e393..5b8c05719 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfCloseTo.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfCloseTo.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_other; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleFunction; @@ -26,4 +26,4 @@ public class NullIfCloseTo implements DoubleFunction { if (Math.abs(value - compareto) <= sigma) return null; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfEq.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfEq.java index 7e7c89767..3cc1918ec 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfEq.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfEq.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_other; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleFunction; @@ -21,4 +21,4 @@ public class NullIfEq implements DoubleFunction { if (value == compareto) return null; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfGe.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfGe.java index bbf6b2b74..fb273fe97 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfGe.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfGe.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_other; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleFunction; @@ -21,4 +21,4 @@ public class NullIfGe implements DoubleFunction { if (value >= this.compareto) return null; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfGt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfGt.java index 7705845fd..892e90bdd 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfGt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfGt.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_other; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleFunction; @@ -21,4 +21,4 @@ public class NullIfGt implements DoubleFunction { if (value > compareto) return null; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfLe.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfLe.java index 7b583f1ea..3da45f0e1 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfLe.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfLe.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_other; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleFunction; @@ -21,4 +21,4 @@ public class NullIfLe implements DoubleFunction { if (value <= compareto) return null; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfLt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfLt.java index 63c3aaedf..5dcc3dba6 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfLt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfLt.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_other; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleFunction; @@ -21,4 +21,4 @@ public class NullIfLt implements DoubleFunction { if (value < compareto) return null; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfWithin.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfWithin.java index 58ce0a910..7d6809181 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfWithin.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfWithin.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_other; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleFunction; @@ -28,4 +28,4 @@ public class NullIfWithin implements DoubleFunction { if (value>=min && value <=max) { return null; } return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfCloseTo.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfCloseTo.java index d070ae091..d6e075bd4 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfCloseTo.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfCloseTo.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import java.util.function.DoubleFunction; @@ -29,4 +29,4 @@ public class UnsetIfCloseTo implements DoubleFunction { if (Math.abs(value - compareto) <= sigma) return VALUE.unset; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfEq.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfEq.java index e69241503..9823619a4 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfEq.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfEq.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.DoubleFunction; @@ -21,4 +21,4 @@ public class UnsetIfEq implements DoubleFunction { if (value == compareto) return null; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfGe.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfGe.java index 9ca4e6eb6..2e46ea4f2 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfGe.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfGe.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import java.util.function.DoubleFunction; @@ -22,4 +22,4 @@ public class UnsetIfGe implements DoubleFunction { if (value >= this.compareto) return VALUE.unset; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfGt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfGt.java index 993ed71ff..770bc8b43 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfGt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfGt.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import java.util.function.DoubleFunction; @@ -22,4 +22,4 @@ public class UnsetIfGt implements DoubleFunction { if (value > compareto) return VALUE.unset; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfLe.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfLe.java index 2f80d99f6..388ae4beb 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfLe.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfLe.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import java.util.function.DoubleFunction; @@ -22,4 +22,4 @@ public class UnsetIfLe implements DoubleFunction { if (value <= compareto) return VALUE.unset; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfLt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfLt.java index 37375d2e8..066697c93 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfLt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfLt.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import java.util.function.DoubleFunction; @@ -22,4 +22,4 @@ public class UnsetIfLt implements DoubleFunction { if (value < compareto) return VALUE.unset; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfWithin.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfWithin.java index b7ab59891..5f71b8c2d 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfWithin.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfWithin.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_double.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import java.util.function.DoubleFunction; @@ -29,4 +29,4 @@ public class UnsetIfWithin implements DoubleFunction { if (value>=min && value <=max) { return VALUE.unset; } return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ModuloToBigDecimal.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ModuloToBigDecimal.java index 1bcf654fd..9ec689b7d 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ModuloToBigDecimal.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ModuloToBigDecimal.java @@ -18,9 +18,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_bigdecimal; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; 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_bigint/ModuloToBigInt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ModuloToBigInt.java index 476f3eb27..69fd3b594 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ModuloToBigInt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ModuloToBigInt.java @@ -18,9 +18,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_bigint; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; 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_bigint/ToBigInt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ToBigInt.java index bd5713e9a..e1fc2df70 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ToBigInt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ToBigInt.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_bigint; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.math.BigInteger; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_boolean/ModuloToBoolean.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_boolean/ModuloToBoolean.java index 0c766f948..3ec432870 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_boolean/ModuloToBoolean.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_boolean/ModuloToBoolean.java @@ -18,9 +18,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_boolean; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_boolean/ToBoolean.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_boolean/ToBoolean.java index bdf8302d5..605ee595b 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_boolean/ToBoolean.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_boolean/ToBoolean.java @@ -18,9 +18,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_boolean; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_byte/LongToByte.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_byte/LongToByte.java index cbd2c7c7d..f51621752 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_byte/LongToByte.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_byte/LongToByte.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_byte; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_byte/ModuloToByte.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_byte/ModuloToByte.java index 9c3257b9a..b16f91bea 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_byte/ModuloToByte.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_byte/ModuloToByte.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_byte; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBuffer.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBuffer.java index 3a5c677a8..4e5269f10 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBuffer.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBuffer.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_bytebuffer; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.codec.digest.MessageDigestAlgorithms; import java.nio.ByteBuffer; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedToByteBuffer.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedToByteBuffer.java index a2115cbcc..a94591b95 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedToByteBuffer.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedToByteBuffer.java @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_bytebuffer; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Hash; import java.nio.ByteBuffer; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ToMD5ByteBuffer.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ToMD5ByteBuffer.java index e84825af2..9017ce077 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ToMD5ByteBuffer.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ToMD5ByteBuffer.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_bytebuffer; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.nio.ByteBuffer; import java.security.MessageDigest; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringList.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringList.java index 14cba1247..3e3d91462 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringList.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringList.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.HashRange; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.HashedLineToString; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringSet.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringSet.java index 3a9af66c6..ff93cee9b 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringSet.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringSet.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.HashRange; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.HashedLineToString; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringStringMap.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringStringMap.java index 86828d8ef..4920177ae 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringStringMap.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringStringMap.java @@ -19,9 +19,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_int.HashRange; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.HashedLineToString; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedRangeToLongList.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedRangeToLongList.java index c7b29f11c..31fc072e6 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedRangeToLongList.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedRangeToLongList.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.HashRange; import java.util.ArrayList; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/List.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/List.java index 194f69115..947ce9ebb 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/List.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/List.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.ArrayList; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/Map.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/Map.java index d4ab5f7d1..7f5fcff29 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/Map.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/Map.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection; -import io.nosqlbench.virtdata.annotations.*; +import io.nosqlbench.virtdata.api.annotations.*; import java.util.HashMap; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/Set.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/Set.java index 2ea94b078..2bab76bb6 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/Set.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/Set.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.HashSet; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringList.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringList.java index b0a4cd5e1..2b50586c9 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringList.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringList.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.ArrayList; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringMap.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringMap.java index 0c8ec34c9..3e36cda04 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringMap.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringMap.java @@ -1,6 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection; -import io.nosqlbench.virtdata.annotations.*; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.HashMap; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringSet.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringSet.java index 0d2321f8c..be35bceab 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringSet.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringSet.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.HashSet; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/HashedDoubleRange.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/HashedDoubleRange.java index 9b4cda985..c8ccc4f43 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/HashedDoubleRange.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/HashedDoubleRange.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Hash; import java.util.function.LongToDoubleFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/HashedRangedToNonuniformDouble.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/HashedRangedToNonuniformDouble.java index e16f1d9f1..ea6a0698e 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/HashedRangedToNonuniformDouble.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/HashedRangedToNonuniformDouble.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Hash; import java.util.function.LongToDoubleFunction; @@ -20,7 +20,7 @@ public class HashedRangedToNonuniformDouble implements LongToDoubleFunction { private final long max; private final double length; private final Hash hash; - + public HashedRangedToNonuniformDouble(long min, long max) { this.hash = new Hash(); if (max<=min) { diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/Interpolate.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/Interpolate.java index 9303e0a8b..380a789de 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/Interpolate.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/Interpolate.java @@ -1,6 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_double; -import io.nosqlbench.virtdata.annotations.*; + +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongToDoubleFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/ToDouble.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/ToDouble.java index c1a70143d..62a979016 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/ToDouble.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/ToDouble.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongToDoubleFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_inetaddress/ToInetAddress.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_inetaddress/ToInetAddress.java index b0d66076e..51c0d7886 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_inetaddress/ToInetAddress.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_inetaddress/ToInetAddress.java @@ -18,9 +18,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_inetaddress; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.net.Inet4Address; import java.net.InetAddress; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Add.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Add.java index 98b836e4a..8348603f8 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Add.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Add.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongToIntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/AddCycleRange.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/AddCycleRange.java index 9e42d93c5..a5e3d1b0f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/AddCycleRange.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/AddCycleRange.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.CycleRange; import java.util.function.LongToIntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/AddHashRange.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/AddHashRange.java index 5d8dccb1b..a04225470 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/AddHashRange.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/AddHashRange.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.HashRange; import java.util.function.LongToIntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/CycleRange.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/CycleRange.java index fcdd279df..a8b221125 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/CycleRange.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/CycleRange.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongToIntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Div.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Div.java index fb3434192..9d562d608 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Div.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Div.java @@ -14,8 +14,8 @@ */ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.Description; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Description; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongToIntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Expr.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Expr.java index 5734e8026..c3640ac02 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Expr.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Expr.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.MVELExpr; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import org.mvel2.MVEL; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/FixedValue.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/FixedValue.java index 8db18cb9d..dfcfa2e6a 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/FixedValue.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/FixedValue.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongToIntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/FixedValues.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/FixedValues.java index 3bc756a00..0a9558b6f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/FixedValues.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/FixedValues.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongToIntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Hash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Hash.java index dcfa03e45..aad3f97ba 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Hash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Hash.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.murmur.Murmur3F; import java.nio.ByteBuffer; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRange.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRange.java index ddfbd089a..fa4790eaa 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRange.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRange.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Hash; import java.util.function.LongToIntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRangeScaled.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRangeScaled.java index 107d8e987..e86a31409 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRangeScaled.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRangeScaled.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Hash; import java.util.function.LongToIntFunction; 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 87125127c..cc652ec39 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,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.nb.api.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_int/Mod.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Mod.java index cf7b9d23c..6d93cc8b2 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Mod.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Mod.java @@ -14,7 +14,7 @@ */ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongToIntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/ModuloToInteger.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/ModuloToInteger.java index ab08ee9b5..dd842f08b 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/ModuloToInteger.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/ModuloToInteger.java @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; @@ -39,4 +39,4 @@ public class ModuloToInteger implements LongFunction { int ret = (int) (operand % modulo) & Integer.MAX_VALUE; return ret; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Mul.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Mul.java index 966f880e6..58f75523f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Mul.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Mul.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongToIntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Scale.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Scale.java index 2661ca185..cc87d2a8b 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Scale.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Scale.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongToIntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/SignedHash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/SignedHash.java index 3f7c80a91..0f2a9412d 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/SignedHash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/SignedHash.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.murmur.Murmur3F; import java.nio.ByteBuffer; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/ToInt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/ToInt.java index ff1571b17..cc98720b4 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/ToInt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/ToInt.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongToIntFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Add.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Add.java index 16797607f..439583d5e 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Add.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Add.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddCycleRange.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddCycleRange.java index 966703f43..1d4250f74 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddCycleRange.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddCycleRange.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddHashRange.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddHashRange.java index d5208840e..03de3cec0 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddHashRange.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddHashRange.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Clamp.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Clamp.java index 006136dcf..8a8d4e02f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Clamp.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Clamp.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/CycleRange.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/CycleRange.java index 4d8a26384..ea1cc3e9e 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/CycleRange.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/CycleRange.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Div.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Div.java index d77122c60..5881f635c 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Div.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Div.java @@ -14,8 +14,8 @@ */ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/DivideToLong.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/DivideToLong.java index 75855822d..aa3242ed5 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/DivideToLong.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/DivideToLong.java @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.Description; +import io.nosqlbench.virtdata.api.annotations.Description; import java.util.function.LongUnaryOperator; @@ -38,4 +38,4 @@ public class DivideToLong implements LongUnaryOperator { public long applyAsLong(long input) { return (input / divisor); } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Expr.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Expr.java index fb532f863..c97857265 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Expr.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Expr.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.MVELExpr; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import org.mvel2.MVEL; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FixedValue.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FixedValue.java index bab2d5083..a070740ea 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FixedValue.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FixedValue.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FixedValues.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FixedValues.java index bd0a29c39..58278da33 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FixedValues.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FixedValues.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FullHash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FullHash.java index c36a38254..660d0e1cc 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FullHash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FullHash.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.murmur.Murmur3F; import java.nio.ByteBuffer; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Hash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Hash.java index d56fa8418..5da6a81ee 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Hash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Hash.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.murmur.Murmur3F; import java.nio.ByteBuffer; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRange.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRange.java index bf8a7c800..b5218bb5c 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRange.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRange.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRangeScaled.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRangeScaled.java index abbb0c3f0..236c2513b 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRangeScaled.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRangeScaled.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HostHash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HostHash.java index fd6f00fd8..0267043e9 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HostHash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HostHash.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.Example; import io.nosqlbench.virtdata.murmur.Murmur3F; import java.net.InetAddress; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Identity.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Identity.java index c43f73d9a..1885f91c7 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Identity.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Identity.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Interpolate.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Interpolate.java index 1f533f421..e10a26c82 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Interpolate.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Interpolate.java @@ -1,6 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.*; + +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Load.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Load.java index 67b5ab2c1..d5d8f9de3 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Load.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Load.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/LongFlow.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/LongFlow.java index 2c4fbbf48..a52dd8cef 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/LongFlow.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/LongFlow.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Max.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Max.java index a1f7611b1..ab8abecd9 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Max.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Max.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Min.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Min.java index a69a8b408..0b385d108 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Min.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Min.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Mod.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Mod.java index 9fc369371..7c428d8fc 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Mod.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Mod.java @@ -14,7 +14,7 @@ */ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ModuloToLong.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ModuloToLong.java index 3ee36b8af..c7e288cf5 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ModuloToLong.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ModuloToLong.java @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; 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_long/Mul.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Mul.java index c6c352a99..9ee41a79d 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Mul.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Mul.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Murmur3DivToLong.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Murmur3DivToLong.java index fd29e6e04..7754b5d29 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Murmur3DivToLong.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Murmur3DivToLong.java @@ -18,8 +18,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.murmur.Murmur3F; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Save.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Save.java index 013237b3c..0246b7925 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Save.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Save.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Shuffle.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Shuffle.java index 6f233aee3..6e092ab39 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Shuffle.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Shuffle.java @@ -14,9 +14,9 @@ */ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.Description; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Description; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.lfsrs.MetaShift; /** diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SignedHash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SignedHash.java index a7b536295..aea79f702 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SignedHash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SignedHash.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.murmur.Murmur3F; import java.nio.ByteBuffer; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Swap.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Swap.java index 378ee4cf9..02a8b60c5 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Swap.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Swap.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/WeightedLongs.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/WeightedLongs.java index 3d24eb21e..71338460a 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/WeightedLongs.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/WeightedLongs.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_double.HashedDoubleRange; import java.util.ArrayList; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/CoinFunc.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/CoinFunc.java index a48165038..7533a250c 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/CoinFunc.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/CoinFunc.java @@ -1,11 +1,11 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_object; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_double.HashedDoubleRange; -import io.nosqlbench.virtdata.api.VirtDataFunctions; +import io.nosqlbench.virtdata.core.bindings.VirtDataFunctions; import java.util.function.Function; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncs.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncs.java index c32fa0e9e..7361afdd6 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncs.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncs.java @@ -1,12 +1,12 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_object; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +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_double.HashedDoubleRange; -import io.nosqlbench.virtdata.api.VirtDataFunctions; +import io.nosqlbench.virtdata.core.bindings.VirtDataFunctions; import java.util.ArrayList; import java.util.Arrays; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfEq.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfEq.java index cb9b8742b..7431e6740 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfEq.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfEq.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_other; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; /** @@ -23,4 +23,4 @@ public class NullIfEq implements LongFunction { if (value == compareto) return null; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfGe.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfGe.java index 20f993343..5b974b9f3 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfGe.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfGe.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_other; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; @@ -25,4 +25,4 @@ public class NullIfGe implements LongFunction { if (value >= compareto) return null; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfGt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfGt.java index 47271d327..6d663086f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfGt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfGt.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_other; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; @@ -25,4 +25,4 @@ public class NullIfGt implements LongFunction { if (value > compareto) return null; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfLe.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfLe.java index bf3322fc7..c5b694d32 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfLe.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfLe.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_other; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; @@ -25,4 +25,4 @@ public class NullIfLe implements LongFunction { if (value <= compareto) return null; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfLt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfLt.java index 8bfb2ccd3..db472d6af 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfLt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfLt.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_other; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; @@ -25,4 +25,4 @@ NullIfLt implements LongFunction { if (value < compareto) return null; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_short/LongToShort.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_short/LongToShort.java index fa1e2b404..26d3dc22c 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_short/LongToShort.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_short/LongToShort.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_short; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_short/ModuloToShort.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_short/ModuloToShort.java index 16eb797a0..b38ac22e6 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_short/ModuloToShort.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_short/ModuloToShort.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_short; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/AlphaNumericString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/AlphaNumericString.java index eccb912b3..d6588bbd8 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/AlphaNumericString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/AlphaNumericString.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Hash; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Combinations.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Combinations.java index 8263f4ddb..a6cb87df7 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Combinations.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Combinations.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.nio.ByteBuffer; import java.nio.CharBuffer; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLines.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLines.java index 5d78227b8..0a3c53db4 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLines.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLines.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; 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/DivideToLongToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DivideToLongToString.java index eb497bfbd..b7b58f5d4 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DivideToLongToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DivideToLongToString.java @@ -18,8 +18,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.concurrent.atomic.AtomicLong; import java.util.function.LongFunction; @@ -44,4 +44,4 @@ public class DivideToLongToString implements LongFunction { public String apply(long operand) { return String.valueOf((operand / divisor)); } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Expr.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Expr.java index 3535df11a..744a5a12f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Expr.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Expr.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.MVELExpr; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import org.mvel2.MVEL; 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 f90315b44..0679683d8 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 @@ -18,8 +18,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +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 org.apache.logging.log4j.Logger; 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 ee916e068..146c36210 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 @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +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 org.apache.logging.log4j.Logger; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLinesToKeyValueString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLinesToKeyValueString.java index 4eba0cd9a..ad5d8e959 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLinesToKeyValueString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLinesToKeyValueString.java @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection.HashedLineToStringStringMap; 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/HashedLoremExtractToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLoremExtractToString.java index f8e8ef308..6ebed7cf0 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLoremExtractToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLoremExtractToString.java @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTemplate.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTemplate.java index f057030e2..f8c870ae2 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTemplate.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTemplate.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ListTemplate.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ListTemplate.java index fc263560b..e7f9c26d9 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ListTemplate.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ListTemplate.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.ArrayList; import java.util.List; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/LongToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/LongToString.java index b02b41501..c567b14b8 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/LongToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/LongToString.java @@ -18,8 +18,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/MD5HexString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/MD5HexString.java index ddcc184e1..1d58dea19 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/MD5HexString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/MD5HexString.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.codec.binary.Hex; import java.nio.ByteBuffer; 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 3f039b56a..ac13fa4e8 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 @@ -18,8 +18,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.nb.api.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_string/ModuloLineToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloLineToString.java index b7950db7e..cd18c070f 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 @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.nb.api.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/Murmur3DivToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Murmur3DivToString.java index 08d6cdfb0..2c64d2ccf 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Murmur3DivToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Murmur3DivToString.java @@ -18,8 +18,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.murmur.Murmur3F; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.DivideToLong; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToString.java index ac0f4486d..08ab5efd3 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToString.java @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import uk.ydubey.formatter.numtoword.NumberInWordsFormatter; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/StaticStringMapper.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/StaticStringMapper.java index 76ea7f2fa..1cd5ff357 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/StaticStringMapper.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/StaticStringMapper.java @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/StringDateWrapper.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/StringDateWrapper.java index fc9d6a8a4..f948c9219 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/StringDateWrapper.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/StringDateWrapper.java @@ -18,9 +18,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java index 1b7eac9c3..81c5d6380 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VirtDataFunctions; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VirtDataFunctions; 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/ToBase64String.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64String.java index 149ba77ab..cb9970ef0 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64String.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64String.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.nio.ByteBuffer; import java.util.Base64; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/WeightedStrings.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/WeightedStrings.java index 89846ced4..e99bb6d7b 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/WeightedStrings.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/WeightedStrings.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_string; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_double.HashedDoubleRange; import java.util.ArrayList; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/StartingEpochMillis.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/StartingEpochMillis.java index 20efe28d8..284fc8b2d 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/StartingEpochMillis.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/StartingEpochMillis.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.DateTimeFormats; import org.joda.time.DateTime; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDate.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDate.java index 7fccf1775..93ed0b6a2 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDate.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDate.java @@ -36,9 +36,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.Date; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDateTime.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDateTime.java index a2da52305..0aa0dbdb5 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDateTime.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDateTime.java @@ -36,10 +36,10 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToEpochTimeUUID.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToEpochTimeUUID.java index 51753dea9..e20ad69a2 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToEpochTimeUUID.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToEpochTimeUUID.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.DateTimeFormats; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToFinestTimeUUID.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToFinestTimeUUID.java index c545ad929..826ba136f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToFinestTimeUUID.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToFinestTimeUUID.java @@ -1,10 +1,10 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; import io.nosqlbench.virtdata.library.basics.core.DateTimeFormats; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.UUID; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToJodaDateTime.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToJodaDateTime.java index 2258f797d..96d08e073 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToJodaDateTime.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToJodaDateTime.java @@ -36,9 +36,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfDay.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfDay.java index 608c30053..0c8766e52 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfDay.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfDay.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types.joda; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfHour.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfHour.java index 3c16b0388..aeb2e159a 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfHour.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfHour.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types.joda; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfMinute.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfMinute.java index 86a9ea612..b97c700d4 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfMinute.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfMinute.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types.joda; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfMonth.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfMonth.java index 7cee839d2..330117845 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfMonth.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfMonth.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types.joda; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNamedWeekDay.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNamedWeekDay.java index 5da77d2da..24678a448 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNamedWeekDay.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNamedWeekDay.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types.joda; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNextDay.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNextDay.java index 26377d684..56d8a8da5 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNextDay.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNextDay.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types.joda; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNextNamedWeekDay.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNextNamedWeekDay.java index ae82ccba3..4a7f8914f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNextNamedWeekDay.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNextNamedWeekDay.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types.joda; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfSecond.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfSecond.java index 84a6d72b3..bba07fe80 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfSecond.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfSecond.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types.joda; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfYear.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfYear.java index 1abc45b1f..e503e4916 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfYear.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfYear.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_time_types.joda; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/Unset.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/Unset.java index d56c0cb6d..3e5b1a2c7 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/Unset.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/Unset.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfEq.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfEq.java index 778d08d7a..9f08d05c0 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfEq.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfEq.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import java.util.function.LongFunction; @@ -26,4 +26,4 @@ public class UnsetIfEq implements LongFunction { if (value == compareto) return VALUE.unset; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfGe.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfGe.java index 35d8c347b..2dd9c947b 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfGe.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfGe.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import java.util.function.LongFunction; @@ -27,4 +27,4 @@ public class UnsetIfGe implements LongFunction { if (value >= compareto) return VALUE.unset; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfGt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfGt.java index 29f1573be..0c799434d 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfGt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfGt.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import java.util.function.LongFunction; @@ -26,4 +26,4 @@ public class UnsetIfGt implements LongFunction { if (value > compareto) return VALUE.unset; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfLe.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfLe.java index 4a7be0fa0..0d8e62b6b 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfLe.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfLe.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import java.util.function.LongFunction; @@ -27,4 +27,4 @@ public class UnsetIfLe implements LongFunction { if (value <= compareto) return VALUE.unset; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfLt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfLt.java index a2809b5e4..27ee177c2 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfLt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfLt.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import java.util.function.LongFunction; @@ -26,4 +26,4 @@ public class UnsetIfLt implements LongFunction { if (value < compareto) return VALUE.unset; return value; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/Expr.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/Expr.java index ea3f4b955..69ae679a0 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/Expr.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/Expr.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_uuid; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.MVELExpr; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import org.mvel2.MVEL; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToHashedUUID.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToHashedUUID.java index 12736339a..9c1a5eca7 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToHashedUUID.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToHashedUUID.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_uuid; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Hash; import java.util.UUID; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUID.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUID.java index d7ea8bd93..476c59ca9 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUID.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUID.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_uuid; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Hash; import java.util.UUID; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchFunc.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchFunc.java index 3a9f69ef7..d129cda2c 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchFunc.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchFunc.java @@ -1,10 +1,10 @@ package io.nosqlbench.virtdata.library.basics.shared.from_string; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.composers.FunctionAssembly; -import io.nosqlbench.virtdata.api.composers.FunctionComposer; -import io.nosqlbench.virtdata.api.VirtDataFunctions; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.composers.FunctionAssembly; +import io.nosqlbench.virtdata.core.composers.FunctionComposer; +import io.nosqlbench.virtdata.core.bindings.VirtDataFunctions; import java.util.function.Function; import java.util.regex.Matcher; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchRegex.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchRegex.java index f37ab0630..98e731894 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchRegex.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchRegex.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.from_string; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; import java.util.regex.Matcher; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_epoch/DateTimeParser.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_epoch/DateTimeParser.java index cad96ce13..f7231b9ce 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_epoch/DateTimeParser.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_epoch/DateTimeParser.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_string.to_epoch; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.joda.time.DateTime; import org.joda.time.chrono.GregorianChronology; import org.joda.time.format.DateTimeFormat; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/NullIfEmpty.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/NullIfEmpty.java index 32df5a699..ac8dcdcf9 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/NullIfEmpty.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/NullIfEmpty.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_string.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/NullIfNullOrEmpty.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/NullIfNullOrEmpty.java index e28854208..2d96ac9c3 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/NullIfNullOrEmpty.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/NullIfNullOrEmpty.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.from_string.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; @@ -12,7 +12,7 @@ import java.util.function.Function; @Categories(Category.nulls) @ThreadSafeMapper public class NullIfNullOrEmpty implements Function { - + @Override public String apply(String s) { if (s==null || s.isEmpty()) { diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfEmpty.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfEmpty.java index 7c6676eee..3e09a46cb 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfEmpty.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfEmpty.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_string.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfNullOrEmpty.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfNullOrEmpty.java index 5658c0b07..47a10355d 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfNullOrEmpty.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfNullOrEmpty.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_string.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import java.util.function.Function; @@ -14,7 +14,7 @@ import java.util.function.Function; @Categories(Category.nulls) @ThreadSafeMapper public class UnsetIfNullOrEmpty implements Function { - + @Override public Object apply(String s) { if (s==null || s.isEmpty()) { diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfStringEq.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfStringEq.java index 194a9a065..2db4bc1de 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfStringEq.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfStringEq.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_string.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfStringNe.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfStringNe.java index 4b6ce5605..bad331da3 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfStringNe.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfStringNe.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.from_string.to_unset; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/Flow.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/Flow.java index dfa935351..eb0e480d1 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/Flow.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/Flow.java @@ -1,12 +1,12 @@ package io.nosqlbench.virtdata.library.basics.shared.functionadapters; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.composers.FunctionAssembly; -import io.nosqlbench.virtdata.api.composers.FunctionComposer; -import io.nosqlbench.virtdata.api.ResolvedFunction; -import io.nosqlbench.virtdata.api.VirtDataFunctions; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.composers.FunctionAssembly; +import io.nosqlbench.virtdata.core.composers.FunctionComposer; +import io.nosqlbench.virtdata.core.bindings.ResolvedFunction; +import io.nosqlbench.virtdata.core.bindings.VirtDataFunctions; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/ToLongFunction.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/ToLongFunction.java index 20e0f3f46..93c28e5b3 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/ToLongFunction.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/ToLongFunction.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.functionadapters; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.*; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/ToLongUnaryOperator.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/ToLongUnaryOperator.java index 1ab86cb6f..d9a5a099f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/ToLongUnaryOperator.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/ToLongUnaryOperator.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.functionadapters; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToInteger.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToInteger.java index bbecd8bdb..30f26b5c0 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToInteger.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToInteger.java @@ -18,8 +18,8 @@ package io.nosqlbench.virtdata.library.basics.shared.nondeterministic; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongFunction; import java.util.regex.Matcher; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToLong.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToLong.java index 49ff0aa7e..2bac10b9b 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToLong.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToLong.java @@ -18,8 +18,8 @@ package io.nosqlbench.virtdata.library.basics.shared.nondeterministic; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; import java.util.regex.Matcher; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_int/ThreadNum.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_int/ThreadNum.java index 083fa63e9..cbd7ae2f9 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_int/ThreadNum.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_int/ThreadNum.java @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.basics.shared.nondeterministic.to_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongToIntFunction; import java.util.regex.Matcher; @@ -55,4 +55,4 @@ public class ThreadNum implements LongToIntFunction { return threadLocalInt.get(); } } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_long/ThreadNum.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_long/ThreadNum.java index d2d7a6c3d..0773fd97f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_long/ThreadNum.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_long/ThreadNum.java @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.basics.shared.nondeterministic.to_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.LongUnaryOperator; import java.util.regex.Matcher; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Clear.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Clear.java index c882ca04a..ec42463e0 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Clear.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Clear.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Load.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Load.java index 8fdccb3e2..1719a562f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Load.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Load.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadDouble.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadDouble.java index 91111cbe6..129b83979 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadDouble.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadDouble.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadElement.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadElement.java index 9fb5c50d1..c193c8f2a 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadElement.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadElement.java @@ -1,10 +1,10 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.config.ConfigAware; -import io.nosqlbench.virtdata.api.config.ConfigModel; -import io.nosqlbench.virtdata.api.config.MutableConfigModel; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.config.ConfigAware; +import io.nosqlbench.virtdata.core.config.ConfigModel; +import io.nosqlbench.virtdata.core.config.MutableConfigModel; import java.util.Map; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadFloat.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadFloat.java index c0ccd5458..0f1e55a86 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadFloat.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadFloat.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadInteger.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadInteger.java index 19b568782..48d425950 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadInteger.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadInteger.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadLong.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadLong.java index f51ad07c6..9076896cd 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadLong.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadLong.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadString.java index efe9a99ed..0f7d38d7b 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadString.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrLoad.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrLoad.java index 0e5a210a4..cfd907d43 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrLoad.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrLoad.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_double.HashedDoubleRange; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrPass.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrPass.java index 0df18a155..5868cd028 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrPass.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrPass.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_double.HashedDoubleRange; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Save.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Save.java index 4e4333ca6..ee948f880 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Save.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Save.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveDouble.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveDouble.java index 2b27f7731..94cddf630 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveDouble.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveDouble.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveFloat.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveFloat.java index a85d76e38..93f4dc86a 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveFloat.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveFloat.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveInteger.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveInteger.java index 0d215e390..9ee41f219 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveInteger.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveInteger.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveLong.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveLong.java index f94deda5e..7da01641e 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveLong.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveLong.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveString.java index da0c00cae..4f3b78ba9 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveString.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Show.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Show.java index 093946ec7..e1c1c8484 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Show.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Show.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Swap.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Swap.java index ee8115408..6a0a48a96 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Swap.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Swap.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/UnsetOrLoad.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/UnsetOrLoad.java index a325dd898..91bd48f11 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/UnsetOrLoad.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/UnsetOrLoad.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_double.HashedDoubleRange; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/UnsetOrPass.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/UnsetOrPass.java index 3367acc8b..dab983965 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/UnsetOrPass.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/UnsetOrPass.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.api.VALUE; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.core.bindings.VALUE; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_double.HashedDoubleRange; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Clear.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Clear.java index d677d7911..6f70a40c5 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Clear.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Clear.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Load.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Load.java index 7c2072f32..c97a1140c 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Load.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Load.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadDouble.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadDouble.java index a6d9c5f9f..a18996c16 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadDouble.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadDouble.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadFloat.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadFloat.java index 9f0689116..20cf3dc3a 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadFloat.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadFloat.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadInteger.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadInteger.java index 77a1bcd66..22c07f227 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadInteger.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadInteger.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadLong.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadLong.java index fcec1e18d..8af96b9cb 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadLong.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadLong.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadString.java index c56c6d205..11d5aa636 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadString.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Save.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Save.java index e87a398ff..6e1227420 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Save.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Save.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveDouble.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveDouble.java index 6338a3219..57b4d6577 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveDouble.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveDouble.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveFloat.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveFloat.java index 9631bde90..086916c55 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveFloat.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveFloat.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveInteger.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveInteger.java index 8d9567c52..a9dc964fa 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveInteger.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveInteger.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.function.LongFunction; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveLong.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveLong.java index b1453cd41..248589bb7 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveLong.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveLong.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveString.java index 6037a6af0..f33bf2ea3 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveString.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Show.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Show.java index 7fd5bd27e..69db21da9 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Show.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Show.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Swap.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Swap.java index 67fc7b4be..645e30975 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Swap.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Swap.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful.from_long; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Add.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Add.java index 87ef9722c..cc8134d61 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Add.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Add.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddCycleRange.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddCycleRange.java index c9e05185f..e4c03c7ba 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddCycleRange.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddCycleRange.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddHashRange.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddHashRange.java index b29c08f1b..520a3cb73 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddHashRange.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddHashRange.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Clamp.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Clamp.java index ece68cc5f..25c884d5f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Clamp.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Clamp.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/CycleRange.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/CycleRange.java index a997166a4..f436c279e 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/CycleRange.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/CycleRange.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Div.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Div.java index cf92a68b9..0f96bc64a 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Div.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Div.java @@ -14,8 +14,8 @@ */ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.Description; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Description; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Expr.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Expr.java index f951a6f6b..b3bee792c 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Expr.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Expr.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.MVELExpr; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import org.mvel2.MVEL; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Hash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Hash.java index e52a08b81..80257a1f2 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Hash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Hash.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.murmur.Murmur3F; import java.nio.ByteBuffer; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRange.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRange.java index 58a5a8ede..2d031b164 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRange.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRange.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRangeScaled.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRangeScaled.java index f0ada2401..246df876d 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRangeScaled.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRangeScaled.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/IntFlow.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/IntFlow.java index cf61961ac..757af46ce 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/IntFlow.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/IntFlow.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Load.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Load.java index 01809a237..fb0633eb2 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Load.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Load.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Max.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Max.java index ddc4ec1b0..ad20460e4 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Max.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Max.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Min.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Min.java index 0f1e4d986..e8f931427 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Min.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Min.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mod.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mod.java index c59f369fb..f44bb145b 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mod.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mod.java @@ -14,7 +14,7 @@ */ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mul.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mul.java index 5f0a9a37f..9c69075cc 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mul.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mul.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Save.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Save.java index d400df827..5a99c2112 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Save.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Save.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Scale.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Scale.java index 64f636553..0c6043788 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Scale.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Scale.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.IntUnaryOperator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/SignedHash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/SignedHash.java index d84f86c3c..f49c0cc15 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/SignedHash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/SignedHash.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.murmur.Murmur3F; import java.nio.ByteBuffer; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/ToInt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/ToInt.java index 0fd5e036a..aeaf95941 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/ToInt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/ToInt.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractor.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractor.java index 36f109536..69e767e2e 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractor.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractor.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_string; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; 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/unary_string/Load.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Load.java index 8aab6c8a6..c2e25d3c4 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Load.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Load.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_string; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.HashMap; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Prefix.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Prefix.java index 37dc1b121..9ef754dda 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Prefix.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Prefix.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_string; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Save.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Save.java index 06baa5e57..ee00f3390 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Save.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Save.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_string; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/StringFlow.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/StringFlow.java index 33191ec7c..806cf821f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/StringFlow.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/StringFlow.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_string; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Suffix.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Suffix.java index aae19a8b8..2d2595e77 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Suffix.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Suffix.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_string; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToBase64String.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToBase64String.java index 6980697ed..cd05983a2 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToBase64String.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToBase64String.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_string; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToString.java index 2bd84da6a..f8668aac7 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToString.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_string; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Trim.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Trim.java index 347ff5036..ed3bad0e8 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Trim.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Trim.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.basics.shared.unary_string; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import java.util.function.Function; diff --git a/virtdata-lib-basics/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/virtdata-lib-basics/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 77f0797f1..cfe520cfe 100644 --- a/virtdata-lib-basics/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/virtdata-lib-basics/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,2 @@ -io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor +io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/libraryimpl/BasicDataMappersTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/libraryimpl/BasicDataMappersTest.java index e25132722..2fb96a6d4 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/libraryimpl/BasicDataMappersTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/libraryimpl/BasicDataMappersTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.basics.tests.libraryimpl; -import io.nosqlbench.virtdata.api.DataMapper; -import io.nosqlbench.virtdata.api.VirtData; +import io.nosqlbench.virtdata.core.bindings.DataMapper; +import io.nosqlbench.virtdata.core.bindings.VirtData; import org.junit.Test; import java.util.Date; @@ -70,4 +70,4 @@ public class BasicDataMappersTest { assertThat(dataMapper.get().get(1)).isNotNull(); } -} \ No newline at end of file +} diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Beta.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Beta.java index 48eba8212..923518659 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Beta.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Beta.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.BetaDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Cauchy.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Cauchy.java index 58d5b6321..2b653db06 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Cauchy.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Cauchy.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.CauchyDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/ChiSquared.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/ChiSquared.java index d6afdabea..c27a577dd 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/ChiSquared.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/ChiSquared.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.ChiSquaredDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/ConstantContinuous.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/ConstantContinuous.java index a57f19e88..14f7bd991 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/ConstantContinuous.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/ConstantContinuous.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.ConstantContinuousDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Enumerated.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Enumerated.java index b84bf4a8e..3738706e1 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Enumerated.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Enumerated.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.math4.distribution.EnumeratedRealDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Exponential.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Exponential.java index ea5dde355..a6bb42bc1 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Exponential.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Exponential.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.ExponentialDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/F.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/F.java index f71c8c1cb..0df3f5bcd 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/F.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/F.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.FDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Gamma.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Gamma.java index a4e514b28..c9f6a586c 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Gamma.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Gamma.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.GammaDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Gumbel.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Gumbel.java index 60a9498cc..fd5d465ca 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Gumbel.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Gumbel.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.GumbelDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Laplace.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Laplace.java index 04348049b..b3776ebe3 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Laplace.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Laplace.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.LaplaceDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Levy.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Levy.java index 971f1725b..26fa54b89 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Levy.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Levy.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.LevyDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/LogNormal.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/LogNormal.java index 4943d4942..6ffde8945 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/LogNormal.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/LogNormal.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.LogNormalDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Logistic.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Logistic.java index 6638e17b8..989ebd3bb 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Logistic.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Logistic.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.LogisticDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Nakagami.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Nakagami.java index 18b2b30cc..04f9a95e6 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Nakagami.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Nakagami.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.NakagamiDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Normal.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Normal.java index 627aea44b..a3c7c641f 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Normal.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Normal.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.NormalDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Pareto.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Pareto.java index 32a7107b4..05226d37e 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Pareto.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Pareto.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.ParetoDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/T.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/T.java index b7d4081fa..10a22094a 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/T.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/T.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.TDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Triangular.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Triangular.java index db1b43f24..610d36bc1 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Triangular.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Triangular.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.TriangularDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Uniform.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Uniform.java index f7cba4dda..0f3ce20bb 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Uniform.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Uniform.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.UniformContinuousDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Weibull.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Weibull.java index bb4a09e75..0f5a0342b 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Weibull.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Weibull.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.WeibullDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Beta.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Beta.java index 75c5f954c..85e84fad9 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Beta.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Beta.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.BetaDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Cauchy.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Cauchy.java index 408c4951d..5213f787f 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Cauchy.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Cauchy.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.CauchyDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ChiSquared.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ChiSquared.java index 5698e4f15..91f785b90 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ChiSquared.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ChiSquared.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.ChiSquaredDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ConstantContinuous.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ConstantContinuous.java index 983594445..2fedb4e14 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ConstantContinuous.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ConstantContinuous.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.ConstantContinuousDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Enumerated.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Enumerated.java index a84a3288b..149086be1 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Enumerated.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Enumerated.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.math4.distribution.EnumeratedRealDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Exponential.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Exponential.java index 682b362a6..ea1497a06 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Exponential.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Exponential.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.ExponentialDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/F.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/F.java index d78b44e3e..bc7982677 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/F.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/F.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.FDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gamma.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gamma.java index 9e51e03ba..7646809dd 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gamma.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gamma.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.GammaDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gumbel.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gumbel.java index 6b21c087f..ef797ab33 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gumbel.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gumbel.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.GumbelDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Laplace.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Laplace.java index c3812043e..c6befd41c 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Laplace.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Laplace.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.LaplaceDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Levy.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Levy.java index aab69b14b..c8e6f1d0c 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Levy.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Levy.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.LevyDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/LogNormal.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/LogNormal.java index 68d15c549..638e9cc98 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/LogNormal.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/LogNormal.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.LogNormalDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Logistic.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Logistic.java index b51175187..defac11e9 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Logistic.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Logistic.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.LogisticDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Nakagami.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Nakagami.java index 77fa573e3..7afb1b78f 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Nakagami.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Nakagami.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.NakagamiDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Normal.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Normal.java index c7515f8e9..5199ed00b 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Normal.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Normal.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.NormalDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Pareto.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Pareto.java index 4957d68e7..44c6654e2 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Pareto.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Pareto.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.ParetoDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/T.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/T.java index fce24b9b7..03e3b4a36 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/T.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/T.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.TDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Triangular.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Triangular.java index dff67c009..db26e7047 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Triangular.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Triangular.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.TriangularDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Uniform.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Uniform.java index 6782aa60c..9892c4e49 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Uniform.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Uniform.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.UniformContinuousDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Weibull.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Weibull.java index a8a69273b..b43959642 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Weibull.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Weibull.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.WeibullDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Binomial.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Binomial.java index 80bf33bba..6e6d3d3d0 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Binomial.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Binomial.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.discrete.int_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.BinomialDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Geometric.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Geometric.java index 31eb6a463..9279e0352 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Geometric.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Geometric.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.discrete.int_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.GeometricDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Hypergeometric.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Hypergeometric.java index e1caf4cbe..b488dcdb9 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Hypergeometric.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Hypergeometric.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.discrete.int_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.HypergeometricDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Pascal.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Pascal.java index f18881baf..220b1a8e3 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Pascal.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Pascal.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.discrete.int_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.PascalDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Poisson.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Poisson.java index ccfd3fad1..f00cdbea6 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Poisson.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Poisson.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.discrete.int_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.PoissonDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Uniform.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Uniform.java index 6d50ba8b7..4b1914bbb 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Uniform.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Uniform.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.discrete.int_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.UniformDiscreteDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Zipf.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Zipf.java index ff44a381e..1983a1d52 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Zipf.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Zipf.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.curves4.discrete.int_int; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.ZipfDistribution; /** diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Binomial.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Binomial.java index c3861d3ff..f05b7ebe5 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Binomial.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Binomial.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.int_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.BinomialDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Geometric.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Geometric.java index 6997ebc6f..5643ea78e 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Geometric.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Geometric.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.int_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.GeometricDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Hypergeometric.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Hypergeometric.java index 850bffeb0..516a0deed 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Hypergeometric.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Hypergeometric.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.int_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.HypergeometricDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Pascal.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Pascal.java index eeceb2825..be09a7369 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Pascal.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Pascal.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.int_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.PascalDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Poisson.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Poisson.java index 54b3216d7..4226399fb 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Poisson.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Poisson.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.int_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.PoissonDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Uniform.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Uniform.java index 1a167c427..a45747ea9 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Uniform.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Uniform.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.int_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.UniformDiscreteDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Zipf.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Zipf.java index d417ca521..508a723bd 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Zipf.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Zipf.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.int_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.ZipfDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Binomial.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Binomial.java index bba3ac9ec..e136aa43f 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Binomial.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Binomial.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.long_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.BinomialDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Geometric.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Geometric.java index 71ea64fe4..c78b95453 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Geometric.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Geometric.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.long_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.GeometricDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Hypergeometric.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Hypergeometric.java index 53811f6ea..780f974a5 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Hypergeometric.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Hypergeometric.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.long_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.HypergeometricDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Pascal.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Pascal.java index 853f0b391..034e9165d 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Pascal.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Pascal.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.long_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.PascalDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Poisson.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Poisson.java index 59de90f55..e794b62cd 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Poisson.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Poisson.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.long_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.PoissonDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Uniform.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Uniform.java index cbdc5d0aa..b3039b45e 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Uniform.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Uniform.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.long_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.UniformDiscreteDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Zipf.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Zipf.java index 7ab5eced6..0b3abbc81 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Zipf.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Zipf.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.long_int; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.ZipfDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Binomial.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Binomial.java index a581088ae..3f7181a05 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Binomial.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Binomial.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.long_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.BinomialDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Geometric.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Geometric.java index c7bd85632..ea288319d 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Geometric.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Geometric.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.long_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.GeometricDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Hypergeometric.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Hypergeometric.java index 4bc72b50d..de71f854e 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Hypergeometric.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Hypergeometric.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.long_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.HypergeometricDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Pascal.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Pascal.java index 4212ffb76..d4c0a655d 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Pascal.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Pascal.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.long_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.PascalDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Poisson.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Poisson.java index d5e3a7bfa..9bb2c322a 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Poisson.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Poisson.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.long_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.PoissonDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Uniform.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Uniform.java index 83ea08b03..759a6c5b3 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Uniform.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Uniform.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.long_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.UniformDiscreteDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Zipf.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Zipf.java index 9d8594710..5f0053189 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Zipf.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Zipf.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.library.curves4.discrete.long_long; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import org.apache.commons.statistics.distribution.ZipfDistribution; @ThreadSafeMapper diff --git a/virtdata-lib-curves4/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/virtdata-lib-curves4/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 77f0797f1..fcb692d9f 100644 --- a/virtdata-lib-curves4/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/virtdata-lib-curves4/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,3 @@ -io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor +io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor + io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsConcurrencyTests.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsConcurrencyTests.java index bd1658465..c68871126 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsConcurrencyTests.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsConcurrencyTests.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.curves4.continuous; -import io.nosqlbench.virtdata.api.DataMapper; -import io.nosqlbench.virtdata.api.VirtData; +import io.nosqlbench.virtdata.core.bindings.DataMapper; +import io.nosqlbench.virtdata.core.bindings.VirtData; import org.junit.Test; import java.util.ArrayList; diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsConcurrencyTest.java b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsConcurrencyTest.java index 97f15072b..79bfcc0c9 100644 --- a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsConcurrencyTest.java +++ b/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsConcurrencyTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.curves4.discrete; -import io.nosqlbench.virtdata.api.DataMapper; -import io.nosqlbench.virtdata.api.VirtData; +import io.nosqlbench.virtdata.core.bindings.DataMapper; +import io.nosqlbench.virtdata.core.bindings.VirtData; import org.apache.commons.statistics.distribution.BinomialDistribution; import org.assertj.core.data.Offset; import org.junit.Test; 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 7fc6be3d1..b4307bc0a 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 @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.random; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; import io.nosqlbench.nb.api.VirtDataResources; import org.apache.commons.math3.distribution.IntegerDistribution; import org.apache.commons.math3.distribution.UniformIntegerDistribution; 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 c8372de79..e8c5850d5 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,6 +1,6 @@ package io.nosqlbench.virtdata.library.random; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; import io.nosqlbench.nb.api.VirtDataResources; import org.apache.commons.math3.distribution.IntegerDistribution; import org.apache.commons.math3.distribution.UniformIntegerDistribution; 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 11ffd75d1..b7de4ae42 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 @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.random; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; import io.nosqlbench.nb.api.VirtDataResources; import org.apache.commons.math3.distribution.IntegerDistribution; import org.apache.commons.math3.distribution.UniformIntegerDistribution; diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToStringMap.java b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToStringMap.java index d06ac9815..a62d263e3 100644 --- a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToStringMap.java +++ b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToStringMap.java @@ -19,7 +19,7 @@ package io.nosqlbench.virtdata.library.random; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; 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/RandomLinesToKeyValueString.java b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLinesToKeyValueString.java index fb384f986..7fd3d83b8 100644 --- a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLinesToKeyValueString.java +++ b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLinesToKeyValueString.java @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.random; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; import org.apache.commons.math3.random.MersenneTwister; 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/RandomLongToString.java b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLongToString.java index 4a12e47cf..d7be06af2 100644 --- a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLongToString.java +++ b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLongToString.java @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.random; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; import org.apache.commons.math3.random.MersenneTwister; import java.util.function.LongFunction; diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLoremExtractToString.java b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLoremExtractToString.java index 328eca5b9..31a34acf6 100644 --- a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLoremExtractToString.java +++ b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLoremExtractToString.java @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.random; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; import java.util.function.LongFunction; diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToDouble.java b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToDouble.java index 5aa6bd6fa..cd257a5e4 100644 --- a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToDouble.java +++ b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToDouble.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.library.random; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; -import io.nosqlbench.virtdata.api.DataMapper; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.core.bindings.DataMapper; import org.apache.commons.math3.random.MersenneTwister; @DeprecatedFunction("random mappers are not deterministic. They will be replaced with hash-based functions.") diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToInt.java b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToInt.java index d68bc34f9..9c3027764 100644 --- a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToInt.java +++ b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToInt.java @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.random; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; import org.apache.commons.math3.random.MersenneTwister; import java.util.function.LongFunction; diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToLong.java b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToLong.java index 8ebc10007..e0b8f7346 100644 --- a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToLong.java +++ b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToLong.java @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.random; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; import org.apache.commons.math3.random.MersenneTwister; import java.util.function.LongUnaryOperator; diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToString.java b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToString.java index 51b70b2b3..63ac952ae 100644 --- a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToString.java +++ b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToString.java @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.random; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; import org.apache.commons.math3.random.MersenneTwister; import java.util.function.LongFunction; diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomToByteBuffer.java b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomToByteBuffer.java index 5f34b2449..a7e0f28c4 100644 --- a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomToByteBuffer.java +++ b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomToByteBuffer.java @@ -18,7 +18,7 @@ package io.nosqlbench.virtdata.library.random; -import io.nosqlbench.virtdata.annotations.DeprecatedFunction; +import io.nosqlbench.virtdata.api.annotations.DeprecatedFunction; import org.apache.commons.math3.random.MersenneTwister; import java.nio.ByteBuffer; diff --git a/virtdata-lib-random/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/virtdata-lib-random/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 77f0797f1..fcb692d9f 100644 --- a/virtdata-lib-random/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/virtdata-lib-random/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,3 @@ -io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor +io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor + io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/FirstNames.java b/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/FirstNames.java index 62e78d2d0..46ca06f54 100644 --- a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/FirstNames.java +++ b/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/FirstNames.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.realer; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.distributions.WeightedStringsFromCSV; import java.util.function.LongFunction; diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/FullNames.java b/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/FullNames.java index 41b3d88a1..82d1b1511 100644 --- a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/FullNames.java +++ b/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/FullNames.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.library.realer; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.Template; import java.util.function.LongFunction; diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/LastNames.java b/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/LastNames.java index 45e8aa9ee..fdf819a0d 100644 --- a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/LastNames.java +++ b/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/LastNames.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.library.realer; -import io.nosqlbench.virtdata.annotations.Categories; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.annotations.Example; -import io.nosqlbench.virtdata.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.shared.distributions.WeightedStringsFromCSV; import java.util.function.LongFunction; diff --git a/virtdata-lib-realer/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/virtdata-lib-realer/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 77f0797f1..fcb692d9f 100644 --- a/virtdata-lib-realer/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/virtdata-lib-realer/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,3 @@ -io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor +io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor + io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/virtdata-processors/pom.xml b/virtdata-processors/pom.xml deleted file mode 100644 index 24de8c9db..000000000 --- a/virtdata-processors/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - 4.0.0 - - virtdata-processors - jar - - - mvn-defaults - io.nosqlbench - 3.12.73-SNAPSHOT - ../mvn-defaults - - - virtdata-processors - - - - com.squareup - javapoet - - - io.nosqlbench - virtdata-annotations - 3.12.73-SNAPSHOT - - - - - - - - io.nosqlbench - nb-api - 3.12.73-SNAPSHOT - compile - - - - diff --git a/virtdata-realdata/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/virtdata-realdata/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 77f0797f1..fcb692d9f 100644 --- a/virtdata-realdata/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/virtdata-realdata/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,3 @@ -io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor +io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor + io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataService.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataService.java index 07d072cac..2dd5745ba 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataService.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataService.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.userlibs.apps; import io.nosqlbench.nb.api.annotations.Service; -import io.nosqlbench.virtdata.api.DataMapper; -import io.nosqlbench.virtdata.api.ResolverDiagnostics; -import io.nosqlbench.virtdata.api.VirtData; +import io.nosqlbench.virtdata.core.bindings.DataMapper; +import io.nosqlbench.virtdata.core.bindings.ResolverDiagnostics; +import io.nosqlbench.virtdata.core.bindings.VirtData; import io.nosqlbench.docsys.api.WebServiceObject; import javax.inject.Singleton; 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 fb0de7b19..ab116cc00 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 @@ -2,10 +2,10 @@ package io.nosqlbench.virtdata.userlibs.apps.docsapp; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.api.VirtDataDocs; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.core.bindings.VirtDataDocs; import io.nosqlbench.nb.api.VirtDataResources; -import io.nosqlbench.virtdata.processors.DocFuncData; +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; import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.FDocFunc; diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsJson.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsJson.java index ce1e87c3b..f7fa96b7a 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsJson.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsJson.java @@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.userlibs.apps.docsapp; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import io.nosqlbench.virtdata.processors.DocFuncData; +import io.nosqlbench.virtdata.api.processors.DocFuncData; import java.util.List; diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsWebService.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsWebService.java index 25168293a..c02d261b7 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsWebService.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsWebService.java @@ -3,9 +3,9 @@ package io.nosqlbench.virtdata.userlibs.apps.docsapp; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.jaxrs.annotation.JacksonFeatures; import io.nosqlbench.nb.api.annotations.Service; -import io.nosqlbench.virtdata.api.VirtDataDocs; +import io.nosqlbench.virtdata.core.bindings.VirtDataDocs; import io.nosqlbench.docsys.api.WebServiceObject; -import io.nosqlbench.virtdata.processors.DocFuncData; +import io.nosqlbench.virtdata.api.processors.DocFuncData; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCtor.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCtor.java index 9ed87b137..10b7c867d 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCtor.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCtor.java @@ -1,6 +1,6 @@ package io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs; -import io.nosqlbench.virtdata.processors.DocCtorData; +import io.nosqlbench.virtdata.api.processors.DocCtorData; import java.util.List; import java.util.Map; diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFunc.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFunc.java index 03ae6d1d0..044f79c24 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFunc.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFunc.java @@ -1,8 +1,8 @@ package io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.processors.DocCtorData; -import io.nosqlbench.virtdata.processors.DocFuncData; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.processors.DocCtorData; +import io.nosqlbench.virtdata.api.processors.DocFuncData; import java.util.*; import java.util.stream.Collectors; diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java index 1136b3a80..a286cf9dc 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs; import com.vladsch.flexmark.convert.html.FlexmarkHtmlParser; -import io.nosqlbench.virtdata.processors.DocCtorData; +import io.nosqlbench.virtdata.api.processors.DocCtorData; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerCoordinator.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerCoordinator.java index 09d95fcf4..88d97d0ff 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerCoordinator.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerCoordinator.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.userlibs.apps.valuesapp; -import io.nosqlbench.virtdata.api.DataMapper; -import io.nosqlbench.virtdata.api.VirtData; +import io.nosqlbench.virtdata.core.bindings.DataMapper; +import io.nosqlbench.virtdata.core.bindings.VirtData; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; @@ -211,4 +211,4 @@ public class ValuesCheckerCoordinator implements Callable { ((double) cmpTimeAccumulator / 1000000.0D) ); } -} \ No newline at end of file +} diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerRunnable.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerRunnable.java index 14a5b880a..5300d04d2 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerRunnable.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerRunnable.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.userlibs.apps.valuesapp; -import io.nosqlbench.virtdata.api.DataMapper; -import io.nosqlbench.virtdata.api.VirtData; +import io.nosqlbench.virtdata.core.bindings.DataMapper; +import io.nosqlbench.virtdata.core.bindings.VirtData; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/virtdata-userlibs/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/virtdata-userlibs/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 77f0797f1..fcb692d9f 100644 --- a/virtdata-userlibs/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/virtdata-userlibs/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,3 @@ -io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor +io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor + io.nosqlbench.nb.api.processors.ServiceProcessor diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/core/VirtDataDocsIntegratedTest.java b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/core/VirtDataDocsIntegratedTest.java index 3b636e1a6..97e150c8a 100644 --- a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/core/VirtDataDocsIntegratedTest.java +++ b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/core/VirtDataDocsIntegratedTest.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.core; -import io.nosqlbench.virtdata.api.VirtDataDocs; -import io.nosqlbench.virtdata.processors.DocFuncData; +import io.nosqlbench.virtdata.core.bindings.VirtDataDocs; +import io.nosqlbench.virtdata.api.processors.DocFuncData; import org.junit.Test; import java.util.List; diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc1.java b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc1.java index c807e8899..1981a2474 100644 --- a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc1.java +++ b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc1.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.processors.DocCtorData; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.processors.DocCtorData; import io.nosqlbench.virtdata.processors.DocForFuncCtor; -import io.nosqlbench.virtdata.processors.DocFuncData; +import io.nosqlbench.virtdata.api.processors.DocFuncData; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc2.java b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc2.java index f02536c1a..8a0516f57 100644 --- a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc2.java +++ b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc2.java @@ -1,9 +1,9 @@ package io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs; -import io.nosqlbench.virtdata.annotations.Category; -import io.nosqlbench.virtdata.processors.DocCtorData; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.processors.DocCtorData; import io.nosqlbench.virtdata.processors.DocForFuncCtor; -import io.nosqlbench.virtdata.processors.DocFuncData; +import io.nosqlbench.virtdata.api.processors.DocFuncData; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java index ec30b4f18..f62e33b91 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java @@ -15,9 +15,9 @@ package io.virtdata; -import io.nosqlbench.virtdata.api.DataMapper; -import io.nosqlbench.virtdata.api.Bindings; -import io.nosqlbench.virtdata.api.VirtData; +import io.nosqlbench.virtdata.core.bindings.DataMapper; +import io.nosqlbench.virtdata.core.bindings.Bindings; +import io.nosqlbench.virtdata.core.bindings.VirtData; import org.junit.Test; import java.util.LinkedHashMap; diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLibraryTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLibraryTest.java index 2d5dc7153..cd2709092 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLibraryTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLibraryTest.java @@ -15,11 +15,11 @@ package io.virtdata; -import io.nosqlbench.virtdata.api.DataMapper; -import io.nosqlbench.virtdata.api.Bindings; -import io.nosqlbench.virtdata.api.BindingsTemplate; -import io.nosqlbench.virtdata.api.ResolverDiagnostics; -import io.nosqlbench.virtdata.api.VirtData; +import io.nosqlbench.virtdata.core.bindings.DataMapper; +import io.nosqlbench.virtdata.core.bindings.Bindings; +import io.nosqlbench.virtdata.core.bindings.BindingsTemplate; +import io.nosqlbench.virtdata.core.bindings.ResolverDiagnostics; +import io.nosqlbench.virtdata.core.bindings.VirtData; import org.junit.Ignore; import org.junit.Test; diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java index c8e51af24..2274cb682 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java @@ -1,7 +1,7 @@ package io.virtdata; -import io.nosqlbench.virtdata.api.DataMapper; -import io.nosqlbench.virtdata.api.VirtData; +import io.nosqlbench.virtdata.core.bindings.DataMapper; +import io.nosqlbench.virtdata.core.bindings.VirtData; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Identity; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.NumberNameToString; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.Template; diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedCurvesTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedCurvesTest.java index 2d31b783d..d66a94a8f 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedCurvesTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedCurvesTest.java @@ -1,7 +1,7 @@ package io.virtdata; -import io.nosqlbench.virtdata.api.DataMapper; -import io.nosqlbench.virtdata.api.VirtData; +import io.nosqlbench.virtdata.core.bindings.DataMapper; +import io.nosqlbench.virtdata.core.bindings.VirtData; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import org.assertj.core.data.Offset; import org.junit.Test; diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedRealerTests.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedRealerTests.java index 7fbdc727f..72e30384b 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedRealerTests.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedRealerTests.java @@ -1,7 +1,7 @@ package io.virtdata; -import io.nosqlbench.virtdata.api.DataMapper; -import io.nosqlbench.virtdata.api.VirtData; +import io.nosqlbench.virtdata.core.bindings.DataMapper; +import io.nosqlbench.virtdata.core.bindings.VirtData; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedStringCompositorTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedStringCompositorTest.java index 33125669a..6278dbaa5 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedStringCompositorTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedStringCompositorTest.java @@ -1,8 +1,8 @@ package io.virtdata; -import io.nosqlbench.virtdata.api.Bindings; -import io.nosqlbench.virtdata.api.BindingsTemplate; -import io.nosqlbench.virtdata.api.templates.StringCompositor; +import io.nosqlbench.virtdata.core.bindings.Bindings; +import io.nosqlbench.virtdata.core.bindings.BindingsTemplate; +import io.nosqlbench.virtdata.core.templates.StringCompositor; import org.junit.BeforeClass; import org.junit.Test; diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedTemporalExamplesTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedTemporalExamplesTest.java index 23108bae7..7465d151d 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedTemporalExamplesTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedTemporalExamplesTest.java @@ -1,7 +1,7 @@ package io.virtdata; -import io.nosqlbench.virtdata.api.DataMapper; -import io.nosqlbench.virtdata.api.VirtData; +import io.nosqlbench.virtdata.core.bindings.DataMapper; +import io.nosqlbench.virtdata.core.bindings.VirtData; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Test; From 424b86551e947e086e482e6ff76ff742c7c04b10 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 17:57:51 -0500 Subject: [PATCH 11/17] patch up annotation processor names and packages --- .../virtdata/api/processors/ProcessorClassNames.java | 4 ++-- virtdata-lib-basics/pom.xml | 6 ++++++ .../virtdata/userlibs/apps/docsapp/FDocFuncsTest.java | 1 - .../userlibs/apps/docsapp/fdocs/ExampleDocFunc1.java | 2 +- .../userlibs/apps/docsapp/fdocs/ExampleDocFunc2.java | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ProcessorClassNames.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ProcessorClassNames.java index c19a3c5ef..0407f9c36 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ProcessorClassNames.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ProcessorClassNames.java @@ -6,7 +6,7 @@ package io.nosqlbench.virtdata.api.processors; */ public class ProcessorClassNames { public final static String ThreadSafeMapper = - "io.nosqlbench.virtdata.annotations.ThreadSafeMapper"; + "io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper"; public final static String PerThreadMapper = - "io.nosqlbench.virtdata.annotations.PerThreadMapper"; + "io.nosqlbench.virtdata.api.annotations.PerThreadMapper"; } diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index cb78009e6..9f974ab83 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -17,6 +17,12 @@ + + io.nosqlbench + virtdata-api + 3.12.73-SNAPSHOT + + org.apache.commons commons-csv diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/FDocFuncsTest.java b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/FDocFuncsTest.java index fb0e43f2e..a609b3b82 100644 --- a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/FDocFuncsTest.java +++ b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/FDocFuncsTest.java @@ -1,6 +1,5 @@ package io.nosqlbench.virtdata.userlibs.apps.docsapp; -import io.nosqlbench.virtdata.processors.ExampleDocData; import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.ExampleDocFunc1; import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.ExampleDocFunc2; import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.FDocFunc; diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc1.java b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc1.java index 1981a2474..a1b0891cc 100644 --- a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc1.java +++ b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc1.java @@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs; import io.nosqlbench.virtdata.api.annotations.Category; import io.nosqlbench.virtdata.api.processors.DocCtorData; -import io.nosqlbench.virtdata.processors.DocForFuncCtor; +import io.nosqlbench.virtdata.api.processors.DocForFuncCtor; import io.nosqlbench.virtdata.api.processors.DocFuncData; import java.util.ArrayList; diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc2.java b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc2.java index 8a0516f57..6a9091bc4 100644 --- a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc2.java +++ b/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc2.java @@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs; import io.nosqlbench.virtdata.api.annotations.Category; import io.nosqlbench.virtdata.api.processors.DocCtorData; -import io.nosqlbench.virtdata.processors.DocForFuncCtor; +import io.nosqlbench.virtdata.api.processors.DocForFuncCtor; import io.nosqlbench.virtdata.api.processors.DocFuncData; import java.util.ArrayList; From 378f6b9844357b0dda04114adb8b42bacb28babc Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 18:04:59 -0500 Subject: [PATCH 12/17] added docs info --- docsys/docs/docsys.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 docsys/docs/docsys.md diff --git a/docsys/docs/docsys.md b/docsys/docs/docsys.md new file mode 100644 index 000000000..7267414d9 --- /dev/null +++ b/docsys/docs/docsys.md @@ -0,0 +1,26 @@ +# DocSys Design + +## Future + +### Front Matter Everything + +- Only markdown files which contain front matter will be considered user-facing docs. +- Front matter will specify the namespace and/or names under which the included file should appear +- Front matter will include search meta and related topics +- Front matter will contain all the meta data that any client app needs to create a basic topic index or menu. +- Front matter will specify whether or not to include the markdown in command line help. +- Front matter will specify whether or not to include the markdown in web help. +- Front matter will specify the topic path for the included. + +### Internal APIs + +- All markdown sources will be provided uniformly behind a markdown service type with SPI, like _MarkdownProvider_ +- Services and Static contexts will be supported equally. +- MarkdownProvider data will have digest level info, which is exactly the frontmatter required above. + +### Searching + +- A standard search index payload in JSON form will be cachable by clients. +- The initial phase of search will contain only meta and topic level matching. +- A subsequent phase may include a compact or compressed form of FTS searching. + From e2d3d3825c0870c0befde0a7fead40e1651e8d6a Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 18:24:38 -0500 Subject: [PATCH 13/17] centralized path functions --- .../core/YamlCQLStatementLoader.java | 2 +- .../rawyaml/RawYamlStatementLoader.java | 2 +- .../engine/api/util/NBFilesTest.java | 1 + .../java/io/nosqlbench/engine/cli/NBCLI.java | 6 +- .../nosqlbench/engine/cli/NBCLIOptions.java | 2 +- .../engine/cli/NBCLIScenarioParser.java | 60 ++++++++++++- .../engine/cli/NBCLIScriptAssembly.java | 2 +- .../nosqlbench/engine/cli/WorkloadDesc.java | 28 +++++++ .../engine/docker/DockerMetricsManager.java | 2 +- .../nosqlbench/engine/docker/RestHelper.java | 2 +- .../engine/extensions/files/FileAccess.java | 2 +- .../nosqlbench/nb/api/pathutil}/NBFiles.java | 84 +------------------ .../nb/api/pathutil}/NBPathWalker.java | 2 +- 13 files changed, 101 insertions(+), 94 deletions(-) create mode 100644 engine-cli/src/main/java/io/nosqlbench/engine/cli/WorkloadDesc.java rename {engine-api/src/main/java/io/nosqlbench/engine/api/util => nb-api/src/main/java/io/nosqlbench/nb/api/pathutil}/NBFiles.java (64%) rename {engine-api/src/main/java/io/nosqlbench/engine/api/util => nb-api/src/main/java/io/nosqlbench/nb/api/pathutil}/NBPathWalker.java (98%) diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java index 20ffc1cf7..c36db2230 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java @@ -1,7 +1,7 @@ package io.nosqlbench.activitytype.cql.statements.core; import io.nosqlbench.engine.api.activityimpl.ActivityInitializationError; -import io.nosqlbench.engine.api.util.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBFiles; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.TypeDescription; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoader.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoader.java index 2a30b1e1a..7cf827029 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoader.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoader.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.activityconfig.rawyaml; import io.nosqlbench.engine.api.activityconfig.snakecharmer.SnakeYamlCharmer; import io.nosqlbench.engine.api.activityimpl.ActivityInitializationError; -import io.nosqlbench.engine.api.util.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBFiles; import org.slf4j.Logger; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBFilesTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBFilesTest.java index 13baacb43..df414d39e 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBFilesTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBFilesTest.java @@ -17,6 +17,7 @@ package io.nosqlbench.engine.api.util; +import io.nosqlbench.nb.api.pathutil.NBFiles; import org.junit.Test; import java.io.InputStream; 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 ab6eab671..2e805268f 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 @@ -6,7 +6,7 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.outputs.cyclelog.CycleLogIm 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.engine.api.util.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBFiles; import io.nosqlbench.engine.core.MarkdownDocInfo; import io.nosqlbench.engine.core.ScenarioLogger; import io.nosqlbench.engine.core.ScenariosResults; @@ -233,8 +233,8 @@ public class NBCLI { } public void printWorkloads() { - List workloads = NBFiles.getWorkloadsWithScenarioScripts(); - for (NBFiles.WorkloadDesc workload : workloads) { + List workloads = NBCLIScenarioParser.getWorkloadsWithScenarioScripts(); + for (WorkloadDesc workload : workloads) { System.out.println("\n# from: "+ workload.getYamlPath()); List scenarioList = workload.getScenarioNames(); String workloadName = workload.getYamlPath().replaceAll("\\.yaml", "") ; diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java index c8c1cbf06..eb7b83507 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java @@ -2,7 +2,7 @@ package io.nosqlbench.engine.cli; import ch.qos.logback.classic.Level; import io.nosqlbench.engine.api.metrics.IndicatorMode; -import io.nosqlbench.engine.api.util.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBFiles; import io.nosqlbench.engine.api.util.Unit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 f4a404bb1..240cd0884 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 @@ -1,18 +1,23 @@ package io.nosqlbench.engine.cli; +import io.nosqlbench.docsys.core.PathWalker; 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.engine.api.util.NBFiles; +import io.nosqlbench.nb.api.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBFiles; import io.nosqlbench.engine.api.util.StrInterpolator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; public class NBCLIScenarioParser { @@ -223,4 +228,57 @@ public class NBCLIScenarioParser { // } // } + private static Pattern templatePattern = Pattern.compile("TEMPLATE\\((.+?)\\)"); + private static Pattern templatePattern2 = Pattern.compile("<<(.+?)>>"); + + + public static List getWorkloadsWithScenarioScripts() { + + String dir = "activities/"; + + Path basePath = VirtDataResources.findPathIn(dir); + List yamlPathList = PathWalker.findAll(basePath) + .stream() + .filter(f -> f.toString().endsWith(".yaml")) + .filter(f -> f.toString().contains("activities")) + .collect(Collectors.toList()); + + List workloadDescriptions = new ArrayList<>(); + for (Path yamlPath : yamlPathList) { + String substring = yamlPath.toString().substring(1); + StmtsDocList stmts = StatementsLoader.load(logger, substring); + + Set templates = new HashSet<>(); + try { + List lines = Files.readAllLines(yamlPath); + for (String line : lines) { + Matcher matcher = templatePattern.matcher(line); + + while (matcher.find()) { + templates.add(matcher.group(1)); + } + matcher = templatePattern2.matcher(line); + + while (matcher.find()) { + templates.add(matcher.group(1)); + } + + } + } catch (IOException e) { + e.printStackTrace(); + } + + + Scenarios scenarios = stmts.getDocScenarios(); + + List scenarioNames = scenarios.getScenarioNames(); + + if (scenarioNames != null && scenarioNames.size() >0){ + workloadDescriptions.add(new WorkloadDesc(yamlPath.getFileName().toString(), scenarioNames, templates)); + } + } + + return workloadDescriptions; + } + } diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScriptAssembly.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScriptAssembly.java index f3836d08e..658220c25 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScriptAssembly.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScriptAssembly.java @@ -1,7 +1,7 @@ package io.nosqlbench.engine.cli; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import io.nosqlbench.engine.api.util.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBFiles; import io.nosqlbench.engine.api.util.StrInterpolator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/WorkloadDesc.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/WorkloadDesc.java new file mode 100644 index 000000000..4ac24d38c --- /dev/null +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/WorkloadDesc.java @@ -0,0 +1,28 @@ +package io.nosqlbench.engine.cli; + +import java.util.List; +import java.util.Set; + +public class WorkloadDesc { + private final String yamlPath; + private final List scenarioNames; + private final Set temlpates; + + public WorkloadDesc(String yamlPath, List scenarioNames, Set templates) { + this.yamlPath = yamlPath; + this.scenarioNames = scenarioNames; + this.temlpates = templates; + } + + public String getYamlPath() { + return yamlPath; + } + + public List getScenarioNames() { + return scenarioNames; + } + + public Set getTemlpates() { + return temlpates; + } +} diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java index b692d27be..ef177c356 100644 --- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java +++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java @@ -12,7 +12,7 @@ import com.github.dockerjava.api.model.ContainerNetworkSettings; import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.core.async.ResultCallbackTemplate; import com.github.dockerjava.core.command.LogContainerResultCallback; -import io.nosqlbench.engine.api.util.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBFiles; 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 972adf90e..8c9bd333e 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,7 +1,7 @@ package io.nosqlbench.engine.docker; import io.nosqlbench.engine.api.exceptions.BasicError; -import io.nosqlbench.engine.api.util.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBFiles; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccess.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccess.java index 7bc7b88f6..89ab7497f 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccess.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccess.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.extensions.files; -import io.nosqlbench.engine.api.util.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBFiles; public class FileAccess extends FileAccessPluginData { diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/util/NBFiles.java b/nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/NBFiles.java similarity index 64% rename from engine-api/src/main/java/io/nosqlbench/engine/api/util/NBFiles.java rename to nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/NBFiles.java index d77e125af..e87bf9e91 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/util/NBFiles.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/NBFiles.java @@ -15,30 +15,21 @@ * / */ -package io.nosqlbench.engine.api.util; +package io.nosqlbench.nb.api.pathutil; -import io.nosqlbench.docsys.core.PathWalker; -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.nb.api.VirtDataResources; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.*; import java.net.URL; -import java.nio.file.Files; import java.nio.file.Path; import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import java.util.stream.Collectors; public class NBFiles { private final static Logger logger = LoggerFactory.getLogger(NBFiles.class); - private static Pattern templatePattern = Pattern.compile("TEMPLATE\\((.+?)\\)"); - private static Pattern templatePattern2 = Pattern.compile("<<(.+?)>>"); + public static InputStream findRequiredStreamOrFile(String basename, String extension, String... searchPaths) { @@ -160,76 +151,5 @@ public class NBFiles { } } - public static List getWorkloadsWithScenarioScripts() { - String dir = "activities/"; - - Path basePath = VirtDataResources.findPathIn(dir); - List yamlPathList = PathWalker.findAll(basePath) - .stream() - .filter(f -> f.toString().endsWith(".yaml")) - .filter(f -> f.toString().contains("activities")) - .collect(Collectors.toList()); - - List workloadDescriptions = new ArrayList<>(); - for (Path yamlPath : yamlPathList) { - String substring = yamlPath.toString().substring(1); - StmtsDocList stmts = StatementsLoader.load(logger, substring); - - Set templates = new HashSet<>(); - try { - List lines = Files.readAllLines(yamlPath); - for (String line : lines) { - Matcher matcher = templatePattern.matcher(line); - - while (matcher.find()) { - templates.add(matcher.group(1)); - } - matcher = templatePattern2.matcher(line); - - while (matcher.find()) { - templates.add(matcher.group(1)); - } - - } - } catch (IOException e) { - e.printStackTrace(); - } - - - Scenarios scenarios = stmts.getDocScenarios(); - - List scenarioNames = scenarios.getScenarioNames(); - - if (scenarioNames != null && scenarioNames.size() >0){ - workloadDescriptions.add(new WorkloadDesc(yamlPath.getFileName().toString(), scenarioNames, templates)); - } - } - - return workloadDescriptions; - } - - public static class WorkloadDesc { - private final String yamlPath; - private final List scenarioNames; - private final Set temlpates; - - public WorkloadDesc(String yamlPath, List scenarioNames, Set templates) { - this.yamlPath = yamlPath; - this.scenarioNames = scenarioNames; - this.temlpates = templates; - } - - public String getYamlPath() { - return yamlPath; - } - - public List getScenarioNames() { - return scenarioNames; - } - - public Set getTemlpates() { - return temlpates; - } - } } diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/util/NBPathWalker.java b/nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/NBPathWalker.java similarity index 98% rename from engine-api/src/main/java/io/nosqlbench/engine/api/util/NBPathWalker.java rename to nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/NBPathWalker.java index 6b03f794f..5716f968d 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/util/NBPathWalker.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/NBPathWalker.java @@ -1,4 +1,4 @@ -package io.nosqlbench.engine.api.util; +package io.nosqlbench.nb.api.pathutil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; From 24a0807cb00087ce1ce3d87fdc7b0745db3a488d Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 18:28:23 -0500 Subject: [PATCH 14/17] 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; From 7afb19daca4434574cf2be113414b94d52faf6f7 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 19:01:04 -0500 Subject: [PATCH 15/17] more paths consolidation --- .../long_string/ModuloCSVLineToUUID.java | 4 +- .../java/io/nosqlbench/docsys/api/Docs.java | 4 +- .../engine/cli/NBCLIScenarioParser.java | 4 +- .../engine/cli/TestNBCLIOptions.java | 4 +- .../{VirtDataResources.java => NBPaths.java} | 380 ++++++++++-------- .../library/basics/core/lfsrs/MetaShift.java | 4 +- .../distributions/CSVFrequencySampler.java | 4 +- .../distributions/DelimFrequencySampler.java | 4 +- .../distributions/WeightedStringsFromCSV.java | 4 +- .../from_long/to_int/HashedLineToInt.java | 6 +- .../to_string/HashedFileExtractToString.java | 4 +- .../to_string/HashedLineToString.java | 10 +- .../to_string/ModuloCSVLineToString.java | 4 +- .../to_string/ModuloLineToString.java | 6 +- .../random/RandomFileExtractToString.java | 4 +- .../library/random/RandomLineToInt.java | 4 +- .../library/random/RandomLineToString.java | 10 +- .../userlibs/apps/docsapp/AutoDocsApp.java | 4 +- 18 files changed, 252 insertions(+), 212 deletions(-) rename nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/{VirtDataResources.java => NBPaths.java} (84%) 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 068a7ce22..9bb48ab57 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.pathutil.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBPaths; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.ModuloLineToString; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; @@ -49,7 +49,7 @@ public class ModuloCSVLineToUUID implements LongFunction { @Example({"ModuloCSVLineToUUID('data/myfile.csv','lat')","load values for 'lat' from the CSV file myfile.csv."}) public ModuloCSVLineToUUID(String filename, String fieldname) { this.filename = filename; - CSVParser csvp = VirtDataResources.readFileCSV(filename); + CSVParser csvp = NBPaths.readFileCSV(filename); int column = csvp.getHeaderMap().get(fieldname); for (CSVRecord strings : csvp) { lines.add(strings.get(column)); 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 de4c57854..e707d3720 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.pathutil.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBPaths; import java.nio.file.Files; import java.nio.file.Path; @@ -25,7 +25,7 @@ public class Docs implements DocsBinder { } public Docs addFirstFoundPath(String... potentials) { - Path pathIn = VirtDataResources.findPathIn(potentials); + Path pathIn = NBPaths.findPathIn(potentials); if (pathIn == null || !Files.exists(pathIn)) { throw new RuntimeException("Unable to find a path in one of " + Arrays.stream(potentials).collect(Collectors.joining(","))); } 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 7b34e5f18..edb2b1b75 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.pathutil.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBPaths; import io.nosqlbench.nb.api.pathutil.NBFiles; import io.nosqlbench.engine.api.util.StrInterpolator; import org.slf4j.Logger; @@ -236,7 +236,7 @@ public class NBCLIScenarioParser { String dir = "activities/"; - Path basePath = VirtDataResources.findPathIn(dir); + Path basePath = NBPaths.findPathIn(dir); List yamlPathList = PathWalker.findAll(basePath) .stream() .filter(f -> f.toString().endsWith(".yaml")) 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 bd0f69297..b4b805789 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.pathutil.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.junit.Test; import java.net.URL; @@ -205,7 +205,7 @@ public class TestNBCLIOptions { String dir= "./"; URL resource = getClass().getClassLoader().getResource(dir); assertThat(resource); - Path basePath = VirtDataResources.findPathIn(dir); + Path basePath = NBPaths.findPathIn(dir); List yamlPathList = PathWalker.findAll(basePath).stream().filter(f -> f.toString().endsWith(".yaml")).collect(Collectors.toList()); assertThat(yamlPathList); } diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/VirtDataResources.java b/nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/NBPaths.java similarity index 84% rename from nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/VirtDataResources.java rename to nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/NBPaths.java index a1c2db34c..424c4b128 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/VirtDataResources.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/NBPaths.java @@ -19,12 +19,11 @@ package io.nosqlbench.nb.api.pathutil; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.*; import java.net.URI; -import java.net.URISyntaxException; import java.net.URL; import java.nio.CharBuffer; import java.nio.file.*; @@ -33,175 +32,11 @@ import java.nio.file.spi.FileSystemProvider; import java.util.*; import java.util.stream.Collectors; -public class VirtDataResources { +public class NBPaths { + + private final static Logger logger = LoggerFactory.getLogger(NBPaths.class); + public final static String DATA_DIR = "data"; - private final static Logger logger = LogManager.getLogger(VirtDataResources.class); - - public static CharBuffer readDataFileToCharBuffer(String basename) { - return loadFileToCharBuffer(basename, DATA_DIR); - } - - public static List readDataFileLines(String basename) { - return readFileLines(basename, DATA_DIR); - } - - public static String readDataFileString(String basename) { - return readFileString(basename, DATA_DIR); - } - - public static InputStream findRequiredStreamOrFile(String basename, String extension, String... searchPaths) { - Optional optionalStreamOrFile = findOptionalStreamOrFile(basename, extension, searchPaths); - return optionalStreamOrFile.orElseThrow(() -> new RuntimeException( - "Unable to find " + basename + " with extension " + extension + " in file system or in classpath, with" - + " search paths: " + Arrays.stream(searchPaths).collect(Collectors.joining(",")) - )); - } - - public static Reader findRequiredReader(String basename, String extension, String... searchPaths) { - Optional optionalReader = findOptionalReader(basename, extension, searchPaths); - return optionalReader.orElseThrow(() -> new RuntimeException( - "Unable to find " + basename + " with extension " + extension + " in file system or in classpath, with" - + " search paths: " + Arrays.stream(searchPaths).collect(Collectors.joining(",")) - )); - } - - public static Optional findOptionalReader(String basename, String extenion, String... searchPaths) { - return findOptionalStreamOrFile(basename, extenion, searchPaths) - .map(InputStreamReader::new) - .map(BufferedReader::new); - } - - public static Optional findOptionalDirPath(String pathName) { - URL systemResource = ClassLoader.getSystemResource(pathName); - - if (systemResource != null) { - try { - return Optional.of(Path.of(systemResource.toURI())); - } catch (URISyntaxException e) { - throw new RuntimeException(e); - } - } - - return Optional.empty(); - } - - public static Optional findOptionalStreamOrFile(String basename, String extension, String... searchPaths) { - - boolean needsExtension = (extension != null && !extension.isEmpty() && !basename.endsWith("." + extension)); - String filename = basename + (needsExtension ? "." + extension : ""); - - ArrayList paths = new ArrayList() {{ - add(filename); - if (!isRemote(basename)) { - addAll(Arrays.stream(searchPaths).map(s -> s + File.separator + filename) - .collect(Collectors.toCollection(ArrayList::new))); - } - }}; - - for (String path : paths) { - Optional stream = getInputStream(path); - if (stream.isPresent()) { - return stream; - } - } - - return Optional.empty(); - } - - private static boolean isRemote(String path) { - return (path.toLowerCase().startsWith("http:") - || path.toLowerCase().startsWith("https:")); - } - - public static Optional getInputStream(String path) { - - // URLs, if http: or https: - if (isRemote(path)) { - Optional inputStream = getInputStreamForUrl(path); - if (inputStream != null) return inputStream; - } - - // Files - try { - InputStream stream = new FileInputStream(path); - return Optional.of(stream); - } catch (FileNotFoundException ignored) { - } - - // Classpath - ClassLoader classLoader = VirtDataResources.class.getClassLoader(); - InputStream stream = classLoader.getResourceAsStream(path); - if (stream != null) { - return Optional.of(stream); - } - - return Optional.empty(); - } - - public static Optional getInputStreamForUrl(String path) { - URL url; - try { - url = new URL(path); - InputStream inputStream = url.openStream(); - if (inputStream != null) { - return Optional.of(inputStream); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - return null; - } - - - public static List readFileLines(String basename, String... searchPaths) { - InputStream requiredStreamOrFile = findRequiredStreamOrFile(basename, "", DATA_DIR); - try (BufferedReader buffer = new BufferedReader((new InputStreamReader(requiredStreamOrFile)))) { - List collected = buffer.lines().collect(Collectors.toList()); - return collected; - } catch (IOException ioe) { - throw new RuntimeException("Error while reading required file to string", ioe); - } - } - - public static String readFileString(String basename, String... searchPaths) { - InputStream requiredStreamOrFile = findRequiredStreamOrFile(basename, "", searchPaths); - try (BufferedReader buffer = new BufferedReader((new InputStreamReader(requiredStreamOrFile)))) { - String filedata = buffer.lines().collect(Collectors.joining("\n")); - return filedata; - } catch (IOException ioe) { - throw new RuntimeException("Error while reading required file to string", ioe); - } - } - - public static CSVParser readFileCSV(String basename, String... searchPaths) { - Reader reader = findRequiredReader(basename, "csv", searchPaths); - CSVFormat format = CSVFormat.newFormat(',').withFirstRecordAsHeader(); - try { - CSVParser parser = new CSVParser(reader, format); - return parser; - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - - public static CharBuffer loadFileToCharBuffer(String filename, String... searchPaths) { - InputStream stream = findRequiredStreamOrFile(filename, "", searchPaths); - - CharBuffer linesImage; - try { - InputStreamReader isr = new InputStreamReader(stream); - linesImage = CharBuffer.allocate(1024 * 1024); - while (isr.read(linesImage) > 0) { - } - isr.close(); - } catch (IOException e) { - logger.error(e.getMessage()); - throw new RuntimeException(e); - } - linesImage.flip(); - return linesImage.asReadOnlyBuffer(); - } /** *

Look in all the provided path specifiers for an extant Path, and return @@ -280,6 +115,54 @@ public class VirtDataResources { return Optional.ofNullable(foundPath); } + public static Optional getInputStreamForUrl(String path) { + URL url; + try { + url = new URL(path); + InputStream inputStream = url.openStream(); + if (inputStream != null) { + return Optional.of(inputStream); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + return null; + } + + public static CSVParser readDelimFile(String basename, char delimiter, String... searchPaths) { + Reader reader = findRequiredReader(basename, "csv", searchPaths); + CSVFormat format = CSVFormat.newFormat(delimiter).withFirstRecordAsHeader(); + try { + CSVParser parser = new CSVParser(reader, format); + return parser; + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public static Reader findRequiredReader(String basename, String extension, String... searchPaths) { + Optional optionalReader = findOptionalReader(basename, extension, searchPaths); + return optionalReader.orElseThrow(() -> new RuntimeException( + "Unable to find " + basename + " with extension " + extension + " in file system or in classpath, with" + + " search paths: " + Arrays.stream(searchPaths).collect(Collectors.joining(",")) + )); + } + + public static List readFileLines(String basename, String... searchPaths) { + InputStream requiredStreamOrFile = findRequiredStreamOrFile(basename, "", DATA_DIR); + try (BufferedReader buffer = new BufferedReader((new InputStreamReader(requiredStreamOrFile)))) { + List collected = buffer.lines().collect(Collectors.toList()); + return collected; + } catch (IOException ioe) { + throw new RuntimeException("Error while reading required file to string", ioe); + } + } + + public static Optional findOptionalReader(String basename, String extenion, String... searchPaths) { + return findOptionalStreamOrFile(basename, extenion, searchPaths) + .map(InputStreamReader::new) + .map(BufferedReader::new); + } private synchronized static Path getPathInFilesystem(URI uri) { FileSystem fileSystem = null; @@ -295,9 +178,120 @@ public class VirtDataResources { return Path.of(uri); } - public static CSVParser readDelimFile(String basename, char delimiter, String... searchPaths) { + + public static InputStream findRequiredStreamOrFile(String basename, String extension, String... searchPaths) { + Optional optionalStreamOrFile = findOptionalStreamOrFile(basename, extension, searchPaths); + return optionalStreamOrFile.orElseThrow(() -> new RuntimeException( + "Unable to find " + basename + " with extension " + extension + " in file system or in classpath, with" + + " search paths: " + Arrays.stream(searchPaths).collect(Collectors.joining(",")) + )); + } + + public static Optional findOptionalStreamOrFile(String basename, String extension, String... searchPaths) { + + boolean needsExtension = (extension != null && !extension.isEmpty() && !basename.endsWith("." + extension)); + String filename = basename + (needsExtension ? "." + extension : ""); + + ArrayList paths = new ArrayList() {{ + add(filename); + if (!isRemote(basename)) { + addAll(Arrays.stream(searchPaths).map(s -> s + File.separator + filename) + .collect(Collectors.toCollection(ArrayList::new))); + } + + }}; + + for (String path : paths) { + Optional stream = getInputStream(path); + if (stream.isPresent()) { + return stream; + } + } + + return Optional.empty(); + } + + /** + * Search for the path + * + * @param basename Basename of path, with or without extension + * @param extension The extension of the filename + * @param searchWithin If enabled, all searchPaths are traversed, looking for a matching suffix pattern. + * @param searchPaths Additional places to look for the path suffix + * @return An optional path + */ + public static Optional findOptionalPath(String basename, String extension, boolean searchWithin, String... searchPaths) { + + boolean needsExtension = (extension != null && !extension.isEmpty() && !basename.endsWith("." + extension)); + String filename = basename + (needsExtension ? "." + extension : ""); + + ArrayList paths = new ArrayList() {{ + add(filename); + if (!isRemote(basename)) { + addAll(Arrays.stream(searchPaths).map(s -> s + File.separator + filename) + .collect(Collectors.toCollection(ArrayList::new))); + } + + }}; + + for (String path : paths) { + + Optional stream = getInputStream(path); + if (stream.isPresent()) { + return Optional.of(Path.of(path)); + } + } + + if (searchWithin) { + throw new RuntimeException("not implemented"); +// for (String searchPath : searchPaths) { +// NBPathWalker.findEndMatching(Path.of(searchPath), Path.of(filename)); +// } + } + return Optional.empty(); + } + + private static boolean isRemote(String path) { + return (path.toLowerCase().startsWith("http:") + || path.toLowerCase().startsWith("https:")); + } + + public static Optional getInputStream(String path) { + + // URLs, if http: or https: + if (isRemote(path)) { + URL url; + try { + url = new URL(path); + InputStream inputStream = url.openStream(); + if (inputStream != null) { + return Optional.of(inputStream); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + // Files + try { + InputStream stream = new FileInputStream(path); + return Optional.of(stream); + } catch (FileNotFoundException ignored) { + } + + // Classpath + ClassLoader classLoader = NBPaths.class.getClassLoader(); + InputStream stream = classLoader.getResourceAsStream(path); + if (stream != null) { + return Optional.of(stream); + } + + return Optional.empty(); + } + + public static CSVParser readFileCSV(String basename, String... searchPaths) { Reader reader = findRequiredReader(basename, "csv", searchPaths); - CSVFormat format = CSVFormat.newFormat(delimiter).withFirstRecordAsHeader(); + CSVFormat format = CSVFormat.newFormat(',').withFirstRecordAsHeader(); try { CSVParser parser = new CSVParser(reader, format); return parser; @@ -305,4 +299,44 @@ public class VirtDataResources { throw new RuntimeException(e); } } + + public static List readDataFileLines(String basename) { + return readFileLines(basename, DATA_DIR); + } + + public static String readFile(String basename) { + InputStream requiredStreamOrFile = findRequiredStreamOrFile(basename, ""); + try (BufferedReader buffer = new BufferedReader((new InputStreamReader(requiredStreamOrFile)))) { + String filedata = buffer.lines().collect(Collectors.joining("\n")); + return filedata; + } catch (IOException ioe) { + throw new RuntimeException("Error while reading required file to string", ioe); + } + } + + public static CharBuffer readDataFileToCharBuffer(String basename) { + return loadFileToCharBuffer(basename, DATA_DIR); + } + + + public static CharBuffer loadFileToCharBuffer(String filename, String... searchPaths) { + InputStream stream = findRequiredStreamOrFile(filename, "", searchPaths); + + CharBuffer linesImage; + try { + InputStreamReader isr = new InputStreamReader(stream); + linesImage = CharBuffer.allocate(1024 * 1024); + while (isr.read(linesImage) > 0) { + } + isr.close(); + } catch (IOException e) { + logger.error(e.getMessage()); + throw new RuntimeException(e); + } + linesImage.flip(); + return linesImage.asReadOnlyBuffer(); + } + + + } 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 bd4c51e5f..9f4ff6543 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.pathutil.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; @@ -141,7 +141,7 @@ public class MetaShift { } int availableSize= Math.max(registerSize,4); String maskFileName= String.valueOf(availableSize)+"."+"txt"; - List lines = VirtDataResources.readDataFileLines("lfsrmasks/" + maskFileName); + List lines = NBPaths.readDataFileLines("lfsrmasks/" + maskFileName); long[] longs = lines.stream().mapToLong(s -> Long.parseLong(s, 16)).toArray(); return longs; } 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 f367fc9aa..e86093070 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.pathutil.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; import org.apache.commons.math3.stat.Frequency; @@ -72,7 +72,7 @@ public class CSVFrequencySampler implements LongFunction { Set values = new HashSet<>(); List frequencies = new ArrayList<>(); - CSVParser csvdata = VirtDataResources.readFileCSV(filename); + CSVParser csvdata = NBPaths.readFileCSV(filename); Frequency freq = new Frequency(); for (CSVRecord csvdatum : csvdata) { String value = csvdatum.get(columnName); 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 9b4ec1f87..91814e145 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.pathutil.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; import org.apache.commons.math3.stat.Frequency; @@ -75,7 +75,7 @@ public class DelimFrequencySampler implements LongFunction { Set values = new HashSet<>(); List frequencies = new ArrayList<>(); - CSVParser csvdata = VirtDataResources.readDelimFile(filename, delimiter); + CSVParser csvdata = NBPaths.readDelimFile(filename, delimiter); Frequency freq = new Frequency(); for (CSVRecord csvdatum : csvdata) { String value = csvdatum.get(columnName); 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 652079dda..a2f19f109 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.pathutil.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; @@ -71,7 +71,7 @@ public class WeightedStringsFromCSV implements LongFunction { this.hash=new Hash(); } for (String filename: filenames) { - CSVParser csvdata = VirtDataResources.readFileCSV(filename); + CSVParser csvdata = NBPaths.readFileCSV(filename); for (CSVRecord csvdatum : csvdata) { String value = csvdatum.get(valueColumn); values.add(value); 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 4a519443c..49a87ae9c 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,13 +1,15 @@ package io.nosqlbench.virtdata.library.basics.shared.from_long.to_int; import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; -import io.nosqlbench.nb.api.pathutil.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import java.util.List; import java.util.function.LongToIntFunction; +import static io.nosqlbench.nb.api.pathutil.NBPaths.readDataFileLines; + /** * Return a pseudo-randomly selected integer value from a file of numeric values. * Each line in the file must contain one parsable integer value. @@ -21,7 +23,7 @@ public class HashedLineToInt implements LongToIntFunction { public HashedLineToInt(String filename) { this.filename = filename; - List lines = VirtDataResources.readDataFileLines(filename); + List lines = readDataFileLines(filename); this.values = lines.stream().mapToInt(Integer::parseInt).toArray(); this.intHash = new Hash(); } 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 6b33041c7..e49854efb 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.pathutil.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; @@ -60,7 +60,7 @@ public class HashedFileExtractToString implements LongFunction { if (fileDataImage == null) { synchronized (HashedFileExtractToString.class) { if (fileDataImage == null) { - CharBuffer image= VirtDataResources.readDataFileToCharBuffer(fileName); + CharBuffer image= NBPaths.readDataFileToCharBuffer(fileName); fileDataImage = image; } } 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 fe4934e72..ef97eeea7 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.pathutil.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; @@ -28,13 +28,15 @@ import java.util.ArrayList; import java.util.List; import java.util.function.LongFunction; +import static io.nosqlbench.nb.api.pathutil.NBPaths.*; + /** * Return a pseudo-randomly selected String value from a single line of * the specified file. */ @ThreadSafeMapper public class HashedLineToString implements LongFunction { - private final static Logger logger = LogManager.getLogger(HashedLineToString.class); + private final static Logger logger = LogManager.getLogger(HashedLineToString.class); private final HashRange indexRange; private List lines = new ArrayList<>(); @@ -43,8 +45,8 @@ public class HashedLineToString implements LongFunction { public HashedLineToString(String filename) { this.filename = filename; - this.lines = VirtDataResources.readDataFileLines(filename); - this.indexRange = new HashRange(0, lines.size()-2); + this.lines = readDataFileLines(filename); + this.indexRange = new HashRange(0, lines.size() - 2); } public String toString() { 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 9dd681899..689e43c58 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.pathutil.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; import org.apache.logging.log4j.Logger; @@ -47,7 +47,7 @@ public class ModuloCSVLineToString implements LongFunction { @Example({"ModuloCSVLineToString('data/myfile.csv','lat')","load values for 'lat' from the CSV file myfile.csv."}) public ModuloCSVLineToString(String filename, String fieldname) { this.filename = filename; - CSVParser csvp = VirtDataResources.readFileCSV(filename); + CSVParser csvp = NBPaths.readFileCSV(filename); Map headerMap = csvp.getHeaderMap(); if (headerMap==null || headerMap.isEmpty()) { 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 ddc2ad7c8..29dedc8a8 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.pathutil.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; @@ -27,6 +27,8 @@ import java.util.ArrayList; import java.util.List; import java.util.function.LongFunction; +import static io.nosqlbench.nb.api.pathutil.NBPaths.readDataFileLines; + /** * Select a value from a text file line by modulo division against the number * of lines in the file. @@ -40,7 +42,7 @@ public class ModuloLineToString implements LongFunction { public ModuloLineToString(String filename) { this.filename = filename; - this.lines = VirtDataResources.readDataFileLines(filename); + this.lines = readDataFileLines(filename); } @Override 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 24c7cedaa..740d0dc64 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.pathutil.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.apache.commons.math3.distribution.IntegerDistribution; import org.apache.commons.math3.distribution.UniformIntegerDistribution; import org.apache.commons.math3.random.MersenneTwister; @@ -60,7 +60,7 @@ public class RandomFileExtractToString implements LongFunction { if (fileDataImage == null) { synchronized (RandomFileExtractToString.class) { if (fileDataImage == null) { - CharBuffer image= VirtDataResources.readDataFileToCharBuffer(fileName); + CharBuffer image= NBPaths.readDataFileToCharBuffer(fileName); fileDataImage = image; } } 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 d73ec9adc..15ce2e820 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.pathutil.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.apache.commons.math3.distribution.IntegerDistribution; import org.apache.commons.math3.distribution.UniformIntegerDistribution; import org.apache.commons.math3.random.MersenneTwister; @@ -26,7 +26,7 @@ public class RandomLineToInt implements LongToIntFunction { public RandomLineToInt(String filename, long seed) { this.filename = filename; - this.lines = VirtDataResources.readDataFileLines(filename); + this.lines = NBPaths.readDataFileLines(filename); this.rng = new MersenneTwister(seed); this.itemDistribution= new UniformIntegerDistribution(rng, 0, lines.size()-2); } 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 1a44cbe45..43c81d4b2 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.pathutil.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.apache.commons.math3.distribution.IntegerDistribution; import org.apache.commons.math3.distribution.UniformIntegerDistribution; import org.apache.commons.math3.random.MersenneTwister; @@ -45,22 +45,22 @@ public class RandomLineToString implements LongFunction { public RandomLineToString(String filename) { this.rng = new MersenneTwister(System.nanoTime()); this.filename = filename; - this.lines = VirtDataResources.readDataFileLines(filename); + this.lines = NBPaths.readDataFileLines(filename); itemDistribution= new UniformIntegerDistribution(rng, 0, lines.size()-2); } public RandomLineToString(String filename, MersenneTwister rng) { this.rng = rng; this.filename = filename; - this.lines = VirtDataResources.readDataFileLines(filename); - this.lines = VirtDataResources.readDataFileLines(filename); + this.lines = NBPaths.readDataFileLines(filename); + this.lines = NBPaths.readDataFileLines(filename); itemDistribution= new UniformIntegerDistribution(rng, 0, lines.size()-2); } public RandomLineToString(String filename, long seed) { this.rng = new MersenneTwister(seed); this.filename = filename; - this.lines = VirtDataResources.readDataFileLines(filename); + this.lines = NBPaths.readDataFileLines(filename); itemDistribution= new UniformIntegerDistribution(rng, 0, lines.size()-2); } 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 8a49870e3..e74d534c3 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.pathutil.VirtDataResources; +import io.nosqlbench.nb.api.pathutil.NBPaths; 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; @@ -143,7 +143,7 @@ public class AutoDocsApp implements Runnable { String[] blurbsdirs = blurbsDirs.split(":"); for (String blurbsdir : blurbsdirs) { - Optional bdir = VirtDataResources.FindOptionalPathIn(blurbsdir+"/"); + Optional bdir = NBPaths.FindOptionalPathIn(blurbsdir+"/"); if (bdir.isPresent()) { Path blurbsFile = bdir.get().resolve(Path.of(outputname).getFileName().toString()); if (Files.exists(blurbsFile)) { From c66352afacc5803e6cc49172fea3fe19ace6310f Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 19:03:17 -0500 Subject: [PATCH 16/17] NBPaths is the main path utility --- .../core/YamlCQLStatementLoader.java | 4 +- .../rawyaml/RawYamlStatementLoader.java | 4 +- .../engine/api/util/NBFilesTest.java | 6 +- .../java/io/nosqlbench/engine/cli/NBCLI.java | 2 +- .../nosqlbench/engine/cli/NBCLIOptions.java | 4 +- .../engine/cli/NBCLIScenarioParser.java | 6 +- .../engine/cli/NBCLIScriptAssembly.java | 4 +- .../engine/docker/DockerMetricsManager.java | 4 +- .../nosqlbench/engine/docker/RestHelper.java | 4 +- .../engine/extensions/files/FileAccess.java | 4 +- .../nosqlbench/nb/api/pathutil/NBFiles.java | 155 ------------------ 11 files changed, 21 insertions(+), 176 deletions(-) delete mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/NBFiles.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java index c36db2230..9da93a41b 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java @@ -1,7 +1,7 @@ package io.nosqlbench.activitytype.cql.statements.core; import io.nosqlbench.engine.api.activityimpl.ActivityInitializationError; -import io.nosqlbench.nb.api.pathutil.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.TypeDescription; @@ -32,7 +32,7 @@ public class YamlCQLStatementLoader { public AvailableCQLStatements load(String fromPath, String... searchPaths) { - InputStream stream = NBFiles.findRequiredStreamOrFile(fromPath, + InputStream stream = NBPaths.findRequiredStreamOrFile(fromPath, "yaml", searchPaths); String data = ""; try (BufferedReader buffer = new BufferedReader(new InputStreamReader(stream))) { diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoader.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoader.java index 7cf827029..8556b554c 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoader.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoader.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.activityconfig.rawyaml; import io.nosqlbench.engine.api.activityconfig.snakecharmer.SnakeYamlCharmer; import io.nosqlbench.engine.api.activityimpl.ActivityInitializationError; -import io.nosqlbench.nb.api.pathutil.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.slf4j.Logger; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; @@ -55,7 +55,7 @@ public class RawYamlStatementLoader { } protected String loadRawFile(Logger logger, String fromPath, String... searchPaths) { - InputStream stream = NBFiles.findRequiredStreamOrFile(fromPath, "yaml", searchPaths); + InputStream stream = NBPaths.findRequiredStreamOrFile(fromPath, "yaml", searchPaths); try (BufferedReader buffer = new BufferedReader(new InputStreamReader(stream))) { return buffer.lines().collect(Collectors.joining("\n")); } catch (Exception e) { diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBFilesTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBFilesTest.java index df414d39e..670956c3b 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBFilesTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBFilesTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.util; -import io.nosqlbench.nb.api.pathutil.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.junit.Test; import java.io.InputStream; @@ -25,11 +25,11 @@ import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -public class NBFilesTest { +public class NBPathsTest { @Test public void testNestedClasspathLoading() { - Optional optionalStreamOrFile = NBFiles.findOptionalStreamOrFile("nested/testfile", "txt", "activities"); + Optional optionalStreamOrFile = NBPaths.findOptionalStreamOrFile("nested/testfile", "txt", "activities"); assertThat(optionalStreamOrFile).isPresent(); } 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 2e805268f..83dab1c3a 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 @@ -6,7 +6,7 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.outputs.cyclelog.CycleLogIm 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.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBPaths; import io.nosqlbench.engine.core.MarkdownDocInfo; import io.nosqlbench.engine.core.ScenarioLogger; import io.nosqlbench.engine.core.ScenariosResults; diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java index eb7b83507..d818d8c75 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java @@ -2,7 +2,7 @@ package io.nosqlbench.engine.cli; import ch.qos.logback.classic.Level; import io.nosqlbench.engine.api.metrics.IndicatorMode; -import io.nosqlbench.nb.api.pathutil.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBPaths; import io.nosqlbench.engine.api.util.Unit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -303,7 +303,7 @@ public class NBCLIOptions { break; default: Optional optionalScript = - NBFiles.findOptionalStreamOrFile(word, "js", "scripts/auto"); + NBPaths.findOptionalStreamOrFile(word, "js", "scripts/auto"); //Script if (optionalScript.isPresent()) { arglist.removeFirst(); 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 edb2b1b75..dfaa787cc 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 @@ -6,7 +6,7 @@ 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.pathutil.NBPaths; -import io.nosqlbench.nb.api.pathutil.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBPaths; import io.nosqlbench.engine.api.util.StrInterpolator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,14 +28,14 @@ public class NBCLIScenarioParser { private final static Logger logger = LoggerFactory.getLogger(NBCLIScenarioParser.class); public static boolean isFoundWorkload(String word) { - Optional workloadPath = NBFiles.findOptionalPath(word, "yaml", false, "activities"); + Optional workloadPath = NBPaths.findOptionalPath(word, "yaml", false, "activities"); return workloadPath.isPresent(); } public static void parseScenarioCommand(LinkedList arglist) { String workloadName = arglist.removeFirst(); - Optional workloadPathSearch = NBFiles.findOptionalPath(workloadName, "yaml", false, "activities"); + Optional workloadPathSearch = NBPaths.findOptionalPath(workloadName, "yaml", false, "activities"); Path workloadPath = workloadPathSearch.orElseThrow(); List scenarioNames = new ArrayList<>(); diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScriptAssembly.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScriptAssembly.java index 658220c25..6ce0c30cb 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScriptAssembly.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScriptAssembly.java @@ -1,7 +1,7 @@ package io.nosqlbench.engine.cli; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import io.nosqlbench.nb.api.pathutil.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBPaths; import io.nosqlbench.engine.api.util.StrInterpolator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -81,7 +81,7 @@ public class NBCLIScriptAssembly { } catch (IOException ignored) { } - InputStream resourceAsStream = NBFiles.findRequiredStreamOrFile(cmd.getCmdSpec(), "js", "scripts"); + InputStream resourceAsStream = NBPaths.findRequiredStreamOrFile(cmd.getCmdSpec(), "js", "scripts"); try (BufferedReader buffer = new BufferedReader(new InputStreamReader(resourceAsStream))) { scriptData = buffer.lines().collect(Collectors.joining("\n")); diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java index ef177c356..064047bd3 100644 --- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java +++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java @@ -12,7 +12,7 @@ import com.github.dockerjava.api.model.ContainerNetworkSettings; import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.core.async.ResultCallbackTemplate; import com.github.dockerjava.core.command.LogContainerResultCallback; -import io.nosqlbench.nb.api.pathutil.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -147,7 +147,7 @@ public class DockerMetricsManager { } private void setupPromFiles(String ip) { - String datasource = NBFiles.readFile("docker/prometheus/prometheus.yml"); + String datasource = NBPaths.readFile("docker/prometheus/prometheus.yml"); if (ip == null) { logger.error("IP for graphite container not found"); 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 8c9bd333e..c28013a5a 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,7 +1,7 @@ package io.nosqlbench.engine.docker; import io.nosqlbench.engine.api.exceptions.BasicError; -import io.nosqlbench.nb.api.pathutil.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBPaths; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +36,7 @@ public class RestHelper { if (path !=null) { logger.debug("POSTing " + path + " to " + url); - String dashboard = NBFiles.readFile(path); + String dashboard = NBPaths.readFile(path); logger.debug("length of content for " + path + " is " + dashboard.length()); builder = builder.POST(HttpRequest.BodyPublishers.ofString(dashboard)); builder.setHeader("Content-Type", "application/json"); diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccess.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccess.java index 89ab7497f..7f1458757 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccess.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccess.java @@ -17,12 +17,12 @@ package io.nosqlbench.engine.extensions.files; -import io.nosqlbench.nb.api.pathutil.NBFiles; +import io.nosqlbench.nb.api.pathutil.NBPaths; public class FileAccess extends FileAccessPluginData { public String read(String filepath) { - String filedata = NBFiles.readFile(filepath); + String filedata = NBPaths.readFile(filepath); return filedata; } diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/NBFiles.java b/nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/NBFiles.java deleted file mode 100644 index e87bf9e91..000000000 --- a/nb-api/src/main/java/io/nosqlbench/nb/api/pathutil/NBFiles.java +++ /dev/null @@ -1,155 +0,0 @@ -/* - * - * Copyright 2016 jshook - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * / - */ - -package io.nosqlbench.nb.api.pathutil; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.*; -import java.net.URL; -import java.nio.file.Path; -import java.util.*; -import java.util.stream.Collectors; - -public class NBFiles { - - private final static Logger logger = LoggerFactory.getLogger(NBFiles.class); - - - - public static InputStream findRequiredStreamOrFile(String basename, String extension, String... searchPaths) { - Optional optionalStreamOrFile = findOptionalStreamOrFile(basename, extension, searchPaths); - return optionalStreamOrFile.orElseThrow(() -> new RuntimeException( - "Unable to find " + basename + " with extension " + extension + " in file system or in classpath, with" - + " search paths: " + Arrays.stream(searchPaths).collect(Collectors.joining(",")) - )); - } - - public static Optional findOptionalStreamOrFile(String basename, String extension, String... searchPaths) { - - boolean needsExtension = (extension != null && !extension.isEmpty() && !basename.endsWith("." + extension)); - String filename = basename + (needsExtension ? "." + extension : ""); - - ArrayList paths = new ArrayList() {{ - add(filename); - if (!isRemote(basename)) { - addAll(Arrays.stream(searchPaths).map(s -> s + File.separator + filename) - .collect(Collectors.toCollection(ArrayList::new))); - } - - }}; - - for (String path : paths) { - Optional stream = getInputStream(path); - if (stream.isPresent()) { - return stream; - } - } - - return Optional.empty(); - } - - /** - * Search for the path - * @param basename Basename of path, with or without extension - * @param extension The extension of the filename - * @param searchWithin If enabled, all searchPaths are traversed, looking for a matching suffix pattern. - * @param searchPaths Additional places to look for the path suffix - * @return An optional path - */ - public static Optional findOptionalPath(String basename, String extension, boolean searchWithin, String... searchPaths) { - - boolean needsExtension = (extension != null && !extension.isEmpty() && !basename.endsWith("." + extension)); - String filename = basename + (needsExtension ? "." + extension : ""); - - ArrayList paths = new ArrayList() {{ - add(filename); - if (!isRemote(basename)) { - addAll(Arrays.stream(searchPaths).map(s -> s + File.separator + filename) - .collect(Collectors.toCollection(ArrayList::new))); - } - - }}; - - for (String path : paths) { - - Optional stream = getInputStream(path); - if (stream.isPresent()) { - return Optional.of(Path.of(path)); - } - } - - if (searchWithin) { - throw new RuntimeException("not implemented"); -// for (String searchPath : searchPaths) { -// NBPathWalker.findEndMatching(Path.of(searchPath), Path.of(filename)); -// } - } - return Optional.empty(); - } - - private static boolean isRemote(String path) { - return (path.toLowerCase().startsWith("http:") - || path.toLowerCase().startsWith("https:")); - } - - public static Optional getInputStream(String path) { - - // URLs, if http: or https: - if (isRemote(path)) { - URL url; - try { - url = new URL(path); - InputStream inputStream = url.openStream(); - if (inputStream!=null) { - return Optional.of(inputStream); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - // Files - try { - InputStream stream = new FileInputStream(path); - return Optional.of(stream); - } catch (FileNotFoundException ignored) { - } - - // Classpath - ClassLoader classLoader = NBFiles.class.getClassLoader(); - InputStream stream = classLoader.getResourceAsStream(path); - if (stream != null) { - return Optional.of(stream); - } - - return Optional.empty(); - } - - public static String readFile(String basename) { - InputStream requiredStreamOrFile = findRequiredStreamOrFile(basename, ""); - try (BufferedReader buffer = new BufferedReader((new InputStreamReader(requiredStreamOrFile)))) { - String filedata = buffer.lines().collect(Collectors.joining("\n")); - return filedata; - } catch (IOException ioe) { - throw new RuntimeException("Error while reading required file to string", ioe); - } - } - - -} From 195169ae904801a80982e0dbfbc8ad9aedd5bf8a Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 19:04:59 -0500 Subject: [PATCH 17/17] fixed path test name --- .../engine/api/util/{NBFilesTest.java => NBPathsTest.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename engine-api/src/test/java/io/nosqlbench/engine/api/util/{NBFilesTest.java => NBPathsTest.java} (100%) diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBFilesTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBPathsTest.java similarity index 100% rename from engine-api/src/test/java/io/nosqlbench/engine/api/util/NBFilesTest.java rename to engine-api/src/test/java/io/nosqlbench/engine/api/util/NBPathsTest.java