update sparky with configurable features

Allow end user calls and sync calls to be configurable
expose the ability to set shallow entities configuration from a
delimited string
add proper exit condition for auto suggestion if the suggestible type
list is empty
enable a configurable domain
add the ability to personalize html header and title

Issue-ID: AAI-1874
Change-Id: Iec7183e0e82dba7f63780eeab824d000fe5f558c
Signed-off-by: renealr <reneal.rogers@amdocs.com>

14 files changed, 154 insertions, 79 deletions

diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/AutosuggestionSynchronizerTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/AutosuggestionSynchronizerTest.java
index 8eaff79..8a83ca7 100644
--- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/AutosuggestionSynchronizerTest.java
+++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/AutosuggestionSynchronizerTest.java
@@ -268,20 +268,20 @@ public class AutosuggestionSynchronizerTest {
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("generic-vnf-1"), Mockito.anyString(),
-            Mockito.anyInt()))
+            Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/generic-vnf-generic-vnf-1_full_depth.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("generic-vnf-2"), Mockito.anyString(),
-            Mockito.anyInt()))
+            Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/generic-vnf-generic-vnf-2_full_depth.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-3"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-3_full_depth.json")));
 
@@ -358,20 +358,20 @@ public class AutosuggestionSynchronizerTest {
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("generic-vnf-1"), Mockito.anyString(),
-            Mockito.anyInt()))
+            Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/generic-vnf-generic-vnf-1_full_depth.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("generic-vnf-2"), Mockito.anyString(),
-            Mockito.anyInt()))
+            Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/generic-vnf-generic-vnf-2_full_depth.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-3"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-3_full_depth.json")));
 
diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/VnfAliasSuggestionSynchronizerTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/VnfAliasSuggestionSynchronizerTest.java
index e72b0df..3680c6f 100644
--- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/VnfAliasSuggestionSynchronizerTest.java
+++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/VnfAliasSuggestionSynchronizerTest.java
@@ -228,19 +228,19 @@ public class VnfAliasSuggestionSynchronizerTest {
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-1"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-1_full_depth.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-2"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-2_full_depth.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-3"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-3_full_depth.json")));
 
@@ -310,19 +310,19 @@ public class VnfAliasSuggestionSynchronizerTest {
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-1"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-1_full_depth.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-2"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-2_full_depth.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-3"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-3_full_depth.json")));
 
diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/crossentityreference/sync/CrossEntityReferenceSynchronizerTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/crossentityreference/sync/CrossEntityReferenceSynchronizerTest.java
index b275813..2366439 100644
--- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/crossentityreference/sync/CrossEntityReferenceSynchronizerTest.java
+++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/crossentityreference/sync/CrossEntityReferenceSynchronizerTest.java
@@ -216,20 +216,20 @@ public class CrossEntityReferenceSynchronizerTest {
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("service-subscription-2"), Mockito.anyString(),
-            Mockito.anyInt()))
+            Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/service-subscription-service-subscription-2.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("service-subscription-1"), Mockito.anyString(),
-            Mockito.anyInt()))
+            Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/service-subscription-service-subscription-1.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("service-subscription-3"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/service-subscription-service-subscription-3.json")));
     
@@ -298,70 +298,70 @@ public class CrossEntityReferenceSynchronizerTest {
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-59"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-59.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-54"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-54.json")));
     
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-55"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-55.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-50"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-50.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-52"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-52.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-57"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-57.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-53"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-53.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-58"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-58.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-51"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-51.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-56"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-56.json")));
 
@@ -520,20 +520,20 @@ public class CrossEntityReferenceSynchronizerTest {
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("service-subscription-2"), Mockito.anyString(),
-            Mockito.anyInt()))
+            Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/service-subscription-service-subscription-2.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("service-subscription-1"), Mockito.anyString(),
-            Mockito.anyInt()))
+            Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/service-subscription-service-subscription-1.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("service-subscription-3"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/service-subscription-service-subscription-3.json")));
     
@@ -602,70 +602,70 @@ public class CrossEntityReferenceSynchronizerTest {
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-59"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-59.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-54"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-54.json")));
     
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-55"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-55.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-50"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-50.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-52"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-52.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-57"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-57.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-53"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-53.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-58"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-58.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-51"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-51.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-56"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-56.json")));
 
@@ -832,20 +832,20 @@ public class CrossEntityReferenceSynchronizerTest {
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("service-subscription-2"), Mockito.anyString(),
-            Mockito.anyInt()))
+            Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/service-subscription-service-subscription-2.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("service-subscription-1"), Mockito.anyString(),
-            Mockito.anyInt()))
+            Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/service-subscription-service-subscription-1.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("service-subscription-3"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/service-subscription-service-subscription-3.json")));
     
@@ -914,70 +914,70 @@ public class CrossEntityReferenceSynchronizerTest {
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-59"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-59.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-54"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-54.json")));
     
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-55"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-55.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-50"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-50.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-52"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-52.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-57"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-57.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-53"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-53.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-58"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-58.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-51"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-51.json")));
 
     Mockito
     .when(aaiAdapter.queryActiveInventoryWithRetries(
         Matchers.contains("generic-query/service-instance-56"), Mockito.anyString(),
-        Mockito.anyInt()))
+        Mockito.anyInt(),Mockito.anyString()))
     .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
         "/sync/aai/aai-traversal/generic-query/service-instance-56.json")));
 
diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/dal/ActiveInventoryAdapterTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/dal/ActiveInventoryAdapterTest.java
index d60ca02..6ec7513 100644
--- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/dal/ActiveInventoryAdapterTest.java
+++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/dal/ActiveInventoryAdapterTest.java
@@ -27,7 +27,7 @@ public class ActiveInventoryAdapterTest {
     endpointConfig = new RestEndpointConfig();
     queryParams = new ArrayList<String>();
     endpointConfig.setRestAuthenticationMode(RestAuthenticationMode.SSL_BASIC);
-    aaiAdapter = new ActiveInventoryAdapter(oxmModelLoader, oxmEntityLookup, endpointConfig);
+    aaiAdapter = new ActiveInventoryAdapter(oxmModelLoader, oxmEntityLookup, endpointConfig,"aai");
   }
 
 
@@ -42,9 +42,9 @@ public class ActiveInventoryAdapterTest {
     assertNotNull(aaiAdapter.getGenericQueryForSelfLink("", queryParams));
     assertNull(aaiAdapter.getSelfLinkForEntity("pserver", "PrimaryKeyName", "PrimaryKeyValue"));
     assertNotNull(
-        aaiAdapter.queryActiveInventory("https://server.proxy:8443/aai/v11/", "application/json"));
+        aaiAdapter.queryActiveInventory("https://server.proxy:8443/aai/v11/", "application/json","sync"));
     assertNotNull(aaiAdapter.queryActiveInventoryWithRetries(
-        "https://server.proxy:8443/aai/v11/business/customers/", "application/json", 4));
+        "https://server.proxy:8443/aai/v11/business/customers/", "application/json", 4,"sync"));
     aaiAdapter.setOxmEntityLookup(oxmEntityLookup);
     assertNotNull(aaiAdapter.getOxmEntityLookup());
     aaiAdapter.setEndpointConfig(endpointConfig);
diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/editattributes/AttributeUpdaterTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/editattributes/AttributeUpdaterTest.java
index b31962b..a5f7049 100644
--- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/editattributes/AttributeUpdaterTest.java
+++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/editattributes/AttributeUpdaterTest.java
@@ -78,7 +78,7 @@ public class AttributeUpdaterTest {
     entityLookup.addEntityDescriptor("pserver", desc);
 
     AttributeUpdater updater =
-        new AttributeUpdater(new OxmModelLoader("v11", null, null), entityLookup, aaiAdapter);
+        new AttributeUpdater(new OxmModelLoader("v11", null, null), entityLookup, aaiAdapter,"aai");
     Map<String, Object> attributes = new HashMap<>();
     attributes.put("prov-status", "PREPROV");
     attributes.put("in-maint", "true");
@@ -122,7 +122,7 @@ public class AttributeUpdaterTest {
 
 
     AttributeUpdater updater =
-        new AttributeUpdater(new OxmModelLoader(version, null, null), entityLookup, aaiAdapter);
+        new AttributeUpdater(new OxmModelLoader(version, null, null), entityLookup, aaiAdapter,"aai");
     AaiEditObject result = updater.getEditObjectFromUri(null);
     assertEquals("Pserver", result.getObjectType());
     assertEquals("pserver", result.getRootElement());
@@ -146,7 +146,7 @@ public class AttributeUpdaterTest {
     OxmEntityLookup entityLookup = new OxmEntityLookup();
     entityLookup.addEntityDescriptor("pserver", desc);
 
-    AttributeUpdater updater = new AttributeUpdater(new OxmModelLoader("v11",null,null), entityLookup, aaiAdapter);
+    AttributeUpdater updater = new AttributeUpdater(new OxmModelLoader("v11",null,null), entityLookup, aaiAdapter,"aai");
     // Test entity uri without "/aai/version/"
     String result = updater.getRelativeUri("cloud-infrastructure/pservers/pserver/mtznjtax101");
     assertEquals("/cloud-infrastructure/pservers/pserver/mtznjtax101", result);
diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/personalization/PersonalizationServiceProviderTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/personalization/PersonalizationServiceProviderTest.java
new file mode 100644
index 0000000..04f0412
--- /dev/null
+++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/personalization/PersonalizationServiceProviderTest.java
@@ -0,0 +1,38 @@
+package org.onap.aai.sparky.personalization;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.onap.aai.sparky.personalization.config.PersonalizationConfig;
+
+
+
+public class PersonalizationServiceProviderTest {
+
+  private PersonalizationServiceProvider personalizationServiceProvider;
+  private Exchange mockExchange;
+  private Message mockRequestMessage;
+  private Message mockResponseMessage;
+  private PersonalizationConfig mockPersonalizationConfig;
+
+
+  @Before
+  public void init() throws Exception {
+
+    mockExchange = Mockito.mock(Exchange.class);
+    mockRequestMessage = Mockito.mock(Message.class);
+    mockResponseMessage = Mockito.mock(Message.class);
+    mockPersonalizationConfig = Mockito.mock(PersonalizationConfig.class);
+    personalizationServiceProvider = new PersonalizationServiceProvider(mockPersonalizationConfig);
+
+
+    Mockito.when(mockExchange.getIn()).thenReturn(mockRequestMessage);
+    Mockito.when(mockExchange.getOut()).thenReturn(mockResponseMessage);
+
+   
+  }
+  
+
+}
diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/personalization/config/PersonalizationConfigTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/personalization/config/PersonalizationConfigTest.java
new file mode 100644
index 0000000..6b06add
--- /dev/null
+++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/personalization/config/PersonalizationConfigTest.java
@@ -0,0 +1,32 @@
+package org.onap.aai.sparky.personalization.config;
+
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class PersonalizationConfigTest {
+
+  
+  private PersonalizationConfig personalizationConfig;
+  
+
+  @Before
+  public void init() throws Exception {
+    personalizationConfig = new PersonalizationConfig();
+  
+  }
+
+
+  @Test
+  public void updateValues() {
+
+    personalizationConfig.setHtmlDocumentTitle("AAI");
+    assertNotNull(personalizationConfig.getHtmlDocumentTitle());
+    personalizationConfig.setTopLeftHeader("AAI");
+    assertNotNull(personalizationConfig.getTopLeftHeader());
+ 
+  }
+
+}
diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/sync/AggregationSynchronizerTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/sync/AggregationSynchronizerTest.java
index 8f8beea..da222e4 100644
--- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/sync/AggregationSynchronizerTest.java
+++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/sync/AggregationSynchronizerTest.java
@@ -171,7 +171,7 @@ public class AggregationSynchronizerTest {
 					.thenReturn("https://server.proxy:8443/aai/v11/cloud-infrastructure/complexes/complex" + x);
 
 			Mockito.when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("complex" + x),
-					Mockito.anyString(), Mockito.anyInt()))
+					Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
 					.thenReturn(new OperationResult(200, TestResourceLoader
 							.getTestResourceDataJson("/sync/aai/complex" + x + "_fullDepth_aaiEntityRetrieval.json")));
 
@@ -233,7 +233,7 @@ public class AggregationSynchronizerTest {
 					.thenReturn("https://server.proxy:8443/aai/v11/cloud-infrastructure/complexes/complex" + x);
 
 			Mockito.when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("complex" + x),
-					Mockito.anyString(), Mockito.anyInt()))
+					Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
 					.thenReturn(new OperationResult(200, TestResourceLoader
 							.getTestResourceDataJson("/sync/aai/complex" + x + "_fullDepth_aaiEntityRetrieval.json")));
 
@@ -297,7 +297,7 @@ public class AggregationSynchronizerTest {
 					.thenReturn("https://server.proxy:8443/aai/v11/cloud-infrastructure/complexes/complex" + x);
 
 			Mockito.when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("complex" + x),
-					Mockito.anyString(), Mockito.anyInt()))
+					Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
 					.thenReturn(new OperationResult(200, TestResourceLoader
 							.getTestResourceDataJson("/sync/aai/complex" + x + "_fullDepth_aaiEntityRetrieval.json")));
 
diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/BaseVisualizationContextTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/BaseVisualizationContextTest.java
index d58bf42..0a2c75e 100644
--- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/BaseVisualizationContextTest.java
+++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/BaseVisualizationContextTest.java
@@ -152,7 +152,7 @@ public class BaseVisualizationContextTest {
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("customer-4"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/aai-resources/customer/customer-4.json")));
 
@@ -160,7 +160,7 @@ public class BaseVisualizationContextTest {
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("tenant/tenant-1"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/aai-resources/tenant/tenant-1.json")));
 
@@ -176,7 +176,7 @@ public class BaseVisualizationContextTest {
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("generic-query/service-subscription-2"), Mockito.anyString(),
-            Mockito.anyInt()))
+            Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/aai-traversal/generic-query/service-subscription/service-subscription-2.json")));
 
@@ -191,7 +191,7 @@ public class BaseVisualizationContextTest {
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("generic-query/service-instance-id/service-instance-54"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/aai-traversal/generic-query/service-instance/service-instance-54.json")));
 
@@ -206,7 +206,7 @@ public class BaseVisualizationContextTest {
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("generic-query/service-instance-id/service-instance-55"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/aai-traversal/generic-query/service-instance/service-instance-55.json")));
 
diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/BaseVisualizationServiceTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/BaseVisualizationServiceTest.java
index 9be0fe2..624c239 100644
--- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/BaseVisualizationServiceTest.java
+++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/BaseVisualizationServiceTest.java
@@ -64,7 +64,7 @@ public class BaseVisualizationServiceTest {
 
   private void initializeMocksForBuildVisualizationUsingGenericQueryTest() {
     Mockito.when(mockAaiAdapter.queryActiveInventoryWithRetries(Mockito.anyString(),
-        Mockito.anyString(), Mockito.anyInt())).thenReturn(null);
+        Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())).thenReturn(null);
   }
 
 }
diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/config/VisualizationConfigTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/config/VisualizationConfigTest.java
index dbbd38d..3e6cab8 100644
--- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/config/VisualizationConfigTest.java
+++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/config/VisualizationConfigTest.java
@@ -57,6 +57,10 @@ public class VisualizationConfigTest {
     visualConfig.setSelectedSearchedNodeClassName(null);
     assertNull(visualConfig.getSelectedSearchedNodeClassName());
     assertNotNull(visualConfig.toString());
+    
+    visualConfig.setDelimitedShallowEntities("cloud-region,network,pserver");
+    assertNotNull(visualConfig.getShallowEntities());
+    assertEquals(3, visualConfig.getShallowEntities().size());
 
 
   }
diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/entity/ActiveInventoryNodeTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/entity/ActiveInventoryNodeTest.java
index 8469d1a..b44782b 100644
--- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/entity/ActiveInventoryNodeTest.java
+++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/entity/ActiveInventoryNodeTest.java
@@ -37,6 +37,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.onap.aai.restclient.client.OperationResult;
 import org.onap.aai.sparky.config.oxm.OxmEntityLookup;
+import org.onap.aai.sparky.util.NodeUtils;
 import org.onap.aai.sparky.viewandinspect.config.VisualizationConfigs;
 
 public class ActiveInventoryNodeTest {
@@ -118,8 +119,8 @@ public class ActiveInventoryNodeTest {
 			assertNotNull(activeInventoryNode.getEntityType());
 			assertNotNull(activeInventoryNode.dumpNodeTree(true));
 			assertNotNull(activeInventoryNode.getProcessingErrorCauses());
-			assertNull(activeInventoryNode.calculateEditAttributeUri("Invalid-link"));
-			assertNull(activeInventoryNode.calculateEditAttributeUri("aai/v[\\d]/"));
+			assertNull(NodeUtils.calculateEditAttributeUri("Invalid-link"));
+			assertNull(NodeUtils.calculateEditAttributeUri("aai/v[\\d]/"));
 			activeInventoryNode.processPathedSelfLinkResponse("jsonResp","startNodeType","startNodeResourceKey");
 			activeInventoryNode.processPathedSelfLinkResponse(null,"startNodeType","startNodeResourceKey");
 			activeInventoryNode.processPathedSelfLinkResponse("","startNodeType","startNodeResourceKey");
diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationContextTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationContextTest.java
index 394bfe4..bfb89ac 100644
--- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationContextTest.java
+++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationContextTest.java
@@ -152,7 +152,7 @@ public class BaseVisualizationContextTest {
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("customer-4"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/aai-resources/customer/customer-4.json")));
 
@@ -160,7 +160,7 @@ public class BaseVisualizationContextTest {
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("tenant/tenant-1"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/aai-resources/tenant/tenant-1.json")));
 
@@ -176,7 +176,7 @@ public class BaseVisualizationContextTest {
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("generic-query/service-subscription-2"), Mockito.anyString(),
-            Mockito.anyInt()))
+            Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/aai-traversal/generic-query/service-subscription/service-subscription-2.json")));
 
@@ -191,7 +191,7 @@ public class BaseVisualizationContextTest {
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("generic-query/service-instance-id/service-instance-54"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/aai-traversal/generic-query/service-instance/service-instance-54.json")));
 
@@ -206,7 +206,7 @@ public class BaseVisualizationContextTest {
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("generic-query/service-instance-id/service-instance-55"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/aai-traversal/generic-query/service-instance/service-instance-55.json")));
 
diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/sync/ViewInspectEntitySynchronizerTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/sync/ViewInspectEntitySynchronizerTest.java
index 0fd3bca..5b2f8d1 100644
--- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/sync/ViewInspectEntitySynchronizerTest.java
+++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/sync/ViewInspectEntitySynchronizerTest.java
@@ -211,19 +211,19 @@ public class ViewInspectEntitySynchronizerTest {
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-1"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-1_full_depth.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-2"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-2_full_depth.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-3"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-3_full_depth.json")));
 
@@ -293,19 +293,19 @@ public class ViewInspectEntitySynchronizerTest {
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-1"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-1_full_depth.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-2"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-2_full_depth.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-3"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-3_full_depth.json")));