From 76d02e3ebc78a2cc70bd2cced9932ddb462a4259 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Fri, 12 May 2017 17:30:51 +0200 Subject: [PATCH] logback-config: final parameters This automatically-generated patch flags all appropriate parameters as final (including caught exceptions). Change-Id: I3570e5fe57776a24c4ab84de8bdf9b0e09cc0a95 Signed-off-by: Stephen Kitt --- .../yang/logback/config/LogbackModule.java | 22 ++++++------- .../logback/config/LogbackModuleFactory.java | 2 +- .../logback/config/LogbackStatusListener.java | 12 +++---- .../logback/config/ContextSetterImplTest.java | 10 +++--- .../logback/config/LogbackModuleTest.java | 32 +++++++++---------- 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackModule.java b/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackModule.java index 0078120d8c..3a5fc3a1a9 100644 --- a/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackModule.java +++ b/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackModule.java @@ -26,15 +26,15 @@ import org.opendaylight.controller.config.api.JmxAttributeValidationException; */ public final class LogbackModule extends org.opendaylight.controller.config.yang.logback.config.AbstractLogbackModule { - public LogbackModule(org.opendaylight.controller.config.api.ModuleIdentifier name, - org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { + public LogbackModule(final org.opendaylight.controller.config.api.ModuleIdentifier name, + final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { super(name, dependencyResolver); } - public LogbackModule(org.opendaylight.controller.config.api.ModuleIdentifier name, - org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, - org.opendaylight.controller.config.yang.logback.config.AbstractLogbackModule oldModule, - java.lang.AutoCloseable oldInstance) { + public LogbackModule(final org.opendaylight.controller.config.api.ModuleIdentifier name, + final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, + final org.opendaylight.controller.config.yang.logback.config.AbstractLogbackModule oldModule, + final java.lang.AutoCloseable oldInstance) { super(name, dependencyResolver, oldModule, oldInstance); } @@ -48,7 +48,7 @@ public final class LogbackModule extends org.opendaylight.controller.config.yang validateLoggersObjects(appenderNames); } - private void validateLoggersObjects(Set appenderNames) { + private void validateLoggersObjects(final Set appenderNames) { JmxAttributeValidationException.checkNotNull(getLoggerTO(), loggersJmxAttribute); for (LoggerTO loggerToValidate : getLoggerTO()) { @@ -71,7 +71,7 @@ public final class LogbackModule extends org.opendaylight.controller.config.yang } } - private void validateConsoleObjects(Set appenderNames) { + private void validateConsoleObjects(final Set appenderNames) { JmxAttributeValidationException.checkNotNull(getConsoleAppenderTO(), consoleAppendersJmxAttribute); for (ConsoleAppenderTO object : getConsoleAppenderTO()) { @@ -85,7 +85,7 @@ public final class LogbackModule extends org.opendaylight.controller.config.yang } } - private void validateFileObjects(Set appenderNames) { + private void validateFileObjects(final Set appenderNames) { JmxAttributeValidationException.checkNotNull(getFileAppenderTO(), fileAppendersJmxAttribute); for (FileAppenderTO object : getFileAppenderTO()) { JmxAttributeValidationException.checkNotNull(object.getEncoderPattern(), "EncoderPattern is null", @@ -103,7 +103,7 @@ public final class LogbackModule extends org.opendaylight.controller.config.yang } } - private void validateRollingObjects(Set appenderNames) { + private void validateRollingObjects(final Set appenderNames) { JmxAttributeValidationException.checkNotNull(getRollingFileAppenderTO(), rollingAppendersJmxAttribute); for (RollingFileAppenderTO object : getRollingFileAppenderTO()) { @@ -147,7 +147,7 @@ public final class LogbackModule extends org.opendaylight.controller.config.yang } } - private void validateAppenderName(Set appenderNames, String appenderName, JmxAttribute jmxAttribute) { + private void validateAppenderName(final Set appenderNames, final String appenderName, final JmxAttribute jmxAttribute) { JmxAttributeValidationException.checkNotNull(appenderName, "Name is null", jmxAttribute); JmxAttributeValidationException.checkCondition(appenderNames.contains(appenderName) == false, "Duplicate appender name " + appenderName, jmxAttribute); diff --git a/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackModuleFactory.java b/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackModuleFactory.java index b79e3d307f..23828f7529 100644 --- a/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackModuleFactory.java +++ b/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackModuleFactory.java @@ -258,7 +258,7 @@ public class LogbackModuleFactory extends } @VisibleForTesting - static FileSize getMaxFileSize(SizeBasedTriggeringPolicy policy) { + static FileSize getMaxFileSize(final SizeBasedTriggeringPolicy policy) { try { return (FileSize) MAX_FILE_SIZE_FIELD.get(policy); } catch (IllegalArgumentException | IllegalAccessException e) { diff --git a/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackStatusListener.java b/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackStatusListener.java index 720f33d794..dd58c94f84 100644 --- a/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackStatusListener.java +++ b/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackStatusListener.java @@ -34,7 +34,7 @@ public class LogbackStatusListener implements StatusListener, LogbackRuntimeMXBe private final LogbackRuntimeRegistrator rootRuntimeBeanRegistratorWrapper; private LogbackRuntimeRegistration reg; - public LogbackStatusListener(LogbackRuntimeRegistrator rootRuntimeBeanRegistratorWrapper) { + public LogbackStatusListener(final LogbackRuntimeRegistrator rootRuntimeBeanRegistratorWrapper) { receivedStatuses = new ArrayList<>(); this.rootRuntimeBeanRegistratorWrapper = rootRuntimeBeanRegistratorWrapper; } @@ -55,7 +55,7 @@ public class LogbackStatusListener implements StatusListener, LogbackRuntimeMXBe return reg; } - private LogbackRuntimeRegistration registerToJMX(LogbackRuntimeRegistrator rootRuntimeBeanRegistratorWrapper) { + private LogbackRuntimeRegistration registerToJMX(final LogbackRuntimeRegistrator rootRuntimeBeanRegistratorWrapper) { return rootRuntimeBeanRegistratorWrapper.register(this); } @@ -70,18 +70,18 @@ public class LogbackStatusListener implements StatusListener, LogbackRuntimeMXBe addInitialStatuses(statusManager); } - private void addInitialStatuses(StatusManager statusManager) { + private void addInitialStatuses(final StatusManager statusManager) { for (ch.qos.logback.core.status.Status status : statusManager.getCopyOfStatusList()) { addStatusEvent(status); } } @Override - public synchronized void addStatusEvent(ch.qos.logback.core.status.Status status) { + public synchronized void addStatusEvent(final ch.qos.logback.core.status.Status status) { receivedStatuses.add(transformStatus(status)); } - private StatusTO transformStatus(ch.qos.logback.core.status.Status status) { + private StatusTO transformStatus(final ch.qos.logback.core.status.Status status) { StatusTO transformed = new StatusTO(); transformed.setDate(status.getDate()); @@ -91,7 +91,7 @@ public class LogbackStatusListener implements StatusListener, LogbackRuntimeMXBe return transformed; } - private String transformStatusLevel(int status) { + private String transformStatusLevel(final int status) { switch (status) { case StatusBase.INFO: return "INFO"; diff --git a/opendaylight/config/logback-config/src/test/java/org/opendaylight/controller/config/yang/logback/config/ContextSetterImplTest.java b/opendaylight/config/logback-config/src/test/java/org/opendaylight/controller/config/yang/logback/config/ContextSetterImplTest.java index 9547112298..17572e5e39 100644 --- a/opendaylight/config/logback-config/src/test/java/org/opendaylight/controller/config/yang/logback/config/ContextSetterImplTest.java +++ b/opendaylight/config/logback-config/src/test/java/org/opendaylight/controller/config/yang/logback/config/ContextSetterImplTest.java @@ -89,7 +89,7 @@ public class ContextSetterImplTest { assertLoggerWithAppenders("l2", "a22"); } - private void createContextSetter(Multimap loggersToAppenders) throws IOException { + private void createContextSetter(final Multimap loggersToAppenders) throws IOException { try (ContextSetterImpl setter = new ContextSetterImpl(runtimeRegistratorMock)) { List logger = Lists.newArrayList(); @@ -109,7 +109,7 @@ public class ContextSetterImplTest { } } - private void assertLoggerWithAppenders(String name, String... appenders) { + private void assertLoggerWithAppenders(final String name, final String... appenders) { LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); ch.qos.logback.classic.Logger logger = context.getLogger(name); Iterator> it = logger.iteratorForAppenders(); @@ -132,7 +132,7 @@ public class ContextSetterImplTest { } - private LogbackModule createLogbackModule(List logger, List consoleAppenders) { + private LogbackModule createLogbackModule(final List logger, final List consoleAppenders) { LogbackModule logbackModule = new LogbackModule(new ModuleIdentifier("fact", "first"), dependencyResolverMock); logbackModule.setLoggerTO(logger); logbackModule.setConsoleAppenderTO(consoleAppenders); @@ -141,7 +141,7 @@ public class ContextSetterImplTest { return logbackModule; } - private LoggerTO createLogger(String name, Collection appenders) { + private LoggerTO createLogger(final String name, final Collection appenders) { LoggerTO l1 = new LoggerTO(); l1.setAppenders(Lists.newArrayList(appenders)); l1.setLoggerName(name); @@ -149,7 +149,7 @@ public class ContextSetterImplTest { return l1; } - private ConsoleAppenderTO createConsoleAppender(String name) { + private ConsoleAppenderTO createConsoleAppender(final String name) { ConsoleAppenderTO a = new ConsoleAppenderTO(); a.setName(name); a.setEncoderPattern("%-4relative [%thread] %-5level %logger{35} - %msg%n"); diff --git a/opendaylight/config/logback-config/src/test/java/org/opendaylight/controller/config/yang/logback/config/LogbackModuleTest.java b/opendaylight/config/logback-config/src/test/java/org/opendaylight/controller/config/yang/logback/config/LogbackModuleTest.java index d190f04e61..c3c78314c3 100644 --- a/opendaylight/config/logback-config/src/test/java/org/opendaylight/controller/config/yang/logback/config/LogbackModuleTest.java +++ b/opendaylight/config/logback-config/src/test/java/org/opendaylight/controller/config/yang/logback/config/LogbackModuleTest.java @@ -103,7 +103,7 @@ public class LogbackModuleTest extends AbstractConfigTest { "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", "FixedWindowRollingPolicy", 0, "FileAppender").commit(); fail(); - } catch (ValidationException e) { + } catch (final ValidationException e) { assertThat(e.getFailedValidations().toString(), containsString("FileName is null")); } } @@ -114,7 +114,7 @@ public class LogbackModuleTest extends AbstractConfigTest { createBeans(true, "target/rollingApp", null, "30MB", 1, 5, "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", "FixedWindowRollingPolicy", 0, "FileAppender").commit(); fail(); - } catch (ValidationException e) { + } catch (final ValidationException e) { assertThat(e.getFailedValidations().toString(), containsString("EncoderPattern is null")); } } @@ -126,7 +126,7 @@ public class LogbackModuleTest extends AbstractConfigTest { "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", "FixedWindowRollingPolicy", 0, "FileAppender").commit(); fail(); - } catch (ValidationException e) { + } catch (final ValidationException e) { assertThat(e.getFailedValidations().toString(), containsString("MaxFileSize is null")); } } @@ -138,7 +138,7 @@ public class LogbackModuleTest extends AbstractConfigTest { "rolling", "consoleName", "ALL", "logger1", "DEBUG", "FixedWindowRollingPolicy", 0, "FileAppender") .commit(); fail(); - } catch (ValidationException e) { + } catch (final ValidationException e) { assertThat(e.getFailedValidations().toString(), containsString("FileName needs to be set")); } } @@ -151,7 +151,7 @@ public class LogbackModuleTest extends AbstractConfigTest { true, "target/rollingApp", "", "30MB", 1, 5, "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", "FixedWindowRollingPolicy", 0, "FileAppender").commit(); fail(); - } catch (ValidationException e) { + } catch (final ValidationException e) { assertThat(e.getFailedValidations().toString(), containsString("EncoderPattern needs to be set")); } } @@ -163,7 +163,7 @@ public class LogbackModuleTest extends AbstractConfigTest { "target/%i.log", "rolling", "consoleName", "ALL", null, "DEBUG", "FixedWindowRollingPolicy", 0, "FileAppender").commit(); fail(); - } catch (ValidationException e) { + } catch (final ValidationException e) { assertThat(e.getFailedValidations().toString(), containsString("LoggerName is null")); } } @@ -175,7 +175,7 @@ public class LogbackModuleTest extends AbstractConfigTest { "target/%i.log", "rolling", "consoleName", "ALL", "", "DEBUG", "FixedWindowRollingPolicy", 0, "FileAppender").commit(); fail(); - } catch (ValidationException e) { + } catch (final ValidationException e) { assertThat(e.getFailedValidations().toString(), containsString("LoggerName needs to be set")); } } @@ -187,7 +187,7 @@ public class LogbackModuleTest extends AbstractConfigTest { 5, "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", "FixedWindowRollingPolicy", 0, "FileAppender").commit(); fail(); - } catch (ValidationException e) { + } catch (final ValidationException e) { assertThat(e.getFailedValidations().toString(), containsString("MinIndex is null")); } } @@ -199,7 +199,7 @@ public class LogbackModuleTest extends AbstractConfigTest { null, "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", "FixedWindowRollingPolicy", 0, "FileAppender").commit(); fail(); - } catch (ValidationException e) { + } catch (final ValidationException e) { assertThat(e.getFailedValidations().toString(), containsString("MaxIndex is null")); } } @@ -211,7 +211,7 @@ public class LogbackModuleTest extends AbstractConfigTest { null, "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", null, 1, "FileAppender") .commit(); fail(); - } catch (ValidationException e) { + } catch (final ValidationException e) { assertThat(e.getFailedValidations().toString(), containsString("RollingPolicyType is null")); } } @@ -223,7 +223,7 @@ public class LogbackModuleTest extends AbstractConfigTest { null, "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", "", 1, "FileAppender") .commit(); fail(); - } catch (ValidationException e) { + } catch (final ValidationException e) { assertThat(e.getFailedValidations().toString(), containsString("RollingPolicyType is not set")); } } @@ -235,7 +235,7 @@ public class LogbackModuleTest extends AbstractConfigTest { null, "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", "RollingPolicy", 1, "FileAppender").commit(); fail(); - } catch (ValidationException e) { + } catch (final ValidationException e) { assertThat(e.getFailedValidations().toString(), containsString("RollingPolicyType is not supported")); } } @@ -247,10 +247,10 @@ public class LogbackModuleTest extends AbstractConfigTest { 1, "FileAppender").commit(); } - private ConfigTransactionJMXClient createBeans(Boolean isAppend, String rollingFileName, String encoderPattern, - String maxFileSize, Integer minIndex, Integer maxIndex, String fileNamePattern, String rollingName, - String consoleName, String thresholdFilter, String loggerName, String level, String rollingPolicyType, - int maxHistory, String fileAppName) throws Exception { + private ConfigTransactionJMXClient createBeans(final Boolean isAppend, final String rollingFileName, final String encoderPattern, + final String maxFileSize, final Integer minIndex, final Integer maxIndex, final String fileNamePattern, final String rollingName, + final String consoleName, final String thresholdFilter, final String loggerName, final String level, final String rollingPolicyType, + final int maxHistory, final String fileAppName) throws Exception { ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction(); ObjectName nameRetrieved = transaction.lookupConfigBean(factory.getImplementationName(), INSTANCE_NAME); LogbackModuleMXBean bean = transaction.newMXBeanProxy(nameRetrieved, LogbackModuleMXBean.class); -- 2.36.6