From 3de5d0908a2bdf0af3ed3c06eaa4978d3bc778cf Mon Sep 17 00:00:00 2001 From: Jan Rieke Date: Thu, 30 Dec 2021 19:04:00 +0100 Subject: [fixes #3070] fix guava type name for SuperBuilder's toBuilder --- .../lombok/eclipse/handlers/singulars/EclipseGuavaSingularizer.java | 2 +- src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/lombok') diff --git a/src/core/lombok/eclipse/handlers/singulars/EclipseGuavaSingularizer.java b/src/core/lombok/eclipse/handlers/singulars/EclipseGuavaSingularizer.java index 9b464a25..59fccdab 100755 --- a/src/core/lombok/eclipse/handlers/singulars/EclipseGuavaSingularizer.java +++ b/src/core/lombok/eclipse/handlers/singulars/EclipseGuavaSingularizer.java @@ -93,7 +93,7 @@ abstract class EclipseGuavaSingularizer extends EclipseSingularizer { } @Override protected char[][] getEmptyMakerReceiver(String targetFqn) { - return CGCC; + return makeGuavaTypeName(GuavaTypeMap.getGuavaTypeName(targetFqn), false); } @Override public List generateFields(SingularData data, EclipseNode builderType) { diff --git a/src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java b/src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java index ce5aad5e..808b794a 100644 --- a/src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java +++ b/src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java @@ -52,7 +52,7 @@ abstract class JavacGuavaSingularizer extends JavacSingularizer { } @Override protected String getEmptyMaker(String target) { - return target + ".of"; + return "com.google.common.collect." + GuavaTypeMap.getGuavaTypeName(target) + ".of"; } protected String getBuilderMethodName(SingularData data) { -- cgit