diff options
author | Magnusen, Drew (dm741q) <dm741q@att.com> | 2017-08-02 13:00:23 -0500 |
---|---|---|
committer | Magnusen, Drew (dm741q) <dm741q@att.com> | 2017-08-04 08:02:00 -0500 |
commit | 09ca5f00b5fb88d35987e1922c34cae8469ed79d (patch) | |
tree | 4a91d76e1d51257bf2279e06cf96cbd760ae8e6e /common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/FlexLogger.java | |
parent | a7ab43dbd252c5bc70e490f4db94940e6985f25a (diff) |
[POLICY-98] Code cleanup for sonar issues.
Modified code in ECOMP-Logging to resolve critical/major sonar issues.
Not all issues were resolved as some guidance needs to be provided for
specific cases.
Restored config/policyLogger.properties file. It was modified by a junit
test.
Change-Id: I49fee98b2497d9d503d81bbbacbb1b416e1058a7
Signed-off-by: Magnusen, Drew (dm741q) <dm741q@att.com>
Diffstat (limited to 'common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/FlexLogger.java')
-rw-r--r-- | common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/FlexLogger.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/FlexLogger.java b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/FlexLogger.java index 797f857b..2cf591cb 100644 --- a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/FlexLogger.java +++ b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/FlexLogger.java @@ -39,9 +39,9 @@ import org.onap.policy.common.logging.flexlogger.PropertyUtil.Listener; public class FlexLogger extends SecurityManager{ private static LoggerType loggerType = LoggerType.EELF; - private static ConcurrentHashMap<String, Logger4J> logger4JMap = new ConcurrentHashMap<String, Logger4J>(); - private static ConcurrentHashMap<String, EelfLogger> eelfLoggerMap = new ConcurrentHashMap<String, EelfLogger>(); - private static ConcurrentHashMap<String, SystemOutLogger> systemOutMap = new ConcurrentHashMap<String, SystemOutLogger>(); + private static ConcurrentHashMap<String, Logger4J> logger4JMap = new ConcurrentHashMap<>(); + private static ConcurrentHashMap<String, EelfLogger> eelfLoggerMap = new ConcurrentHashMap<>(); + private static ConcurrentHashMap<String, SystemOutLogger> systemOutMap = new ConcurrentHashMap<>(); //--- init logger first static { loggerType = initlogger(); @@ -60,10 +60,10 @@ public class FlexLogger extends SecurityManager{ logger = getEelfLogger(clazz, false); break; case LOG4J: - logger = getLog4JLogger(clazz); + logger = getLog4JLogger(); break; case SYSTEMOUT: - logger = getSystemOutLogger(null); + logger = getSystemOutLogger(); break; } @@ -87,7 +87,7 @@ public class FlexLogger extends SecurityManager{ logger = getLog4JLogger(s); break; case SYSTEMOUT: - logger = getSystemOutLogger(null); + logger = getSystemOutLogger(); break; } @@ -109,10 +109,10 @@ public class FlexLogger extends SecurityManager{ logger = getEelfLogger(clazz, isNewTransaction); break; case LOG4J: - logger = getLog4JLogger(clazz); + logger = getLog4JLogger(); break; case SYSTEMOUT: - logger = getSystemOutLogger(null); + logger = getSystemOutLogger(); break; } @@ -137,7 +137,7 @@ public class FlexLogger extends SecurityManager{ logger = getLog4JLogger(s); break; case SYSTEMOUT: - logger = getSystemOutLogger(null); + logger = getSystemOutLogger(); break; } @@ -156,7 +156,7 @@ public class FlexLogger extends SecurityManager{ * Returns an instance of Logger4J * @param clazz */ - private static Logger4J getLog4JLogger(Class<?> clazz){ + private static Logger4J getLog4JLogger(){ String className = new FlexLogger().getClassName(); if(!logger4JMap.containsKey(className)){ @@ -190,8 +190,8 @@ public class FlexLogger extends SecurityManager{ */ private static EelfLogger getEelfLogger(Class<?> clazz, boolean isNewTransaction){ - String className = ""; - EelfLogger logger = null; + String className; + EelfLogger logger; if(clazz != null){ className = clazz.getName(); }else{ @@ -221,7 +221,7 @@ public class FlexLogger extends SecurityManager{ * Returns an instance of SystemOutLogger * @param clazz */ - private static SystemOutLogger getSystemOutLogger(Class<?> clazz){ + private static SystemOutLogger getSystemOutLogger(){ String className = new FlexLogger().getClassName(); @@ -253,8 +253,7 @@ public class FlexLogger extends SecurityManager{ if (loggerTypeString != null){ if (loggerTypeString.equalsIgnoreCase("EELF")){ loggerType = LoggerType.EELF; - if (overrideLogbackLevel != null && - overrideLogbackLevel.equalsIgnoreCase("TRUE")) { + if ("TRUE".equalsIgnoreCase(overrideLogbackLevel)) { System.out.println("FlexLogger: start listener."); properties = PropertyUtil.getProperties ("config/policyLogger.properties", @@ -292,6 +291,7 @@ public class FlexLogger extends SecurityManager{ /** * This method will be called automatically if he policyLogger.properties got updated */ + @Override public void propertiesChanged(Properties properties, Set<String> changedKeys) { |