This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch GROOVY_3_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 8a296fafc842f32356612a87c565b7f35c71c34c Author: Daniel Sun <[email protected]> AuthorDate: Sat Apr 11 20:39:05 2020 +0800 Trivial refactoring: Remove redundant interface modifiers (cherry picked from commit 39912a673f4edbf9d2f1292b29e58eba7f9f776b) --- src/main/java/groovy/lang/DelegatesTo.java | 2 +- src/main/java/groovy/util/logging/Commons.java | 2 +- src/main/java/groovy/util/logging/Log.java | 2 +- src/main/java/groovy/util/logging/Log4j.java | 2 +- src/main/java/groovy/util/logging/Log4j2.java | 2 +- src/main/java/groovy/util/logging/Slf4j.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/groovy/lang/DelegatesTo.java b/src/main/java/groovy/lang/DelegatesTo.java index c4fd50c..6a7d0e4 100644 --- a/src/main/java/groovy/lang/DelegatesTo.java +++ b/src/main/java/groovy/lang/DelegatesTo.java @@ -83,7 +83,7 @@ public @interface DelegatesTo { */ @Retention(RetentionPolicy.RUNTIME) @java.lang.annotation.Target({ElementType.PARAMETER}) - public static @interface Target { + @interface Target { /** * An identifier that should be used to disambiguate targets when there are diff --git a/src/main/java/groovy/util/logging/Commons.java b/src/main/java/groovy/util/logging/Commons.java index 6146309..a9662e7 100644 --- a/src/main/java/groovy/util/logging/Commons.java +++ b/src/main/java/groovy/util/logging/Commons.java @@ -74,7 +74,7 @@ public @interface Commons { Class<? extends LogASTTransformation.LoggingStrategy> loggingStrategy() default CommonsLoggingStrategy.class; - public static class CommonsLoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 { + class CommonsLoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 { private static final String LOGGER_NAME = "org.apache.commons.logging.Log"; private static final String LOGGERFACTORY_NAME = "org.apache.commons.logging.LogFactory"; diff --git a/src/main/java/groovy/util/logging/Log.java b/src/main/java/groovy/util/logging/Log.java index c431bc7..317939a 100644 --- a/src/main/java/groovy/util/logging/Log.java +++ b/src/main/java/groovy/util/logging/Log.java @@ -83,7 +83,7 @@ public @interface Log { /** * This class contains the logic of how to weave a Java Util Logging logger into the host class. */ - public static class JavaUtilLoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 { + class JavaUtilLoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 { private static final ClassNode LOGGER_CLASSNODE = ClassHelper.make(java.util.logging.Logger.class); private static final ClassNode LEVEL_CLASSNODE = ClassHelper.make(java.util.logging.Level.class); diff --git a/src/main/java/groovy/util/logging/Log4j.java b/src/main/java/groovy/util/logging/Log4j.java index ccccad5..ad8084f 100644 --- a/src/main/java/groovy/util/logging/Log4j.java +++ b/src/main/java/groovy/util/logging/Log4j.java @@ -76,7 +76,7 @@ public @interface Log4j { Class<? extends LogASTTransformation.LoggingStrategy> loggingStrategy() default Log4jLoggingStrategy.class; - public static class Log4jLoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 { + class Log4jLoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 { private static final String LOGGER_NAME = "org.apache.log4j.Logger"; private static final String PRIORITY_NAME = "org.apache.log4j.Priority"; diff --git a/src/main/java/groovy/util/logging/Log4j2.java b/src/main/java/groovy/util/logging/Log4j2.java index 08f57fc..03c504e 100644 --- a/src/main/java/groovy/util/logging/Log4j2.java +++ b/src/main/java/groovy/util/logging/Log4j2.java @@ -75,7 +75,7 @@ public @interface Log4j2 { Class<? extends LogASTTransformation.LoggingStrategy> loggingStrategy() default Log4j2LoggingStrategy.class; - public static class Log4j2LoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 { + class Log4j2LoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 { private static final String LOGGER_NAME = "org.apache.logging.log4j.core.Logger"; private static final String LOG_MANAGER_NAME = "org.apache.logging.log4j.LogManager"; diff --git a/src/main/java/groovy/util/logging/Slf4j.java b/src/main/java/groovy/util/logging/Slf4j.java index 5ee7218..40fe2ca 100644 --- a/src/main/java/groovy/util/logging/Slf4j.java +++ b/src/main/java/groovy/util/logging/Slf4j.java @@ -75,7 +75,7 @@ public @interface Slf4j { Class<? extends LogASTTransformation.LoggingStrategy> loggingStrategy() default Slf4jLoggingStrategy.class; - public static class Slf4jLoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 { + class Slf4jLoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 { private static final String LOGGER_NAME = "org.slf4j.Logger"; private static final String FACTORY_NAME = "org.slf4j.LoggerFactory";
