From 041febf40b6aa1ceb4fb29090a13e4c89354aa66 Mon Sep 17 00:00:00 2001 From: Marian Dubai Date: Thu, 20 Nov 2014 11:05:06 +0100 Subject: [PATCH] Fix checkstyle warnings in logback-config-loader. Change-Id: If926826e233000f771518d966493ee8b100a76e4 Signed-off-by: Marian Dubai --- .../controller/logback/config/loader/Activator.java | 3 +-- .../logback/config/loader/impl/LogbackConfigUtil.java | 1 - .../config/loader/impl/LogbackConfigurationLoader.java | 10 ++++------ .../loader/test/LogbackConfigurationLoaderTest.java | 3 +-- .../logback/config/loader/test/TestAppender.java | 5 ++--- .../logback/config/loader/test/logwork/Debugger.java | 2 +- .../logback/config/loader/test/logwork/Errorer.java | 2 +- .../logback/config/loader/test/logwork/Informer.java | 2 +- .../logback/config/loader/test/logwork/Tracer.java | 2 +- .../logback/config/loader/test/logwork/Warner.java | 2 +- 10 files changed, 13 insertions(+), 19 deletions(-) diff --git a/opendaylight/config/logback-config-loader/src/main/java/org/opendaylight/controller/logback/config/loader/Activator.java b/opendaylight/config/logback-config-loader/src/main/java/org/opendaylight/controller/logback/config/loader/Activator.java index 99866d5767..fa67009858 100644 --- a/opendaylight/config/logback-config-loader/src/main/java/org/opendaylight/controller/logback/config/loader/Activator.java +++ b/opendaylight/config/logback-config-loader/src/main/java/org/opendaylight/controller/logback/config/loader/Activator.java @@ -9,7 +9,6 @@ package org.opendaylight.controller.logback.config.loader; import java.io.File; import java.util.List; - import org.opendaylight.controller.logback.config.loader.impl.LogbackConfigUtil; import org.opendaylight.controller.logback.config.loader.impl.LogbackConfigurationLoader; import org.osgi.framework.BundleActivator; @@ -27,7 +26,7 @@ public class Activator implements BundleActivator { * logback configurations */ private static final String LOGBACK_CONFIG_D = "logback.config.d"; - private static Logger LOG = LoggerFactory.getLogger(Activator.class); + private static final Logger LOG = LoggerFactory.getLogger(Activator.class); @Override public void start(BundleContext context) { diff --git a/opendaylight/config/logback-config-loader/src/main/java/org/opendaylight/controller/logback/config/loader/impl/LogbackConfigUtil.java b/opendaylight/config/logback-config-loader/src/main/java/org/opendaylight/controller/logback/config/loader/impl/LogbackConfigUtil.java index ddf14d7dd3..47e420fb74 100644 --- a/opendaylight/config/logback-config-loader/src/main/java/org/opendaylight/controller/logback/config/loader/impl/LogbackConfigUtil.java +++ b/opendaylight/config/logback-config-loader/src/main/java/org/opendaylight/controller/logback/config/loader/impl/LogbackConfigUtil.java @@ -13,7 +13,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.regex.Pattern; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/opendaylight/config/logback-config-loader/src/main/java/org/opendaylight/controller/logback/config/loader/impl/LogbackConfigurationLoader.java b/opendaylight/config/logback-config-loader/src/main/java/org/opendaylight/controller/logback/config/loader/impl/LogbackConfigurationLoader.java index 2aa6b1a348..accb6e1d03 100644 --- a/opendaylight/config/logback-config-loader/src/main/java/org/opendaylight/controller/logback/config/loader/impl/LogbackConfigurationLoader.java +++ b/opendaylight/config/logback-config-loader/src/main/java/org/opendaylight/controller/logback/config/loader/impl/LogbackConfigurationLoader.java @@ -7,18 +7,16 @@ */ package org.opendaylight.controller.logback.config.loader.impl; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.util.StatusPrinter; import java.io.File; import java.net.URL; - import org.slf4j.ILoggerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.joran.JoranConfigurator; -import ch.qos.logback.core.joran.spi.JoranException; -import ch.qos.logback.core.util.StatusPrinter; - /** * Logback configuration loader. * Strategy: diff --git a/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/LogbackConfigurationLoaderTest.java b/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/LogbackConfigurationLoaderTest.java index adbb9f4cd6..44a84b7a9e 100644 --- a/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/LogbackConfigurationLoaderTest.java +++ b/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/LogbackConfigurationLoaderTest.java @@ -10,7 +10,6 @@ package org.opendaylight.controller.logback.config.loader.test; import java.io.File; import java.util.ArrayList; import java.util.List; - import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -33,7 +32,7 @@ public class LogbackConfigurationLoaderTest { /** logback config root */ private static final String LOGBACK_D = "/logback.d"; - private static Logger LOG = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(LogbackConfigurationLoaderTest.class); /** diff --git a/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/TestAppender.java b/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/TestAppender.java index b273d2777c..a950c818fe 100644 --- a/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/TestAppender.java +++ b/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/TestAppender.java @@ -7,9 +7,6 @@ */ package org.opendaylight.controller.logback.config.loader.test; -import java.util.ArrayList; -import java.util.List; - import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.Appender; import ch.qos.logback.core.Context; @@ -17,6 +14,8 @@ import ch.qos.logback.core.LogbackException; import ch.qos.logback.core.filter.Filter; import ch.qos.logback.core.spi.FilterReply; import ch.qos.logback.core.status.Status; +import java.util.ArrayList; +import java.util.List; /** * dummy appender for collecting log messages diff --git a/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Debugger.java b/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Debugger.java index a8052f71c9..ec10ae9fa6 100644 --- a/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Debugger.java +++ b/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Debugger.java @@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory; */ public class Debugger { - private static Logger LOG = LoggerFactory.getLogger(Debugger.class); + private static final Logger LOG = LoggerFactory.getLogger(Debugger.class); /** * all logging diff --git a/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Errorer.java b/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Errorer.java index 0bcd830ad1..e33b7f9d15 100644 --- a/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Errorer.java +++ b/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Errorer.java @@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory; */ public class Errorer { - private static Logger LOG = LoggerFactory.getLogger(Errorer.class); + private static final Logger LOG = LoggerFactory.getLogger(Errorer.class); /** * all logging diff --git a/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Informer.java b/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Informer.java index 44f09315cf..06c518349c 100644 --- a/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Informer.java +++ b/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Informer.java @@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory; */ public class Informer { - private static Logger LOG = LoggerFactory.getLogger(Informer.class); + private static final Logger LOG = LoggerFactory.getLogger(Informer.class); /** * all logging diff --git a/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Tracer.java b/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Tracer.java index 70df607d8d..c842c1a260 100644 --- a/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Tracer.java +++ b/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Tracer.java @@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory; */ public class Tracer { - private static Logger LOG = LoggerFactory.getLogger(Tracer.class); + private static final Logger LOG = LoggerFactory.getLogger(Tracer.class); /** * all logging diff --git a/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Warner.java b/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Warner.java index 8093180a8b..aae0c34512 100644 --- a/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Warner.java +++ b/opendaylight/config/logback-config-loader/src/test/java/org/opendaylight/controller/logback/config/loader/test/logwork/Warner.java @@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory; */ public class Warner { - private static Logger LOG = LoggerFactory.getLogger(Warner.class); + private static final Logger LOG = LoggerFactory.getLogger(Warner.class); /** * all logging -- 2.36.6