Code Review / controller.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
move binding-broker.xml DI into BindingBrokerWiring
[controller.git] / opendaylight / md-sal / sal-binding-broker / src / main / resources / org / opendaylight / blueprint / binding-broker.xml
diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/resources/org/opendaylight/blueprint/binding-broker.xml b/opendaylight/md-sal/sal-binding-broker/src/main/resources/org/opendaylight/blueprint/binding-broker.xml
index e156c1e7a13d7d0fe2909c904f586691a67ec749..8b13c00f9666c78ad8051970c9715fd0094445f9 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/resources/org/opendaylight/blueprint/binding-broker.xml
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/resources/org/opendaylight/blueprint/binding-broker.xml
@@ -2,23 +2,36 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
 
-  <!-- Runtime binding/normalized mapping service -->
-
-  <reference id="classLoadingStrategy" interface="org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy"/>
+  <reference id="classLoadingStrategy" interface="org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy" />
   <reference id="schemaService" interface="org.opendaylight.mdsal.dom.api.DOMSchemaService" />
+  <reference id="domRpcService" interface="org.opendaylight.controller.md.sal.dom.api.DOMRpcService"/>
+  <reference id="domRpcRegistry" interface="org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService"/>
+  <reference id="domMountPointService" interface="org.opendaylight.controller.md.sal.dom.api.DOMMountPointService"/>
+  <reference id="domNotificationService" interface="org.opendaylight.controller.md.sal.dom.api.DOMNotificationService"/>
+  <reference id="domNotificationPublishService" interface="org.opendaylight.controller.md.sal.dom.api.DOMNotificationPublishService"/>
+  <reference id="domNotificationListenerRegistry" interface="org.opendaylight.controller.md.sal.dom.spi.DOMNotificationSubscriptionListenerRegistry"/>
+  <reference id="domDefaultDataBroker" interface="org.opendaylight.controller.md.sal.dom.api.DOMDataBroker"
+          odl:type="default"/>
+  <reference id="domPingPongDataBroker" interface="org.opendaylight.controller.md.sal.dom.api.DOMDataBroker"
+          odl:type="pingpong"/>
 
-  <bean id="mappingCodec" class="org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodecFactory"
-         factory-method="newInstance">
+  <bean id="wiring" class="org.opendaylight.controller.md.sal.binding.impl.BindingBrokerWiring">
     <argument ref="classLoadingStrategy"/>
-  </bean>
-
-  <!-- Register the BindingToNormalizedNodeCodec with the SchemaService as a SchemaContextListener -->
-  <bean id="mappingCodecListenerReg" class="org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodecFactory"
-         factory-method="registerInstance" destroy-method="close">
-    <argument ref="mappingCodec"/>
     <argument ref="schemaService"/>
+    <argument ref="domRpcService"/>
+    <argument ref="domRpcRegistry"/>
+    <argument ref="domMountPointService"/>
+    <argument ref="domNotificationService"/>
+    <argument ref="domNotificationPublishService"/>
+    <argument ref="domNotificationListenerRegistry"/>
+    <argument ref="domDefaultDataBroker"/>
+    <argument ref="domPingPongDataBroker"/>
   </bean>
 
+  <!-- Runtime binding/normalized mapping service -->
+
+  <bean id="mappingCodec" factory-ref="wiring" factory-method="getBindingToNormalizedNodeCodec" />
+
   <service ref="mappingCodec" odl:type="default">
     <interfaces>
       <value>org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer</value>
@@ -30,9 +43,7 @@
   <service id="codec" ref="mappingCodec" interface="org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec"/>
 
   <!-- Adapter service -->
-  <bean id="adapterFactory" class="org.opendaylight.controller.md.sal.binding.impl.BindingToDOMAdapterFactory">
-    <argument ref="mappingCodec"/>
-  </bean>
+  <bean id="adapterFactory" factory-ref="wiring" factory-method="getAdapterFactory" />
 
   <service id="factory" ref="adapterFactory">
     <interfaces>
@@ -42,105 +53,56 @@
 
   <!-- Binding RPC Registry Service -->
 
-  <reference id="domRpcService" interface="org.opendaylight.controller.md.sal.dom.api.DOMRpcService"/>
-
-  <bean id="bindingRpcServiceAdapter" class="org.opendaylight.controller.md.sal.binding.impl.BindingDOMRpcServiceAdapter" >
-    <argument ref="domRpcService"/>
-    <argument ref="mappingCodec"/>
-  </bean>
-
-  <reference id="domRpcRegistry" interface="org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService"/>
-
-  <bean id="bindingRpcProviderAdapter" class="org.opendaylight.controller.md.sal.binding.impl.BindingDOMRpcProviderServiceAdapter" >
-    <argument ref="domRpcRegistry"/>
-    <argument ref="mappingCodec"/>
-  </bean>
-
-  <bean id="bindingRpcRegistry" class="org.opendaylight.controller.md.sal.binding.compat.HeliumRpcProviderRegistry" >
-    <argument ref="bindingRpcServiceAdapter"/>
-    <argument ref="bindingRpcProviderAdapter"/>
-  </bean>
+  <bean id="bindingRpcRegistry" factory-ref="wiring" factory-method="getRpcProviderRegistry" />
 
   <service ref="bindingRpcRegistry" interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"
           odl:type="default"/>
 
   <!-- Binding MountPoint Service -->
 
