Merge branch 'master' of github.com:rzwitserloot/lombok

11 files changed, 77 insertions, 17 deletions

diff --git a/test/transform/resource/after-delombok/LoggerCommons.java b/test/transform/resource/after-delombok/LoggerCommons.java
index 686ab889..a55aa336 100644
--- a/test/transform/resource/after-delombok/LoggerCommons.java
+++ b/test/transform/resource/after-delombok/LoggerCommons.java
@@ -1,6 +1,9 @@
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 class LoggerCommons {
-	private static final Log log = LogFactory.getLog(LoggerCommons.class);
+	private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class);
+}
+class LoggerCommonsString {
+	private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(String.class);
+}
+class LoggerCommonsJavaLangString {
+	private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(java.lang.String.class);
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/LoggerJul.java b/test/transform/resource/after-delombok/LoggerJul.java
index de4ad914..51f19926 100644
--- a/test/transform/resource/after-delombok/LoggerJul.java
+++ b/test/transform/resource/after-delombok/LoggerJul.java
@@ -1,5 +1,9 @@
-import java.util.logging.Logger;
-
 class LoggerJul {
-	private static final Logger log = Logger.getLogger("LoggerJul");
+	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJul.class.getName());
+}
+class LoggerJulString {
+	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(String.class.getName());
+}
+class LoggerJulJavaLangString {
+	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(java.lang.String.class.getName());
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/LoggerLog4j.java b/test/transform/resource/after-delombok/LoggerLog4j.java
index 33f90278..e946c858 100644
--- a/test/transform/resource/after-delombok/LoggerLog4j.java
+++ b/test/transform/resource/after-delombok/LoggerLog4j.java
@@ -1,5 +1,9 @@
-import org.apache.log4j.Logger;
-
 class LoggerLog4j {
-	private static final Logger log = Logger.getLogger(LoggerLog4j.class);
+	private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class);
+}
+class LoggerLog4jString {
+	private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(String.class);
+}
+class LoggerLog4jJavaLangString {
+	private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(java.lang.String.class);
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/LoggerSlf4j.java b/test/transform/resource/after-delombok/LoggerSlf4j.java
index 0d7dee22..dae17826 100644
--- a/test/transform/resource/after-delombok/LoggerSlf4j.java
+++ b/test/transform/resource/after-delombok/LoggerSlf4j.java
@@ -1,6 +1,8 @@
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class LoggerLog4j {
-	private static final Logger log = LoggerFactory.getLogger(LoggerLog4j.class);
+class LoggerSlf4j {
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class);
+}
+class LoggerSlf4jOuter {
+	static class Inner {
+		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOuter.Inner.class);
+	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/LoggerSlf4jAlreadyExists.java b/test/transform/resource/after-delombok/LoggerSlf4jAlreadyExists.java
new file mode 100644
index 00000000..a7cd9409
--- /dev/null
+++ b/test/transform/resource/after-delombok/LoggerSlf4jAlreadyExists.java
@@ -0,0 +1,3 @@
+class LoggerSlf4jAlreadyExists {
+	int log;
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/LoggerSlf4jClassOfArray.java b/test/transform/resource/after-delombok/LoggerSlf4jClassOfArray.java
new file mode 100644
index 00000000..bcae2741
--- /dev/null
+++ b/test/transform/resource/after-delombok/LoggerSlf4jClassOfArray.java
@@ -0,0 +1,3 @@
+class LoggerSlf4jClassOfArray {
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String[].class);
+}
diff --git a/test/transform/resource/after-delombok/LoggerSlf4jOnNonType.java b/test/transform/resource/after-delombok/LoggerSlf4jOnNonType.java
new file mode 100644
index 00000000..4c944172
--- /dev/null
+++ b/test/transform/resource/after-delombok/LoggerSlf4jOnNonType.java
@@ -0,0 +1,4 @@
+class LoggerSlf4jOnNonType {
+	void foo() {
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/LoggerSlf4jTypes.java b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java
new file mode 100644
index 00000000..539f46d6
--- /dev/null
+++ b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java
@@ -0,0 +1,17 @@
+interface LoggerSlf4jTypesInterface {
+}
+@interface LoggerSlf4jTypesAnnotation {
+}
+enum LoggerSlf4jTypesEnum {
+;
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class);
+}
+enum LoggerSlf4jTypesEnumWithElement {
+	FOO;
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class);
+}
+interface LoggerSlf4jTypesInterfaceOuter {
+	class Inner {
+		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesInterfaceOuter.Inner.class);
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/LoggerSlf4jWithClass.java b/test/transform/resource/after-delombok/LoggerSlf4jWithClass.java
new file mode 100644
index 00000000..5908d374
--- /dev/null
+++ b/test/transform/resource/after-delombok/LoggerSlf4jWithClass.java
@@ -0,0 +1,12 @@
+class LoggerSlf4jWithClass {
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String.class);
+}
+class LoggerSlf4jWithClassList {
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.util.List.class);
+}
+class LoggerSlf4jWithClassValue {
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.lang.String.class);
+}
+class LoggerSlf4jWithClassVoid {
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithClassVoid.class);
+}
diff --git a/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java b/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java
new file mode 100644
index 00000000..516f858f
--- /dev/null
+++ b/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java
@@ -0,0 +1,9 @@
+package before;
+class LoggerSlf4jWithPackage {
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(before.LoggerSlf4jWithPackage.class);
+}
+class LoggerSlf4jWithPackageOuter {
+	static class Inner {
+		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(before.LoggerSlf4jWithPackageOuter.Inner.class);
+	}
+}
diff --git a/test/transform/resource/after-delombok/ValInFor.java b/test/transform/resource/after-delombok/ValInFor.java
index d97ce732..a04d0f0c 100644
--- a/test/transform/resource/after-delombok/ValInFor.java
+++ b/test/transform/resource/after-delombok/ValInFor.java
@@ -15,6 +15,5 @@ public class ValInFor {
 			System.out.println(shouldBeString.toLowerCase());
 			val shouldBeString2 = shouldBeString;
 		}
-	}
-*/
+	}*/
 }
\ No newline at end of file