IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

cleanup service loader code

Browse Source
This commit is contained in:
Jonathan Shook
2021-02-18 19:09:22 -06:00
parent 7e776d5fcf
commit 6e4eff1515
62 changed files with 184 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoWriter.java
View File

@@ -17,8 +17,8 @@ import java.util.stream.Collectors;
public class FunctionDocInfoWriter implements FuncEnumerator.Listener {
private final String suffix;
private Filer filer;
private Messager messenger;
private final Filer filer;
private final Messager messenger;
public FunctionDocInfoWriter(Filer filer, Messager messenger, String suffix) {
this.filer = filer;
@@ -100,7 +100,7 @@ public class FunctionDocInfoWriter implements FuncEnumerator.Listener {
ctors.add("add(new $T<$T>() {{$>\n", ArrayList.class, String.class);
for (String s : example) {
Matcher m = Pattern.compile(Matcher.quoteReplacement("$")).matcher(s);
s=m.replaceAll(m.quoteReplacement("$$"));
s = m.replaceAll(Matcher.quoteReplacement("$$"));
ctors.add("add(\"" + s + "\");\n");
}
ctors.add("$<}});\n");
@@ -127,7 +127,8 @@ public class FunctionDocInfoWriter implements FuncEnumerator.Listener {
AnnotationSpec serviceAnnotation = AnnotationSpec.builder(Service.class)
.addMember("value","$T.class",DocFuncData.class)
.addMember("value", "$T.class", DocFuncData.class)
.addMember("selector", "$S", doc.getPackageName() + "." + doc.getClassName())
.build();
TypeSpec manifestType = TypeSpec.classBuilder(newClassName)

3
virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionLibrary.java
View File

@@ -1,6 +1,5 @@
package io.nosqlbench.virtdata.core.bindings;
import io.nosqlbench.nb.api.spi.Named;
import io.nosqlbench.virtdata.lang.ast.Expression;
import io.nosqlbench.virtdata.lang.ast.FunctionCall;
import io.nosqlbench.virtdata.lang.parser.VirtDataDSL;
@@ -12,7 +11,7 @@ import java.util.stream.Collectors;
* A VirtDataFunctionLibrary is simply a way to ask for a set
* of named function objects in a generic way.
*/
public interface VirtDataFunctionLibrary extends Named {
public interface VirtDataFunctionLibrary {
/**
* Given a signature for a unary function which takes an input

11
virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibraries.java
View File

@@ -9,9 +9,9 @@ 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 Map<String,DataMapper<?>> threadSafeCache = new HashMap<>();
private final static Logger logger = LogManager.getLogger(VirtDataLibraries.class);
private static final VirtDataLibraries instance = new VirtDataLibraries();
private final Map<String, DataMapper<?>> threadSafeCache = new HashMap<>();
private final VirtDataFunctionResolver resolver = new VirtDataFunctionResolver();
@@ -21,11 +21,6 @@ public class VirtDataLibraries implements VirtDataFunctionLibrary {
private VirtDataLibraries() {
}
@Override
public String getName() {
return "ALL";
}
@Override
public List<ResolvedFunction> resolveFunctions(