added the ‘always use guava’ lombok.config option for @Singular @Builder.

7 files changed, 77 insertions, 9 deletions

diff --git a/src/core/lombok/javac/handlers/JavacSingularsRecipes.java b/src/core/lombok/javac/handlers/JavacSingularsRecipes.java
index 35bd66ed..e60bc247 100644
--- a/src/core/lombok/javac/handlers/JavacSingularsRecipes.java
+++ b/src/core/lombok/javac/handlers/JavacSingularsRecipes.java
@@ -150,7 +150,7 @@ public class JavacSingularsRecipes {
 					Name name = field.name;
 					if (name == null) break;
 					if (getGeneratedBy(field) != null) continue;
-					for (Name fieldToBeGenerated : listFieldsToBeGenerated(builderType, data)) {
+					for (Name fieldToBeGenerated : listFieldsToBeGenerated(data, builderType)) {
 						if (!fieldToBeGenerated.equals(name)) continue;
 						child.addError("Manually adding a field that @Singular @Builder would generate is not supported. If you want to manually manage the builder aspect for this field/parameter, don't use @Singular.");
 						return true;
@@ -162,7 +162,7 @@ public class JavacSingularsRecipes {
 					Name name = method.name;
 					if (name == null) break;
 					if (getGeneratedBy(method) != null) continue;
-					for (Name methodToBeGenerated : listMethodsToBeGenerated(builderType, data)) {
+					for (Name methodToBeGenerated : listMethodsToBeGenerated(data, builderType)) {
 						if (!methodToBeGenerated.equals(name)) continue;
 						child.addError("Manually adding a method that @Singular @Builder would generate is not supported. If you want to manually manage the builder aspect for this field/parameter, don't use @Singular.");
 						return true;
@@ -174,11 +174,11 @@ public class JavacSingularsRecipes {
 			return false;
 		}
 		
-		public java.util.List<Name> listFieldsToBeGenerated(JavacNode builderType, SingularData data) {
+		public java.util.List<Name> listFieldsToBeGenerated(SingularData data, JavacNode builderType) {
 			return Collections.singletonList(data.pluralName);
 		}
 		
-		public java.util.List<Name> listMethodsToBeGenerated(JavacNode builderType, SingularData data) {
+		public java.util.List<Name> listMethodsToBeGenerated(SingularData data, JavacNode builderType) {
 			Name p = data.pluralName;
 			Name s = data.singularName;
 			if (p.equals(s)) return Collections.singletonList(p);
diff --git a/src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java b/src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java
index 62cbc98b..a45faae4 100644
--- a/src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java
+++ b/src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java
@@ -26,6 +26,7 @@ import static lombok.javac.handlers.JavacHandlerUtil.*;
 
 import java.util.Collections;
 
+import lombok.core.GuavaTypeMap;
 import lombok.core.handlers.HandlerUtil;
 import lombok.javac.JavacNode;
 import lombok.javac.JavacTreeMaker;
@@ -48,13 +49,11 @@ import com.sun.tools.javac.util.Name;
 
 abstract class JavacGuavaSingularizer extends JavacSingularizer {
 	protected String getSimpleTargetTypeName(SingularData data) {
-		String simpleTypeName = data.getTargetSimpleType();
-		if ("ImmutableCollection".equals(simpleTypeName)) return "ImmutableList";
-		return simpleTypeName;
+		return GuavaTypeMap.getGuavaTypeName(data.getTargetFqn());
 	}
 	
 	protected String getBuilderMethodName(SingularData data) {
-		String simpleTypeName = data.getTargetSimpleType();
+		String simpleTypeName = getSimpleTargetTypeName(data);
 		if ("ImmutableSortedSet".equals(simpleTypeName) || "ImmutableSortedMap".equals(simpleTypeName)) return "naturalOrder";
 		return "builder";
 	}
diff --git a/src/core/lombok/javac/handlers/singulars/JavacJavaUtilListSetSingularizer.java b/src/core/lombok/javac/handlers/singulars/JavacJavaUtilListSetSingularizer.java
index 1129f19c..6f8ff705 100644
--- a/src/core/lombok/javac/handlers/singulars/JavacJavaUtilListSetSingularizer.java
+++ b/src/core/lombok/javac/handlers/singulars/JavacJavaUtilListSetSingularizer.java
@@ -46,7 +46,27 @@ import com.sun.tools.javac.util.ListBuffer;
 import com.sun.tools.javac.util.Name;
 
 abstract class JavacJavaUtilListSetSingularizer extends JavacJavaUtilSingularizer {
+	@Override public java.util.List<Name> listFieldsToBeGenerated(SingularData data, JavacNode builderType) {
+		if (useGuavaInstead(builderType)) {
+			return guavaListSetSingularizer.listFieldsToBeGenerated(data, builderType);
+		}
+		
+		return super.listFieldsToBeGenerated(data, builderType);
+	}
+	
+	@Override public java.util.List<Name> listMethodsToBeGenerated(SingularData data, JavacNode builderType) {
+		if (useGuavaInstead(builderType)) {
+			return guavaListSetSingularizer.listMethodsToBeGenerated(data, builderType);
+		}
+		
+		return super.listMethodsToBeGenerated(data, builderType);
+	}
+	
 	@Override public java.util.List<JavacNode> generateFields(SingularData data, JavacNode builderType, JCTree source) {
+		if (useGuavaInstead(builderType)) {
+			return guavaListSetSingularizer.generateFields(data, builderType, source);
+		}
+		
 		JavacTreeMaker maker = builderType.getTreeMaker();
 		JCExpression type = JavacHandlerUtil.chainDots(builderType, "java", "util", "ArrayList");
 		type = addTypeArgs(1, false, builderType, type, data.getTypeArgs(), source);
@@ -56,6 +76,11 @@ abstract class JavacJavaUtilListSetSingularizer extends JavacJavaUtilSingularize
 	}
 	
 	@Override public void generateMethods(SingularData data, JavacNode builderType, JCTree source, boolean fluent, boolean chain) {
+		if (useGuavaInstead(builderType)) {
+			guavaListSetSingularizer.generateMethods(data, builderType, source, fluent, chain);
+			return;
+		}
+		
 		JavacTreeMaker maker = builderType.getTreeMaker();
 		Name thisName = builderType.toName("this");
 		
diff --git a/src/core/lombok/javac/handlers/singulars/JavacJavaUtilListSingularizer.java b/src/core/lombok/javac/handlers/singulars/JavacJavaUtilListSingularizer.java
index abf273e8..2cf34cf7 100644
--- a/src/core/lombok/javac/handlers/singulars/JavacJavaUtilListSingularizer.java
+++ b/src/core/lombok/javac/handlers/singulars/JavacJavaUtilListSingularizer.java
@@ -47,6 +47,11 @@ public class JavacJavaUtilListSingularizer extends JavacJavaUtilListSetSingulari
 	}
 	
 	@Override public void appendBuildCode(SingularData data, JavacNode builderType, JCTree source, ListBuffer<JCStatement> statements, Name targetVariableName) {
+		if (useGuavaInstead(builderType)) {
+			guavaListSetSingularizer.appendBuildCode(data, builderType, source, statements, targetVariableName);
+			return;
+		}
+		
 		JavacTreeMaker maker = builderType.getTreeMaker();
 		List<JCExpression> jceBlank = List.nil();
 		ListBuffer<JCCase> cases = new ListBuffer<JCCase>();
diff --git a/src/core/lombok/javac/handlers/singulars/JavacJavaUtilMapSingularizer.java b/src/core/lombok/javac/handlers/singulars/JavacJavaUtilMapSingularizer.java
index 21b25221..ed91698d 100644
--- a/src/core/lombok/javac/handlers/singulars/JavacJavaUtilMapSingularizer.java
+++ b/src/core/lombok/javac/handlers/singulars/JavacJavaUtilMapSingularizer.java
@@ -55,12 +55,28 @@ public class JavacJavaUtilMapSingularizer extends JavacJavaUtilSingularizer {
 		return LombokImmutableList.of("java.util.Map", "java.util.SortedMap", "java.util.NavigableMap");
 	}
 	
-	@Override public java.util.List<Name> listFieldsToBeGenerated(JavacNode builderType, SingularData data) {
+	@Override public java.util.List<Name> listFieldsToBeGenerated(SingularData data, JavacNode builderType) {
+		if (useGuavaInstead(builderType)) {
+			return guavaMapSingularizer.listFieldsToBeGenerated(data, builderType);
+		}
+		
 		String p = data.getPluralName().toString();
 		return Arrays.asList(builderType.toName(p + "$key"), builderType.toName(p + "$value"));
 	}
 	
+	@Override public java.util.List<Name> listMethodsToBeGenerated(SingularData data, JavacNode builderType) {
+		if (useGuavaInstead(builderType)) {
+			return guavaMapSingularizer.listMethodsToBeGenerated(data, builderType);
+		}
+		
+		return super.listMethodsToBeGenerated(data, builderType);
+	}
+	
 	@Override public java.util.List<JavacNode> generateFields(SingularData data, JavacNode builderType, JCTree source) {
+		if (useGuavaInstead(builderType)) {
+			return guavaMapSingularizer.generateFields(data, builderType, source);
+		}
+		
 		JavacTreeMaker maker = builderType.getTreeMaker();
 		
 		JCVariableDecl buildKeyField; {
@@ -85,6 +101,11 @@ public class JavacJavaUtilMapSingularizer extends JavacJavaUtilSingularizer {
 	}
 	
 	@Override public void generateMethods(SingularData data, JavacNode builderType, JCTree source, boolean fluent, boolean chain) {
+		if (useGuavaInstead(builderType)) {
+			guavaMapSingularizer.generateMethods(data, builderType, source, fluent, chain);
+			return;
+		}
+		
 		JavacTreeMaker maker = builderType.getTreeMaker();
 		
 		JCExpression returnType = chain ? cloneSelfType(builderType) : maker.Type(createVoidType(maker, CTC_VOID));
@@ -161,6 +182,11 @@ public class JavacJavaUtilMapSingularizer extends JavacJavaUtilSingularizer {
 	}
 	
 	@Override public void appendBuildCode(SingularData data, JavacNode builderType, JCTree source, ListBuffer<JCStatement> statements, Name targetVariableName) {
+		if (useGuavaInstead(builderType)) {
+			guavaMapSingularizer.appendBuildCode(data, builderType, source, statements, targetVariableName);
+			return;
+		}
+		
 		JavacTreeMaker maker = builderType.getTreeMaker();
 		
 		if (data.getTargetFqn().equals("java.util.Map")) {
diff --git a/src/core/lombok/javac/handlers/singulars/JavacJavaUtilSetSingularizer.java b/src/core/lombok/javac/handlers/singulars/JavacJavaUtilSetSingularizer.java
index ffba0dd8..317233cb 100644
--- a/src/core/lombok/javac/handlers/singulars/JavacJavaUtilSetSingularizer.java
+++ b/src/core/lombok/javac/handlers/singulars/JavacJavaUtilSetSingularizer.java
@@ -41,6 +41,11 @@ public class JavacJavaUtilSetSingularizer extends JavacJavaUtilListSetSingulariz
 	}
 	
 	@Override public void appendBuildCode(SingularData data, JavacNode builderType, JCTree source, ListBuffer<JCStatement> statements, Name targetVariableName) {
+		if (useGuavaInstead(builderType)) {
+			guavaListSetSingularizer.appendBuildCode(data, builderType, source, statements, targetVariableName);
+			return;
+		}
+		
 		JavacTreeMaker maker = builderType.getTreeMaker();
 		
 		if (data.getTargetFqn().equals("java.util.Set")) {
diff --git a/src/core/lombok/javac/handlers/singulars/JavacJavaUtilSingularizer.java b/src/core/lombok/javac/handlers/singulars/JavacJavaUtilSingularizer.java
index f89df80e..6aeadfea 100644
--- a/src/core/lombok/javac/handlers/singulars/JavacJavaUtilSingularizer.java
+++ b/src/core/lombok/javac/handlers/singulars/JavacJavaUtilSingularizer.java
@@ -32,12 +32,20 @@ import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.util.ListBuffer;
 import com.sun.tools.javac.util.Name;
 
+import lombok.ConfigurationKeys;
 import lombok.javac.JavacNode;
 import lombok.javac.JavacTreeMaker;
 import lombok.javac.handlers.JavacSingularsRecipes.JavacSingularizer;
 import lombok.javac.handlers.JavacSingularsRecipes.SingularData;
 
 abstract class JavacJavaUtilSingularizer extends JavacSingularizer {
+	protected final JavacSingularizer guavaListSetSingularizer = new JavacGuavaSetListSingularizer();
+	protected final JavacSingularizer guavaMapSingularizer = new JavacGuavaMapSingularizer();
+	
+	protected boolean useGuavaInstead(JavacNode node) {
+		return Boolean.TRUE.equals(node.getAst().readConfiguration(ConfigurationKeys.BUILDER_USE_GUAVA));
+	}
+	
 	protected List<JCStatement> createJavaUtilSetMapInitialCapacitySwitchStatements(JavacTreeMaker maker, SingularData data, JavacNode builderType, boolean mapMode, String emptyCollectionMethod, String singletonCollectionMethod, String targetType, JCTree source) {
 		List<JCExpression> jceBlank = List.nil();
 		ListBuffer<JCCase> cases = new ListBuffer<JCCase>();