formatting fix

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<Path> basePaths = new ArrayList<>();
+    private final static Logger logger  = LogManager.getLogger(DocServer.class);
+
+    private final List<Path> basePaths = new ArrayList<>();
     private final List<Class> servletClasses = new ArrayList<>();
     private ServletContextHandler contextHandler;
     private ServletHolder servletHolder;

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;
 

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);
     }
 

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;

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.</p>
  */
 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<DataMapper<?>> dataMappers = new ArrayList<DataMapper<?>>();
     private ThreadLocal<Map<String, DataMapper<?>>> nameCache;
 

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<String> bindPointNames = new ArrayList<>();
+    private final static Logger logger  = LogManager.getLogger(BindingsTemplate.class);
+    private List<String> bindPointNames = new ArrayList<>();
     private List<String> specifiers = new ArrayList<>();
 
 //    public BindingsTemplate(Map<String,String> specs) {

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<String,String> funcs = new HashMap<String,String>() {{
         put("log_normal","LogNormal");
         put("normal", "Normal");

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;
 

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.

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<String,Object> customElements = new HashMap<>();

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<ResolvedFunction> resolveFunctions(Class<?> returnType, Class<?> inputType, String functionName, Map<String,?> customParameters, Object... parameters) {

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<String,DataMapper<?>> threadSafeCache = new HashMap<>();
 
     private final VirtDataFunctionResolver resolver = new VirtDataFunctionResolver();

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<LongFunction<?>> {
-    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;

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() {

virtdata-core/src/main/java/io/nosqlbench/virtdata/api/templates/ParsedTemplate.java

@@ -87,7 +87,8 @@ public class ParsedTemplate {
             Pattern.compile("\\{(?<anchor>\\w+[-_\\d\\w.]*)}"),
             Pattern.compile("\\?(?<anchor>\\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;

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<ErrorNode> errorNodes = new ArrayList<>();
 
     private Stack<VirtDataParser.VirtdataFlowContext> flowContexts = new Stack<>();

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);
     }

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<BigDecimal> {
-    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<BigDecimal> {
         long ret = (value % modulo) & Long.MAX_VALUE;
         return BigDecimal.valueOf(ret);
     }
-}
+}

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<BigInteger> {
-    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<BigInteger> {
         long ret = (value % modulo) & Long.MAX_VALUE;
         return BigInteger.valueOf(ret);
     }
-}
+}

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;
 

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;
     }
 
-}
+}

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<String> {
 
-    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<Path> allFiles;
     private Iterator<String> stringIterator;

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<String> {
 
-    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;
 

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<String> {
-    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<String> lines = new ArrayList<>();
 

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<String> {
-    private final static Logger logger  = LogManager.getLogger(ModuloLineToString.class);private List<String> lines = new ArrayList<>();
+    private final static Logger logger  = LogManager.getLogger(ModuloLineToString.class);
+    private List<String> lines = new ArrayList<>();
 
     private String filename;
 

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<String> {
-    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<StringBuilder> sb = ThreadLocal.withInitial(StringBuilder::new);
     private final String rawTemplate;

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<String,String> {
 
-    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;

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<String> {
 
-    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;

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<String> lines;
+    private final static Logger logger  = LogManager.getLogger(RandomLineToInt.class);
+    private final List<String> lines;
 
     private final MersenneTwister rng;
     private final IntegerDistribution itemDistribution;

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<String> {
-    private final static Logger logger  = LogManager.getLogger(RandomLineToString.class);private List<String> lines = new ArrayList<>();
+    private final static Logger logger  = LogManager.getLogger(RandomLineToString.class);
+    private List<String> lines = new ArrayList<>();
 
     private final MersenneTwister rng;
     private final IntegerDistribution itemDistribution;

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");

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;