diff options
Diffstat (limited to 'test')
26 files changed, 82 insertions, 178 deletions
diff --git a/test/transform/resource/after-delombok/LoggerCommons.java b/test/transform/resource/after-delombok/LoggerCommons.java index a55aa336..c2a03815 100644 --- a/test/transform/resource/after-delombok/LoggerCommons.java +++ b/test/transform/resource/after-delombok/LoggerCommons.java @@ -1,9 +1,7 @@ class LoggerCommons { 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); + +class LoggerCommonsWithImport { + private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsWithImport.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 51f19926..39cb2aac 100644 --- a/test/transform/resource/after-delombok/LoggerJul.java +++ b/test/transform/resource/after-delombok/LoggerJul.java @@ -1,9 +1,7 @@ class 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()); + +class LoggerJulWithImport { + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithImport.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 e946c858..6892a7d8 100644 --- a/test/transform/resource/after-delombok/LoggerLog4j.java +++ b/test/transform/resource/after-delombok/LoggerLog4j.java @@ -1,9 +1,7 @@ class LoggerLog4j { 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); + +class LoggerLog4jWithImport { + private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithImport.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 c7c84631..cb1486ba 100644 --- a/test/transform/resource/after-delombok/LoggerSlf4j.java +++ b/test/transform/resource/after-delombok/LoggerSlf4j.java @@ -1,6 +1,11 @@ class LoggerSlf4j { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class); } + +class LoggerSlf4jWithImport { + private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithImport.class); +} + class LoggerSlf4jOuter { static class Inner { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); diff --git a/test/transform/resource/after-delombok/LoggerSlf4jClassOfArray.java b/test/transform/resource/after-delombok/LoggerSlf4jClassOfArray.java deleted file mode 100644 index 00b44d5c..00000000 --- a/test/transform/resource/after-delombok/LoggerSlf4jClassOfArray.java +++ /dev/null @@ -1,6 +0,0 @@ -class LoggerSlf4jClassOfArray { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String[].class); -} -class LoggerSlf4jClassOfArrayJLS { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.lang.String[].class); -} diff --git a/test/transform/resource/after-delombok/LoggerSlf4jWithClass.java b/test/transform/resource/after-delombok/LoggerSlf4jWithClass.java deleted file mode 100644 index b4e2181e..00000000 --- a/test/transform/resource/after-delombok/LoggerSlf4jWithClass.java +++ /dev/null @@ -1,12 +0,0 @@ -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(void.class); -} diff --git a/test/transform/resource/after-ecj/LoggerCommons.java b/test/transform/resource/after-ecj/LoggerCommons.java index bb38983f..d63bb9c1 100644 --- a/test/transform/resource/after-ecj/LoggerCommons.java +++ b/test/transform/resource/after-ecj/LoggerCommons.java @@ -1,4 +1,5 @@ -@lombok.extern.apachecommons.Log class LoggerCommons { +import lombok.extern.apachecommons.CommonsLog; +@lombok.extern.apachecommons.CommonsLog class LoggerCommons { private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class); <clinit>() { } @@ -6,19 +7,11 @@ super(); } } -@lombok.extern.apachecommons.Log(String.class) class LoggerCommonsString { - private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(String.class); +@CommonsLog class LoggerCommonsWithImport { + private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsWithImport.class); <clinit>() { } - LoggerCommonsString() { - super(); - } -} -@lombok.extern.apachecommons.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); - <clinit>() { - } - LoggerCommonsJavaLangString() { + LoggerCommonsWithImport() { 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 index 3d09cb71..c98dfe27 100644 --- a/test/transform/resource/after-ecj/LoggerJul.java +++ b/test/transform/resource/after-ecj/LoggerJul.java @@ -1,4 +1,5 @@ -@lombok.extern.jul.Log class LoggerJul { +import lombok.extern.java.Log; +@lombok.extern.java.Log class LoggerJul { private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJul.class.getName()); <clinit>() { } @@ -6,19 +7,11 @@ super(); } } -@lombok.extern.jul.Log(String.class) class LoggerJulString { - private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(String.class.getName()); +@Log class LoggerJulWithImport { + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithImport.class.getName()); <clinit>() { } - LoggerJulString() { - super(); - } -} -@lombok.extern.jul.Log(java.lang.String.class) class LoggerJulJavaLangString { - private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(java.lang.String.class.getName()); - <clinit>() { - } - LoggerJulJavaLangString() { + LoggerJulWithImport() { 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 index 45898a57..6814be7b 100644 --- a/test/transform/resource/after-ecj/LoggerLog4j.java +++ b/test/transform/resource/after-ecj/LoggerLog4j.java @@ -1,4 +1,5 @@ -@lombok.extern.log4j.Log class LoggerLog4j { +import lombok.extern.log4j.Log4j; +@lombok.extern.log4j.Log4j class LoggerLog4j { private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class); <clinit>() { } @@ -6,19 +7,11 @@ super(); } } -@lombok.extern.log4j.Log(String.class) class LoggerLog4jString { - private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(String.class); +@Log4j class LoggerLog4jWithImport { + private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithImport.class); <clinit>() { } - LoggerLog4jString() { - super(); - } -} -@lombok.extern.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); - <clinit>() { - } - LoggerLog4jJavaLangString() { + LoggerLog4jWithImport() { super(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/LoggerSlf4j.java b/test/transform/resource/after-ecj/LoggerSlf4j.java index e635ece8..1ccf5c9e 100644 --- a/test/transform/resource/after-ecj/LoggerSlf4j.java +++ b/test/transform/resource/after-ecj/LoggerSlf4j.java @@ -1,4 +1,5 @@ -@lombok.extern.slf4j.Log class LoggerSlf4j { +import lombok.extern.slf4j.Slf4j; +@lombok.extern.slf4j.Slf4j class LoggerSlf4j { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class); <clinit>() { } @@ -6,8 +7,16 @@ super(); } } +@Slf4j class LoggerSlf4jWithImport { + private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithImport.class); + <clinit>() { + } + LoggerSlf4jWithImport() { + super(); + } +} class LoggerSlf4jOuter { - static @lombok.extern.slf4j.Log class Inner { + static @lombok.extern.slf4j.Slf4j class Inner { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); <clinit>() { } diff --git a/test/transform/resource/after-ecj/LoggerSlf4jAlreadyExists.java b/test/transform/resource/after-ecj/LoggerSlf4jAlreadyExists.java index 22fa0eeb..5fb6bc06 100644 --- a/test/transform/resource/after-ecj/LoggerSlf4jAlreadyExists.java +++ b/test/transform/resource/after-ecj/LoggerSlf4jAlreadyExists.java @@ -1,4 +1,4 @@ -@lombok.extern.slf4j.Log class LoggerSlf4jAlreadyExists { +@lombok.extern.slf4j.Slf4j class LoggerSlf4jAlreadyExists { int log; LoggerSlf4jAlreadyExists() { super(); diff --git a/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java b/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java deleted file mode 100644 index 20fe0fde..00000000 --- a/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java +++ /dev/null @@ -1,16 +0,0 @@ -@lombok.extern.slf4j.Log(String[].class) class LoggerSlf4jClassOfArray { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String[].class); - <clinit>() { - } - LoggerSlf4jClassOfArray() { - super(); - } -} -@lombok.extern.slf4j.Log(java.lang.String[].class) class LoggerSlf4jClassOfArrayJLS { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.lang.String[].class); - <clinit>() { - } - LoggerSlf4jClassOfArrayJLS() { - 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 index a45612ae..f0c2ee58 100644 --- a/test/transform/resource/after-ecj/LoggerSlf4jOnNonType.java +++ b/test/transform/resource/after-ecj/LoggerSlf4jOnNonType.java @@ -2,6 +2,6 @@ class LoggerSlf4jOnNonType { LoggerSlf4jOnNonType() { super(); } - @lombok.extern.slf4j.Log void foo() { + @lombok.extern.slf4j.Slf4j 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 index 25b3fd86..95ed1ebf 100644 --- a/test/transform/resource/after-ecj/LoggerSlf4jTypes.java +++ b/test/transform/resource/after-ecj/LoggerSlf4jTypes.java @@ -1,8 +1,8 @@ -@lombok.extern.slf4j.Log interface LoggerSlf4jTypesInterface { +@lombok.extern.slf4j.Slf4j interface LoggerSlf4jTypesInterface { } -@lombok.extern.slf4j.Log @interface LoggerSlf4jTypesAnnotation { +@lombok.extern.slf4j.Slf4j @interface LoggerSlf4jTypesAnnotation { } -@lombok.extern.slf4j.Log enum LoggerSlf4jTypesEnum { +@lombok.extern.slf4j.Slf4j enum LoggerSlf4jTypesEnum { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class); <clinit>() { } @@ -10,7 +10,7 @@ super(); } } -@lombok.extern.slf4j.Log enum LoggerSlf4jTypesEnumWithElement { +@lombok.extern.slf4j.Slf4j enum LoggerSlf4jTypesEnumWithElement { FOO(), private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class); <clinit>() { @@ -20,7 +20,7 @@ } } interface LoggerSlf4jTypesInterfaceOuter { - @lombok.extern.slf4j.Log class Inner { + @lombok.extern.slf4j.Slf4j class Inner { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); <clinit>() { } diff --git a/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java b/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java deleted file mode 100644 index 9f4846aa..00000000 --- a/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java +++ /dev/null @@ -1,32 +0,0 @@ -@lombok.extern.slf4j.Log(String.class) class LoggerSlf4jWithClass { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String.class); - <clinit>() { - } - LoggerSlf4jWithClass() { - super(); - } -} -@lombok.extern.slf4j.Log(java.util.List.class) class LoggerSlf4jWithClassList { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.util.List.class); - <clinit>() { - } - LoggerSlf4jWithClassList() { - super(); - } -} -@lombok.extern.slf4j.Log(value = java.lang.String.class) class LoggerSlf4jWithClassValue { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.lang.String.class); - <clinit>() { - } - LoggerSlf4jWithClassValue() { - super(); - } -} -@lombok.extern.slf4j.Log(void.class) class LoggerSlf4jWithClassVoid { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(void.class); - <clinit>() { - } - LoggerSlf4jWithClassVoid() { - super(); - } -} diff --git a/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java b/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java index 655d14f8..6d395db8 100644 --- a/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java +++ b/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java @@ -1,5 +1,5 @@ package before; -@lombok.extern.slf4j.Log class LoggerSlf4jWithPackage { +@lombok.extern.slf4j.Slf4j class LoggerSlf4jWithPackage { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithPackage.class); <clinit>() { } @@ -8,7 +8,7 @@ package before; } } class LoggerSlf4jWithPackageOuter { - static @lombok.extern.slf4j.Log class Inner { + static @lombok.extern.slf4j.Slf4j class Inner { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); <clinit>() { } 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 |