From ea2a71cc02cae292ba1770979eb312d691fd8237 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Apr 2020 12:41:45 -0500 Subject: [PATCH] formatting fix --- .../src/main/java/io/nosqlbench/docsys/core/DocServer.java | 4 +++- .../io/nosqlbench/docsys/core/DocsysMarkdownEndpoint.java | 3 ++- .../src/main/java/io/nosqlbench/docsys/core/PathWalker.java | 3 ++- .../java/io/nosqlbench/docsys/handlers/FavIconHandler.java | 3 ++- .../src/main/java/io/nosqlbench/virtdata/api/Bindings.java | 3 ++- .../java/io/nosqlbench/virtdata/api/BindingsTemplate.java | 3 ++- .../java/io/nosqlbench/virtdata/api/CompatibilityFixups.java | 4 +++- .../java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java | 4 +++- .../src/main/java/io/nosqlbench/virtdata/api/VirtData.java | 3 ++- .../java/io/nosqlbench/virtdata/api/VirtDataComposer.java | 3 ++- .../io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java | 3 ++- .../java/io/nosqlbench/virtdata/api/VirtDataLibraries.java | 3 ++- .../virtdata/api/composers/ComposerForLongFunction.java | 3 ++- .../nosqlbench/virtdata/api/composers/FunctionAssembly.java | 3 ++- .../io/nosqlbench/virtdata/api/templates/ParsedTemplate.java | 3 ++- .../io/nosqlbench/virtdata/lang/parser/VirtDataBuilder.java | 3 ++- .../virtdata/library/basics/core/lfsrs/MetaShift.java | 4 ++-- .../shared/from_long/to_bigdecimal/ModuloToBigDecimal.java | 5 +++-- .../basics/shared/from_long/to_bigint/ModuloToBigInt.java | 5 +++-- .../basics/shared/from_long/to_int/HashedLineToInt.java | 3 ++- .../basics/shared/from_long/to_long/ModuloToLong.java | 5 +++-- .../basics/shared/from_long/to_string/DirectoryLines.java | 4 +++- .../from_long/to_string/HashedFileExtractToString.java | 4 +++- .../shared/from_long/to_string/HashedLineToString.java | 3 ++- .../shared/from_long/to_string/ModuloLineToString.java | 3 ++- .../library/basics/shared/from_long/to_string/Template.java | 3 ++- .../library/basics/shared/unary_string/FieldExtractor.java | 4 +++- .../virtdata/library/random/RandomFileExtractToString.java | 4 +++- .../nosqlbench/virtdata/library/random/RandomLineToInt.java | 3 ++- .../virtdata/library/random/RandomLineToString.java | 3 ++- .../virtdata/userlibs/apps/valuesapp/ValuesCheckerApp.java | 4 +++- .../userlibs/apps/valuesapp/ValuesCheckerRunnable.java | 4 +++- 32 files changed, 76 insertions(+), 36 deletions(-) diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/DocServer.java b/docsys/src/main/java/io/nosqlbench/docsys/core/DocServer.java index 1d02df337..6babdbdd7 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/core/DocServer.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/core/DocServer.java @@ -43,7 +43,9 @@ import java.util.stream.Collectors; */ public class DocServer implements Runnable { - private final static Logger logger = LogManager.getLogger(DocServer.class);private final List basePaths = new ArrayList<>(); + private final static Logger logger = LogManager.getLogger(DocServer.class); + + private final List basePaths = new ArrayList<>(); private final List servletClasses = new ArrayList<>(); private ServletContextHandler contextHandler; private ServletHolder servletHolder; diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpoint.java b/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpoint.java index 69fb79a92..b46be9550 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpoint.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpoint.java @@ -22,7 +22,8 @@ import java.util.concurrent.atomic.AtomicLong; @Singleton @Path("/services/docs/") public class DocsysMarkdownEndpoint implements WebServiceObject { - private final static Logger logger = LogManager.getLogger(DocsysMarkdownEndpoint.class);private DocsBinder docsinfo; + private final static Logger logger = LogManager.getLogger(DocsysMarkdownEndpoint.class); + private DocsBinder docsinfo; private DocsBinder enabled; private DocsBinder disabled; diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/PathWalker.java b/docsys/src/main/java/io/nosqlbench/docsys/core/PathWalker.java index 5ecb2cd91..dbe3d0b76 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/core/PathWalker.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/core/PathWalker.java @@ -12,7 +12,8 @@ import java.util.ArrayList; import java.util.List; public class PathWalker { - private final static Logger logger = LogManager.getLogger(PathWalker.class);public static void walk(Path p, PathVisitor v) { + private final static Logger logger = LogManager.getLogger(PathWalker.class); + public static void walk(Path p, PathVisitor v) { walk(p,v,PathWalker.WALK_ALL); } diff --git a/docsys/src/main/java/io/nosqlbench/docsys/handlers/FavIconHandler.java b/docsys/src/main/java/io/nosqlbench/docsys/handlers/FavIconHandler.java index 89b4135b0..659004bd8 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/handlers/FavIconHandler.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/handlers/FavIconHandler.java @@ -18,7 +18,8 @@ import java.nio.file.Path; import java.security.InvalidParameterException; public class FavIconHandler extends AbstractHandler { - private final static Logger logger = LogManager.getLogger(FavIconHandler.class);private final Path faviconPath; + private final static Logger logger = LogManager.getLogger(FavIconHandler.class); + private final Path faviconPath; byte[] iconData; private long lastModified = 0L; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Bindings.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Bindings.java index 83af22627..da61a9ae3 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Bindings.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/Bindings.java @@ -36,7 +36,8 @@ import java.util.*; * directly on your provided objects. See the detailed method docs for more information.

*/ public class Bindings { - private final static Logger logger = LogManager.getLogger(Bindings.class);private BindingsTemplate template; + private final static Logger logger = LogManager.getLogger(Bindings.class); + private BindingsTemplate template; private List> dataMappers = new ArrayList>(); private ThreadLocal>> nameCache; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsTemplate.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsTemplate.java index 94e052cfb..d9787e286 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsTemplate.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/BindingsTemplate.java @@ -38,7 +38,8 @@ import java.util.Optional; * bindings will be used in. */ public class BindingsTemplate { - private final static Logger logger = LogManager.getLogger(BindingsTemplate.class);private List bindPointNames = new ArrayList<>(); + private final static Logger logger = LogManager.getLogger(BindingsTemplate.class); + private List bindPointNames = new ArrayList<>(); private List specifiers = new ArrayList<>(); // public BindingsTemplate(Map specs) { diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/CompatibilityFixups.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/CompatibilityFixups.java index e6681828b..306602e74 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/CompatibilityFixups.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/CompatibilityFixups.java @@ -11,7 +11,9 @@ import java.util.regex.Pattern; public class CompatibilityFixups { - private final static Logger logger = LogManager.getLogger(CompatibilityFixups.class);// Not all of these are simple upper-case changes + private final static Logger logger = LogManager.getLogger(CompatibilityFixups.class); + + // Not all of these are simple upper-case changes private final static Map funcs = new HashMap() {{ put("log_normal","LogNormal"); put("normal", "Normal"); diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java index a43340968..e2720902f 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/ResolverDiagnostics.java @@ -9,7 +9,9 @@ import java.util.Optional; public class ResolverDiagnostics { - private final static Logger logger = LogManager.getLogger(ResolverDiagnostics.class);private ResolvedFunction resolvedFunction; + private final static Logger logger = LogManager.getLogger(ResolverDiagnostics.class); + + private ResolvedFunction resolvedFunction; private final StringBuilder log = new StringBuilder(); private Throwable error; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtData.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtData.java index 3a1471cd4..a66cb884f 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtData.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtData.java @@ -10,7 +10,8 @@ import org.apache.logging.log4j.LogManager; import java.util.*; public class VirtData { - private final static Logger logger = LogManager.getLogger(VirtData.class);/** + private final static Logger logger = LogManager.getLogger(VirtData.class); + /** * Create a bindings template from the pair-wise names and specifiers. * Each even-numbered (starting with zero) argument is a binding name, * and each odd-numbered (starting with one) argument is a binding spec. diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataComposer.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataComposer.java index 0348b17cf..87a06c7d9 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataComposer.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataComposer.java @@ -50,7 +50,8 @@ import java.util.stream.Collectors; public class VirtDataComposer { private final static String PREAMBLE = "compose "; - private final static Logger logger = LogManager.getLogger(DataMapperLibrary.class);private final static MethodHandles.Lookup lookup = MethodHandles.publicLookup(); + private final static Logger logger = LogManager.getLogger(DataMapperLibrary.class); + private final static MethodHandles.Lookup lookup = MethodHandles.publicLookup(); private final VirtDataFunctionLibrary functionLibrary; private final Map customElements = new HashMap<>(); diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java index 01b35b02c..216cdd529 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataFunctionResolver.java @@ -16,7 +16,8 @@ import java.util.*; import java.util.stream.Collectors; public class VirtDataFunctionResolver { - private final static Logger logger = LogManager.getLogger(VirtDataFunctionResolver.class);private final static MethodHandles.Lookup lookup = MethodHandles.publicLookup(); + private final static Logger logger = LogManager.getLogger(VirtDataFunctionResolver.class); + private final static MethodHandles.Lookup lookup = MethodHandles.publicLookup(); private final VirtDataFunctionFinder virtDataFunctionFinder = new VirtDataFunctionFinder(); public List resolveFunctions(Class returnType, Class inputType, String functionName, Map customParameters, Object... parameters) { diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibraries.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibraries.java index 3fcc412ce..0dd20cf81 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibraries.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/VirtDataLibraries.java @@ -9,7 +9,8 @@ import java.util.List; import java.util.Map; public class VirtDataLibraries implements VirtDataFunctionLibrary { - private final static Logger logger = LogManager.getLogger(VirtDataLibraries.class);private static VirtDataLibraries instance = new VirtDataLibraries(); + private final static Logger logger = LogManager.getLogger(VirtDataLibraries.class); + private static VirtDataLibraries instance = new VirtDataLibraries(); private final Map> threadSafeCache = new HashMap<>(); private final VirtDataFunctionResolver resolver = new VirtDataFunctionResolver(); diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongFunction.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongFunction.java index b3340fb05..47c9cf2b0 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongFunction.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/ComposerForLongFunction.java @@ -8,7 +8,8 @@ import org.apache.logging.log4j.LogManager; import java.util.function.*; public class ComposerForLongFunction implements FunctionComposer> { - private final static Logger logger = LogManager.getLogger(ComposerForLongFunction.class);private final LongFunction inner; + private final static Logger logger = LogManager.getLogger(ComposerForLongFunction.class); + private final LongFunction inner; public ComposerForLongFunction(LongFunction inner) { this.inner = inner; diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionAssembly.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionAssembly.java index 75c8ef390..ccbe8f93b 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionAssembly.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/composers/FunctionAssembly.java @@ -7,7 +7,8 @@ import org.apache.logging.log4j.LogManager; import java.util.function.*; public class FunctionAssembly implements FunctionComposer { - private final static Logger logger = LogManager.getLogger(FunctionAssembly.class);private FunctionComposer composer = null; + private final static Logger logger = LogManager.getLogger(FunctionAssembly.class); + private FunctionComposer composer = null; @Override public Object getFunctionObject() { diff --git a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/ParsedTemplate.java b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/ParsedTemplate.java index 1141f677a..529126002 100644 --- a/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/ParsedTemplate.java +++ b/virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/ParsedTemplate.java @@ -87,7 +87,8 @@ public class ParsedTemplate { Pattern.compile("\\{(?\\w+[-_\\d\\w.]*)}"), Pattern.compile("\\?(?\\w+[-_\\d\\w.]*)") }; - private final static Logger logger = LogManager.getLogger(ParsedTemplate.class);private final Pattern[] patterns; + private final static Logger logger = LogManager.getLogger(ParsedTemplate.class); + private final Pattern[] patterns; // Spans is an even-odd form of (literal, variable, ..., ..., literal) private final String rawtemplate; private final String[] spans; diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/parser/VirtDataBuilder.java b/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/parser/VirtDataBuilder.java index 202edcc0b..f6c1db459 100644 --- a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/parser/VirtDataBuilder.java +++ b/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/parser/VirtDataBuilder.java @@ -16,7 +16,8 @@ import java.util.Stack; import java.util.regex.Pattern; public class VirtDataBuilder extends VirtDataBaseListener { - private final static Logger logger = LogManager.getLogger(VirtDataBuilder.class);private VirtDataAST model = new VirtDataAST(); + private final static Logger logger = LogManager.getLogger(VirtDataBuilder.class); + private VirtDataAST model = new VirtDataAST(); private List errorNodes = new ArrayList<>(); private Stack flowContexts = new Stack<>(); diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShift.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShift.java index 717b9ed3c..21d8635d2 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShift.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShift.java @@ -6,10 +6,10 @@ import org.apache.logging.log4j.LogManager; import java.util.List; import java.util.function.LongUnaryOperator; -import java.util.logging.LogManager; public class MetaShift { - private final static Logger logger = LogManager.getLogger(MetaShift.class);public static Func forSizeAndBank(long size, int selector) { + private final static Logger logger = LogManager.getLogger(MetaShift.class); + public static Func forSizeAndBank(long size, int selector) { GaloisData data = Masks.forPeriodAndBank(size, selector); return new Func(data); } diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ModuloToBigDecimal.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ModuloToBigDecimal.java index 17af399ae..1bcf654fd 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ModuloToBigDecimal.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ModuloToBigDecimal.java @@ -33,7 +33,8 @@ import java.util.function.LongFunction; @ThreadSafeMapper @Categories({Category.conversion}) public class ModuloToBigDecimal implements LongFunction { - private final static Logger logger = LogManager.getLogger(ModuloToBigDecimal.class);private final long modulo; + private final static Logger logger = LogManager.getLogger(ModuloToBigDecimal.class); + private final long modulo; public ModuloToBigDecimal() { this.modulo = Long.MAX_VALUE; @@ -48,4 +49,4 @@ public class ModuloToBigDecimal implements LongFunction { long ret = (value % modulo) & Long.MAX_VALUE; return BigDecimal.valueOf(ret); } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ModuloToBigInt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ModuloToBigInt.java index 5a862d47f..476f3eb27 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ModuloToBigInt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ModuloToBigInt.java @@ -33,7 +33,8 @@ import java.util.function.LongFunction; @ThreadSafeMapper @Categories({Category.conversion}) public class ModuloToBigInt implements LongFunction { - private final static Logger logger = LogManager.getLogger(ModuloToBigInt.class);private final long modulo; + private final static Logger logger = LogManager.getLogger(ModuloToBigInt.class); + private final long modulo; public ModuloToBigInt() { this.modulo = Long.MAX_VALUE; @@ -48,4 +49,4 @@ public class ModuloToBigInt implements LongFunction { long ret = (value % modulo) & Long.MAX_VALUE; return BigInteger.valueOf(ret); } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashedLineToInt.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashedLineToInt.java index 01d86bb5f..79eb9a11f 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashedLineToInt.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashedLineToInt.java @@ -14,7 +14,8 @@ import java.util.function.LongToIntFunction; */ @ThreadSafeMapper public class HashedLineToInt implements LongToIntFunction { - private final static Logger logger = LogManager.getLogger(HashedLineToInt.class);private int[] values; + private final static Logger logger = LogManager.getLogger(HashedLineToInt.class); + private int[] values; private final String filename; private final Hash intHash; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ModuloToLong.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ModuloToLong.java index 9c042623b..3ee36b8af 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ModuloToLong.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ModuloToLong.java @@ -29,7 +29,8 @@ import java.util.function.LongUnaryOperator; */ @ThreadSafeMapper public class ModuloToLong implements LongUnaryOperator { - private final static Logger logger = LogManager.getLogger(ModuloToLong.class);private final long modulo; + private final static Logger logger = LogManager.getLogger(ModuloToLong.class); + private final long modulo; public ModuloToLong(long modulo) { this.modulo=modulo; @@ -41,4 +42,4 @@ public class ModuloToLong implements LongUnaryOperator { return ret; } -} \ No newline at end of file +} diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLines.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLines.java index 3e963ee23..5d78227b8 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLines.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLines.java @@ -25,7 +25,9 @@ import java.util.regex.Pattern; @ThreadSafeMapper public class DirectoryLines implements LongFunction { - private final static Logger logger = LogManager.getLogger(DirectoryLines.class);private final Pattern namePattern; + private final static Logger logger = LogManager.getLogger(DirectoryLines.class); + + private final Pattern namePattern; private final String basepath; private final List allFiles; private Iterator stringIterator; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedFileExtractToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedFileExtractToString.java index a5daa267a..d55e5864c 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedFileExtractToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedFileExtractToString.java @@ -37,7 +37,9 @@ import java.util.function.LongFunction; @ThreadSafeMapper public class HashedFileExtractToString implements LongFunction { - private final static Logger logger = LogManager.getLogger(HashedFileExtractToString.class);private static CharBuffer fileDataImage =null; + private final static Logger logger = LogManager.getLogger(HashedFileExtractToString.class); + + private static CharBuffer fileDataImage =null; private final HashRange sizeRange; private final HashRange positionRange; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLineToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLineToString.java index 26071eb43..8fe9eae47 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLineToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLineToString.java @@ -34,7 +34,8 @@ import java.util.function.LongFunction; */ @ThreadSafeMapper public class HashedLineToString implements LongFunction { - private final static Logger logger = LogManager.getLogger(HashedLineToString.class);private final HashRange indexRange; + private final static Logger logger = LogManager.getLogger(HashedLineToString.class); + private final HashRange indexRange; private List lines = new ArrayList<>(); diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloLineToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloLineToString.java index 499af58db..5e43e4c97 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloLineToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloLineToString.java @@ -33,7 +33,8 @@ import java.util.function.LongFunction; */ @ThreadSafeMapper public class ModuloLineToString implements LongFunction { - private final static Logger logger = LogManager.getLogger(ModuloLineToString.class);private List lines = new ArrayList<>(); + private final static Logger logger = LogManager.getLogger(ModuloLineToString.class); + private List lines = new ArrayList<>(); private String filename; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java index 3ab8a7dd2..1b7eac9c3 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java @@ -35,7 +35,8 @@ import java.util.regex.Pattern; */ @ThreadSafeMapper public class Template implements LongFunction { - private final static Logger logger = LogManager.getLogger(Template.class);private static final String EXPR_BEGIN = "[["; + private final static Logger logger = LogManager.getLogger(Template.class); + private static final String EXPR_BEGIN = "[["; private static final String EXPR_END = "]]"; private final static ThreadLocal sb = ThreadLocal.withInitial(StringBuilder::new); private final String rawTemplate; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractor.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractor.java index 253579428..36f109536 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractor.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractor.java @@ -15,7 +15,9 @@ import java.util.function.Function; @ThreadSafeMapper public class FieldExtractor implements Function { - private final static Logger logger = LogManager.getLogger(FieldExtractor.class);private final String fields; + private final static Logger logger = LogManager.getLogger(FieldExtractor.class); + + private final String fields; private final String splitDelim; private final String printDelim; private final int maxIdx; diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomFileExtractToString.java b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomFileExtractToString.java index 06cf2b9dc..b599a171e 100644 --- a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomFileExtractToString.java +++ b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomFileExtractToString.java @@ -32,7 +32,9 @@ import java.util.function.LongFunction; @DeprecatedFunction("random mappers are not deterministic. They will be replaced with hash-based functions.") public class RandomFileExtractToString implements LongFunction { - private final static Logger logger = LogManager.getLogger(RandomFileExtractToString.class);private static CharBuffer fileDataImage =null; + private final static Logger logger = LogManager.getLogger(RandomFileExtractToString.class); + + private static CharBuffer fileDataImage =null; private int minsize, maxsize; private final MersenneTwister rng; diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToInt.java b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToInt.java index 8db47f349..d0399627a 100644 --- a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToInt.java +++ b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToInt.java @@ -13,7 +13,8 @@ import java.util.function.LongToIntFunction; @DeprecatedFunction("random mappers are not deterministic. They will be replaced with hash-based functions.") public class RandomLineToInt implements LongToIntFunction { - private final static Logger logger = LogManager.getLogger(RandomLineToInt.class);private final List lines; + private final static Logger logger = LogManager.getLogger(RandomLineToInt.class); + private final List lines; private final MersenneTwister rng; private final IntegerDistribution itemDistribution; diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToString.java b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToString.java index a258002ac..ddfc6d0ec 100644 --- a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToString.java +++ b/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToString.java @@ -35,7 +35,8 @@ import java.util.function.LongFunction; */ @DeprecatedFunction("random mappers are not deterministic. They will be replaced with hash-based functions.") public class RandomLineToString implements LongFunction { - private final static Logger logger = LogManager.getLogger(RandomLineToString.class);private List lines = new ArrayList<>(); + private final static Logger logger = LogManager.getLogger(RandomLineToString.class); + private List lines = new ArrayList<>(); private final MersenneTwister rng; private final IntegerDistribution itemDistribution; diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerApp.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerApp.java index c5a1458b0..8c88bc60c 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerApp.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerApp.java @@ -5,7 +5,9 @@ import org.apache.logging.log4j.LogManager; public class ValuesCheckerApp { - private final static Logger logger = LogManager.getLogger(ValuesCheckerApp.class);public static void main(String[] args) { + private final static Logger logger = LogManager.getLogger(ValuesCheckerApp.class); + + public static void main(String[] args) { if (args.length<5) { System.out.println("ARGS: 'specifier' threads bufsize start end"); System.out.println("example: 'timeuuid()' 100 1000 0 10000"); diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerRunnable.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerRunnable.java index d538abfc1..14a5b880a 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerRunnable.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuesapp/ValuesCheckerRunnable.java @@ -13,7 +13,9 @@ import java.util.concurrent.locks.Lock; public class ValuesCheckerRunnable implements Runnable { - private final static Logger logger = LogManager.getLogger(ValuesCheckerRunnable.class);private final Condition goTime; + private final static Logger logger = LogManager.getLogger(ValuesCheckerRunnable.class); + + private final Condition goTime; private final Lock lock; private final long start; private final long end;