minor sli provider base changes

add more unit testing, use constants for success/failure and improve some logging calls

Issue-ID: CCSDK-2064
Signed-off-by: Smokowski, Kevin (ks6305) <kevin.smokowski@att.com>
Change-Id: I2c7039c706de1172bd506a20e96eb987cc86f211

3 files changed, 13 insertions, 12 deletions

diff --git a/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils.java b/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils.java
index 1fc052532..0d9ab217e 100644
--- a/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils.java
+++ b/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils.java
@@ -41,6 +41,7 @@ import java.util.Set;
 import java.util.UUID;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
+import org.onap.ccsdk.sli.core.sli.SvcLogicConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
@@ -935,19 +936,19 @@ public class SliPluginUtils implements SvcLogicJavaPlugin {
 		try {
 			checkParameters(parameters, new String[]{"root"}, LOG);
 		} catch (Exception ex) {
-			return "failure";
+			return SvcLogicConstants.FAILURE;
 		}
 
 		String root = parameters.get("root");
 
 		if (StringUtils.isEmpty(root)) {
-			return "failure";
+			return SvcLogicConstants.FAILURE;
 		}
 
 		// set context memory to the the properties passed with root as prefix
 		setParameterValuesToRoot(parameters, ctx, root);
 
-		return "success";
+		return SvcLogicConstants.SUCCESS;
 	}
 
 	private static boolean setParameterValuesToRoot(Map<String, String> parameters, SvcLogicContext ctx, String root) {
@@ -1003,7 +1004,7 @@ public class SliPluginUtils implements SvcLogicJavaPlugin {
 			checkParameters(parameters, new String[]{"prefixKey", "keyName", "keyValue"}, LOG);
 		} catch (Exception e) {
 			LOG.error("a required parameter is missing");
-			return "failure";
+			return SvcLogicConstants.FAILURE;
 		}
 
 		String prefixKey = parameters.get("prefixKey");
@@ -1012,7 +1013,7 @@ public class SliPluginUtils implements SvcLogicJavaPlugin {
 
 		if (StringUtils.isEmpty(keyName) || StringUtils.isEmpty(keyValue) || StringUtils.isEmpty(prefixKey)) {
 			LOG.error("a required parameters value is empty or null");
-			return "failure";
+			return SvcLogicConstants.FAILURE;
 		}
 
 		int listLength = getArrayLength(ctx, prefixKey);
@@ -1037,7 +1038,7 @@ public class SliPluginUtils implements SvcLogicJavaPlugin {
 							+ "but " + map.size() + " entries were found in context memory "
 							+ "where the key begins with: " + prefixKey);
 
-					return "failure";
+					return SvcLogicConstants.FAILURE;
 				}
 			} else if (ctxListContains(containParams, ctx) == "false") {
 				setNewEntryInList(parameters, ctx, keyName, keyValue, prefixKey, valuePrefixKey, listLength);
@@ -1059,10 +1060,10 @@ public class SliPluginUtils implements SvcLogicJavaPlugin {
 		} catch (SvcLogicException e) {
 			LOG.error("Call to ctxListContains failed: " + e.getMessage());
 
-			return "failure";
+			return SvcLogicConstants.FAILURE;
 		}
 
-		return "success";
+		return SvcLogicConstants.SUCCESS;
 	}
 
 	private static void setNewEntryInList(Map<String, String> parameters, SvcLogicContext ctx, String keyName,
diff --git a/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_StaticFunctionsTest.java b/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_StaticFunctionsTest.java
index 64645b363..5c222c83f 100644
--- a/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_StaticFunctionsTest.java
+++ b/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_StaticFunctionsTest.java
@@ -32,6 +32,7 @@ import java.util.HashMap;
 import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.ccsdk.sli.core.sli.SvcLogicConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils.LogLevel;
@@ -313,7 +314,7 @@ public class SliPluginUtils_StaticFunctionsTest {
         Map<String, String> parameters = new HashMap<>();
         parameters.put("root", "RootVal");
         parameters.put("valueRoot", "ValueRootVal");
-        assertEquals("success", SliPluginUtils.setPropertiesForRoot(parameters, ctx));
+        assertEquals(SvcLogicConstants.SUCCESS, SliPluginUtils.setPropertiesForRoot(parameters, ctx));
     }
 
     @Test
diff --git a/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_ctxSortList.java b/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_ctxSortList.java
index 78e846aef..3d4469bf2 100644
--- a/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_ctxSortList.java
+++ b/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_ctxSortList.java
@@ -25,12 +25,11 @@ package org.onap.ccsdk.sli.core.slipluginutils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-
 import java.util.HashMap;
 import java.util.Random;
-
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.ccsdk.sli.core.sli.SvcLogicConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.slf4j.Logger;
@@ -144,7 +143,7 @@ public class SliPluginUtils_ctxSortList {
 		parameters.put("keyName", "testKey");
 		parameters.put("keyValue", "testValue");
 
-		assertEquals("success", SliPluginUtils.setPropertiesForList(parameters, ctx));
+		assertEquals(SvcLogicConstants.SUCCESS, SliPluginUtils.setPropertiesForList(parameters, ctx));
 
 	}
 }