-  <reference id="domMountPointService" interface="org.opendaylight.controller.md.sal.dom.api.DOMMountPointService"/>
-
-  <bean id="bindingMountPointService" class="org.opendaylight.controller.md.sal.binding.impl.BindingDOMMountPointServiceAdapter" >
-    <argument ref="domMountPointService"/>
-    <argument ref="mappingCodec"/>
-  </bean>
+  <bean id="bindingMountPointService" factory-ref="wiring" factory-method="getMountPointService" />
 
   <service ref="bindingMountPointService" interface="org.opendaylight.controller.md.sal.binding.api.MountPointService"
           odl:type="default"/>
 
   <!-- Binding Notification Service -->
 
-  <reference id="domNotificationService" interface="org.opendaylight.controller.md.sal.dom.api.DOMNotificationService"/>
-
-  <bean id="bindingNotificationServiceAdapter" class="org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationServiceAdapter">
-    <argument>
-      <bean factory-ref="mappingCodec" factory-method="getCodecRegistry"/>
-    </argument>
-    <argument ref="domNotificationService"/>
-  </bean>
-
+  <bean id="bindingNotificationServiceAdapter" factory-ref="wiring" factory-method="getNotificationService" />
   <service ref="bindingNotificationServiceAdapter" interface="org.opendaylight.controller.md.sal.binding.api.NotificationService"
           odl:type="default"/>
 
-  <reference id="domNotificationPublishService" interface="org.opendaylight.controller.md.sal.dom.api.DOMNotificationPublishService"/>
-
-  <bean id="bindingNotificationPublishAdapter" class="org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationPublishServiceAdapter">
-    <argument ref="mappingCodec"/>
-    <argument ref="domNotificationPublishService"/>
-  </bean>
-
+  <bean id="bindingNotificationPublishAdapter" factory-ref="wiring" factory-method="getNotificationPublishService" />
   <service ref="bindingNotificationPublishAdapter" interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"
           odl:type="default"/>
 
-  <reference id="domNotificationListenerRegistry" interface="org.opendaylight.controller.md.sal.dom.spi.DOMNotificationSubscriptionListenerRegistry"/>
-
-  <bean id="bindingNotificationProviderService" class="org.opendaylight.controller.md.sal.binding.compat.HeliumNotificationProviderServiceWithInterestListeners">
-    <argument ref="bindingNotificationPublishAdapter"/>
-    <argument ref="bindingNotificationServiceAdapter"/>
-    <argument ref="domNotificationListenerRegistry"/>
-  </bean>
+  <bean id="notificationProviderService" factory-ref="wiring" factory-method="getNotificationProviderService" />
+  <service ref="notificationProviderService" interface="org.opendaylight.controller.sal.binding.api.NotificationProviderService" odl:type="default" />
 
-  <service ref="bindingNotificationProviderService" odl:type="default">
-    <interfaces>
-      <value>org.opendaylight.controller.sal.binding.api.NotificationProviderService</value>
-      <value>org.opendaylight.controller.sal.binding.api.NotificationService</value>
-    </interfaces>
-  </service>
+  <bean id="deprecatedNotificationService" factory-ref="wiring" factory-method="getNotificationProviderService" />
+  <service ref="deprecatedNotificationService" interface="org.opendaylight.controller.sal.binding.api.NotificationService" odl:type="default" />
 
   <!-- Binding DataBroker -->
 
-  <reference id="domDefaultDataBroker" interface="org.opendaylight.controller.md.sal.dom.api.DOMDataBroker"
-          odl:type="default"/>
-
-  <bean id="bindingDataBroker" factory-ref="adapterFactory" factory-method="createDataBroker">
-    <argument ref="domDefaultDataBroker"/>
-  </bean>
+  <bean id="bindingDataBroker" factory-ref="wiring" factory-method="getDataBroker" />
 
   <service ref="bindingDataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
           odl:type="default"/>
 
   <!-- Binding PingPong DataBroker -->
 
-  <reference id="domPingPongDataBroker" interface="org.opendaylight.controller.md.sal.dom.api.DOMDataBroker"
-          odl:type="pingpong"/>
-
-  <bean id="bindingPingPongDataBroker" factory-ref="adapterFactory" factory-method="createDataBroker">
-    <argument ref="domPingPongDataBroker"/>
-  </bean>
+  <bean id="bindingPingPongDataBroker" factory-ref="wiring" factory-method="getPingPongDataBroker" />
 
   <service ref="bindingPingPongDataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
           odl:type="pingpong"/>
 
   <!-- Legacy BindingAwareBroker -->
 
+  <bean id="bindingNotificationProviderService" class="org.opendaylight.controller.md.sal.binding.compat.HeliumNotificationProviderServiceWithInterestListeners">
+    <argument ref="bindingNotificationPublishAdapter"/>
+    <argument ref="bindingNotificationServiceAdapter"/>
+    <argument ref="domNotificationListenerRegistry"/>
+  </bean>
+
   <bean id="bindingAwareBroker" class="org.opendaylight.controller.sal.binding.impl.RootBindingAwareBroker"
       init-method="start" destroy-method="close">
     <argument value="deprecated-BindingAwareBroker"/>
OpenDaylight controller