From 950b31fbae5b76c3fad83a68638dbee07f37220e Mon Sep 17 00:00:00 2001 From: Christopher Lambert Date: Thu, 17 Jun 2021 15:03:16 +0200 Subject: [PATCH] fix errors found by errorprone --- .../endpoints/DocsysMarkdownEndpoint.java | 8 -------- .../functions/to_daterange/DateRangeFunc.java | 3 +-- .../core/AvailableCQLStatements.java | 2 -- .../cql/statements/core/CQLSessionCache.java | 2 +- .../core/CQLStatementDefParser.java | 13 +------------ .../rowoperators/verification/DiffType.java | 2 +- .../generators/cql/lang/ParserForCqlTest.java | 10 +++++----- .../core/AvailableCQLStatements.java | 2 -- .../cql/statements/core/CQLSessionCache.java | 2 +- .../core/CQLStatementDefParser.java | 12 ------------ .../rowoperators/verification/DiffType.java | 2 +- .../generators/cql/lang/ParserForCqlTest.java | 10 +++++----- .../cqlverify/CqlVerifyActivity.java | 14 +++++++------- .../ebdrivers/dsegraph/GraphActivity.java | 2 +- .../activitytype/http/HttpConsoleFormats.java | 1 - .../driver/pulsar/PulsarActivity.java | 2 +- .../engine/api/activityapi/core/RunState.java | 2 +- .../CycleResultsRLEBufferReadable.java | 7 ++----- .../planning/IntervalSequencer.java | 3 --- .../activityapi/planning/SequencePlanner.java | 1 - .../api/activityapi/ratelimits/RateSpec.java | 2 -- .../engine/api/activityconfig/ParsedStmt.java | 8 -------- .../api/activityconfig/yaml/StmtsBlock.java | 2 -- .../engine/api/activityimpl/ParameterMap.java | 1 - .../api/activityimpl/SimpleActivity.java | 2 +- .../api/metrics/HistoStatsCSVWriter.java | 1 - .../engine/api/metrics/HistoStatsLogger.java | 4 +--- .../engine/api/metrics/NicerTimer.java | 1 - .../io/nosqlbench/engine/api/util/Unit.java | 6 +----- .../activityapi/ratelimits/RateSpecTest.java | 2 +- .../activityconfig/yaml/ParsedStmtTest.java | 2 +- .../api/metrics/HistoIntervalLoggerTest.java | 8 -------- .../engine/api/util/TagFilterTest.java | 11 +++-------- .../engine/cli/TestNBCLIOptions.java | 19 ++++++++++--------- .../core/lifecycle/ActivityExecutor.java | 8 +------- .../core/lifecycle/ScenarioController.java | 4 +--- .../engine/core/script/Scenario.java | 2 +- .../engine/core/script/ScenariosExecutor.java | 2 +- .../engine/docker/DockerHelper.java | 3 --- .../engine/rest/services/WorkSpace.java | 3 +-- .../engine/rest/services/WorkspaceFinder.java | 11 ++++------- .../rest/transfertypes/WorkspacesView.java | 4 +--- .../nb/annotations/ServiceProcessor.java | 2 -- .../nb/api/content/ResolverForURL.java | 1 - .../api/markdown/aggregator/MarkdownDocs.java | 7 +------ .../markdown/aggregator/MarkdownDocsTest.java | 12 +++++------- .../processors/FunctionManifestProcessor.java | 2 -- .../virtdata/core/bindings/FunctionType.java | 8 ++++---- .../virtdata/core/bindings/ValueType.java | 2 +- .../virtdata/core/templates/BindPoint.java | 5 +++++ .../core/templates/ParsedTemplateTest.java | 9 ++++----- .../shared/distributions/CSVSampler.java | 3 --- .../shared/from_long/to_long/HostHash.java | 4 ++-- .../from_long/to_object/WeightedFuncs.java | 8 +++----- .../shared/from_long/to_long/ShuffleTest.java | 3 +-- .../basics/shared/stateful/ShowTest.java | 4 +--- .../libraryimpl/BasicDataMappersTest.java | 7 ++++--- .../long_timeuuid/ToEpochTimeUUIDTest.java | 3 +++ .../stat/descriptive/moment/SemiVariance.java | 2 +- .../io/virtdata/IntegratedBindingsTest.java | 2 +- .../virtdata/IntegratedComposerLogicTest.java | 5 ++--- 61 files changed, 94 insertions(+), 201 deletions(-) diff --git a/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java b/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java index 724e24822..29e3153a9 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java @@ -180,12 +180,6 @@ public class DocsysMarkdownEndpoint implements WebServiceObject { } private void enable(Set enabled) { - - Set toEnable = new HashSet<>(); - if (this.enables !=null) { - toEnable.addAll(this.enables); - } - for (DocsNameSpace nsinfo : docsinfo) { // add namespaces which are neither enabled nor disabled to the default group if (nsinfo.isEnabledByDefault()) { @@ -204,6 +198,4 @@ public class DocsysMarkdownEndpoint implements WebServiceObject { this.enabled = disabled.remove(enabled); } } - - } diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFunc.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFunc.java index b538d845f..8dc99798c 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFunc.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFunc.java @@ -75,13 +75,12 @@ public class DateRangeFunc implements LongFunction { this.upper = upper; } - @Override public DateRange apply(long value) { Date lowerDate = new Date(lower.applyAsLong(value)); DateRange.DateRangeBound lower = DateRange.DateRangeBound.lowerBound(lowerDate,precision); Date upperDate = new Date(upper.applyAsLong(value)); - DateRange.DateRangeBound upper = DateRange.DateRangeBound.upperBound(lowerDate,precision); + DateRange.DateRangeBound upper = DateRange.DateRangeBound.upperBound(upperDate,precision); DateRange dateRange = new DateRange(lower, upper); return dateRange; } diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java index cb1b0b801..f95dde80d 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java @@ -30,8 +30,6 @@ public class AvailableCQLStatements { } public List getMatching(String tagSpec) { - - List defs = new ArrayList<>(); TagFilter ts = new TagFilter(tagSpec); List CQLStatementDefParsers = availableDefs.stream() diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java index c7947800c..608b97f2e 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java @@ -320,7 +320,7 @@ public class CQLSessionCache implements Shutdownable { Cluster cl = builder.build(); // Apply default idempotence, if set - activityDef.getParams().getOptionalBoolean("defaultidempotence").map( + activityDef.getParams().getOptionalBoolean("defaultidempotence").ifPresent( b -> cl.getConfiguration().getQueryOptions().setDefaultIdempotence(b) ); diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java index 7e4ddc076..d26edc772 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java @@ -12,30 +12,18 @@ public class CQLStatementDefParser { private final static Logger logger = LogManager.getLogger(CQLStatementDefParser.class); // private final static Pattern templateToken = Pattern.compile("<<(\\w+(:(.+?))?)>>"); private final static Pattern stmtToken = Pattern.compile("\\?(\\w+[-_\\d\\w]*)|\\{(\\w+[-_\\d\\w.]*)}"); - private final static String UNSET_VALUE = "UNSET-VALUE"; private final String stmt; private final String name; - private CQLStatementDef deprecatedDef; // deprecated, to be removed - public void setBindings(Map bindings) { this.bindings = bindings; } private Map bindings; - public CQLStatementDef getDeprecatedDef() { - return deprecatedDef; - } - - public void setDeprecatedDef(CQLStatementDef deprecatedDef) { - this.deprecatedDef = deprecatedDef; - } - public CQLStatementDefParser(String name, String stmt) { this.stmt = stmt; this.name = name; - this.bindings = bindings; } public Map getBindings() { @@ -122,6 +110,7 @@ public class CQLStatementDefParser { this.missingGenerators = missingGenerators; this.missingAnchors = missingAnchors; this.statement = stmt; + this.bindings = bindings; this.name = name; } diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/verification/DiffType.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/verification/DiffType.java index 385d692dc..6d570a14d 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/verification/DiffType.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/verification/DiffType.java @@ -23,7 +23,7 @@ public enum DiffType { /// the actual data. all(0x1|0x1<<1|0x1<<2); - public int bitmask; + public final int bitmask; DiffType(int bit) { this.bitmask = bit; diff --git a/driver-cql-shaded/src/test/java/io/nosqlbench/generators/cql/lang/ParserForCqlTest.java b/driver-cql-shaded/src/test/java/io/nosqlbench/generators/cql/lang/ParserForCqlTest.java index 445322126..a417f0f32 100644 --- a/driver-cql-shaded/src/test/java/io/nosqlbench/generators/cql/lang/ParserForCqlTest.java +++ b/driver-cql-shaded/src/test/java/io/nosqlbench/generators/cql/lang/ParserForCqlTest.java @@ -9,6 +9,7 @@ import java.nio.file.*; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; +import java.util.stream.Stream; public class ParserForCqlTest { @@ -37,15 +38,14 @@ public class ParserForCqlTest { URL url = resources.nextElement(); System.out.println("url=" + url.toExternalForm()); Path path = Paths.get(url.toURI()); - Files.walk(path, FileVisitOption.FOLLOW_LINKS) - .filter(p -> !Files.isDirectory(p, LinkOption.NOFOLLOW_LINKS)) - .forEach(subpaths::add); + try (Stream fileStream = Files.walk(path, FileVisitOption.FOLLOW_LINKS)) { + fileStream.filter(p -> !Files.isDirectory(p, LinkOption.NOFOLLOW_LINKS)) + .forEach(subpaths::add); + } } } catch (Exception e) { throw new RuntimeException(e); } return subpaths; - } - } diff --git a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java index cb1b0b801..f95dde80d 100644 --- a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java +++ b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java @@ -30,8 +30,6 @@ public class AvailableCQLStatements { } public List getMatching(String tagSpec) { - - List defs = new ArrayList<>(); TagFilter ts = new TagFilter(tagSpec); List CQLStatementDefParsers = availableDefs.stream() diff --git a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java index adbbc8a83..c4a79f2f0 100644 --- a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java +++ b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java @@ -304,7 +304,7 @@ public class CQLSessionCache implements Shutdownable { Cluster cl = builder.build(); // Apply default idempotence, if set - activityDef.getParams().getOptionalBoolean("defaultidempotence").map( + activityDef.getParams().getOptionalBoolean("defaultidempotence").ifPresent( b -> cl.getConfiguration().getQueryOptions().setDefaultIdempotence(b) ); diff --git a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java index 7e4ddc076..0ae2ba15b 100644 --- a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java +++ b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java @@ -12,30 +12,18 @@ public class CQLStatementDefParser { private final static Logger logger = LogManager.getLogger(CQLStatementDefParser.class); // private final static Pattern templateToken = Pattern.compile("<<(\\w+(:(.+?))?)>>"); private final static Pattern stmtToken = Pattern.compile("\\?(\\w+[-_\\d\\w]*)|\\{(\\w+[-_\\d\\w.]*)}"); - private final static String UNSET_VALUE = "UNSET-VALUE"; private final String stmt; private final String name; - private CQLStatementDef deprecatedDef; // deprecated, to be removed - public void setBindings(Map bindings) { this.bindings = bindings; } private Map bindings; - public CQLStatementDef getDeprecatedDef() { - return deprecatedDef; - } - - public void setDeprecatedDef(CQLStatementDef deprecatedDef) { - this.deprecatedDef = deprecatedDef; - } - public CQLStatementDefParser(String name, String stmt) { this.stmt = stmt; this.name = name; - this.bindings = bindings; } public Map getBindings() { diff --git a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/verification/DiffType.java b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/verification/DiffType.java index 385d692dc..6d570a14d 100644 --- a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/verification/DiffType.java +++ b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/verification/DiffType.java @@ -23,7 +23,7 @@ public enum DiffType { /// the actual data. all(0x1|0x1<<1|0x1<<2); - public int bitmask; + public final int bitmask; DiffType(int bit) { this.bitmask = bit; diff --git a/driver-cqld3-shaded/src/test/java/io/nosqlbench/generators/cql/lang/ParserForCqlTest.java b/driver-cqld3-shaded/src/test/java/io/nosqlbench/generators/cql/lang/ParserForCqlTest.java index 445322126..a417f0f32 100644 --- a/driver-cqld3-shaded/src/test/java/io/nosqlbench/generators/cql/lang/ParserForCqlTest.java +++ b/driver-cqld3-shaded/src/test/java/io/nosqlbench/generators/cql/lang/ParserForCqlTest.java @@ -9,6 +9,7 @@ import java.nio.file.*; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; +import java.util.stream.Stream; public class ParserForCqlTest { @@ -37,15 +38,14 @@ public class ParserForCqlTest { URL url = resources.nextElement(); System.out.println("url=" + url.toExternalForm()); Path path = Paths.get(url.toURI()); - Files.walk(path, FileVisitOption.FOLLOW_LINKS) - .filter(p -> !Files.isDirectory(p, LinkOption.NOFOLLOW_LINKS)) - .forEach(subpaths::add); + try (Stream fileStream = Files.walk(path, FileVisitOption.FOLLOW_LINKS)) { + fileStream.filter(p -> !Files.isDirectory(p, LinkOption.NOFOLLOW_LINKS)) + .forEach(subpaths::add); + } } } catch (Exception e) { throw new RuntimeException(e); } return subpaths; - } - } diff --git a/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java b/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java index 706b3bb9e..355b63e94 100644 --- a/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java +++ b/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java @@ -3,6 +3,7 @@ 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.engine.api.activityimpl.ParameterMap; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -22,27 +23,26 @@ public class CqlVerifyActivity extends CqlActivity { @Override public synchronized void initActivity() { - if (!super.getActivityDef().getParams().contains("verify") && - !super.getActivityDef().getParams().contains("verify-fields")) { + ParameterMap activityParams = super.getActivityDef().getParams(); + if (!activityParams.containsKey("verify") && + !activityParams.containsKey("verify-fields")) { logger.info("Pre-configuring activity param 'verify=*' since none was provided."); logger.info("To control this on a per-statement basis, use the verify param."); - super.getActivityDef().getParams().put("verify", "*"); + activityParams.put("verify", "*"); } - if (!super.getActivityDef().getParams().contains("compare")) { - super.getActivityDef().getParams().put("compare", "all"); + if (!activityParams.containsKey("compare")) { + activityParams.put("compare", "all"); logger.info("Pre-configuring activity param 'compare=all' since none was provided."); logger.info("To control this on a per-statement basis, use the compare param."); } super.initActivity(); - } @Override public void onActivityDefUpdate(ActivityDef activityDef) { super.onActivityDefUpdate(activityDef); addResultSetCycleOperator(new AssertSingleRowResultSet()); - } } diff --git a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java index 73fd8047e..631355a86 100644 --- a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java +++ b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java @@ -212,7 +212,7 @@ public class GraphActivity extends SimpleActivity implements ActivityDefObserver logger.error("Error while instantiating cluster from builder: " + e.toString(), e); throw e; } - activityDef.getParams().getOptionalBoolean("defaultidempotence").map( + activityDef.getParams().getOptionalBoolean("defaultidempotence").ifPresent( b -> cluster.getConfiguration().getQueryOptions().setDefaultIdempotence(b) ); diff --git a/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpConsoleFormats.java b/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpConsoleFormats.java index 2b30e8fe2..2df81b005 100644 --- a/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpConsoleFormats.java +++ b/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpConsoleFormats.java @@ -108,7 +108,6 @@ public class HttpConsoleFormats { } long mod = 1L; - Set incl = new HashSet<>(); long mask = 0L; for (String include : filterSet) { diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java index 76ea6a7f5..668eae911 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java @@ -197,6 +197,6 @@ public class PulsarActivity extends SimpleActivity implements ActivityDefObserve } public void asyncOperationFailed(Throwable ex) { - this.asyncOperationFailure = asyncOperationFailure; + this.asyncOperationFailure = ex; } } diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/RunState.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/RunState.java index 5bde23134..fd1c3a68e 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/RunState.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/RunState.java @@ -33,7 +33,7 @@ public enum RunState { // The thread has stopped. This should only be set by the controlled thread Stopped("_\u23F9"); - private String runcode; + private final String runcode; RunState(String runcode) { this.runcode = runcode; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferReadable.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferReadable.java index 9e07af7ba..6d03e84ac 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferReadable.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferReadable.java @@ -104,11 +104,8 @@ public class CycleResultsRLEBufferReadable implements CycleResultSegmentsReadabl @Override public CycleResultsSegment next() { - if (next==null) { - hasNext(); - if (next==null) { - throw new RuntimeException("Possible call to next() without calling hasNext(). There was no remaining unfiltered data."); - } + if (next == null && !hasNext()) { + throw new RuntimeException("Call to next() but there was no remaining unfiltered data."); } CycleResultsSegment wasNext = this.next; next=null; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencer.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencer.java index 7cf32dc7c..e9f66fc13 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencer.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencer.java @@ -67,9 +67,6 @@ import java.util.function.ToLongFunction; */ public class IntervalSequencer implements ElementSequencer { - private List elems; - private ToLongFunction ratioFunc; - @Override public int[] seqIndexByRatioFunc(List elements, ToLongFunction ratioFunc) { diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencePlanner.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencePlanner.java index d94e1faae..72c25b3fc 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencePlanner.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencePlanner.java @@ -59,7 +59,6 @@ public class SequencePlanner { logger.trace("sequencing elements by concatenation"); this.elementIndex = new ConcatSequencer().seqIndexesByRatios(elements, ratios); } - this.elements = elements; return new Sequence<>(sequencerType, elements, elementIndex); } diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpec.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpec.java index 81018543a..1d6fe72f6 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpec.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateSpec.java @@ -178,8 +178,6 @@ public class RateSpec { } public String toString() { - StringBuilder sb = new StringBuilder(); - double ratePortion = Math.abs(opsPerSec - ((long) opsPerSec)); String ratefmt = (ratePortion > 0.001D) ? String.format("%,.3f", opsPerSec) : String.format("%,d", (long) opsPerSec); 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 9de64669a..1963e340b 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 @@ -149,14 +149,6 @@ public class ParsedStmt { return opDef.getBindings(); } - /** - * @return the params from the enclosed {@link OpDef} - * @deprecated You should use {@link #getParamReader()} instead. - */ - public Map getParams() { - return opDef.getParams(); - } - /** * @return a params reader from the enclosed {@link OpDef} params map */ diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsBlock.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsBlock.java index a464d9baa..d07f51942 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsBlock.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsBlock.java @@ -27,8 +27,6 @@ import java.util.*; public class StmtsBlock implements Tagged, Iterable { - private final static String NameToken = "name"; - private final static String StmtToken = "stmt"; private final RawStmtsBlock rawStmtsBlock; private final StmtsDoc rawStmtsDoc; private final int blockIdx; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java index 0a4a95ab8..37df398a9 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java @@ -377,7 +377,6 @@ public class ParameterMap extends ConcurrentHashMap implements Bi } public static String toJSON(Map map) { - StringBuilder sb = new StringBuilder(); List l = new ArrayList<>(); map.forEach((k,v) -> l.add("'" + k + "': '" + v + "'")); return "params={"+String.join(",\n ",l)+"};\n"; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java index b8064234f..5515e381b 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java @@ -255,7 +255,7 @@ public class SimpleActivity implements Activity, ProgressCapable { @Override public void setPhaseLimiter(RateLimiter rateLimiter) { - this.phaseLimiter = phaseLimiter; + this.phaseLimiter = rateLimiter; } @Override diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsCSVWriter.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsCSVWriter.java index 693c1c754..3984f95cf 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsCSVWriter.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsCSVWriter.java @@ -41,7 +41,6 @@ public class HistoStatsCSVWriter { private PrintStream initFile(File logfile) { try { - FileOutputStream fileOutputStream = new FileOutputStream(logfile); PrintStream writer = new PrintStream(logfile); return writer; } catch (IOException e) { diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsLogger.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsLogger.java index e323b864b..b71eb70f8 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsLogger.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/HistoStatsLogger.java @@ -84,9 +84,7 @@ public class HistoStatsLogger extends CapabilityHook mirrors; public NicerTimer(String metricName, DeltaHdrHistogramReservoir deltaHdrHistogramReservoir) { diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/util/Unit.java b/engine-api/src/main/java/io/nosqlbench/engine/api/util/Unit.java index 9769f08af..b9c6fca4c 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/util/Unit.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/util/Unit.java @@ -265,17 +265,13 @@ public class Unit { TB("TB", "terabyte", bytesPerGB * 1000), PB("PB", "petabyte", bytesPerGB * 1000000), EB("EB", "exabyte", bytesPerGB * bytesPerGB), - ZB("ZB", "zettabyte", bytesPerGB * bytesPerGB * 1000), - YB("YB", "yottabyte", bytesPerGB * bytesPerGB * 1000000), KIB("KiB", "kibibyte", 1024), MIB("MiB", "mebibyte", 1024 * 1024), GIB("GiB", "gibibyte", BytesPerGiB), TIB("TiB", "tebibyte", BytesPerGiB * 1024), PIB("PIB", "pebibyte", BytesPerGiB * 1024 * 1024), - EIB("EiB", "exbibyte", BytesPerGiB * BytesPerGiB), - ZIB("ZiB", "zebibyte", BytesPerGiB * BytesPerGiB * 1024), - YIB("YiB", "yobibyte", BytesPerGiB * BytesPerGiB * 1024 * 1024); + EIB("EiB", "exbibyte", BytesPerGiB * BytesPerGiB); private final String name; private final long bytes; 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 6c3910072..999d5ff23 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 @@ -44,6 +44,6 @@ public class RateSpecTest { RateSpec d = new RateSpec("12345,1.4,restart"); assertThat(d.verb).isEqualTo(RateSpec.Verb.restart); RateSpec c = new RateSpec("12345,1.1"); - assertThat(c.verb== RateSpec.Verb.start); + assertThat(c.verb).isEqualTo(RateSpec.Verb.start); } } 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 1a294115f..7ca43c35d 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 @@ -63,7 +63,7 @@ public class ParsedStmtTest { OpTemplate stmtDef1 = block2.getOps().get(1); ParsedStmt parsed1 = stmtDef1.getParsed(); - assertThat(parsed1.getMissingBindings().isEmpty()); + assertThat(parsed1.getMissingBindings()).isEmpty(); assertThat(parsed1.hasError()).isFalse(); } 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 4006cce39..e9245cb77 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 @@ -47,20 +47,12 @@ public class HistoIntervalLoggerTest { hil.onHistogramAdded("histo1",nicerHistogram); - List moments = new ArrayList<>(100); - moments.add(System.currentTimeMillis()); // 0 nicerHistogram.update(1L); - moments.add(System.currentTimeMillis()); // 1 delay(1001); - moments.add(System.currentTimeMillis()); // 2 nicerHistogram.update(1000000L); - moments.add(System.currentTimeMillis()); // 3 delay(1001); - moments.add(System.currentTimeMillis()); // 4 nicerHistogram.update(1000L); - moments.add(System.currentTimeMillis()); // 5 hil.onHistogramRemoved("histo1"); - moments.add(System.currentTimeMillis()); // 6 hil.closeMetrics(); 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 3234db195..dce139ec9 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 @@ -45,11 +45,9 @@ public class TagFilterTest { @Test public void testSomeFilterTagsNoItemTagsDoesNotMatch() { - Map itemtags = new HashMap<>() {{ - }}; + Map itemtags = new HashMap<>(); TagFilter tf = new TagFilter("tag=foo"); assertThat(tf.matches(itemtags).matched()).isFalse(); - } @Test @@ -59,7 +57,6 @@ public class TagFilterTest { }}; TagFilter tf = new TagFilter(""); assertThat(tf.matches(itemtags).matched()).isTrue(); - } @Test @@ -77,7 +74,6 @@ public class TagFilterTest { assertThat(tf.matches(itemtags2).matched()).isTrue(); } - @Test public void testMatchingKeyMismatchingValueDoesNotMatch() { Map itemtags = new HashMap<>() {{ @@ -110,7 +106,8 @@ public class TagFilterTest { assertThat(tfRight.matches(itemtags).matched()).isTrue(); } - public void testMatchingDetails() { + // TODO: enable and fix test + private void testMatchingDetails() { Tagged tagged = new Tagged() { @Override public Map getTags() { @@ -131,7 +128,6 @@ public class TagFilterTest { assertThat(result.getLog()).contains("filter(five) tag(five): matched names"); assertThat(result.getLog()).contains("filter(seven) tag(): did not match"); assertThat(result.getLog()).contains("filter(six:again) tag(six): null tag value did not match"); - } @Test @@ -171,5 +167,4 @@ public class TagFilterTest { TagFilter tf2 = new TagFilter("any(car:truck,phase:moon)"); assertThat(tf2.matches(itemtags).matched()).isFalse(); } - } 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 0f4ef55d1..aa5a68ea2 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 @@ -174,27 +174,28 @@ public class TestNBCLIOptions { @Test public void listWorkloads() { NBCLIOptions opts = new NBCLIOptions(new String[]{ "--list-workloads"}); - List cmds = opts.getCommands(); - assertThat(opts.wantsScenariosList()); + assertThat(opts.wantsWorkloadsList()).isTrue(); + } + + @Test + public void listScenarios() { + NBCLIOptions opts = new NBCLIOptions(new String[]{ "--list-scenarios"}); + assertThat(opts.wantsScenariosList()).isTrue(); } @Test public void listScripts() { NBCLIOptions opts = new NBCLIOptions(new String[]{ "--list-scripts"}); - List cmds = opts.getCommands(); - assertThat(opts.wantsScriptList()); + assertThat(opts.wantsScriptList()).isTrue(); } - @Test public void clTest() { String dir= "./"; URL resource = getClass().getClassLoader().getResource(dir); - assertThat(resource); + assertThat(resource).isNotNull(); Path basePath = NBIO.getFirstLocalPath(dir); List yamlPathList = PathWalker.findAll(basePath).stream().filter(f -> f.toString().endsWith(".yaml")).collect(Collectors.toList()); - assertThat(yamlPathList); + assertThat(yamlPathList).isNotEmpty(); } - - } diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java index 837db9032..4e3a03557 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ActivityExecutor.java @@ -98,7 +98,6 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen */ public synchronized void startActivity() { logger.info("starting activity " + activity.getAlias() + " for cycles " + activity.getCycleSummary()); - this.annotatedCommand = annotatedCommand; Annotators.recordAnnotation(Annotation.newBuilder() .session(sessionId) .now() @@ -248,7 +247,6 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen return wasStopped; } - /** * Listens for changes to parameter maps, maps them to the activity instance, and notifies all eligible listeners of * changes. @@ -256,9 +254,7 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen @Override public synchronized void handleParameterMapUpdate(ParameterMap parameterMap) { - if (activity instanceof ActivityDefObserver) { - activity.onActivityDefUpdate(activityDef); - } + activity.onActivityDefUpdate(activityDef); // An activity must be initialized before the motors and other components are // considered ready to handle parameter map changes. This is signaled in an activity @@ -423,8 +419,6 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen * @return true, if the desired SlotState was detected */ private boolean awaitMotorState(Motor m, int waitTime, int pollTime, RunState... desiredRunStates) { - Set desiredStates = new HashSet<>(Arrays.asList(desiredRunStates)); - long startedAt = System.currentTimeMillis(); while (System.currentTimeMillis() < (startedAt + waitTime)) { Map actualStates = new HashMap<>(); diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java index 30a9229ff..ba5b902d7 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java @@ -383,9 +383,8 @@ public class ScenarioController { * @param waitTimeMillis The time to wait, usually set very high * @return true, if all activities completed before the timer expired, false otherwise */ - public boolean awaitCompletion(int waitTimeMillis) { + public boolean awaitCompletion(long waitTimeMillis) { boolean completed = true; - long waitstart = System.currentTimeMillis(); long remaining = waitTimeMillis; List finishers = new ArrayList<>(); @@ -410,7 +409,6 @@ public class ScenarioController { } return completed; - } private ActivityDef aliasToDef(String alias) { diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java index 127cc4581..6b82d7917 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java @@ -311,7 +311,7 @@ public class Scenario implements Callable { endedAtMillis = System.currentTimeMillis(); } } - int awaitCompletionTime = 86400 * 365 * 1000; + long awaitCompletionTime = 86400 * 365 * 1000L; logger.debug("Awaiting completion of scenario for " + awaitCompletionTime + " millis."); scenarioController.awaitCompletion(awaitCompletionTime); //TODO: Ensure control flow covers controller shutdown in event of internal error. diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java index 975b01e74..17fa42914 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java @@ -113,7 +113,7 @@ public class ScenariosExecutor { } Map scenarioResultMap = new LinkedHashMap<>(); getAsyncResultStatus() - .entrySet().forEach(es -> scenarioResultMap.put(es.getKey(), es.getValue().orElseGet(null))); + .entrySet().forEach(es -> scenarioResultMap.put(es.getKey(), es.getValue().orElse(null))); return new ScenariosResults(this, scenarioResultMap); } diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java index 7ad866abf..ad69cee41 100644 --- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java +++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java @@ -85,13 +85,11 @@ public class DockerHelper { portBindings.add(pb); } - List volumeList = new ArrayList<>(); List volumeBindList = new ArrayList<>(); for (String volumeDesc : volumeDescList) { String volFrom = volumeDesc.split(":")[0]; String volTo = volumeDesc.split(":")[1]; Volume vol = new Volume(volTo); - volumeList.add(vol); volumeBindList.add(new Bind(volFrom, vol)); } @@ -121,7 +119,6 @@ public class DockerHelper { } return containerResponse.getId(); - } private boolean startStoppedContainer(String name) { diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkSpace.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkSpace.java index 8bff3ba74..d08c35928 100644 --- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkSpace.java +++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkSpace.java @@ -123,8 +123,7 @@ public class WorkSpace { List items = new ArrayList<>(); - try { - DirectoryStream elementPaths = Files.newDirectoryStream(target); + try (DirectoryStream elementPaths = Files.newDirectoryStream(target)) { for (Path elementPath : elementPaths) { items.add(new WorkspaceItemView(this.workspacePath,elementPath)); } diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkspaceFinder.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkspaceFinder.java index 4012ee6e7..4ba5a6b70 100644 --- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkspaceFinder.java +++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkspaceFinder.java @@ -56,16 +56,13 @@ public class WorkspaceFinder { public List getWorkspaceViews() { List views = new ArrayList<>(); - DirectoryStream wsrEntries = null; - try { - wsrEntries = Files.newDirectoryStream(root); + try (DirectoryStream wsrEntries = Files.newDirectoryStream(root)) { + for (Path entry : wsrEntries) { + views.add(new WorkspaceView(entry)); + } } catch (IOException e) { throw new RuntimeException(e); } - - for (Path entry : wsrEntries) { - views.add(new WorkspaceView(entry)); - } return views; } diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/transfertypes/WorkspacesView.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/transfertypes/WorkspacesView.java index bbe12389a..5da71921f 100644 --- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/transfertypes/WorkspacesView.java +++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/transfertypes/WorkspacesView.java @@ -16,9 +16,7 @@ public class WorkspacesView { public List getWorkspaces() { List workspaces = new ArrayList<>(); - - try { - DirectoryStream paths = Files.newDirectoryStream(workspacesRoot); + try (DirectoryStream paths = Files.newDirectoryStream(workspacesRoot)) { for (Path path : paths) { workspaces.add(path.toString()); } diff --git a/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/ServiceProcessor.java b/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/ServiceProcessor.java index 757591ab2..578979f18 100644 --- a/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/ServiceProcessor.java +++ b/nb-annotations/src/main/java/io/nosqlbench/nb/annotations/ServiceProcessor.java @@ -68,8 +68,6 @@ public class ServiceProcessor extends AbstractProcessor { @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { - List ts = new ArrayList<>(); - try { for (String annotationType : this.getSupportedAnnotationTypes()) { Class annotationClass = diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForURL.java b/nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForURL.java index 71acb2c23..e23dadf06 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForURL.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForURL.java @@ -19,7 +19,6 @@ public class ResolverForURL implements ContentResolver { @Override public List> resolve(URI uri) { - List> contents = new ArrayList<>(); URLContent urlContent = resolveURI(uri); if (urlContent!=null) { return List.of(urlContent); diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocs.java b/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocs.java index 824900e9e..a67b62fa6 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocs.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocs.java @@ -27,13 +27,8 @@ public class MarkdownDocs { } public static List find(String name, DocScope... scopes) { - List aggregated = new ArrayList<>(); - List> markdownContent = RawMarkdownSources.getAllMarkdown(); - // Find all topics and aggregators - List aggregators = new ArrayList<>(); - List markdownInfos = markdownContent .stream() .map(ParsedMarkdown::new) @@ -78,7 +73,7 @@ public class MarkdownDocs { return mdgraph.processed(); // // -// +// List aggregated = new ArrayList<>(); // List>> edges = new ArrayList<>(); // List matchedtopics = null; // diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocsTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocsTest.java index 9fc06d633..3e7fbe130 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocsTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocsTest.java @@ -9,9 +9,9 @@ import java.net.URL; import java.nio.file.*; import java.util.*; import java.util.stream.Collectors; +import java.util.stream.Stream; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.from; public class MarkdownDocsTest { @@ -74,16 +74,14 @@ public class MarkdownDocsTest { URL url = resources.nextElement(); System.out.println("url="+url.toExternalForm()); Path path = Paths.get(url.toURI()); - Files.walk(path, FileVisitOption.FOLLOW_LINKS) - .filter(p -> !Files.isDirectory(p, LinkOption.NOFOLLOW_LINKS)) - .forEach(subpaths::add); + try (Stream fileStream = Files.walk(path, FileVisitOption.FOLLOW_LINKS)) { + fileStream.filter(p -> !Files.isDirectory(p, LinkOption.NOFOLLOW_LINKS)) + .forEach(subpaths::add); + } } } catch (Exception e) { throw new RuntimeException(e); } return subpaths; - } - - } diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java index 7ed3f5c90..0f09d6c41 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java @@ -48,8 +48,6 @@ public class FunctionManifestProcessor extends AbstractProcessor { @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { - List ts = new ArrayList<>(); - try { if (writer==null) { writer = filer.createResource(StandardLocation.CLASS_OUTPUT, "", "META-INF/functions") diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java index 4557f3895..ac35a7e66 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java @@ -24,10 +24,10 @@ public enum FunctionType { R_T(Function.class, Object.class, Object.class); private final Class functionClass; - private Class inputClass; - private Class returnClass; - private ValueType returnValueType; - private ValueType inputValueType; + private final Class inputClass; + private final Class returnClass; + private final ValueType returnValueType; + private final ValueType inputValueType; FunctionType(Class functionClass, Class inputClass, Class returnClass) { this.functionClass = functionClass; diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java index 021c6b6da..d7270701f 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java @@ -29,7 +29,7 @@ public enum ValueType implements Comparator { OBJECT(Object.class, 8); private final Class clazz; - private int precedence; + private final int precedence; ValueType(Class clazz, int precedence) { this.clazz = clazz; diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java index 63dde339a..18ab0737f 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java @@ -30,6 +30,11 @@ public class BindPoint { return Objects.equals(bindspec, bindPoint.bindspec); } + @Override + public int hashCode() { + return Objects.hash(anchor, bindspec); + } + @Override public String toString() { return "BindPoint{" + diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java index 6a9671c22..a66c9c056 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateTest.java @@ -12,10 +12,9 @@ import static org.assertj.core.api.Assertions.assertThat; public class ParsedTemplateTest { - private final Map bindings = new HashMap<>() {{ - put("bindname1", "bindspec1"); - put("bindname2", "bindspec2"); - }}; + private final Map bindings = Map.of( + "bindname1", "bindspec1", + "bindname2", "bindspec2"); private final String rawNothing = "This has no anchors"; private final String oneCurly = "A {curly} brace."; private final String oneQuestion = " A ?question anchor."; @@ -34,7 +33,7 @@ public class ParsedTemplateTest { public void testShoudlMatchCurlyBraces() { ParsedTemplate pt = new ParsedTemplate(oneCurly, bindings); assertThat(pt.getSpans()).containsExactly("A ", "curly", " brace."); - assertThat(pt.getSpecificBindings().isEmpty()); + assertThat(pt.getSpecificBindings()).isEmpty(); assertThat(pt.getMissingBindings()).contains("curly"); assertThat(pt.getExtraBindings()).hasSameElementsAs(bindings.keySet()); } diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSampler.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSampler.java index 15e4a059a..fefb01f45 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSampler.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSampler.java @@ -8,7 +8,6 @@ import io.nosqlbench.virtdata.api.annotations.Example; import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; import io.nosqlbench.virtdata.library.basics.core.stathelpers.AliasElementSampler; import io.nosqlbench.virtdata.library.basics.core.stathelpers.ElemProbD; -import io.nosqlbench.virtdata.library.basics.core.stathelpers.EvProbD; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Hash; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; @@ -68,8 +67,6 @@ public class CSVSampler implements LongFunction { */ @Example({"CSVSampler('USPS','n/a','name','census_state_abbrev')",""}) public CSVSampler(String labelColumn, String weightColumn, String... data) { - List events = new ArrayList<>(); - List values = new ArrayList<>(); Function weightFunc = LabeledStatistic::sum; LongUnaryOperator prefunc = new Hash(); 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 0267043e9..acd3e4079 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 @@ -60,10 +60,10 @@ public class HostHash implements LongUnaryOperator { distinctNames.add(iface.getHostName()); }); List nameList = new ArrayList<>(distinctNames); - nameList.sort(String::compareTo); + Collections.sort(nameList); Murmur3F m3f = new Murmur3F(0); m3f.reset(); - distinctNames.forEach( + nameList.forEach( s -> m3f.update(s.getBytes(StandardCharsets.UTF_8)) ); return m3f.getValue(); 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 12b729c11..4e3df00c8 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 @@ -26,10 +26,8 @@ public class WeightedFuncs implements LongFunction { private HashedDoubleRange unitSampler = new HashedDoubleRange(0.0d, 1.0d); public WeightedFuncs(Object... weightsAndFuncs) { - List probabilites = new ArrayList<>(); - List> functions = new ArrayList<>(); - List probabilities = new ArrayList<>(); + List> functions = new ArrayList<>(); if ((weightsAndFuncs.length % 2) != 0) { throw new RuntimeException("You must have weights and functions, pairwise." + @@ -45,7 +43,7 @@ public class WeightedFuncs implements LongFunction { } catch (NumberFormatException nfe) { throw new RuntimeException("the 0th and ever even value must be a floating point weight."); } - probabilites.add(new EvProbD(i >> 1, weight)); + probabilities.add(new EvProbD(i >> 1, weight)); Object f = weightsAndFuncs[i + 1]; try { @@ -58,7 +56,7 @@ public class WeightedFuncs implements LongFunction { } } this.funcs = functions.toArray(new LongFunction[0]); - this.functionSampler = new AliasSamplerDoubleInt(probabilites); + this.functionSampler = new AliasSamplerDoubleInt(probabilities); } @Override diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ShuffleTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ShuffleTest.java index 55533b561..fff0ca897 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ShuffleTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ShuffleTest.java @@ -143,9 +143,9 @@ public class ShuffleTest { } // return shuffle.stats; return new int[0]; - } + @Test public void test16() { int max=16; Shuffle shuffle = new Shuffle(0,max); @@ -161,7 +161,6 @@ public class ShuffleTest { assertThat(r[i]).isEqualTo(i+1); } // System.out.println("resampling stats for " + max + " values: " + Arrays.toString(shuffle.stats)); - } @Test diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/ShowTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/ShowTest.java index 9b2a06492..d52f5b133 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/ShowTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/ShowTest.java @@ -23,8 +23,6 @@ public class ShowTest { assertThat(showFoo.apply(2342343L)).isEqualTo("{foo=23}"); assertThat(showBar.apply(23423L)).isEqualTo("{bar=Bar}"); new Clear().apply(234); - assertThat(showAll.apply("234").isEmpty()); + assertThat(showAll.apply("234")).isEqualTo("{}"); } - - } \ No newline at end of file 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 2fb96a6d4..419caccf0 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 @@ -11,7 +11,6 @@ import static org.assertj.core.api.Assertions.assertThat; public class BasicDataMappersTest { - @Test public void testGetDataMapper() throws Exception { Optional> dataMapper = VirtData.getOptionalMapper("StaticStringMapper('foo')"); @@ -52,6 +51,7 @@ public class BasicDataMappersTest { assertThat(dataMapper.get()).isNotNull(); Date d1 = dataMapper.get().get(1); Date d2 = dataMapper.get().get(2); + assertThat(d2).isAfter(d1); } @Test @@ -59,7 +59,9 @@ public class BasicDataMappersTest { Optional> dataMapper = VirtData.getOptionalMapper("ToDate(1000,10000)"); assertThat(dataMapper).isNotNull(); assertThat(dataMapper.get()).isNotNull(); - assertThat(dataMapper.get().get(1).after(new Date(1))); + assertThat(dataMapper.get().get(0)).isEqualTo(new Date(0)); + assertThat(dataMapper.get().get(10)).isEqualTo(new Date(1)); + assertThat(dataMapper.get().get(20)).isEqualTo(new Date(2)); } @Test @@ -69,5 +71,4 @@ public class BasicDataMappersTest { assertThat(dataMapper.get()).isNotNull(); assertThat(dataMapper.get().get(1)).isNotNull(); } - } diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/ToEpochTimeUUIDTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/ToEpochTimeUUIDTest.java index bb84295f2..22c3aa65b 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/ToEpochTimeUUIDTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/ToEpochTimeUUIDTest.java @@ -22,7 +22,10 @@ public class ToEpochTimeUUIDTest { formats.add(formatted); e = new ToEpochTimeUUID(formatted); + } + for (String formatted : formats) { + System.out.println(formatted); } /** diff --git a/virtdata-lib-curves4/src/main/java/org/apache/commons/math4/stat/descriptive/moment/SemiVariance.java b/virtdata-lib-curves4/src/main/java/org/apache/commons/math4/stat/descriptive/moment/SemiVariance.java index 33c0c8ebf..8008d884a 100644 --- a/virtdata-lib-curves4/src/main/java/org/apache/commons/math4/stat/descriptive/moment/SemiVariance.java +++ b/virtdata-lib-curves4/src/main/java/org/apache/commons/math4/stat/descriptive/moment/SemiVariance.java @@ -340,7 +340,7 @@ public class SemiVariance extends AbstractUnivariateStatistic implements Seriali /** * boolean value UPSIDE <-> true */ - private boolean direction; + private final boolean direction; /** * Create a Direction with the given value. diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java index f62e33b91..664a68f7e 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java @@ -216,7 +216,7 @@ public class IntegratedBindingsTest { public void testDirectFunctionalInterfaceLongUnary() { LongUnaryOperator f = VirtData.getFunction("Add(5L)", LongUnaryOperator.class); assertThat(f).isNotNull(); - assertThat(f.getClass()==LongUnaryOperator.class); + assertThat(f.getClass()).isEqualTo(LongUnaryOperator.class); } @Test diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java index 82810595d..1ec1f34e5 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java @@ -132,14 +132,13 @@ public class IntegratedComposerLogicTest { public void sanityCheckFunctionCasting() { Class c1 = NumberNameToString.class; Class c2 = LongFunction.class; - assertThat(ClassUtils.isAssignable(c1,c2)); + assertThat(ClassUtils.isAssignable(c1, c2)).isTrue(); Class c3 = Identity.class; Class c4 = LongFunction.class; - assertThat(ClassUtils.isAssignable(c3,c4)); + assertThat(ClassUtils.isAssignable(c3, c4)).isTrue(); LongUnaryOperator f; f = new Identity(); - } @Test(expected = RuntimeException.class)