Fix blueprints after removing Sonar issues

Change-Id: I120b1646fd43ba74488366e8bd41474191533413
Issue-ID: CCSDK-2604
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>

diff --git a/a1-adapter/a1-adapter-api/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/a1-adapter/a1-adapter-api/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
index 2940360..28dfb5e 100644 (file)
--- a/a1-adapter/a1-adapter-api/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
+++ b/a1-adapter/a1-adapter-api/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
@@ -30,9 +30,6 @@
         <argument ref="svcLogicService"/>
     </bean>
 
-    <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
-               odl:type="default"/>
-
     <reference id="notificationService"
                interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"
                odl:type="default"/>
@@ -41,9 +38,8 @@
                odl:type="default"/>
 
     <bean id="provider" class="org.onap.ccsdk.features.a1.adapter.A1AdapterProvider">
-        <argument ref="dataBroker"/>
-        <argument ref="rpcRegistry"/>
         <argument ref="notificationService"/>
+        <argument ref="rpcRegistry"/>
         <argument ref="client"/>
     </bean>
 

diff --git a/a1-adapter/a1-adapter-api/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/a1-adapter/a1-adapter-api/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 2940360..28dfb5e 100644 (file)
--- a/a1-adapter/a1-adapter-api/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/a1-adapter/a1-adapter-api/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -30,9 +30,6 @@
         <argument ref="svcLogicService"/>
     </bean>
 
-    <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
-               odl:type="default"/>
-
     <reference id="notificationService"
                interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"
                odl:type="default"/>
@@ -41,9 +38,8 @@
                odl:type="default"/>
 
     <bean id="provider" class="org.onap.ccsdk.features.a1.adapter.A1AdapterProvider">
-        <argument ref="dataBroker"/>
-        <argument ref="rpcRegistry"/>
         <argument ref="notificationService"/>
+        <argument ref="rpcRegistry"/>
         <argument ref="client"/>
     </bean>