implemented sparky graph extensibility

Add additional interface abstraction points to make it easier
to extend and customize the graph logic, and made it easier
to interwork with resources and gizmo via spring-bean
wiring changes only.

Issue-ID: AAI-1503
Change-Id: I5a3dcc81ecc49db89d71f0db27cffbb04c89fbd1
Signed-off-by: da490c <dave.adams@amdocs.com>

2 files changed, 29 insertions, 26 deletions

diff --git a/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-gizmo.xml b/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-gizmo.xml
index 9afd8a3..17cfc38 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-gizmo.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-gizmo.xml
@@ -14,7 +14,6 @@
 		<property name="selectedSearchedNodeClassName" value="selectedSearchedNodeClass" />
 		<property name="numOfThreadsToFetchNodeIntegrity" value="20" />
 		<property name="makeAllNeighborsBidirectional" value="false" />
-		<property name="gizmoEnabled" value="true" />
 		<property name="resourceLoader" ref="sparkyResourceLoader" />
 
 		<property name="shallowEntities">
@@ -39,20 +38,24 @@
 		<property name="indexDocType" value="default" />
 		<property name="indexMappingsFileName" value="/schemas/es_mappings.json" />
 		<property name="indexSettingsFileName" value="/schemas/es_settings.json" />
-	</bean>	
+	</bean>
+
+	<bean id="gizmoVisualizationContextBuilder"
+		class="org.onap.aai.sparky.viewandinspect.context.BaseGizmoVisualizationContextBuilder">
+		<constructor-arg name="gizmoAdapter" ref="gizmoAdapter" />
+		<constructor-arg name="numWorkers" value="50" />
+		<constructor-arg name="visualizationConfig" ref="visualizationConfigurations" />
+		<constructor-arg name="oxmEntityType" ref="oxmEntityLookup" />
+	</bean>
 
 	<bean id="baseVisualizationService"
 		class="org.onap.aai.sparky.viewandinspect.services.BaseVisualizationService">
-		<constructor-arg ref="oxmModelLoader" />
-		<constructor-arg ref="visualizationConfigurations" />
-		<constructor-arg name="aaiAdapter"><null/></constructor-arg>
-		<constructor-arg ref="gizmoAdapter" />
-		<constructor-arg ref="elasticSearchAdapter" />
-		<constructor-arg ref="elasticSearchEndpointConfig" />
-		<constructor-arg ref="viewInspectSchemaConfig" />
-		<constructor-arg name="numActiveInventoryWorkers" value="50" />
-		<constructor-arg ref="oxmEntityLookup" />
-		<constructor-arg ref="subscriptionConfig" />
+		<constructor-arg name="contextBuilder" ref="gizmoVisualizationContextBuilder" />
+		<constructor-arg name="visualizationConfigs" ref="visualizationConfigurations" />
+		<constructor-arg name="searchServiceAdapter" ref="searchServiceAdapter" />
+		<constructor-arg name="endpointConfig" ref="searchServiceRestEndpointConfig" />
+		<constructor-arg name="schemaConfig" ref="viewInspectSchemaConfig" />
+		<constructor-arg name="subscriptionConfig" ref="subscriptionConfig" />
 	</bean>
 
 	<bean id="schemaVisualizationProcessor"
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 b0d5471..6869b70 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
@@ -14,7 +14,6 @@
 		<property name="selectedSearchedNodeClassName" value="selectedSearchedNodeClass" />
 		<property name="numOfThreadsToFetchNodeIntegrity" value="20" />
 		<property name="makeAllNeighborsBidirectional" value="false" />
-		<property name="gizmoEnabled" value="false" />
 		<property name="resourceLoader" ref="sparkyResourceLoader" />
 
 		<property name="shallowEntities">
@@ -41,21 +40,22 @@
 		<property name="indexSettingsFileName" value="/schemas/es_settings.json" />
 	</bean>
 
+	<bean id="resourcesVisualizationContextBuilder"
+		class="org.onap.aai.sparky.viewandinspect.context.BaseVisualizationContextBuilder">
+		<constructor-arg name="activeInventoryAdapter" ref="activeInventoryAdapter" />
+		<constructor-arg name="numWorkers" value="50" />
+		<constructor-arg name="visualizationConfig" ref="visualizationConfigurations" />
+		<constructor-arg name="oxmEntityType" ref="oxmEntityLookup" />
+	</bean>
+
 	<bean id="baseVisualizationService"
 		class="org.onap.aai.sparky.viewandinspect.services.BaseVisualizationService">
-		<constructor-arg ref="oxmModelLoader" />
-		<constructor-arg ref="visualizationConfigurations" />
-		<constructor-arg ref="activeInventoryAdapter" />
-		<constructor-arg name="gizmoAdapter">
-			<null />
-		</constructor-arg>
-		<constructor-arg ref="searchServiceAdapter" />
-		<constructor-arg ref="searchServiceRestEndpointConfig" />
-		<constructor-arg ref="viewInspectSchemaConfig" />
-		<constructor-arg name="numActiveInventoryWorkers"
-			value="50" />
-		<constructor-arg ref="oxmEntityLookup" />
-		<constructor-arg ref="subscriptionConfig" />
+		<constructor-arg name="contextBuilder" ref="resourcesVisualizationContextBuilder" />
+		<constructor-arg name="visualizationConfigs" ref="visualizationConfigurations" />
+		<constructor-arg name="searchServiceAdapter" ref="searchServiceAdapter" />
+		<constructor-arg name="endpointConfig" ref="searchServiceRestEndpointConfig" />
+		<constructor-arg name="schemaConfig" ref="viewInspectSchemaConfig" />
+		<constructor-arg name="subscriptionConfig" ref="subscriptionConfig" />
 	</bean>
 
 	<bean id="schemaVisualizationProcessor"