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>

10 files changed, 68 insertions, 14 deletions

diff --git a/sparkybe-onap-application/config/application-personalization.properties b/sparkybe-onap-application/config/application-personalization.properties
new file mode 100644
index 0000000..b462aba
--- /dev/null
+++ b/sparkybe-onap-application/config/application-personalization.properties
@@ -0,0 +1,2 @@
+personalization.topLeftHeader=A&AI
+personalization.htmlDocumentTitle=A&AI
\ No newline at end of file
diff --git a/sparkybe-onap-application/config/application-resources.properties b/sparkybe-onap-application/config/application-resources.properties
index 5860c7a..e33cc4f 100644
--- a/sparkybe-onap-application/config/application-resources.properties
+++ b/sparkybe-onap-application/config/application-resources.properties
@@ -7,3 +7,5 @@ resources.client-cert=client-cert-onap.p12
 resources.client-cert-password=1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
 resources.trust-store=tomcat_keystore
 resources.maxSelfLinkTraversalDepth=2
+resources.domain=aai
+resources.delimitedShallowEntities=cloud-region,complex,vnf-image,image,flavor,availability-zone,tenant,network-profile,l-interface
\ No newline at end of file
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-attribute-update-service.xml b/sparkybe-onap-application/config/spring-beans/sparky-attribute-update-service.xml
index 6ae1edb..27db51a 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-attribute-update-service.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-attribute-update-service.xml
@@ -9,6 +9,7 @@
                 <constructor-arg ref="oxmModelLoader" />
                 <constructor-arg ref="oxmEntityLookup" />
                 <constructor-arg ref="activeInventoryAdapter" />
+                <constructor-arg name="domain" value="${resources.domain:aai}" />
         </bean>
 
         <bean id="attributeEditProcessor"
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-gizmo.xml b/sparkybe-onap-application/config/spring-beans/sparky-gizmo.xml
index adf3507..bb3cfbb 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-gizmo.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-gizmo.xml
@@ -25,6 +25,7 @@
 		<property name="relationshipsBasePath"
 			value="/services/inventory/relationships/${gizmo.apiVersion:v12}" />
 		<property name="inventoryBasePath" value="/services/inventory/${gizmo.apiVersion:v12}" />
+		<property name="appPartnerName" value="${gizmo.appPartnerName:AAI-UI}" />
 	</bean>
 
 </beans>
\ No newline at end of file
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-global-search.xml b/sparkybe-onap-application/config/spring-beans/sparky-global-search.xml
index 4504f65..f572085 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-global-search.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-global-search.xml
@@ -22,5 +22,6 @@
 	<bean id="searchServiceAdapter" class="org.onap.aai.sparky.search.SearchServiceAdapter">
 		<constructor-arg ref="searchServiceRestEndpointConfig" />
 		<constructor-arg name="serviceApiVersion" value="v1" />
+		<property name="appPartnerName" value="${searchservice.appPartnerName:AAI-UI}" />
 	</bean>
 </beans>
\ No newline at end of file
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-personalization-service.xml b/sparkybe-onap-application/config/spring-beans/sparky-personalization-service.xml
new file mode 100644
index 0000000..6ad3f8d
--- /dev/null
+++ b/sparkybe-onap-application/config/spring-beans/sparky-personalization-service.xml
@@ -0,0 +1,19 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="
+	       http://www.springframework.org/schema/beans
+	       http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+
+	<bean id="personalizationConfig"
+		class="org.onap.aai.sparky.personalization.config.PersonalizationConfig">
+		<property name="topLeftHeader" value="${personalization.topLeftHeader:A&amp;AI}" />
+		<property name="htmlDocumentTitle" value="${personalization.htmlDocumentTitle:A&amp;AI}" />
+	</bean>
+
+	<bean id="personalizationServiceProcessor"
+		class="org.onap.aai.sparky.personalization.PersonalizationServiceProvider">
+		<constructor-arg ref="personalizationConfig" />
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-resources.xml b/sparkybe-onap-application/config/spring-beans/sparky-resources.xml
index 6f29868..5788ce4 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-resources.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-resources.xml
@@ -25,6 +25,9 @@
 		<constructor-arg ref="oxmModelLoader" />
 		<constructor-arg ref="oxmEntityLookup" />
 		<constructor-arg ref="aaiRestEndpointConfig" />
+		<constructor-arg name="domain" value="${resources.domain:aai}" />
+		<property name="appPartnerName" value="${resources.appPartnerName:AAI-UI}" />
+		<property name="syncPartnerName" value="${resources.syncPartnerName:AAI-UI-SYNC}" />
 	</bean>
 
 </beans>
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-search-service.xml b/sparkybe-onap-application/config/spring-beans/sparky-search-service.xml
index c8d20c6..3a30161 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-search-service.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-search-service.xml
@@ -22,5 +22,6 @@
 	<bean id="searchServiceAdapter" class="org.onap.aai.sparky.search.SearchServiceAdapter">
 		<constructor-arg ref="searchServiceRestEndpointConfig" />
 		<constructor-arg name="serviceApiVersion" value="v1" />
+		<property name="appPartnerName" value="${searchservice.appPartnerName:AAI-UI}" />
 	</bean>
 </beans>
\ No newline at end of file
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-resources.xml b/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-resources.xml
index 6869b70..7148c56 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-resources.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-resources.xml
@@ -15,20 +15,7 @@
 		<property name="numOfThreadsToFetchNodeIntegrity" value="20" />
 		<property name="makeAllNeighborsBidirectional" value="false" />
 		<property name="resourceLoader" ref="sparkyResourceLoader" />
-
-		<property name="shallowEntities">
-			<list value-type="java.lang.String">
-				<value>cloud-region</value>
-				<value>complex</value>
-				<value>vnf-image</value>
-				<value>image</value>
-				<value>flavor</value>
-				<value>availability-zone</value>
-				<value>tenant</value>
-				<value>network-profile</value>
-				<value>l-interface</value>
-			</list>
-		</property>
+		<property name="delimitedShallowEntities" value="${resources.delimitedShallowEntities:cloud-region,complex,vnf-image,image,flavor,availability-zone,tenant,network-profile,l-interface}" />
 
 	</bean>
 
diff --git a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/camel/PersonalizationRouter.java b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/camel/PersonalizationRouter.java
new file mode 100644
index 0000000..9cd587e
--- /dev/null
+++ b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/camel/PersonalizationRouter.java
@@ -0,0 +1,37 @@
+/**
+ * ============LICENSE_START=======================================================
+ * SPARKY (AAI UI service)
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.sparky.camel;
+
+import org.apache.camel.spring.SpringRouteBuilder;
+import org.springframework.stereotype.Component;
+
+@Component
+public class PersonalizationRouter extends SpringRouteBuilder {
+
+  @Override
+  public void configure() throws Exception {
+
+    rest().get("getPersonalizedValues")
+        .to("bean:personalizationServiceProcessor?method=getPersonalizedValues");
+
+  }
+
+}
\ No newline at end of file