Fix minor sonar issues

Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: Iea540bb663429d55ce90879f9d9a22888c583833
Issue-ID: AAI-2128

2 files changed, 7 insertions, 20 deletions

diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/util/HbaseSaltPrefixer.java b/aai-els-onap-logging/src/main/java/org/onap/aai/util/HbaseSaltPrefixer.java
index fef10a77..95f9c1b7 100644
--- a/aai-els-onap-logging/src/main/java/org/onap/aai/util/HbaseSaltPrefixer.java
+++ b/aai-els-onap-logging/src/main/java/org/onap/aai/util/HbaseSaltPrefixer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
@@ -27,33 +27,20 @@ package org.onap.aai.util;
  * as these keys are generated in a couple places, I made a class to contain that logic
  */
 public class HbaseSaltPrefixer {
-    private int NUM_REGION_BUCKETS = 3; // the number of hbase region servers per cluster
+     // the number of hbase region servers per cluster
+    private static int NUM_REGION_BUCKETS = 3;
 
     private static class SingletonHolder {
         private static final HbaseSaltPrefixer INSTANCE = new HbaseSaltPrefixer();
     }
 
-    /**
-     * Instantiates a new hbase salt prefixer.
-     */
     private HbaseSaltPrefixer() {
     }
 
-    /**
-     * Gets the single instance of HbaseSaltPrefixer.
-     *
-     * @return single instance of HbaseSaltPrefixer
-     */
     public static HbaseSaltPrefixer getInstance() {
         return SingletonHolder.INSTANCE;
     }
 
-    /**
-     * Prepend salt.
-     *
-     * @param key the key
-     * @return the string
-     */
     public String prependSalt(String key) {
         int salt = Math.abs(key.hashCode()) % NUM_REGION_BUCKETS;
         return salt + "-" + key;
diff --git a/aai-els-onap-logging/src/test/java/org/onap/aai/logging/LoggingContextTest.java b/aai-els-onap-logging/src/test/java/org/onap/aai/logging/LoggingContextTest.java
index 245840bc..4fe60315 100644
--- a/aai-els-onap-logging/src/test/java/org/onap/aai/logging/LoggingContextTest.java
+++ b/aai-els-onap-logging/src/test/java/org/onap/aai/logging/LoggingContextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
@@ -39,7 +39,7 @@ public class LoggingContextTest {
         LoggingContext.elapsedTime(300, TimeUnit.MILLISECONDS);
         assertEquals(MDC.get(LoggingContext.LoggingField.ELAPSED_TIME.toString()), "300");
         LoggingContext.init();
-        assertTrue(MDC.get(LoggingContext.LoggingField.ELAPSED_TIME.toString()) == null);
+        assertNull(MDC.get(LoggingContext.LoggingField.ELAPSED_TIME.toString()));
     }
     @Test
     public void stopWatchTest() {
@@ -60,7 +60,7 @@ public class LoggingContextTest {
         assertEquals(testServiceName, MDC.get(LoggingContext.LoggingField.SERVICE_NAME.toString()));
 
         LoggingContext.clear();
-        assertTrue(MDC.get(LoggingContext.LoggingField.SERVICE_NAME.toString()) == null);
+        assertNull(MDC.get(LoggingContext.LoggingField.SERVICE_NAME.toString()));
 
     }
 
@@ -71,7 +71,7 @@ public class LoggingContextTest {
         assertEquals(testServiceName, MDC.get(LoggingContext.LoggingField.SERVICE_NAME.toString()));
 
         LoggingContext.remove(LoggingContext.LoggingField.SERVICE_NAME.toString());
-        assertTrue(MDC.get(LoggingContext.LoggingField.SERVICE_NAME.toString()) == null);
+        assertNull(MDC.get(LoggingContext.LoggingField.SERVICE_NAME.toString()));
 
     }