From f258229b88a797694320b1794a4084998411a94b Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Mon, 22 Nov 2010 23:52:34 +0100 Subject: - Renamed the diverse @Log annotations to give them distinct names - Removed the option to specify a different class to log on - Updated tests and documentation --- test/transform/resource/before/LoggerCommons.java | 12 +++++------- test/transform/resource/before/LoggerJul.java | 12 +++++------- test/transform/resource/before/LoggerLog4j.java | 12 +++++------- test/transform/resource/before/LoggerSlf4j.java | 11 +++++++++-- test/transform/resource/before/LoggerSlf4jAlreadyExists.java | 2 +- test/transform/resource/before/LoggerSlf4jClassOfArray.java | 6 ------ test/transform/resource/before/LoggerSlf4jOnNonType.java | 2 +- test/transform/resource/before/LoggerSlf4jTypes.java | 10 +++++----- test/transform/resource/before/LoggerSlf4jWithClass.java | 12 ------------ test/transform/resource/before/LoggerSlf4jWithPackage.java | 4 ++-- 10 files changed, 33 insertions(+), 50 deletions(-) delete mode 100644 test/transform/resource/before/LoggerSlf4jClassOfArray.java delete mode 100644 test/transform/resource/before/LoggerSlf4jWithClass.java (limited to 'test/transform/resource/before') diff --git a/test/transform/resource/before/LoggerCommons.java b/test/transform/resource/before/LoggerCommons.java index d6359bd7..52210d25 100644 --- a/test/transform/resource/before/LoggerCommons.java +++ b/test/transform/resource/before/LoggerCommons.java @@ -1,11 +1,9 @@ -@lombok.extern.apachecommons.Log -class LoggerCommons { -} +import lombok.extern.apachecommons.CommonsLog; -@lombok.extern.apachecommons.Log(String.class) -class LoggerCommonsString { +@lombok.extern.apachecommons.CommonsLog +class LoggerCommons { } -@lombok.extern.apachecommons.Log(java.lang.String.class) -class LoggerCommonsJavaLangString { +@CommonsLog +class LoggerCommonsWithImport { } \ No newline at end of file diff --git a/test/transform/resource/before/LoggerJul.java b/test/transform/resource/before/LoggerJul.java index 1c74ea4f..52869e81 100644 --- a/test/transform/resource/before/LoggerJul.java +++ b/test/transform/resource/before/LoggerJul.java @@ -1,11 +1,9 @@ -@lombok.extern.jul.Log -class LoggerJul { -} +import lombok.extern.java.Log; -@lombok.extern.jul.Log(String.class) -class LoggerJulString { +@lombok.extern.java.Log +class LoggerJul { } -@lombok.extern.jul.Log(java.lang.String.class) -class LoggerJulJavaLangString { +@Log +class LoggerJulWithImport { } \ No newline at end of file diff --git a/test/transform/resource/before/LoggerLog4j.java b/test/transform/resource/before/LoggerLog4j.java index 0199809c..03735bff 100644 --- a/test/transform/resource/before/LoggerLog4j.java +++ b/test/transform/resource/before/LoggerLog4j.java @@ -1,11 +1,9 @@ -@lombok.extern.log4j.Log -class LoggerLog4j { -} +import lombok.extern.log4j.Log4j; -@lombok.extern.log4j.Log(String.class) -class LoggerLog4jString { +@lombok.extern.log4j.Log4j +class LoggerLog4j { } -@lombok.extern.log4j.Log(java.lang.String.class) -class LoggerLog4jJavaLangString { +@Log4j +class LoggerLog4jWithImport { } \ No newline at end of file diff --git a/test/transform/resource/before/LoggerSlf4j.java b/test/transform/resource/before/LoggerSlf4j.java index 92aeefbd..133ee36e 100644 --- a/test/transform/resource/before/LoggerSlf4j.java +++ b/test/transform/resource/before/LoggerSlf4j.java @@ -1,8 +1,15 @@ -@lombok.extern.slf4j.Log +import lombok.extern.slf4j.Slf4j; + +@lombok.extern.slf4j.Slf4j class LoggerSlf4j { } + +@Slf4j +class LoggerSlf4jWithImport { +} + class LoggerSlf4jOuter { - @lombok.extern.slf4j.Log + @lombok.extern.slf4j.Slf4j static class Inner { } diff --git a/test/transform/resource/before/LoggerSlf4jAlreadyExists.java b/test/transform/resource/before/LoggerSlf4jAlreadyExists.java index 8ac0225d..72044aa7 100644 --- a/test/transform/resource/before/LoggerSlf4jAlreadyExists.java +++ b/test/transform/resource/before/LoggerSlf4jAlreadyExists.java @@ -1,4 +1,4 @@ -@lombok.extern.slf4j.Log +@lombok.extern.slf4j.Slf4j 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 deleted file mode 100644 index 87248538..00000000 --- a/test/transform/resource/before/LoggerSlf4jClassOfArray.java +++ /dev/null @@ -1,6 +0,0 @@ -@lombok.extern.slf4j.Log(String[].class) -class LoggerSlf4jClassOfArray { -} -@lombok.extern.slf4j.Log(java.lang.String[].class) -class LoggerSlf4jClassOfArrayJLS { -} diff --git a/test/transform/resource/before/LoggerSlf4jOnNonType.java b/test/transform/resource/before/LoggerSlf4jOnNonType.java index c57e171c..fd557b25 100644 --- a/test/transform/resource/before/LoggerSlf4jOnNonType.java +++ b/test/transform/resource/before/LoggerSlf4jOnNonType.java @@ -1,5 +1,5 @@ class LoggerSlf4jOnNonType { - @lombok.extern.slf4j.Log + @lombok.extern.slf4j.Slf4j void foo() { } } \ No newline at end of file diff --git a/test/transform/resource/before/LoggerSlf4jTypes.java b/test/transform/resource/before/LoggerSlf4jTypes.java index 9f221f73..d1c06fa5 100644 --- a/test/transform/resource/before/LoggerSlf4jTypes.java +++ b/test/transform/resource/before/LoggerSlf4jTypes.java @@ -1,18 +1,18 @@ -@lombok.extern.slf4j.Log +@lombok.extern.slf4j.Slf4j interface LoggerSlf4jTypesInterface { } -@lombok.extern.slf4j.Log +@lombok.extern.slf4j.Slf4j @interface LoggerSlf4jTypesAnnotation { } -@lombok.extern.slf4j.Log +@lombok.extern.slf4j.Slf4j enum LoggerSlf4jTypesEnum { } -@lombok.extern.slf4j.Log +@lombok.extern.slf4j.Slf4j enum LoggerSlf4jTypesEnumWithElement { FOO; } interface LoggerSlf4jTypesInterfaceOuter { - @lombok.extern.slf4j.Log + @lombok.extern.slf4j.Slf4j class Inner { } } \ No newline at end of file diff --git a/test/transform/resource/before/LoggerSlf4jWithClass.java b/test/transform/resource/before/LoggerSlf4jWithClass.java deleted file mode 100644 index b9cf8187..00000000 --- a/test/transform/resource/before/LoggerSlf4jWithClass.java +++ /dev/null @@ -1,12 +0,0 @@ -@lombok.extern.slf4j.Log(String.class) -class LoggerSlf4jWithClass { -} -@lombok.extern.slf4j.Log(java.util.List.class) -class LoggerSlf4jWithClassList { -} -@lombok.extern.slf4j.Log(value = java.lang.String.class) -class LoggerSlf4jWithClassValue { -} -@lombok.extern.slf4j.Log(void.class) -class LoggerSlf4jWithClassVoid { -} diff --git a/test/transform/resource/before/LoggerSlf4jWithPackage.java b/test/transform/resource/before/LoggerSlf4jWithPackage.java index efbaef68..043e889e 100644 --- a/test/transform/resource/before/LoggerSlf4jWithPackage.java +++ b/test/transform/resource/before/LoggerSlf4jWithPackage.java @@ -1,9 +1,9 @@ package before; -@lombok.extern.slf4j.Log +@lombok.extern.slf4j.Slf4j class LoggerSlf4jWithPackage { } class LoggerSlf4jWithPackageOuter { - @lombok.extern.slf4j.Log + @lombok.extern.slf4j.Slf4j static class Inner { } } \ No newline at end of file -- cgit