From 0d82642937b2cf5737f4a7d51d6f280eb11344e2 Mon Sep 17 00:00:00 2001
From: da490c <dave.adams@amdocs.com>
Date: Fri, 20 Jul 2018 17:19:26 -0400
Subject: Update spring-config for gizmo interworking

Issue-ID: AAI-1379
Change-Id: I1a9d397d484729604eaf945317b2027b664bdaf8
Signed-off-by: da490c <dave.adams@amdocs.com>
---
 .../spring-beans/sparky-attribute-update-service.xml  | 19 +++++++++++++++++++
 .../config/spring-beans/sparky-oxm.xml                | 11 -----------
 .../spring-beans/sparky-view-inspect-with-gizmo.xml   |  2 +-
 3 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 sparkybe-onap-application/config/spring-beans/sparky-attribute-update-service.xml

(limited to 'sparkybe-onap-application')

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
new file mode 100644
index 0000000..6ae1edb
--- /dev/null
+++ b/sparkybe-onap-application/config/spring-beans/sparky-attribute-update-service.xml
@@ -0,0 +1,19 @@
+<beans profile="resources" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
+        xmlns:task="http://www.springframework.org/schema/task"
+        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd
+                http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd">
+
+        <bean id="attributeUpdater" class="org.onap.aai.sparky.editattributes.AttributeUpdater">
+                <constructor-arg ref="oxmModelLoader" />
+                <constructor-arg ref="oxmEntityLookup" />
+                <constructor-arg ref="activeInventoryAdapter" />
+        </bean>
+
+        <bean id="attributeEditProcessor"
+                class="org.onap.aai.sparky.editattributes.AttributeEditProcessor">
+                <constructor-arg ref="attributeUpdater" />
+        </bean>
+
+</beans>
\ No newline at end of file
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml b/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml
index ed084dc..ecba6cd 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml
@@ -70,17 +70,6 @@
 			value="entitycounthistoryindex" />
 	</bean>
 
-	<bean id="attributeUpdater" class="org.onap.aai.sparky.editattributes.AttributeUpdater">
-		<constructor-arg ref="oxmModelLoader" />
-		<constructor-arg ref="oxmEntityLookup" />
-		<constructor-arg ref="activeInventoryAdapter" />
-	</bean>
-
-	<bean id="attributeEditProcessor"
-		class="org.onap.aai.sparky.editattributes.AttributeEditProcessor">
-		<constructor-arg ref="attributeUpdater" />
-	</bean>
-
 	<bean id="geoVisualizationProcessor" class="org.onap.aai.sparky.inventory.GeoVisualizationProcessor">
 		<constructor-arg ref="elasticSearchAdapter" />
 		<constructor-arg name="topographicalSearchIndexName"
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 f709446..d7b9ff1 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
@@ -45,7 +45,7 @@
 		class="org.onap.aai.sparky.viewandinspect.services.BaseVisualizationService">
 		<constructor-arg ref="oxmModelLoader" />
 		<constructor-arg ref="visualizationConfigurations" />
-		<constructor-arg ref="activeInventoryAdapter" />
+		<constructor-arg name="aaiAdapter"><null/></constructor-arg>
 		<constructor-arg ref="gizmoAdapter" />
 		<constructor-arg ref="elasticSearchAdapter" />
 		<constructor-arg ref="elasticSearchEndpointConfig" />
-- 
cgit 1.2.3-korg