From f6b60b0cae7f8af2e4598f2bbbd72839e193a36b Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Wed, 3 Nov 2010 02:13:28 +0100 Subject: Intial support for @Log, for now only slf4j --- .../resource/after-delombok/LoggerSlf4j.java | 12 +++++---- .../after-delombok/LoggerSlf4jAlreadyExists.java | 3 +++ .../after-delombok/LoggerSlf4jClassOfArray.java | 3 +++ .../after-delombok/LoggerSlf4jOnNonType.java | 4 +++ .../resource/after-delombok/LoggerSlf4jTypes.java | 17 +++++++++++++ .../after-delombok/LoggerSlf4jWithClass.java | 12 +++++++++ .../after-delombok/LoggerSlf4jWithPackage.java | 9 +++++++ test/transform/resource/after-ecj/LoggerSlf4j.java | 17 +++++++++++++ .../after-ecj/LoggerSlf4jAlreadyExists.java | 6 +++++ .../after-ecj/LoggerSlf4jClassOfArray.java | 6 +++++ .../resource/after-ecj/LoggerSlf4jOnNonType.java | 7 ++++++ .../resource/after-ecj/LoggerSlf4jTypes.java | 29 ++++++++++++++++++++++ .../resource/after-ecj/LoggerSlf4jWithClass.java | 24 ++++++++++++++++++ .../resource/after-ecj/LoggerSlf4jWithPackage.java | 18 ++++++++++++++ test/transform/resource/before/LoggerSlf4j.java | 9 +++++++ .../resource/before/LoggerSlf4jAlreadyExists.java | 4 +++ .../resource/before/LoggerSlf4jClassOfArray.java | 3 +++ .../resource/before/LoggerSlf4jOnNonType.java | 5 ++++ .../resource/before/LoggerSlf4jTypes.java | 18 ++++++++++++++ .../resource/before/LoggerSlf4jWithClass.java | 12 +++++++++ .../resource/before/LoggerSlf4jWithPackage.java | 9 +++++++ .../LoggerSlf4jAlreadyExists.java.messages | 1 + .../LoggerSlf4jOnNonStaticInnerClass.java.messages | 1 + .../LoggerSlf4jOnNonType.java.messages | 1 + .../LoggerSlf4jTypes.java.messages | 2 ++ .../LoggerSlf4jAlreadyExists.java.messages | 1 + .../LoggerSlf4jOnNonStaticInnerClass.java.messages | 1 + .../LoggerSlf4jOnNonType.java.messages | 1 + .../messages-ecj/LoggerSlf4jTypes.java.messages | 2 ++ 29 files changed, 232 insertions(+), 5 deletions(-) create mode 100644 test/transform/resource/after-delombok/LoggerSlf4jAlreadyExists.java create mode 100644 test/transform/resource/after-delombok/LoggerSlf4jClassOfArray.java create mode 100644 test/transform/resource/after-delombok/LoggerSlf4jOnNonType.java create mode 100644 test/transform/resource/after-delombok/LoggerSlf4jTypes.java create mode 100644 test/transform/resource/after-delombok/LoggerSlf4jWithClass.java create mode 100644 test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java create mode 100644 test/transform/resource/after-ecj/LoggerSlf4j.java create mode 100644 test/transform/resource/after-ecj/LoggerSlf4jAlreadyExists.java create mode 100644 test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java create mode 100644 test/transform/resource/after-ecj/LoggerSlf4jOnNonType.java create mode 100644 test/transform/resource/after-ecj/LoggerSlf4jTypes.java create mode 100644 test/transform/resource/after-ecj/LoggerSlf4jWithClass.java create mode 100644 test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java create mode 100644 test/transform/resource/before/LoggerSlf4j.java create mode 100644 test/transform/resource/before/LoggerSlf4jAlreadyExists.java create mode 100644 test/transform/resource/before/LoggerSlf4jClassOfArray.java create mode 100644 test/transform/resource/before/LoggerSlf4jOnNonType.java create mode 100644 test/transform/resource/before/LoggerSlf4jTypes.java create mode 100644 test/transform/resource/before/LoggerSlf4jWithClass.java create mode 100644 test/transform/resource/before/LoggerSlf4jWithPackage.java create mode 100644 test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages create mode 100644 test/transform/resource/messages-delombok/LoggerSlf4jOnNonStaticInnerClass.java.messages create mode 100644 test/transform/resource/messages-delombok/LoggerSlf4jOnNonType.java.messages create mode 100644 test/transform/resource/messages-delombok/LoggerSlf4jTypes.java.messages create mode 100644 test/transform/resource/messages-ecj/LoggerSlf4jAlreadyExists.java.messages create mode 100644 test/transform/resource/messages-ecj/LoggerSlf4jOnNonStaticInnerClass.java.messages create mode 100644 test/transform/resource/messages-ecj/LoggerSlf4jOnNonType.java.messages create mode 100644 test/transform/resource/messages-ecj/LoggerSlf4jTypes.java.messages (limited to 'test/transform') 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-ecj/LoggerSlf4j.java b/test/transform/resource/after-ecj/LoggerSlf4j.java new file mode 100644 index 00000000..6a611c2b --- /dev/null +++ b/test/transform/resource/after-ecj/LoggerSlf4j.java @@ -0,0 +1,17 @@ +@lombok.slf4j.Log class LoggerSlf4j { + private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class); + LoggerSlf4j() { + super(); + } +} +class LoggerSlf4jOuter { + static @lombok.slf4j.Log class Inner { + private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOuter.Inner.class); + Inner() { + super(); + } + } + LoggerSlf4jOuter() { + super(); + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/LoggerSlf4jAlreadyExists.java b/test/transform/resource/after-ecj/LoggerSlf4jAlreadyExists.java new file mode 100644 index 00000000..60e83922 --- /dev/null +++ b/test/transform/resource/after-ecj/LoggerSlf4jAlreadyExists.java @@ -0,0 +1,6 @@ +@lombok.slf4j.Log class LoggerSlf4jAlreadyExists { + int log; + LoggerSlf4jAlreadyExists() { + super(); + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java b/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java new file mode 100644 index 00000000..c8f8069d --- /dev/null +++ b/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java @@ -0,0 +1,6 @@ +@lombok.slf4j.Log(String[].class) class LoggerSlf4jClassOfArray { + private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String[].class); + LoggerSlf4jClassOfArray() { + super(); + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/LoggerSlf4jOnNonType.java b/test/transform/resource/after-ecj/LoggerSlf4jOnNonType.java new file mode 100644 index 00000000..83567493 --- /dev/null +++ b/test/transform/resource/after-ecj/LoggerSlf4jOnNonType.java @@ -0,0 +1,7 @@ +class LoggerSlf4jOnNonType { + LoggerSlf4jOnNonType() { + super(); + } + @lombok.slf4j.Log void foo() { + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/LoggerSlf4jTypes.java b/test/transform/resource/after-ecj/LoggerSlf4jTypes.java new file mode 100644 index 00000000..88bcdae8 --- /dev/null +++ b/test/transform/resource/after-ecj/LoggerSlf4jTypes.java @@ -0,0 +1,29 @@ +@lombok.slf4j.Log interface LoggerSlf4jTypesInterface { +} +@lombok.slf4j.Log @interface LoggerSlf4jTypesAnnotation { +} +@lombok.slf4j.Log enum LoggerSlf4jTypesEnum { + private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class); + () { + } + LoggerSlf4jTypesEnum() { + super(); + } +} +@lombok.slf4j.Log enum LoggerSlf4jTypesEnumWithElement { + FOO(), + private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class); + () { + } + LoggerSlf4jTypesEnumWithElement() { + super(); + } +} +interface LoggerSlf4jTypesInterfaceOuter { + @lombok.slf4j.Log class Inner { + private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesInterfaceOuter.Inner.class); + Inner() { + super(); + } + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java b/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java new file mode 100644 index 00000000..2839cdef --- /dev/null +++ b/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java @@ -0,0 +1,24 @@ +@lombok.slf4j.Log(String.class) class LoggerSlf4jWithClass { + private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String.class); + LoggerSlf4jWithClass() { + super(); + } +} +@lombok.slf4j.Log(java.util.List.class) class LoggerSlf4jWithClassList { + private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.util.List.class); + LoggerSlf4jWithClassList() { + super(); + } +} +@lombok.slf4j.Log(value = java.lang.String.class) class LoggerSlf4jWithClassValue { + private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.lang.String.class); + LoggerSlf4jWithClassValue() { + super(); + } +} +@lombok.slf4j.Log(void.class) class LoggerSlf4jWithClassVoid { + private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithClassVoid.class); + LoggerSlf4jWithClassVoid() { + super(); + } +} diff --git a/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java b/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java new file mode 100644 index 00000000..efd43685 --- /dev/null +++ b/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java @@ -0,0 +1,18 @@ +package before; +@lombok.slf4j.Log class LoggerSlf4jWithPackage { + private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(before.LoggerSlf4jWithPackage.class); + LoggerSlf4jWithPackage() { + super(); + } +} +class LoggerSlf4jWithPackageOuter { + static @lombok.slf4j.Log class Inner { + private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(before.LoggerSlf4jWithPackageOuter.Inner.class); + Inner() { + super(); + } + } + LoggerSlf4jWithPackageOuter() { + super(); + } +} \ No newline at end of file diff --git a/test/transform/resource/before/LoggerSlf4j.java b/test/transform/resource/before/LoggerSlf4j.java new file mode 100644 index 00000000..78a33fe4 --- /dev/null +++ b/test/transform/resource/before/LoggerSlf4j.java @@ -0,0 +1,9 @@ +@lombok.slf4j.Log +class LoggerSlf4j { +} +class LoggerSlf4jOuter { + @lombok.slf4j.Log + static class Inner { + + } +} \ No newline at end of file diff --git a/test/transform/resource/before/LoggerSlf4jAlreadyExists.java b/test/transform/resource/before/LoggerSlf4jAlreadyExists.java new file mode 100644 index 00000000..d0b26482 --- /dev/null +++ b/test/transform/resource/before/LoggerSlf4jAlreadyExists.java @@ -0,0 +1,4 @@ +@lombok.slf4j.Log +class LoggerSlf4jAlreadyExists { + int log; +} \ No newline at end of file diff --git a/test/transform/resource/before/LoggerSlf4jClassOfArray.java b/test/transform/resource/before/LoggerSlf4jClassOfArray.java new file mode 100644 index 00000000..34394f13 --- /dev/null +++ b/test/transform/resource/before/LoggerSlf4jClassOfArray.java @@ -0,0 +1,3 @@ +@lombok.slf4j.Log(String[].class) +class LoggerSlf4jClassOfArray { +} diff --git a/test/transform/resource/before/LoggerSlf4jOnNonType.java b/test/transform/resource/before/LoggerSlf4jOnNonType.java new file mode 100644 index 00000000..06c8b059 --- /dev/null +++ b/test/transform/resource/before/LoggerSlf4jOnNonType.java @@ -0,0 +1,5 @@ +class LoggerSlf4jOnNonType { + @lombok.slf4j.Log + void foo() { + } +} \ No newline at end of file diff --git a/test/transform/resource/before/LoggerSlf4jTypes.java b/test/transform/resource/before/LoggerSlf4jTypes.java new file mode 100644 index 00000000..27201090 --- /dev/null +++ b/test/transform/resource/before/LoggerSlf4jTypes.java @@ -0,0 +1,18 @@ +@lombok.slf4j.Log +interface LoggerSlf4jTypesInterface { +} +@lombok.slf4j.Log +@interface LoggerSlf4jTypesAnnotation { +} +@lombok.slf4j.Log +enum LoggerSlf4jTypesEnum { +} +@lombok.slf4j.Log +enum LoggerSlf4jTypesEnumWithElement { + FOO; +} +interface LoggerSlf4jTypesInterfaceOuter { + @lombok.slf4j.Log + class Inner { + } +} \ No newline at end of file diff --git a/test/transform/resource/before/LoggerSlf4jWithClass.java b/test/transform/resource/before/LoggerSlf4jWithClass.java new file mode 100644 index 00000000..0005d1f5 --- /dev/null +++ b/test/transform/resource/before/LoggerSlf4jWithClass.java @@ -0,0 +1,12 @@ +@lombok.slf4j.Log(String.class) +class LoggerSlf4jWithClass { +} +@lombok.slf4j.Log(java.util.List.class) +class LoggerSlf4jWithClassList { +} +@lombok.slf4j.Log(value = java.lang.String.class) +class LoggerSlf4jWithClassValue { +} +@lombok.slf4j.Log(void.class) +class LoggerSlf4jWithClassVoid { +} diff --git a/test/transform/resource/before/LoggerSlf4jWithPackage.java b/test/transform/resource/before/LoggerSlf4jWithPackage.java new file mode 100644 index 00000000..db6e8939 --- /dev/null +++ b/test/transform/resource/before/LoggerSlf4jWithPackage.java @@ -0,0 +1,9 @@ +package before; +@lombok.slf4j.Log +class LoggerSlf4jWithPackage { +} +class LoggerSlf4jWithPackageOuter { + @lombok.slf4j.Log + static class Inner { + } +} \ No newline at end of file diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages new file mode 100644 index 00000000..ede6defa --- /dev/null +++ b/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages @@ -0,0 +1 @@ +1:1 WARNING Field 'log' already exists. diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jOnNonStaticInnerClass.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jOnNonStaticInnerClass.java.messages new file mode 100644 index 00000000..e0bbdb2a --- /dev/null +++ b/test/transform/resource/messages-delombok/LoggerSlf4jOnNonStaticInnerClass.java.messages @@ -0,0 +1 @@ +2:9 ERROR @Log is not legal on non-static inner classes. \ No newline at end of file diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jOnNonType.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jOnNonType.java.messages new file mode 100644 index 00000000..9143d4bc --- /dev/null +++ b/test/transform/resource/messages-delombok/LoggerSlf4jOnNonType.java.messages @@ -0,0 +1 @@ +2:9 ERROR @Log is legal only on types. \ No newline at end of file diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jTypes.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jTypes.java.messages new file mode 100644 index 00000000..ba97e38f --- /dev/null +++ b/test/transform/resource/messages-delombok/LoggerSlf4jTypes.java.messages @@ -0,0 +1,2 @@ +1:1 ERROR @Log is legal only on classes and enums. +4:1 ERROR @Log is legal only on classes and enums. \ No newline at end of file diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jAlreadyExists.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jAlreadyExists.java.messages new file mode 100644 index 00000000..f03c7660 --- /dev/null +++ b/test/transform/resource/messages-ecj/LoggerSlf4jAlreadyExists.java.messages @@ -0,0 +1 @@ +1 warning Field 'log' already exists. diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jOnNonStaticInnerClass.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jOnNonStaticInnerClass.java.messages new file mode 100644 index 00000000..e0bbdb2a --- /dev/null +++ b/test/transform/resource/messages-ecj/LoggerSlf4jOnNonStaticInnerClass.java.messages @@ -0,0 +1 @@ +2:9 ERROR @Log is not legal on non-static inner classes. \ No newline at end of file diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jOnNonType.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jOnNonType.java.messages new file mode 100644 index 00000000..4a446f28 --- /dev/null +++ b/test/transform/resource/messages-ecj/LoggerSlf4jOnNonType.java.messages @@ -0,0 +1 @@ +2 error @Log is legal only on types. \ No newline at end of file diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jTypes.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jTypes.java.messages new file mode 100644 index 00000000..42236c7c --- /dev/null +++ b/test/transform/resource/messages-ecj/LoggerSlf4jTypes.java.messages @@ -0,0 +1,2 @@ +1 error @Log is legal only on classes and enums. +4 error @Log is legal only on classes and enums. \ No newline at end of file -- cgit From 7219b78b4d201cba116b101a25a91006767a4c7f Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Sat, 6 Nov 2010 13:29:00 +0100 Subject: Fixed typo in unit test --- test/transform/resource/after-delombok/ValInFor.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'test/transform') 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 -- cgit From c3eddf66cfb16d5d27c7a9562ea539344bfcb2d6 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Sat, 6 Nov 2010 13:30:22 +0100 Subject: Added support for Log4J, Commons and JUL in the javac handler --- test/transform/resource/after-delombok/LoggerCommons.java | 11 +++++++---- test/transform/resource/after-delombok/LoggerJul.java | 10 +++++++--- test/transform/resource/after-delombok/LoggerLog4j.java | 10 +++++++--- test/transform/resource/before/LoggerCommons.java | 11 +++++++++++ test/transform/resource/before/LoggerJul.java | 11 +++++++++++ test/transform/resource/before/LoggerLog4j.java | 11 +++++++++++ 6 files changed, 54 insertions(+), 10 deletions(-) create mode 100644 test/transform/resource/before/LoggerCommons.java create mode 100644 test/transform/resource/before/LoggerJul.java create mode 100644 test/transform/resource/before/LoggerLog4j.java (limited to 'test/transform') 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..a40bb2da 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 LoggerJulString { + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("String"); +} +class LoggerJulJavaLangString { + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("java.lang.String"); } \ 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/before/LoggerCommons.java b/test/transform/resource/before/LoggerCommons.java new file mode 100644 index 00000000..97c91ef0 --- /dev/null +++ b/test/transform/resource/before/LoggerCommons.java @@ -0,0 +1,11 @@ +@lombok.commons.Log +class LoggerCommons { +} + +@lombok.commons.Log(String.class) +class LoggerCommonsString { +} + +@lombok.commons.Log(java.lang.String.class) +class LoggerCommonsJavaLangString { +} \ No newline at end of file diff --git a/test/transform/resource/before/LoggerJul.java b/test/transform/resource/before/LoggerJul.java new file mode 100644 index 00000000..1e3313cb --- /dev/null +++ b/test/transform/resource/before/LoggerJul.java @@ -0,0 +1,11 @@ +@lombok.jul.Log +class LoggerJul { +} + +@lombok.jul.Log(String.class) +class LoggerJulString { +} + +@lombok.jul.Log(java.lang.String.class) +class LoggerJulJavaLangString { +} \ No newline at end of file diff --git a/test/transform/resource/before/LoggerLog4j.java b/test/transform/resource/before/LoggerLog4j.java new file mode 100644 index 00000000..33a876c9 --- /dev/null +++ b/test/transform/resource/before/LoggerLog4j.java @@ -0,0 +1,11 @@ +@lombok.log4j.Log +class LoggerLog4j { +} + +@lombok.log4j.Log(String.class) +class LoggerLog4jString { +} + +@lombok.log4j.Log(java.lang.String.class) +class LoggerLog4jJavaLangString { +} \ No newline at end of file -- cgit From 8a3a656213605482bfa11f2efddf96dc1f47d16e Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Sat, 6 Nov 2010 15:37:20 +0100 Subject: Add support for multiple logging frameworks in Eclipse --- test/transform/resource/after-ecj/LoggerCommons.java | 18 ++++++++++++++++++ test/transform/resource/after-ecj/LoggerJul.java | 18 ++++++++++++++++++ test/transform/resource/after-ecj/LoggerLog4j.java | 18 ++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 test/transform/resource/after-ecj/LoggerCommons.java create mode 100644 test/transform/resource/after-ecj/LoggerJul.java create mode 100644 test/transform/resource/after-ecj/LoggerLog4j.java (limited to 'test/transform') diff --git a/test/transform/resource/after-ecj/LoggerCommons.java b/test/transform/resource/after-ecj/LoggerCommons.java new file mode 100644 index 00000000..1d21fb66 --- /dev/null +++ b/test/transform/resource/after-ecj/LoggerCommons.java @@ -0,0 +1,18 @@ +@lombok.commons.Log class LoggerCommons { + private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class); + LoggerCommons() { + super(); + } +} +@lombok.commons.Log(String.class) class LoggerCommonsString { + private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(String.class); + LoggerCommonsString() { + super(); + } +} +@lombok.commons.Log(java.lang.String.class) class LoggerCommonsJavaLangString { + private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(java.lang.String.class); + LoggerCommonsJavaLangString() { + super(); + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/LoggerJul.java b/test/transform/resource/after-ecj/LoggerJul.java new file mode 100644 index 00000000..86405ebd --- /dev/null +++ b/test/transform/resource/after-ecj/LoggerJul.java @@ -0,0 +1,18 @@ +@lombok.jul.Log class LoggerJul { + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("LoggerJul"); + LoggerJul() { + super(); + } +} +@lombok.jul.Log(String.class) class LoggerJulString { + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("String"); + LoggerJulString() { + super(); + } +} +@lombok.jul.Log(java.lang.String.class) class LoggerJulJavaLangString { + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("java.lang.String"); + LoggerJulJavaLangString() { + super(); + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/LoggerLog4j.java b/test/transform/resource/after-ecj/LoggerLog4j.java new file mode 100644 index 00000000..27ad6b9c --- /dev/null +++ b/test/transform/resource/after-ecj/LoggerLog4j.java @@ -0,0 +1,18 @@ +@lombok.log4j.Log class LoggerLog4j { + private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class); + LoggerLog4j() { + super(); + } +} +@lombok.log4j.Log(String.class) class LoggerLog4jString { + private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(String.class); + LoggerLog4jString() { + super(); + } +} +@lombok.log4j.Log(java.lang.String.class) class LoggerLog4jJavaLangString { + private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(java.lang.String.class); + LoggerLog4jJavaLangString() { + super(); + } +} \ No newline at end of file -- cgit From 0c7b29f8e7009d1433e2386f710c78801f119ebb Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Sat, 6 Nov 2010 16:41:17 +0100 Subject: Create Clinit if you create a static field and it doesn't yet exist --- test/transform/resource/after-ecj/LoggerCommons.java | 6 ++++++ test/transform/resource/after-ecj/LoggerJul.java | 6 ++++++ test/transform/resource/after-ecj/LoggerLog4j.java | 6 ++++++ test/transform/resource/after-ecj/LoggerSlf4j.java | 4 ++++ test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java | 2 ++ test/transform/resource/after-ecj/LoggerSlf4jTypes.java | 2 ++ test/transform/resource/after-ecj/LoggerSlf4jWithClass.java | 8 ++++++++ test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java | 4 ++++ test/transform/resource/after-ecj/SynchronizedPlain.java | 2 ++ 9 files changed, 40 insertions(+) (limited to 'test/transform') diff --git a/test/transform/resource/after-ecj/LoggerCommons.java b/test/transform/resource/after-ecj/LoggerCommons.java index 1d21fb66..e5a3bf35 100644 --- a/test/transform/resource/after-ecj/LoggerCommons.java +++ b/test/transform/resource/after-ecj/LoggerCommons.java @@ -1,17 +1,23 @@ @lombok.commons.Log class LoggerCommons { private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class); + () { + } LoggerCommons() { super(); } } @lombok.commons.Log(String.class) class LoggerCommonsString { private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(String.class); + () { + } LoggerCommonsString() { super(); } } @lombok.commons.Log(java.lang.String.class) class LoggerCommonsJavaLangString { private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(java.lang.String.class); + () { + } LoggerCommonsJavaLangString() { super(); } diff --git a/test/transform/resource/after-ecj/LoggerJul.java b/test/transform/resource/after-ecj/LoggerJul.java index 86405ebd..734d0dac 100644 --- a/test/transform/resource/after-ecj/LoggerJul.java +++ b/test/transform/resource/after-ecj/LoggerJul.java @@ -1,17 +1,23 @@ @lombok.jul.Log class LoggerJul { private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("LoggerJul"); + () { + } LoggerJul() { super(); } } @lombok.jul.Log(String.class) class LoggerJulString { private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("String"); + () { + } LoggerJulString() { super(); } } @lombok.jul.Log(java.lang.String.class) class LoggerJulJavaLangString { private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("java.lang.String"); + () { + } LoggerJulJavaLangString() { super(); } diff --git a/test/transform/resource/after-ecj/LoggerLog4j.java b/test/transform/resource/after-ecj/LoggerLog4j.java index 27ad6b9c..64445b96 100644 --- a/test/transform/resource/after-ecj/LoggerLog4j.java +++ b/test/transform/resource/after-ecj/LoggerLog4j.java @@ -1,17 +1,23 @@ @lombok.log4j.Log class LoggerLog4j { private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class); + () { + } LoggerLog4j() { super(); } } @lombok.log4j.Log(String.class) class LoggerLog4jString { private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(String.class); + () { + } LoggerLog4jString() { super(); } } @lombok.log4j.Log(java.lang.String.class) class LoggerLog4jJavaLangString { private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(java.lang.String.class); + () { + } LoggerLog4jJavaLangString() { super(); } diff --git a/test/transform/resource/after-ecj/LoggerSlf4j.java b/test/transform/resource/after-ecj/LoggerSlf4j.java index 6a611c2b..2e4d65a5 100644 --- a/test/transform/resource/after-ecj/LoggerSlf4j.java +++ b/test/transform/resource/after-ecj/LoggerSlf4j.java @@ -1,5 +1,7 @@ @lombok.slf4j.Log class LoggerSlf4j { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class); + () { + } LoggerSlf4j() { super(); } @@ -7,6 +9,8 @@ class LoggerSlf4jOuter { static @lombok.slf4j.Log class Inner { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOuter.Inner.class); + () { + } Inner() { super(); } diff --git a/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java b/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java index c8f8069d..ffec7e66 100644 --- a/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java +++ b/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java @@ -1,5 +1,7 @@ @lombok.slf4j.Log(String[].class) class LoggerSlf4jClassOfArray { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String[].class); + () { + } LoggerSlf4jClassOfArray() { super(); } diff --git a/test/transform/resource/after-ecj/LoggerSlf4jTypes.java b/test/transform/resource/after-ecj/LoggerSlf4jTypes.java index 88bcdae8..2e860ed2 100644 --- a/test/transform/resource/after-ecj/LoggerSlf4jTypes.java +++ b/test/transform/resource/after-ecj/LoggerSlf4jTypes.java @@ -22,6 +22,8 @@ interface LoggerSlf4jTypesInterfaceOuter { @lombok.slf4j.Log class Inner { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesInterfaceOuter.Inner.class); + () { + } Inner() { super(); } diff --git a/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java b/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java index 2839cdef..fbb4b2d2 100644 --- a/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java +++ b/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java @@ -1,23 +1,31 @@ @lombok.slf4j.Log(String.class) class LoggerSlf4jWithClass { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String.class); + () { + } LoggerSlf4jWithClass() { super(); } } @lombok.slf4j.Log(java.util.List.class) class LoggerSlf4jWithClassList { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.util.List.class); + () { + } LoggerSlf4jWithClassList() { super(); } } @lombok.slf4j.Log(value = java.lang.String.class) class LoggerSlf4jWithClassValue { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.lang.String.class); + () { + } LoggerSlf4jWithClassValue() { super(); } } @lombok.slf4j.Log(void.class) class LoggerSlf4jWithClassVoid { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithClassVoid.class); + () { + } LoggerSlf4jWithClassVoid() { super(); } diff --git a/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java b/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java index efd43685..76d19bc3 100644 --- a/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java +++ b/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java @@ -1,6 +1,8 @@ package before; @lombok.slf4j.Log class LoggerSlf4jWithPackage { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(before.LoggerSlf4jWithPackage.class); + () { + } LoggerSlf4jWithPackage() { super(); } @@ -8,6 +10,8 @@ package before; class LoggerSlf4jWithPackageOuter { static @lombok.slf4j.Log class Inner { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(before.LoggerSlf4jWithPackageOuter.Inner.class); + () { + } Inner() { super(); } diff --git a/test/transform/resource/after-ecj/SynchronizedPlain.java b/test/transform/resource/after-ecj/SynchronizedPlain.java index b9f032c5..8e5b6297 100644 --- a/test/transform/resource/after-ecj/SynchronizedPlain.java +++ b/test/transform/resource/after-ecj/SynchronizedPlain.java @@ -19,6 +19,8 @@ class SynchronizedPlain1 { } class SynchronizedPlain2 { private static final @java.lang.SuppressWarnings("all") java.lang.Object $LOCK = new java.lang.Object[0]; + () { + } SynchronizedPlain2() { super(); } -- cgit From 59150328992339ec64ae015e2d1d73c109c4d322 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Sat, 6 Nov 2010 20:41:36 +0100 Subject: Have j.u.l. be invoked with TargetType.class.getName() instead of "TargetType" --- test/transform/resource/after-delombok/LoggerJul.java | 6 +++--- test/transform/resource/after-ecj/LoggerJul.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'test/transform') diff --git a/test/transform/resource/after-delombok/LoggerJul.java b/test/transform/resource/after-delombok/LoggerJul.java index a40bb2da..51f19926 100644 --- a/test/transform/resource/after-delombok/LoggerJul.java +++ b/test/transform/resource/after-delombok/LoggerJul.java @@ -1,9 +1,9 @@ class LoggerJul { - private static final java.util.logging.Logger log = java.util.logging.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"); + 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"); + 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-ecj/LoggerJul.java b/test/transform/resource/after-ecj/LoggerJul.java index 734d0dac..99c1000c 100644 --- a/test/transform/resource/after-ecj/LoggerJul.java +++ b/test/transform/resource/after-ecj/LoggerJul.java @@ -1,5 +1,5 @@ @lombok.jul.Log class LoggerJul { - private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("LoggerJul"); + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJul.class.getName()); () { } LoggerJul() { @@ -7,7 +7,7 @@ } } @lombok.jul.Log(String.class) class LoggerJulString { - private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("String"); + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(String.class.getName()); () { } LoggerJulString() { @@ -15,7 +15,7 @@ } } @lombok.jul.Log(java.lang.String.class) class LoggerJulJavaLangString { - private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("java.lang.String"); + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(java.lang.String.class.getName()); () { } LoggerJulJavaLangString() { -- cgit