diff --git a/src/core/lombok/eclipse/handlers/HandleLog.java b/src/core/lombok/eclipse/handlers/HandleLog.java index 8a2d1483..3f6044bd 100644 --- a/src/core/lombok/eclipse/handlers/HandleLog.java +++ b/src/core/lombok/eclipse/handlers/HandleLog.java @@ -100,6 +100,7 @@ public class HandleLog { Expression loggerTopic = (Expression) annotation.getActualExpression("topic"); if (valueGuess instanceof String && ((String) valueGuess).trim().isEmpty()) loggerTopic = null; + if (framework.getDeclaration().getParametersWithTopic() == null && loggerTopic != null) { annotationNode.addError(framework.getAnnotationAsString() + " does not allow a topic."); loggerTopic = null; @@ -109,6 +110,9 @@ public class HandleLog { loggerTopic = new StringLiteral(new char[]{}, 0, 0, 0); } + if (access == AccessLevel.NONE) + break; + ClassLiteralAccess loggingType = selfType(owner, source); FieldDeclaration fieldDeclaration = createField(framework, access, source, loggingType, logFieldName.getName(), useStatic, loggerTopic); fieldDeclaration.traverse(new SetGeneratedByVisitor(source), typeDecl.staticInitializerScope); @@ -138,7 +142,7 @@ public class HandleLog { switch (level) { case PUBLIC: return Flags.PUBLIC; case PROTECTED: return Flags.PROTECTED; - case PRIVATE: return Flags.PUBLIC; + case PRIVATE: return Flags.PRIVATE; default: return 0; } } diff --git a/src/core/lombok/javac/handlers/HandleLog.java b/src/core/lombok/javac/handlers/HandleLog.java index 173d8f2a..92f65fc8 100644 --- a/src/core/lombok/javac/handlers/HandleLog.java +++ b/src/core/lombok/javac/handlers/HandleLog.java @@ -99,6 +99,9 @@ public class HandleLog { loggerTopic = typeNode.getTreeMaker().Literal(""); } + if (access == AccessLevel.NONE) + break; + JCFieldAccess loggingType = selfType(typeNode); createField(framework, access, typeNode, loggingType, annotationNode, logFieldName.getName(), useStatic, loggerTopic); break; @@ -118,7 +121,7 @@ public class HandleLog { switch (level) { case PUBLIC: return Flags.PUBLIC; case PROTECTED: return Flags.PROTECTED; - case PRIVATE: return Flags.PUBLIC; + case PRIVATE: return Flags.PRIVATE; default: return 0; } } diff --git a/test/transform/resource/after-ecj/LoggerCommonsAccess.java b/test/transform/resource/after-ecj/LoggerCommonsAccess.java index b5e7e93c..308fa2a5 100644 --- a/test/transform/resource/after-ecj/LoggerCommonsAccess.java +++ b/test/transform/resource/after-ecj/LoggerCommonsAccess.java @@ -1,48 +1,51 @@ import lombok.AccessLevel; import lombok.extern.apachecommons.CommonsLog; -@CommonsLog(access=AccessLevel.PUBLIC) class LoggerCommonsAccessPublic { +@CommonsLog(access = AccessLevel.PUBLIC) class LoggerCommonsAccessPublic { public static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsAccessPublic.class); () { } + LoggerCommonsAccessPublic() { super(); } } -@CommonsLog(access=AccessLevel.MODULE) class LoggerCommonsAccessModule { +@CommonsLog(access = AccessLevel.MODULE) class LoggerCommonsAccessModule { static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsAccessModule.class); () { } + LoggerCommonsAccessModule() { super(); } } -@CommonsLog(access=AccessLevel.PROTECTED) class LoggerCommonsAccessProtected { +@CommonsLog(access = AccessLevel.PROTECTED) class LoggerCommonsAccessProtected { protected static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsAccessProtected.class); () { } + LoggerCommonsAccessProtected() { super(); } } -@CommonsLog(access=AccessLevel.PACKAGE) class LoggerCommonsAccessPackage { +@CommonsLog(access = AccessLevel.PACKAGE) class LoggerCommonsAccessPackage { static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsAccessPackage.class); () { } + LoggerCommonsAccessPackage() { super(); } } -@CommonsLog(access=AccessLevel.PRIVATE) class LoggerCommonsAccessPrivate { +@CommonsLog(access = AccessLevel.PRIVATE) class LoggerCommonsAccessPrivate { private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsAccessPrivate.class); () { } + LoggerCommonsAccessPrivate() { super(); } } -@CommonsLog(access=AccessLevel.NONE) class LoggerCommonsAccessNone { - () { - } +@CommonsLog(access = AccessLevel.NONE) class LoggerCommonsAccessNone { LoggerCommonsAccessNone() { super(); } diff --git a/test/transform/resource/after-ecj/LoggerCustomAccess.java b/test/transform/resource/after-ecj/LoggerCustomAccess.java index e34e7b52..82b72ef1 100644 --- a/test/transform/resource/after-ecj/LoggerCustomAccess.java +++ b/test/transform/resource/after-ecj/LoggerCustomAccess.java @@ -1,48 +1,51 @@ import lombok.AccessLevel; import lombok.CustomLog; -@CustomLog(access=AccessLevel.PUBLIC) class LoggerCustomAccessPublic { +@CustomLog(access = AccessLevel.PUBLIC) class LoggerCustomAccessPublic { public static final @java.lang.SuppressWarnings("all") @lombok.Generated MyLogger log = MyLoggerFactory.create(LoggerCustomAccessPublic.class); () { } + LoggerCustomAccessPublic() { super(); } } -@CustomLog(access=AccessLevel.MODULE) class LoggerCustomAccessModule { +@CustomLog(access = AccessLevel.MODULE) class LoggerCustomAccessModule { static final @java.lang.SuppressWarnings("all") @lombok.Generated MyLogger log = MyLoggerFactory.create(LoggerCustomAccessModule.class); () { } + LoggerCustomAccessModule() { super(); } } -@CustomLog(access=AccessLevel.PROTECTED) class LoggerCustomAccessProtected { +@CustomLog(access = AccessLevel.PROTECTED) class LoggerCustomAccessProtected { protected static final @java.lang.SuppressWarnings("all") @lombok.Generated MyLogger log = MyLoggerFactory.create(LoggerCustomAccessProtected.class); () { } + LoggerCustomAccessProtected() { super(); } } -@CustomLog(access=AccessLevel.PACKAGE) class LoggerCustomAccessPackage { +@CustomLog(access = AccessLevel.PACKAGE) class LoggerCustomAccessPackage { static final @java.lang.SuppressWarnings("all") @lombok.Generated MyLogger log = MyLoggerFactory.create(LoggerCustomAccessPackage.class); () { } + LoggerCustomAccessPackage() { super(); } } -@CustomLog(access=AccessLevel.PRIVATE) class LoggerCustomAccessPrivate { +@CustomLog(access = AccessLevel.PRIVATE) class LoggerCustomAccessPrivate { private static final @java.lang.SuppressWarnings("all") @lombok.Generated MyLogger log = MyLoggerFactory.create(LoggerCustomAccessPrivate.class); () { } + LoggerCustomAccessPrivate() { super(); } } -@CustomLog(access=AccessLevel.NONE) class LoggerCustomAccessNone { - () { - } +@CustomLog(access = AccessLevel.NONE) class LoggerCustomAccessNone { LoggerCustomAccessNone() { super(); } diff --git a/test/transform/resource/after-ecj/LoggerFloggerAccess.java b/test/transform/resource/after-ecj/LoggerFloggerAccess.java index ce470dfc..125c479f 100644 --- a/test/transform/resource/after-ecj/LoggerFloggerAccess.java +++ b/test/transform/resource/after-ecj/LoggerFloggerAccess.java @@ -1,48 +1,51 @@ import lombok.AccessLevel; import lombok.extern.flogger.Flogger; -@Flogger(access=AccessLevel.PUBLIC) class LoggerFloggerAccessPublic { +@Flogger(access = AccessLevel.PUBLIC) class LoggerFloggerAccessPublic { public static final @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); () { } + LoggerFloggerAccessPublic() { super(); } } -@Flogger(access=AccessLevel.MODULE) class LoggerFloggerAccessModule { +@Flogger(access = AccessLevel.MODULE) class LoggerFloggerAccessModule { static final @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); () { } + LoggerFloggerAccessModule() { super(); } } -@Flogger(access=AccessLevel.PROTECTED) class LoggerFloggerAccessProtected { +@Flogger(access = AccessLevel.PROTECTED) class LoggerFloggerAccessProtected { protected static final @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); () { } + LoggerFloggerAccessProtected() { super(); } } -@Flogger(access=AccessLevel.PACKAGE) class LoggerFloggerAccessPackage { +@Flogger(access = AccessLevel.PACKAGE) class LoggerFloggerAccessPackage { static final @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); () { } + LoggerFloggerAccessPackage() { super(); } } -@Flogger(access=AccessLevel.PRIVATE) class LoggerFloggerAccessPrivate { +@Flogger(access = AccessLevel.PRIVATE) class LoggerFloggerAccessPrivate { private static final @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); () { } + LoggerFloggerAccessPrivate() { super(); } } -@Flogger(access=AccessLevel.NONE) class LoggerFloggerAccessNone { - () { - } +@Flogger(access = AccessLevel.NONE) class LoggerFloggerAccessNone { LoggerFloggerAccessNone() { super(); } diff --git a/test/transform/resource/after-ecj/LoggerJBossLogAccess.java b/test/transform/resource/after-ecj/LoggerJBossLogAccess.java index 8d40f320..5a156783 100644 --- a/test/transform/resource/after-ecj/LoggerJBossLogAccess.java +++ b/test/transform/resource/after-ecj/LoggerJBossLogAccess.java @@ -1,48 +1,51 @@ import lombok.AccessLevel; import lombok.extern.jbosslog.JBossLog; -@JBossLog(access=AccessLevel.PUBLIC) class LoggerJBossLogAccessPublic { +@JBossLog(access = AccessLevel.PUBLIC) class LoggerJBossLogAccessPublic { public static final @java.lang.SuppressWarnings("all") @lombok.Generated org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogAccessPublic.class); () { } + LoggerJBossLogAccessPublic() { super(); } } -@JBossLog(access=AccessLevel.MODULE) class LoggerJBossLogAccessModule { +@JBossLog(access = AccessLevel.MODULE) class LoggerJBossLogAccessModule { static final @java.lang.SuppressWarnings("all") @lombok.Generated org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogAccessModule.class); () { } + LoggerJBossLogAccessModule() { super(); } } -@JBossLog(access=AccessLevel.PROTECTED) class LoggerJBossLogAccessProtected { +@JBossLog(access = AccessLevel.PROTECTED) class LoggerJBossLogAccessProtected { protected static final @java.lang.SuppressWarnings("all") @lombok.Generated org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogAccessProtected.class); () { } + LoggerJBossLogAccessProtected() { super(); } } -@JBossLog(access=AccessLevel.PACKAGE) class LoggerJBossLogAccessPackage { +@JBossLog(access = AccessLevel.PACKAGE) class LoggerJBossLogAccessPackage { static final @java.lang.SuppressWarnings("all") @lombok.Generated org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogAccessPackage.class); () { } + LoggerJBossLogAccessPackage() { super(); } } -@JBossLog(access=AccessLevel.PRIVATE) class LoggerJBossLogAccessPrivate { +@JBossLog(access = AccessLevel.PRIVATE) class LoggerJBossLogAccessPrivate { private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogAccessPrivate.class); () { } + LoggerJBossLogAccessPrivate() { super(); } } -@JBossLog(access=AccessLevel.NONE) class LoggerJBossLogAccessNone { - () { - } +@JBossLog(access = AccessLevel.NONE) class LoggerJBossLogAccessNone { LoggerJBossLogAccessNone() { super(); } diff --git a/test/transform/resource/after-ecj/LoggerJulAccess.java b/test/transform/resource/after-ecj/LoggerJulAccess.java index 66fd6f26..6f0210f6 100644 --- a/test/transform/resource/after-ecj/LoggerJulAccess.java +++ b/test/transform/resource/after-ecj/LoggerJulAccess.java @@ -1,48 +1,51 @@ import lombok.AccessLevel; import lombok.extern.java.Log; -@Log(access=AccessLevel.PUBLIC) class LoggerJulAccessPublic { +@Log(access = AccessLevel.PUBLIC) class LoggerJulAccessPublic { public static final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulAccessPublic.class.getName()); () { } + LoggerJulAccessPublic() { super(); } } -@Log(access=AccessLevel.MODULE) class LoggerJulAccessModule { +@Log(access = AccessLevel.MODULE) class LoggerJulAccessModule { static final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulAccessModule.class.getName()); () { } + LoggerJulAccessModule() { super(); } } -@Log(access=AccessLevel.PROTECTED) class LoggerJulAccessProtected { +@Log(access = AccessLevel.PROTECTED) class LoggerJulAccessProtected { protected static final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulAccessProtected.class.getName()); () { } + LoggerJulAccessProtected() { super(); } } -@Log(access=AccessLevel.PACKAGE) class LoggerJulAccessPackage { +@Log(access = AccessLevel.PACKAGE) class LoggerJulAccessPackage { static final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulAccessPackage.class.getName()); () { } + LoggerJulAccessPackage() { super(); } } -@Log(access=AccessLevel.PRIVATE) class LoggerJulAccessPrivate { +@Log(access = AccessLevel.PRIVATE) class LoggerJulAccessPrivate { private static final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulAccessPrivate.class.getName()); () { } + LoggerJulAccessPrivate() { super(); } } -@Log(access=AccessLevel.NONE) class LoggerJulAccessNone { - () { - } +@Log(access = AccessLevel.NONE) class LoggerJulAccessNone { LoggerJulAccessNone() { super(); } diff --git a/test/transform/resource/after-ecj/LoggerLog4j2Access.java b/test/transform/resource/after-ecj/LoggerLog4j2Access.java index b979a99c..0ce19d8d 100644 --- a/test/transform/resource/after-ecj/LoggerLog4j2Access.java +++ b/test/transform/resource/after-ecj/LoggerLog4j2Access.java @@ -1,48 +1,51 @@ import lombok.AccessLevel; import lombok.extern.log4j.Log4j2; -@Log4j2(access=AccessLevel.PUBLIC) class LoggerLog4j2AccessPublic { +@Log4j2(access = AccessLevel.PUBLIC) class LoggerLog4j2AccessPublic { public static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2AccessPublic.class); () { } + LoggerLog4j2AccessPublic() { super(); } } -@Log4j2(access=AccessLevel.MODULE) class LoggerLog4j2AccessModule { +@Log4j2(access = AccessLevel.MODULE) class LoggerLog4j2AccessModule { static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2AccessModule.class); () { } + LoggerLog4j2AccessModule() { super(); } } -@Log4j2(access=AccessLevel.PROTECTED) class LoggerLog4j2AccessProtected { +@Log4j2(access = AccessLevel.PROTECTED) class LoggerLog4j2AccessProtected { protected static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2AccessProtected.class); () { } + LoggerLog4j2AccessProtected() { super(); } } -@Log4j2(access=AccessLevel.PACKAGE) class LoggerLog4j2AccessPackage { +@Log4j2(access = AccessLevel.PACKAGE) class LoggerLog4j2AccessPackage { static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2AccessPackage.class); () { } + LoggerLog4j2AccessPackage() { super(); } } -@Log4j2(access=AccessLevel.PRIVATE) class LoggerLog4j2AccessPrivate { +@Log4j2(access = AccessLevel.PRIVATE) class LoggerLog4j2AccessPrivate { private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2AccessPrivate.class); () { } + LoggerLog4j2AccessPrivate() { super(); } } -@Log4j2(access=AccessLevel.NONE) class LoggerLog4j2AccessNone { - () { - } +@Log4j2(access = AccessLevel.NONE) class LoggerLog4j2AccessNone { LoggerLog4j2AccessNone() { super(); } diff --git a/test/transform/resource/after-ecj/LoggerLog4jAccess.java b/test/transform/resource/after-ecj/LoggerLog4jAccess.java index 25f58013..fb82d92b 100644 --- a/test/transform/resource/after-ecj/LoggerLog4jAccess.java +++ b/test/transform/resource/after-ecj/LoggerLog4jAccess.java @@ -1,48 +1,51 @@ import lombok.AccessLevel; import lombok.extern.log4j.Log4j; -@Log4j(access=AccessLevel.PUBLIC) class LoggerLog4jAccessPublic { +@Log4j(access = AccessLevel.PUBLIC) class LoggerLog4jAccessPublic { public static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jAccessPublic.class); () { } + LoggerLog4jAccessPublic() { super(); } } -@Log4j(access=AccessLevel.MODULE) class LoggerLog4jAccessModule { +@Log4j(access = AccessLevel.MODULE) class LoggerLog4jAccessModule { static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jAccessModule.class); () { } + LoggerLog4jAccessModule() { super(); } } -@Log4j(access=AccessLevel.PROTECTED) class LoggerLog4jAccessProtected { +@Log4j(access = AccessLevel.PROTECTED) class LoggerLog4jAccessProtected { protected static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jAccessProtected.class); () { } + LoggerLog4jAccessProtected() { super(); } } -@Log4j(access=AccessLevel.PACKAGE) class LoggerLog4jAccessPackage { +@Log4j(access = AccessLevel.PACKAGE) class LoggerLog4jAccessPackage { static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jAccessPackage.class); () { } + LoggerLog4jAccessPackage() { super(); } } -@Log4j(access=AccessLevel.PRIVATE) class LoggerLog4jAccessPrivate { +@Log4j(access = AccessLevel.PRIVATE) class LoggerLog4jAccessPrivate { private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jAccessPrivate.class); () { } + LoggerLog4jAccessPrivate() { super(); } } -@Log4j(access=AccessLevel.NONE) class LoggerLog4jAccessNone { - () { - } +@Log4j(access = AccessLevel.NONE) class LoggerLog4jAccessNone { LoggerLog4jAccessNone() { super(); } diff --git a/test/transform/resource/after-ecj/LoggerSlf4jAccess.java b/test/transform/resource/after-ecj/LoggerSlf4jAccess.java index 1445218a..90fad6f1 100644 --- a/test/transform/resource/after-ecj/LoggerSlf4jAccess.java +++ b/test/transform/resource/after-ecj/LoggerSlf4jAccess.java @@ -1,48 +1,51 @@ import lombok.AccessLevel; import lombok.extern.slf4j.Slf4j; -@Slf4j(access=AccessLevel.PUBLIC) class LoggerSlf4jAccessPublic { +@Slf4j(access = AccessLevel.PUBLIC) class LoggerSlf4jAccessPublic { public static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jAccessPublic.class); () { } + LoggerSlf4jAccessPublic() { super(); } } -@Slf4j(access=AccessLevel.MODULE) class LoggerSlf4jAccessModule { +@Slf4j(access = AccessLevel.MODULE) class LoggerSlf4jAccessModule { static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jAccessModule.class); () { } + LoggerSlf4jAccessModule() { super(); } } -@Slf4j(access=AccessLevel.PROTECTED) class LoggerSlf4jAccessProtected { +@Slf4j(access = AccessLevel.PROTECTED) class LoggerSlf4jAccessProtected { protected static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jAccessProtected.class); () { } + LoggerSlf4jAccessProtected() { super(); } } -@Slf4j(access=AccessLevel.PACKAGE) class LoggerSlf4jAccessPackage { +@Slf4j(access = AccessLevel.PACKAGE) class LoggerSlf4jAccessPackage { static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jAccessPackage.class); () { } + LoggerSlf4jAccessPackage() { super(); } } -@Slf4j(access=AccessLevel.PRIVATE) class LoggerSlf4jAccessPrivate { +@Slf4j(access = AccessLevel.PRIVATE) class LoggerSlf4jAccessPrivate { private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jAccessPrivate.class); () { } + LoggerSlf4jAccessPrivate() { super(); } } -@Slf4j(access=AccessLevel.NONE) class LoggerSlf4jAccessNone { - () { - } +@Slf4j(access = AccessLevel.NONE) class LoggerSlf4jAccessNone { LoggerSlf4jAccessNone() { super(); } diff --git a/test/transform/resource/after-ecj/LoggerXslf4jAccess.java b/test/transform/resource/after-ecj/LoggerXslf4jAccess.java index e87ebb0b..b64f50c5 100644 --- a/test/transform/resource/after-ecj/LoggerXslf4jAccess.java +++ b/test/transform/resource/after-ecj/LoggerXslf4jAccess.java @@ -1,48 +1,51 @@ import lombok.AccessLevel; import lombok.extern.slf4j.XSlf4j; -@XSlf4j(access=AccessLevel.PUBLIC) class LoggerXslf4jAccessPublic { +@XSlf4j(access = AccessLevel.PUBLIC) class LoggerXslf4jAccessPublic { public static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXslf4jAccessPublic.class); () { } + LoggerXslf4jAccessPublic() { super(); } } -@XSlf4j(access=AccessLevel.MODULE) class LoggerXslf4jAccessModule { +@XSlf4j(access = AccessLevel.MODULE) class LoggerXslf4jAccessModule { static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXslf4jAccessModule.class); () { } + LoggerXslf4jAccessModule() { super(); } } -@XSlf4j(access=AccessLevel.PROTECTED) class LoggerXslf4jAccessProtected { +@XSlf4j(access = AccessLevel.PROTECTED) class LoggerXslf4jAccessProtected { protected static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXslf4jAccessProtected.class); () { } + LoggerXslf4jAccessProtected() { super(); } } -@XSlf4j(access=AccessLevel.PACKAGE) class LoggerXslf4jAccessPackage { +@XSlf4j(access = AccessLevel.PACKAGE) class LoggerXslf4jAccessPackage { static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXslf4jAccessPackage.class); () { } + LoggerXslf4jAccessPackage() { super(); } } -@XSlf4j(access=AccessLevel.PRIVATE) class LoggerXslf4jAccessPrivate { +@XSlf4j(access = AccessLevel.PRIVATE) class LoggerXslf4jAccessPrivate { private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXslf4jAccessPrivate.class); () { } + LoggerXslf4jAccessPrivate() { super(); } } -@XSlf4j(access=AccessLevel.NONE) class LoggerXslf4jAccessNone { - () { - } +@XSlf4j(access = AccessLevel.NONE) class LoggerXslf4jAccessNone { LoggerXslf4jAccessNone() { super(); } diff --git a/test/transform/resource/before/LoggerCommonsAccess.java b/test/transform/resource/before/LoggerCommonsAccess.java index 91c2930a..7b8ad198 100644 --- a/test/transform/resource/before/LoggerCommonsAccess.java +++ b/test/transform/resource/before/LoggerCommonsAccess.java @@ -1,26 +1,26 @@ import lombok.AccessLevel; import lombok.extern.apachecommons.CommonsLog; -@CommonsLog(access=AccessLevel.PUBLIC) +@CommonsLog(access = AccessLevel.PUBLIC) class LoggerCommonsAccessPublic { } -@CommonsLog(access=AccessLevel.MODULE) +@CommonsLog(access = AccessLevel.MODULE) class LoggerCommonsAccessModule { } -@CommonsLog(access=AccessLevel.PROTECTED) +@CommonsLog(access = AccessLevel.PROTECTED) class LoggerCommonsAccessProtected { } -@CommonsLog(access=AccessLevel.PACKAGE) +@CommonsLog(access = AccessLevel.PACKAGE) class LoggerCommonsAccessPackage { } -@CommonsLog(access=AccessLevel.PRIVATE) +@CommonsLog(access = AccessLevel.PRIVATE) class LoggerCommonsAccessPrivate { } -@CommonsLog(access=AccessLevel.NONE) +@CommonsLog(access = AccessLevel.NONE) class LoggerCommonsAccessNone { } diff --git a/test/transform/resource/before/LoggerCustomAccess.java b/test/transform/resource/before/LoggerCustomAccess.java index c01735d2..3602e917 100644 --- a/test/transform/resource/before/LoggerCustomAccess.java +++ b/test/transform/resource/before/LoggerCustomAccess.java @@ -1,27 +1,28 @@ +//CONF: lombok.log.custom.declaration = MyLogger MyLoggerFactory.create(TYPE) import lombok.AccessLevel; import lombok.CustomLog; -@CustomLog(access=AccessLevel.PUBLIC) +@CustomLog(access = AccessLevel.PUBLIC) class LoggerCustomAccessPublic { } -@CustomLog(access=AccessLevel.MODULE) +@CustomLog(access = AccessLevel.MODULE) class LoggerCustomAccessModule { } -@CustomLog(access=AccessLevel.PROTECTED) +@CustomLog(access = AccessLevel.PROTECTED) class LoggerCustomAccessProtected { } -@CustomLog(access=AccessLevel.PACKAGE) +@CustomLog(access = AccessLevel.PACKAGE) class LoggerCustomAccessPackage { } -@CustomLog(access=AccessLevel.PRIVATE) +@CustomLog(access = AccessLevel.PRIVATE) class LoggerCustomAccessPrivate { } -@CustomLog(access=AccessLevel.NONE) +@CustomLog(access = AccessLevel.NONE) class LoggerCustomAccessNone { } class MyLoggerFactory { diff --git a/test/transform/resource/before/LoggerFloggerAccess.java b/test/transform/resource/before/LoggerFloggerAccess.java index 9673ebe6..65873a73 100644 --- a/test/transform/resource/before/LoggerFloggerAccess.java +++ b/test/transform/resource/before/LoggerFloggerAccess.java @@ -1,26 +1,26 @@ import lombok.AccessLevel; import lombok.extern.flogger.Flogger; -@Flogger(access=AccessLevel.PUBLIC) +@Flogger(access = AccessLevel.PUBLIC) class LoggerFloggerAccessPublic { } -@Flogger(access=AccessLevel.MODULE) +@Flogger(access = AccessLevel.MODULE) class LoggerFloggerAccessModule { } -@Flogger(access=AccessLevel.PROTECTED) +@Flogger(access = AccessLevel.PROTECTED) class LoggerFloggerAccessProtected { } -@Flogger(access=AccessLevel.PACKAGE) +@Flogger(access = AccessLevel.PACKAGE) class LoggerFloggerAccessPackage { } -@Flogger(access=AccessLevel.PRIVATE) +@Flogger(access = AccessLevel.PRIVATE) class LoggerFloggerAccessPrivate { } -@Flogger(access=AccessLevel.NONE) +@Flogger(access = AccessLevel.NONE) class LoggerFloggerAccessNone { } diff --git a/test/transform/resource/before/LoggerJbossLogAccess.java b/test/transform/resource/before/LoggerJbossLogAccess.java index ac79e222..6174c794 100644 --- a/test/transform/resource/before/LoggerJbossLogAccess.java +++ b/test/transform/resource/before/LoggerJbossLogAccess.java @@ -1,26 +1,26 @@ import lombok.AccessLevel; import lombok.extern.jbosslog.JBossLog; -@JBossLog(access=AccessLevel.PUBLIC) +@JBossLog(access = AccessLevel.PUBLIC) class LoggerJBossLogAccessPublic { } -@JBossLog(access=AccessLevel.MODULE) +@JBossLog(access = AccessLevel.MODULE) class LoggerJBossLogAccessModule { } -@JBossLog(access=AccessLevel.PROTECTED) +@JBossLog(access = AccessLevel.PROTECTED) class LoggerJBossLogAccessProtected { } -@JBossLog(access=AccessLevel.PACKAGE) +@JBossLog(access = AccessLevel.PACKAGE) class LoggerJBossLogAccessPackage { } -@JBossLog(access=AccessLevel.PRIVATE) +@JBossLog(access = AccessLevel.PRIVATE) class LoggerJBossLogAccessPrivate { } -@JBossLog(access=AccessLevel.NONE) +@JBossLog(access = AccessLevel.NONE) class LoggerJBossLogAccessNone { } diff --git a/test/transform/resource/before/LoggerJulAccess.java b/test/transform/resource/before/LoggerJulAccess.java index a6200ca5..144b8c4c 100644 --- a/test/transform/resource/before/LoggerJulAccess.java +++ b/test/transform/resource/before/LoggerJulAccess.java @@ -1,26 +1,26 @@ import lombok.AccessLevel; import lombok.extern.java.Log; -@Log(access=AccessLevel.PUBLIC) +@Log(access = AccessLevel.PUBLIC) class LoggerJulAccessPublic { } -@Log(access=AccessLevel.MODULE) +@Log(access = AccessLevel.MODULE) class LoggerJulAccessModule { } -@Log(access=AccessLevel.PROTECTED) +@Log(access = AccessLevel.PROTECTED) class LoggerJulAccessProtected { } -@Log(access=AccessLevel.PACKAGE) +@Log(access = AccessLevel.PACKAGE) class LoggerJulAccessPackage { } -@Log(access=AccessLevel.PRIVATE) +@Log(access = AccessLevel.PRIVATE) class LoggerJulAccessPrivate { } -@Log(access=AccessLevel.NONE) +@Log(access = AccessLevel.NONE) class LoggerJulAccessNone { } diff --git a/test/transform/resource/before/LoggerLog4j2Access.java b/test/transform/resource/before/LoggerLog4j2Access.java index c3fa3232..44bbf71e 100644 --- a/test/transform/resource/before/LoggerLog4j2Access.java +++ b/test/transform/resource/before/LoggerLog4j2Access.java @@ -1,26 +1,26 @@ import lombok.AccessLevel; import lombok.extern.log4j.Log4j2; -@Log4j2(access=AccessLevel.PUBLIC) +@Log4j2(access = AccessLevel.PUBLIC) class LoggerLog4j2AccessPublic { } -@Log4j2(access=AccessLevel.MODULE) +@Log4j2(access = AccessLevel.MODULE) class LoggerLog4j2AccessModule { } -@Log4j2(access=AccessLevel.PROTECTED) +@Log4j2(access = AccessLevel.PROTECTED) class LoggerLog4j2AccessProtected { } -@Log4j2(access=AccessLevel.PACKAGE) +@Log4j2(access = AccessLevel.PACKAGE) class LoggerLog4j2AccessPackage { } -@Log4j2(access=AccessLevel.PRIVATE) +@Log4j2(access = AccessLevel.PRIVATE) class LoggerLog4j2AccessPrivate { } -@Log4j2(access=AccessLevel.NONE) +@Log4j2(access = AccessLevel.NONE) class LoggerLog4j2AccessNone { } diff --git a/test/transform/resource/before/LoggerLog4jAccess.java b/test/transform/resource/before/LoggerLog4jAccess.java index a1410a0b..78e37454 100644 --- a/test/transform/resource/before/LoggerLog4jAccess.java +++ b/test/transform/resource/before/LoggerLog4jAccess.java @@ -1,26 +1,26 @@ import lombok.AccessLevel; import lombok.extern.log4j.Log4j; -@Log4j(access=AccessLevel.PUBLIC) +@Log4j(access = AccessLevel.PUBLIC) class LoggerLog4jAccessPublic { } -@Log4j(access=AccessLevel.MODULE) +@Log4j(access = AccessLevel.MODULE) class LoggerLog4jAccessModule { } -@Log4j(access=AccessLevel.PROTECTED) +@Log4j(access = AccessLevel.PROTECTED) class LoggerLog4jAccessProtected { } -@Log4j(access=AccessLevel.PACKAGE) +@Log4j(access = AccessLevel.PACKAGE) class LoggerLog4jAccessPackage { } -@Log4j(access=AccessLevel.PRIVATE) +@Log4j(access = AccessLevel.PRIVATE) class LoggerLog4jAccessPrivate { } -@Log4j(access=AccessLevel.NONE) +@Log4j(access = AccessLevel.NONE) class LoggerLog4jAccessNone { } diff --git a/test/transform/resource/before/LoggerSlf4jAccess.java b/test/transform/resource/before/LoggerSlf4jAccess.java index 65a14c75..fadac141 100644 --- a/test/transform/resource/before/LoggerSlf4jAccess.java +++ b/test/transform/resource/before/LoggerSlf4jAccess.java @@ -1,26 +1,26 @@ import lombok.AccessLevel; import lombok.extern.slf4j.Slf4j; -@Slf4j(access=AccessLevel.PUBLIC) +@Slf4j(access = AccessLevel.PUBLIC) class LoggerSlf4jAccessPublic { } -@Slf4j(access=AccessLevel.MODULE) +@Slf4j(access = AccessLevel.MODULE) class LoggerSlf4jAccessModule { } -@Slf4j(access=AccessLevel.PROTECTED) +@Slf4j(access = AccessLevel.PROTECTED) class LoggerSlf4jAccessProtected { } -@Slf4j(access=AccessLevel.PACKAGE) +@Slf4j(access = AccessLevel.PACKAGE) class LoggerSlf4jAccessPackage { } -@Slf4j(access=AccessLevel.PRIVATE) +@Slf4j(access = AccessLevel.PRIVATE) class LoggerSlf4jAccessPrivate { } -@Slf4j(access=AccessLevel.NONE) +@Slf4j(access = AccessLevel.NONE) class LoggerSlf4jAccessNone { } diff --git a/test/transform/resource/before/LoggerXslf4jAccess.java b/test/transform/resource/before/LoggerXslf4jAccess.java index 80d453c7..4707c301 100644 --- a/test/transform/resource/before/LoggerXslf4jAccess.java +++ b/test/transform/resource/before/LoggerXslf4jAccess.java @@ -1,26 +1,26 @@ import lombok.AccessLevel; import lombok.extern.slf4j.XSlf4j; -@XSlf4j(access=AccessLevel.PUBLIC) +@XSlf4j(access = AccessLevel.PUBLIC) class LoggerXslf4jAccessPublic { } -@XSlf4j(access=AccessLevel.MODULE) +@XSlf4j(access = AccessLevel.MODULE) class LoggerXslf4jAccessModule { } -@XSlf4j(access=AccessLevel.PROTECTED) +@XSlf4j(access = AccessLevel.PROTECTED) class LoggerXslf4jAccessProtected { } -@XSlf4j(access=AccessLevel.PACKAGE) +@XSlf4j(access = AccessLevel.PACKAGE) class LoggerXslf4jAccessPackage { } -@XSlf4j(access=AccessLevel.PRIVATE) +@XSlf4j(access = AccessLevel.PRIVATE) class LoggerXslf4jAccessPrivate { } -@XSlf4j(access=AccessLevel.NONE) +@XSlf4j(access = AccessLevel.NONE) class LoggerXslf4jAccessNone { }