Martin Peřina has uploaded a new change for review. Change subject: tools: Replace log4j with slf4j as frontend in engine-config ......................................................................
tools: Replace log4j with slf4j as frontend in engine-config Replaces log4j with slf4j as logging frontend in classes which are used in engine-config tool. Change-Id: Idc3d2a507f51c11b468c6af33a8f714545d3d695 Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/ConfigKeyFactory.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/config/validation/SetValidator.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/tools/ToolConsole.java M backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigLogicTest.java M backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigTest.java 7 files changed, 20 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/33756/1 diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java index 025013d..dcab6fb 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java @@ -2,16 +2,17 @@ import java.io.File; -import org.apache.log4j.Logger; import org.ovirt.engine.core.config.validation.ConfigActionType; import org.ovirt.engine.core.utils.EngineLocalConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The <code>EngineConfig</code> class represents the main class of the EngineConfig tool. */ public class EngineConfig { // The log: - private static final Logger log = Logger.getLogger(EngineConfig.class); + private static final Logger log = LoggerFactory.getLogger(EngineConfig.class); public static final String CONFIG_FILE_PATH_PROPERTY = "engine-config.config.file.path"; public static final File DEFAULT_CONFIG_PATH = new File(EngineLocalConfig.getInstance().getEtcDir(), "engine-config"); diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java index e87a278..ad88ccb 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java @@ -18,20 +18,21 @@ import org.apache.commons.configuration.SubnodeConfiguration; import org.apache.commons.configuration.tree.ConfigurationNode; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.ovirt.engine.core.config.db.ConfigDAO; import org.ovirt.engine.core.config.db.ConfigDaoImpl; import org.ovirt.engine.core.config.entity.ConfigKey; import org.ovirt.engine.core.config.entity.ConfigKeyFactory; import org.ovirt.engine.core.config.validation.ConfigActionType; import org.ovirt.engine.core.tools.ToolConsole; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The <code>EngineConfigLogic</code> class is responsible for the logic of the EngineConfig tool. */ public class EngineConfigLogic { // The log: - private static final Logger log = Logger.getLogger(EngineConfigLogic.class); + private static final Logger log = LoggerFactory.getLogger(EngineConfigLogic.class); // The console: private static final ToolConsole console = ToolConsole.getInstance(); diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/ConfigKeyFactory.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/ConfigKeyFactory.java index 7133e6e..ad93a43 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/ConfigKeyFactory.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/ConfigKeyFactory.java @@ -7,11 +7,11 @@ import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.commons.configuration.SubnodeConfiguration; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.ovirt.engine.core.config.EngineConfig; import org.ovirt.engine.core.config.EngineConfigCLIParser; import org.ovirt.engine.core.config.entity.helper.StringValueHelper; import org.ovirt.engine.core.config.entity.helper.ValueHelper; +import org.slf4j.LoggerFactory; public class ConfigKeyFactory { @@ -107,7 +107,7 @@ valueHelper = (ValueHelper) cls.newInstance(); } catch (Exception e) { // failed finding a helper for this type. Setting default string type - Logger.getLogger(EngineConfig.class).debug("Unable to find " + type + " type. Using default string type."); + LoggerFactory.getLogger(EngineConfig.class).debug("Unable to find " + type + " type. Using default string type."); valueHelper = new StringValueHelper(); } return valueHelper; diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/validation/SetValidator.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/validation/SetValidator.java index ec2170a..e4b4219 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/validation/SetValidator.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/validation/SetValidator.java @@ -1,14 +1,15 @@ package org.ovirt.engine.core.config.validation; -import org.apache.log4j.Logger; import org.ovirt.engine.core.config.EngineConfigMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The <code>KeyValidator</code> class is a action specific validator for the 'set' action. */ public class SetValidator implements EngineConfigValidator { - private final static Logger log = Logger.getLogger(SetValidator.class); + private final static Logger log = LoggerFactory.getLogger(SetValidator.class); /** * Validates that the 'set' action has a key and value. diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/tools/ToolConsole.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/tools/ToolConsole.java index 146f57a..200f241 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/tools/ToolConsole.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/tools/ToolConsole.java @@ -2,7 +2,8 @@ import java.io.IOException; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class is intended to handle the regular input and output generated by @@ -13,7 +14,7 @@ */ public class ToolConsole { // The log: - private static final Logger log = Logger.getLogger(ToolConsole.class); + private static final Logger log = LoggerFactory.getLogger(ToolConsole.class); // This is a singleton and this is the instance: private static final ToolConsole instance = new ToolConsole(); diff --git a/backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigLogicTest.java b/backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigLogicTest.java index dc638f4..3e80783 100644 --- a/backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigLogicTest.java +++ b/backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigLogicTest.java @@ -3,16 +3,17 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.apache.log4j.Logger; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.ovirt.engine.core.config.entity.ConfigKey; import org.ovirt.engine.core.config.validation.ConfigActionType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class EngineConfigLogicTest { - private static final Logger log = Logger.getLogger(EngineConfigLogicTest.class); + private static final Logger log = LoggerFactory.getLogger(EngineConfigLogicTest.class); private static EngineConfigCLIParser parser = mock(EngineConfigCLIParser.class); // Is static so that it can be initiated just once in @BeforeClass, cannot be initiated // here since c'tor throws an exception diff --git a/backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigTest.java b/backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigTest.java index 7615b71..f8e8763 100644 --- a/backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigTest.java +++ b/backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigTest.java @@ -4,15 +4,16 @@ import java.net.URLDecoder; import java.util.List; -import org.apache.log4j.Logger; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.ovirt.engine.core.config.entity.ConfigKey; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class EngineConfigTest { - private static final Logger log = Logger.getLogger(EngineConfigTest.class); + private static final Logger log = LoggerFactory.getLogger(EngineConfigTest.class); private EngineConfig config = EngineConfig.getInstance(); @BeforeClass -- To view, visit http://gerrit.ovirt.org/33756 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc3d2a507f51c11b468c6af33a8f714545d3d695 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
