semi-fix for issue 602, but not complete as adding annotations to generated fields leads to crazy issues (see issue 217): generated LOG field now has @SuppressWarnings on it.

This commit is contained in:
Reinier Zwitserloot committed 2013-12-11 22:40:49 +01:00
1 parent 5f92913a52
commit 7d51842ca3
11 files changed
+24 -1

No files matched your search

@@ -73,6 +73,8 @@ public class HandleLog {
FieldDeclaration fieldDeclaration = createField(framework, source, loggingType);
fieldDeclaration.traverse(new SetGeneratedByVisitor(source), typeDecl.staticInitializerScope);
// TODO temporary workaround for issue 217. http://code.google.com/p/projectlombok/issues/detail?id=217
// injectFieldSuppressWarnings(owner, fieldDeclaration);
injectField(owner, fieldDeclaration);
owner.rebuild();
break;
@@ -93,7 +93,7 @@ public class HandleLog {
maker.Modifiers(Flags.PRIVATE | Flags.FINAL | Flags.STATIC),
typeNode.toName("log"), loggerType, factoryMethodCall), source, typeNode.getContext());
injectField(typeNode, fieldDecl);
injectFieldSuppressWarnings(typeNode, fieldDecl);
return true;
}
@@ -4,6 +4,7 @@ enum InjectField1 {
A,
B;
@java.lang.SuppressWarnings("all")
private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField1.class.getName());
@java.lang.SuppressWarnings("all")
private final java.lang.Object $lock = new java.lang.Object[0];
@@ -34,6 +35,7 @@ enum InjectField1 {
}
class InjectField2 {
@java.lang.SuppressWarnings("all")
private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField2.class.getName());
@java.lang.SuppressWarnings("all")
private final java.lang.Object $lock = new java.lang.Object[0];
@@ -52,6 +54,7 @@ class InjectField2 {
}
class InjectField3 {
@java.lang.SuppressWarnings("all")
private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField3.class.getName());
static {
log.log(Level.FINE, "static initializer");
@@ -1,6 +1,8 @@
class LoggerCommons {
@java.lang.SuppressWarnings("all")
private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class);
}
class LoggerCommonsWithImport {
@java.lang.SuppressWarnings("all")
private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsWithImport.class);
}
@@ -1,6 +1,8 @@
class LoggerJul {
@java.lang.SuppressWarnings("all")
private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJul.class.getName());
}
class LoggerJulWithImport {
@java.lang.SuppressWarnings("all")
private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithImport.class.getName());
}
@@ -1,6 +1,8 @@
class LoggerLog4j {
@java.lang.SuppressWarnings("all")
private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class);
}
class LoggerLog4jWithImport {
@java.lang.SuppressWarnings("all")
private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithImport.class);
}
@@ -1,6 +1,8 @@
class LoggerLog4j2 {
@java.lang.SuppressWarnings("all")
private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2.class);
}
class LoggerLog4j2WithImport {
@java.lang.SuppressWarnings("all")
private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithImport.class);
}
@@ -1,11 +1,14 @@
class LoggerSlf4j {
@java.lang.SuppressWarnings("all")
private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class);
}
class LoggerSlf4jWithImport {
@java.lang.SuppressWarnings("all")
private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithImport.class);
}
class LoggerSlf4jOuter {
static class Inner {
@java.lang.SuppressWarnings("all")
private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
}
}
@@ -4,14 +4,17 @@ interface LoggerSlf4jTypesInterface {
}
enum LoggerSlf4jTypesEnum {
;
@java.lang.SuppressWarnings("all")
private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class);
}
enum LoggerSlf4jTypesEnumWithElement {
FOO;
@java.lang.SuppressWarnings("all")
private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class);
}
interface LoggerSlf4jTypesInterfaceOuter {
class Inner {
@java.lang.SuppressWarnings("all")
private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
}
}
@@ -1,9 +1,11 @@
package before;
class LoggerSlf4jWithPackage {
@java.lang.SuppressWarnings("all")
private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithPackage.class);
}
class LoggerSlf4jWithPackageOuter {
static class Inner {
@java.lang.SuppressWarnings("all")
private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
}
}
@@ -1,6 +1,8 @@
class LoggerXSlf4j {
@java.lang.SuppressWarnings("all")
private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4j.class);
}
class LoggerXSlf4jWithImport {
@java.lang.SuppressWarnings("all")
private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4jWithImport.class);
}