Inline Guava singularizer instances into getGuavaInstead()

This commit is contained in:
Emil Lundberg committed 2019-01-13 02:38:15 +01:00
1 parent 258a9bf288
commit 92fc11fd0e
2 files changed
+2 -4

No files matched your search

@@ -44,10 +44,9 @@ import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Name;
abstract class JavacJavaUtilListSetSingularizer extends JavacJavaUtilSingularizer {
private final JavacSingularizer guavaListSetSingularizer = new JavacGuavaSetListSingularizer();
@Override protected JavacSingularizer getGuavaInstead(JavacNode node) {
return guavaListSetSingularizer;
return new JavacGuavaSetListSingularizer();
}
@Override public java.util.List<Name> listFieldsToBeGenerated(SingularData data, JavacNode builderType) {
@@ -49,14 +49,13 @@ import com.sun.tools.javac.util.Name;
@ProviderFor(JavacSingularizer.class)
public class JavacJavaUtilMapSingularizer extends JavacJavaUtilSingularizer {
private final JavacSingularizer guavaMapSingularizer = new JavacGuavaMapSingularizer();
@Override public LombokImmutableList<String> getSupportedTypes() {
return LombokImmutableList.of("java.util.Map", "java.util.SortedMap", "java.util.NavigableMap");
}
@Override protected JavacSingularizer getGuavaInstead(JavacNode node) {
return guavaMapSingularizer;
return new JavacGuavaMapSingularizer();
}
@Override public java.util.List<Name> listFieldsToBeGenerated(SingularData data, JavacNode builderType) {