From 92fc11fd0efdd841f488fda8c937577349dc713c Mon Sep 17 00:00:00 2001 From: Emil Lundberg Date: Sun, 13 Jan 2019 01:34:24 +0100 Subject: Inline Guava singularizer instances into getGuavaInstead() --- .../javac/handlers/singulars/JavacJavaUtilListSetSingularizer.java | 3 +-- .../lombok/javac/handlers/singulars/JavacJavaUtilMapSingularizer.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/core/lombok/javac/handlers/singulars/JavacJavaUtilListSetSingularizer.java b/src/core/lombok/javac/handlers/singulars/JavacJavaUtilListSetSingularizer.java index 26054203..3aeab37a 100644 --- a/src/core/lombok/javac/handlers/singulars/JavacJavaUtilListSetSingularizer.java +++ b/src/core/lombok/javac/handlers/singulars/JavacJavaUtilListSetSingularizer.java @@ -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 listFieldsToBeGenerated(SingularData data, JavacNode builderType) { diff --git a/src/core/lombok/javac/handlers/singulars/JavacJavaUtilMapSingularizer.java b/src/core/lombok/javac/handlers/singulars/JavacJavaUtilMapSingularizer.java index 1d4d8eee..76068570 100644 --- a/src/core/lombok/javac/handlers/singulars/JavacJavaUtilMapSingularizer.java +++ b/src/core/lombok/javac/handlers/singulars/JavacJavaUtilMapSingularizer.java @@ -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 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 listFieldsToBeGenerated(SingularData data, JavacNode builderType) { -- cgit