aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-08-20 17:02:13 -0400
committerJim Hahn <jrh3@att.com>2021-08-20 17:03:48 -0400
commit376cb3fd21b7881cad8df1caa5f38be2c140b0da (patch)
treea67f32b36700655a66321768981b01504b77cd31
parent5d79140dbdaa85c390c3e8f6914739c2c8a6b130 (diff)
Fix sonars and java warnings in common
Issue-ID: POLICY-3284 Change-Id: I13fc28c6ae681871be8bb9cf3d222d7c65459a44 Signed-off-by: Jim Hahn <jrh3@att.com>
-rw-r--r--utils/src/main/java/org/onap/policy/common/utils/logging/LoggerUtils.java31
-rw-r--r--utils/src/test/java/org/onap/policy/common/utils/logging/LoggerUtilsTest.java10
2 files changed, 5 insertions, 36 deletions
diff --git a/utils/src/main/java/org/onap/policy/common/utils/logging/LoggerUtils.java b/utils/src/main/java/org/onap/policy/common/utils/logging/LoggerUtils.java
index 9276f749..89575eb2 100644
--- a/utils/src/main/java/org/onap/policy/common/utils/logging/LoggerUtils.java
+++ b/utils/src/main/java/org/onap/policy/common/utils/logging/LoggerUtils.java
@@ -23,13 +23,15 @@
package org.onap.policy.common.utils.logging;
import ch.qos.logback.classic.LoggerContext;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Marker;
import org.slf4j.MarkerFactory;
-
-public class LoggerUtils {
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class LoggerUtils {
private static final Logger LOGGER = LoggerFactory.getLogger(LoggerUtils.class);
@@ -70,17 +72,6 @@ public class LoggerUtils {
*/
public static final Marker TRANSACTION_LOG_MARKER = MarkerFactory.getMarker(TRANSACTION_LOG_MARKER_NAME);
- /**
- * Logger delegate.
- */
- private final Logger mlogger;
-
- /**
- * Constructor.
- */
- public LoggerUtils(final Logger loggerP) {
- this.mlogger = checkNotNull(loggerP);
- }
/**
* Set the log level of a logger.
@@ -111,18 +102,4 @@ public class LoggerUtils {
return logger.getLevel().toString();
}
-
- /**
- * Dependency-free nullcheck.
- *
- * @param in to be checked
- * @param <T> argument (and return) type
- * @return input arg
- */
- private static <T> T checkNotNull(final T in) {
- if (in == null) {
- throw new NullPointerException();
- }
- return in;
- }
}
diff --git a/utils/src/test/java/org/onap/policy/common/utils/logging/LoggerUtilsTest.java b/utils/src/test/java/org/onap/policy/common/utils/logging/LoggerUtilsTest.java
index 61b83b4c..79db2093 100644
--- a/utils/src/test/java/org/onap/policy/common/utils/logging/LoggerUtilsTest.java
+++ b/utils/src/test/java/org/onap/policy/common/utils/logging/LoggerUtilsTest.java
@@ -24,10 +24,9 @@ package org.onap.policy.common.utils.logging;
import static org.junit.Assert.assertTrue;
-import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,13 +34,6 @@ import org.slf4j.LoggerFactory;
public class LoggerUtilsTest {
protected static final Logger logger = LoggerFactory.getLogger(LoggerUtilsTest.class);
- private LoggerUtils util;
-
- @Before
- public void setup() {
- this.util = new LoggerUtils(logger);
- }
-
@Test
public void testMarker() {
assertTrue(logger.isInfoEnabled());