From 95076a49a4928816062edefa52b8987c91183224 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 30 Apr 2020 10:26:40 -0500 Subject: [PATCH] move annotations up a level in modules --- .../cql/core/CqlActivityType.java | 2 +- .../cql/filtering/CQLResultFilterType.java | 2 +- .../javax.annotation.processing.Processor | 3 +- .../cqlverify/CqlVerifyActivityType.java | 2 +- .../activitytype/diag/DiagActivityType.java | 2 +- .../javax.annotation.processing.Processor | 3 +- .../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 +- .../webdriver/WebDriverActivityType.java | 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 +- .../core/services/WorkloadFinderEndpoint.java | 2 +- .../services/ScenarioTemplateService.java | 3 +- .../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 | 3 +- nb-annotations/pom.xml | 54 +++++++++++++++++++ .../nosqlbench/nb}/annotations/Service.java | 2 +- .../nb/annotations}/ServiceClassName.java | 4 +- .../nb/annotations}/ServiceProcessor.java | 4 +- nb-api/pom.xml | 7 +++ .../javax.annotation.processing.Processor | 1 + .../javax.annotation.processing.Processor | 3 +- pom.xml | 1 + .../api/processors/FunctionDocInfoWriter.java | 2 +- .../javax.annotation.processing.Processor | 2 +- .../javax.annotation.processing.Processor | 3 +- .../javax.annotation.processing.Processor | 3 +- .../javax.annotation.processing.Processor | 3 +- .../javax.annotation.processing.Processor | 3 +- .../userlibs/apps/VirtDataService.java | 2 +- .../docinfo/VirtdataMarkdownManifest.java | 2 +- .../javax.annotation.processing.Processor | 3 +- 52 files changed, 113 insertions(+), 60 deletions(-) create mode 100644 nb-annotations/pom.xml rename {nb-api/src/main/java/io/nosqlbench/nb/api => nb-annotations/src/main/java/io/nosqlbench/nb}/annotations/Service.java (96%) rename {nb-api/src/main/java/io/nosqlbench/nb/api/processors => nb-annotations/src/main/java/io/nosqlbench/nb/annotations}/ServiceClassName.java (65%) rename {nb-api/src/main/java/io/nosqlbench/nb/api/processors => nb-annotations/src/main/java/io/nosqlbench/nb/annotations}/ServiceProcessor.java (96%) create mode 100644 nb-api/src/main/resources/META-INF/services/javax.annotation.processing.Processor 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 d1246fa1f..7572aad8e 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 @@ -7,7 +7,7 @@ import com.datastax.driver.core.UDTValue; 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.nb.api.annotations.Service; +import io.nosqlbench.nb.annotations.Service; import java.math.BigDecimal; import java.math.BigInteger; 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 4b104cdfe..6ab1aee37 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 fcb692d9f..c25032104 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,3 +1,2 @@ io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor - -io.nosqlbench.nb.api.processors.ServiceProcessor +io.nosqlbench.nb.annotations.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 762eaa9c1..0ae0feeb6 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 796302282..8196384c5 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 fcb692d9f..c25032104 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,3 +1,2 @@ io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor - -io.nosqlbench.nb.api.processors.ServiceProcessor +io.nosqlbench.nb.annotations.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 016d7d926..c95cbada7 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 113b143a2..0a1ffeecb 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 4dd9e03bd..67ffbb44d 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 b72d6b1da..920a1c97c 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 cc87feeb5..a44607882 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 b46be9550..c48f078db 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 c8920310f..ceb8ce941 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 +1 @@ -io.nosqlbench.nb.api.processors.ServiceProcessor +io.nosqlbench.nb.annotations.ServiceProcessor diff --git a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverActivityType.java b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverActivityType.java index a39ad7826..d875d2d6c 100644 --- a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverActivityType.java +++ b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverActivityType.java @@ -5,7 +5,7 @@ import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.core.ActivityType; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import io.nosqlbench.nb.api.annotations.Service; +import io.nosqlbench.nb.annotations.Service; @Service(ActivityType.class) public class WebDriverActivityType implements ActivityType { 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 55f41492a..e55266cbf 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 20effa3f7..8734233af 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 d9df2e10a..dbb5e4d50 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 5904fc4d3..edec07937 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 3c518fdd2..b88c081b1 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 a7247d6c4..9ddf2d8ad 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 bf5acfd75..5ec2f44d5 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 716f9797f..6c4abb8ae 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.nb.api.annotations.Service; +import io.nosqlbench.nb.annotations.Service; @Service(MetricRegistryService.class) public class MetricsContext implements MetricRegistryService { diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/services/WorkloadFinderEndpoint.java b/engine-core/src/main/java/io/nosqlbench/engine/core/services/WorkloadFinderEndpoint.java index eb048e2b8..41f520311 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/services/WorkloadFinderEndpoint.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/services/WorkloadFinderEndpoint.java @@ -3,7 +3,7 @@ package io.nosqlbench.engine.core.services; import io.nosqlbench.docsys.api.WebServiceObject; import io.nosqlbench.engine.api.scenarios.NBCLIScenarioParser; import io.nosqlbench.engine.api.scenarios.WorkloadDesc; -import io.nosqlbench.nb.api.annotations.Service; +import io.nosqlbench.nb.annotations.Service; import io.nosqlbench.virtdata.userlibs.apps.docsapp.AutoDocsWebService; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/services/ScenarioTemplateService.java b/engine-core/src/main/java/io/nosqlbench/engine/services/ScenarioTemplateService.java index f234329ba..7eae7890b 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/services/ScenarioTemplateService.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/services/ScenarioTemplateService.java @@ -1,8 +1,7 @@ package io.nosqlbench.engine.services; -import com.fasterxml.jackson.jaxrs.annotation.JacksonFeatures; import io.nosqlbench.docsys.api.WebServiceObject; -import io.nosqlbench.nb.api.annotations.Service; +import io.nosqlbench.nb.annotations.Service; import javax.inject.Singleton; import javax.ws.rs.GET; 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 fcb692d9f..952ba4df0 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,3 +1,3 @@ io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor -io.nosqlbench.nb.api.processors.ServiceProcessor +io.nosqlbench.nb.annotations.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 8d1412c77..f170de708 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 633135b87..90b127d5c 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 d77c1cc73..231abe85b 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 9998c899b..e1b82d94f 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 e92c10368..f0435ec70 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 bfc65ac08..54fd1848b 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 6c4cbee4d..143243d35 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 0970a350a..5cdc97fe8 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 7e81262d3..1547a5caf 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 fcb692d9f..c25032104 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,3 +1,2 @@ io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor - -io.nosqlbench.nb.api.processors.ServiceProcessor +io.nosqlbench.nb.annotations.ServiceProcessor diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml new file mode 100644 index 000000000..018643cca --- /dev/null +++ b/nb-annotations/pom.xml @@ -0,0 +1,54 @@ + + 4.0.0 + + + + mvn-defaults + io.nosqlbench + 3.12.92-SNAPSHOT + ../mvn-defaults + + + nb-annotations + jar + ${project.artifactId} + + This is the annotations module for NoSQLBench. It is the only upstream module from nb-api. + It is a separate module to enable annotation processors to be compiled separately to be used + downstream in any module that depends on the api. To use this module, simply depend on + nb-api. + + + + + + org.slf4j + slf4j-api + + + + ch.qos.logback + logback-classic + + + + junit + junit + test + + + + org.assertj + assertj-core + test + + + + + org.apache.commons + commons-csv + + + + + diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Service.java b/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/Service.java similarity index 96% rename from nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Service.java rename to nb-annotations/src/main/java/io/nosqlbench/nb/annotations/Service.java index af72bfd8e..c2a79ec6e 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Service.java +++ b/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/Service.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package io.nosqlbench.nb.api.annotations; +package io.nosqlbench.nb.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/processors/ServiceClassName.java b/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/ServiceClassName.java similarity index 65% rename from nb-api/src/main/java/io/nosqlbench/nb/api/processors/ServiceClassName.java rename to nb-annotations/src/main/java/io/nosqlbench/nb/annotations/ServiceClassName.java index 142d1fc38..49f5dfaf0 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/api/processors/ServiceClassName.java +++ b/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/ServiceClassName.java @@ -1,4 +1,4 @@ -package io.nosqlbench.nb.api.processors; +package io.nosqlbench.nb.annotations; /** * Statically defined names which need to be visible for refactoring @@ -6,5 +6,5 @@ package io.nosqlbench.nb.api.processors; */ public class ServiceClassName { public final static String Service = - "io.nosqlbench.nb.api.annotations.Service"; + "io.nosqlbench.nb.annotations.Service"; } diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/processors/ServiceProcessor.java b/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/ServiceProcessor.java similarity index 96% rename from nb-api/src/main/java/io/nosqlbench/nb/api/processors/ServiceProcessor.java rename to nb-annotations/src/main/java/io/nosqlbench/nb/annotations/ServiceProcessor.java index ac34dae38..49f2d3ed3 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/api/processors/ServiceProcessor.java +++ b/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/ServiceProcessor.java @@ -1,4 +1,4 @@ -package io.nosqlbench.nb.api.processors; +package io.nosqlbench.nb.annotations; import javax.annotation.processing.*; import javax.lang.model.SourceVersion; @@ -22,7 +22,7 @@ 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(); + public final static String SERVICE_NAME = Service.class.getCanonicalName(); @Override public Set getSupportedAnnotationTypes() { diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 49ba2f40c..84d7c9330 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -27,6 +27,13 @@ + + + io.nosqlbench + nb-annotations + 3.12.92-SNAPSHOT + + org.slf4j slf4j-api diff --git a/nb-api/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/nb-api/src/main/resources/META-INF/services/javax.annotation.processing.Processor new file mode 100644 index 000000000..ceb8ce941 --- /dev/null +++ b/nb-api/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -0,0 +1 @@ +io.nosqlbench.nb.annotations.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 fcb692d9f..c25032104 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,3 +1,2 @@ io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor - -io.nosqlbench.nb.api.processors.ServiceProcessor +io.nosqlbench.nb.annotations.ServiceProcessor diff --git a/pom.xml b/pom.xml index 9cf2c0ac0..dec0716a8 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,7 @@ docsys nb-api + nb-annotations engine-api diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoWriter.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoWriter.java index b6da257c4..cdf675552 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoWriter.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoWriter.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.api.processors; import com.squareup.javapoet.*; -import io.nosqlbench.nb.api.annotations.Service; +import io.nosqlbench.nb.annotations.Service; import io.nosqlbench.virtdata.api.annotations.Category; import javax.annotation.processing.Filer; 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 cfe520cfe..c25032104 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.api.processors.FunctionDocInfoProcessor -io.nosqlbench.nb.api.processors.ServiceProcessor +io.nosqlbench.nb.annotations.ServiceProcessor 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 fcb692d9f..c25032104 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,3 +1,2 @@ io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor - -io.nosqlbench.nb.api.processors.ServiceProcessor +io.nosqlbench.nb.annotations.ServiceProcessor 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 fcb692d9f..c25032104 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,3 +1,2 @@ io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor - -io.nosqlbench.nb.api.processors.ServiceProcessor +io.nosqlbench.nb.annotations.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 fcb692d9f..c25032104 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,3 +1,2 @@ io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor - -io.nosqlbench.nb.api.processors.ServiceProcessor +io.nosqlbench.nb.annotations.ServiceProcessor 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 fcb692d9f..c25032104 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,3 +1,2 @@ io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor - -io.nosqlbench.nb.api.processors.ServiceProcessor +io.nosqlbench.nb.annotations.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 2dd5745ba..f9b034179 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.nb.api.annotations.Service; +import io.nosqlbench.nb.annotations.Service; import io.nosqlbench.virtdata.core.bindings.DataMapper; import io.nosqlbench.virtdata.core.bindings.ResolverDiagnostics; import io.nosqlbench.virtdata.core.bindings.VirtData; 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 1a49f357c..0eef43ce5 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.nb.api.annotations.Service; +import io.nosqlbench.nb.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 fcb692d9f..c25032104 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,3 +1,2 @@ io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor - -io.nosqlbench.nb.api.processors.ServiceProcessor +io.nosqlbench.nb.annotations.ServiceProcessor