[fixes #2268] make lombok generate qualified types in order to avoid name clashes.

12 files changed, 0 insertions, 141 deletions

diff --git a/test/transform/resource/before/BuilderSingularGuavaListsSetsWithSetterPrefix.java b/test/transform/resource/before/BuilderSingularGuavaListsSetsWithSetterPrefix.java
deleted file mode 100644
index af02adb6..00000000
--- a/test/transform/resource/before/BuilderSingularGuavaListsSetsWithSetterPrefix.java
+++ /dev/null
@@ -1,16 +0,0 @@
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableCollection;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedSet;
-import com.google.common.collect.ImmutableTable;
-
-import lombok.Singular;
-
-@lombok.Builder(setterPrefix = "with")
-class BuilderSingularGuavaListsSetsWithSetterPrefix<T> {
-	@Singular private ImmutableList<T> cards;
-	@Singular private ImmutableCollection<? extends Number> frogs;
-	@SuppressWarnings("all") @Singular("rawSet") private ImmutableSet rawSet;
-	@Singular private ImmutableSortedSet<String> passes;
-	@Singular private ImmutableTable<? extends Number, ? extends Number, String> users;
-}
diff --git a/test/transform/resource/before/BuilderSingularGuavaMapsWithSetterPrefix.java b/test/transform/resource/before/BuilderSingularGuavaMapsWithSetterPrefix.java
deleted file mode 100644
index a2b48cb3..00000000
--- a/test/transform/resource/before/BuilderSingularGuavaMapsWithSetterPrefix.java
+++ /dev/null
@@ -1,12 +0,0 @@
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableBiMap;
-import com.google.common.collect.ImmutableSortedMap;
-
-import lombok.Singular;
-
-@lombok.Builder(setterPrefix = "with")
-class BuilderSingularGuavaMapsWithSetterPrefix<K, V> {
-	@Singular private ImmutableMap<K, V> battleaxes;
-	@Singular private ImmutableSortedMap<Integer, ? extends V> vertices;
-	@SuppressWarnings("all") @Singular("rawMap") private ImmutableBiMap rawMap;
-}
diff --git a/test/transform/resource/before/BuilderSingularListsWithSetterPrefix.java b/test/transform/resource/before/BuilderSingularListsWithSetterPrefix.java
deleted file mode 100644
index fd53d97f..00000000
--- a/test/transform/resource/before/BuilderSingularListsWithSetterPrefix.java
+++ /dev/null
@@ -1,11 +0,0 @@
-import java.util.List;
-import java.util.Collection;
-
-import lombok.Singular;
-
-@lombok.Builder(setterPrefix = "with")
-class BuilderSingularListsWithSetterPrefix<T> {
-	@Singular private List<T> children;
-	@Singular private Collection<? extends Number> scarves;
-	@SuppressWarnings("all") @Singular("rawList") private List rawList;
-}
diff --git a/test/transform/resource/before/BuilderSingularRedirectToGuavaWithSetterPrefix.java b/test/transform/resource/before/BuilderSingularRedirectToGuavaWithSetterPrefix.java
deleted file mode 100644
index 7281141d..00000000
--- a/test/transform/resource/before/BuilderSingularRedirectToGuavaWithSetterPrefix.java
+++ /dev/null
@@ -1,13 +0,0 @@
-//CONF: lombok.singular.useGuava = true
-import java.util.Set;
-import java.util.NavigableMap;
-import java.util.Collection;
-
-import lombok.Singular;
-
-@lombok.Builder(setterPrefix = "with")
-class BuilderSingularRedirectToGuavaWithSetterPrefix {
-	@Singular private Set<String> dangerMice;
-	@Singular private NavigableMap<Integer, Number> things;
-	@Singular private Collection<Class<?>> doohickeys;
-}
diff --git a/test/transform/resource/before/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java b/test/transform/resource/before/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
deleted file mode 100644
index cea10bab..00000000
--- a/test/transform/resource/before/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
+++ /dev/null
@@ -1,10 +0,0 @@
-import java.util.List;
-import java.util.Collection;
-
-import lombok.Singular;
-
-@lombok.Builder(toBuilder = true, setterPrefix = "with")
-class BuilderSingularWildcardListsWithToBuilderWithSetterPrefix {
-	@Singular private List<?> objects;
-	@Singular private Collection<? extends Number> numbers;
-}
diff --git a/test/transform/resource/before/BuilderWithAccessorsWithSetterPrefix.java b/test/transform/resource/before/BuilderWithAccessorsWithSetterPrefix.java
deleted file mode 100644
index 4f4ebb18..00000000
--- a/test/transform/resource/before/BuilderWithAccessorsWithSetterPrefix.java
+++ /dev/null
@@ -1,7 +0,0 @@
-@lombok.Builder(setterPrefix = "with") @lombok.experimental.Accessors(prefix={"p", "_"})
-class BuilderWithAccessorsWithSetterPrefix {
-	private final int plower;
-	private final int pUpper;
-	private int _foo;
-	private int __bar;
-}
diff --git a/test/transform/resource/before/BuilderWithBadNamesWithSetterPrefix.java b/test/transform/resource/before/BuilderWithBadNamesWithSetterPrefix.java
deleted file mode 100644
index 69322ee3..00000000
--- a/test/transform/resource/before/BuilderWithBadNamesWithSetterPrefix.java
+++ /dev/null
@@ -1,5 +0,0 @@
-@lombok.Builder(setterPrefix = "with")
-public class BuilderWithBadNamesWithSetterPrefix {
-	String build;
-	String toString;
-}
diff --git a/test/transform/resource/before/BuilderWithDeprecatedWithSetterPrefix.java b/test/transform/resource/before/BuilderWithDeprecatedWithSetterPrefix.java
deleted file mode 100644
index 77baccd3..00000000
--- a/test/transform/resource/before/BuilderWithDeprecatedWithSetterPrefix.java
+++ /dev/null
@@ -1,11 +0,0 @@
-import com.google.common.collect.ImmutableList;
-import lombok.Builder;
-import lombok.Singular;
-
-@Builder(setterPrefix = "with")
-public class BuilderWithDeprecatedWithSetterPrefix {
-	/** @deprecated since always */ String dep1;
-	@Deprecated int dep2;
-	@Singular @Deprecated java.util.List<String> strings;
-	@Singular @Deprecated ImmutableList<Integer> numbers;
-}
diff --git a/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java b/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java
deleted file mode 100644
index 80197dd3..00000000
--- a/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java
+++ /dev/null
@@ -1,5 +0,0 @@
-import lombok.Builder;
-@Builder(toBuilder = true, builderMethodName = "",setterPrefix = "with")
-class BuilderWithNoBuilderMethodWithSetterPrefix {
-	private String a = "";
-}
diff --git a/test/transform/resource/before/BuilderWithRecursiveGenericsWithSetterPrefix.java b/test/transform/resource/before/BuilderWithRecursiveGenericsWithSetterPrefix.java
deleted file mode 100644
index ce8803c0..00000000
--- a/test/transform/resource/before/BuilderWithRecursiveGenericsWithSetterPrefix.java
+++ /dev/null
@@ -1,13 +0,0 @@
-//issue #1298
-import java.util.Set;
-import lombok.Builder;
-import lombok.Value;
-
-public class BuilderWithRecursiveGenericsWithSetterPrefix {
-	interface Inter<T, U extends Inter<T, U>> {}
-	
-	@Builder(setterPrefix = "with") @Value public static class Test<Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> {
-		Foo foo;
-		Bar bar;
-	}
-}
diff --git a/test/transform/resource/before/BuilderWithToBuilderWithSetterPrefix.java b/test/transform/resource/before/BuilderWithToBuilderWithSetterPrefix.java
deleted file mode 100644
index 3b442b8d..00000000
--- a/test/transform/resource/before/BuilderWithToBuilderWithSetterPrefix.java
+++ /dev/null
@@ -1,20 +0,0 @@
-import java.util.List;
-import lombok.Builder;
-@Builder(toBuilder = true, setterPrefix = "with") @lombok.experimental.Accessors(prefix = "m")
-class BuilderWithToBuilderWithSetterPrefix<T> {
-	private String mOne, mTwo;
-	@Builder.ObtainVia(method = "rrr", isStatic = true) private T foo;
-	@lombok.Singular private List<T> bars;
-	public static <K> K rrr(BuilderWithToBuilderWithSetterPrefix<K> x) {
-		return x.foo;
-	}
-}
-@lombok.experimental.Accessors(prefix = "m")
-class ConstructorWithToBuilderWithSetterPrefix<T> {
-	private String mOne, mTwo;
-	private T foo;
-	@lombok.Singular private com.google.common.collect.ImmutableList<T> bars;
-	@Builder(toBuilder = true, setterPrefix = "with")
-	public ConstructorWithToBuilderWithSetterPrefix(String mOne, @Builder.ObtainVia(field = "foo") T baz, com.google.common.collect.ImmutableList<T> bars) {
-	}
-}
diff --git a/test/transform/resource/before/BuilderWithTolerateWithSetterPrefix.java b/test/transform/resource/before/BuilderWithTolerateWithSetterPrefix.java
deleted file mode 100644
index 5c77e177..00000000
--- a/test/transform/resource/before/BuilderWithTolerateWithSetterPrefix.java
+++ /dev/null
@@ -1,18 +0,0 @@
-import lombok.Builder;
-import lombok.experimental.Tolerate;
-		
-@Builder(setterPrefix = "with")
-public class BuilderWithTolerateWithSetterPrefix {
-	private final int value;
-	
-	public static void main(String[] args) {
-		BuilderWithTolerateWithSetterPrefix.builder().withValue("42").build();
-	}
-	
-	public static class BuilderWithTolerateWithSetterPrefixBuilder {
-		@Tolerate
-		public BuilderWithTolerateWithSetterPrefixBuilder withValue(String s) {
-			return this.withValue(Integer.parseInt(s));
-		}
-	}
-}