Set @Singularize code for javac improved, Map @Singularize added.

2 files changed, 13 insertions, 1 deletions

diff --git a/test/transform/resource/before/BuilderSingletonMaps.java b/test/transform/resource/before/BuilderSingletonMaps.java
new file mode 100644
index 00000000..00928e73
--- /dev/null
+++ b/test/transform/resource/before/BuilderSingletonMaps.java
@@ -0,0 +1,12 @@
+import java.util.Map;
+import java.util.SortedMap;
+
+import lombok.Singular;
+
+@lombok.Builder
+class BuilderSingletonMaps<K, V> {
+	@Singular private Map<K, V> women;
+	@Singular private SortedMap<K, ? extends Number> men;
+	@Singular("rawMap") private Map rawMap;
+	@Singular("stringMap") private Map<String, V> stringMap;
+}
diff --git a/test/transform/resource/before/BuilderSingletons.java b/test/transform/resource/before/BuilderSingletonSets.java
index 7722f7d1..a9f12913 100644
--- a/test/transform/resource/before/BuilderSingletons.java
+++ b/test/transform/resource/before/BuilderSingletonSets.java
@@ -4,7 +4,7 @@ import java.util.SortedSet;
 import lombok.Singular;
 
 @lombok.Builder
-class BuilderSingletons<T> {
+class BuilderSingletonSets<T> {
 	@Singular private Set<T> dangerMice;
 	@Singular private SortedSet<? extends Number> octopodes;
 	@Singular("rawSet") private Set rawSet;