Inline dataStreamApplication

[netconf.git] / restconf / restconf-nb / src / main / resources / OSGI-INF / blueprint / restconf-bp.xml

diff --git a/restconf/restconf-nb/src/main/resources/OSGI-INF/blueprint/restconf-bp.xml b/restconf/restconf-nb/src/main/resources/OSGI-INF/blueprint/restconf-bp.xml
index 8929b4c333c43890756639513949e1d8b41fc9c0..bf0771166c3c9ad9b1f3a44e403c9714742bc2fc 100644 (file)
--- a/restconf/restconf-nb/src/main/resources/OSGI-INF/blueprint/restconf-bp.xml
+++ b/restconf/restconf-nb/src/main/resources/OSGI-INF/blueprint/restconf-bp.xml
@@ -20,15 +20,14 @@
     </cm:default-properties>
   </cm:property-placeholder>
 
-  <bean id="threadPoolFactory"
-        class="org.opendaylight.controller.config.threadpool.util.NamingThreadPoolFactory">
-    <argument value="${ping-executor-name-prefix}"/>
-  </bean>
-
   <bean id="scheduledThreadPool"
         class="org.opendaylight.controller.config.threadpool.util.ScheduledThreadPoolWrapper">
     <argument value="${max-thread-count}"/>
-    <argument ref="threadPoolFactory"/>
+    <argument>
+      <bean class="org.opendaylight.controller.config.threadpool.util.NamingThreadPoolFactory">
+        <argument value="${ping-executor-name-prefix}"/>
+      </bean>
+    </argument>
   </bean>
 
   <bean id="configuration"
@@ -39,13 +38,8 @@
     <argument value="${use-sse}" />
   </bean>
 
-  <bean id="dataStreamApplication" class="org.opendaylight.restconf.nb.rfc8040.DataStreamApplication">
-    <argument ref="schemaContextHandler"/>
-    <argument ref="dOMMountPointService"/>
-    <argument ref="restconfDataStreamServiceImpl"/>
-  </bean>
   <bean id="restconfApplication" class="org.opendaylight.restconf.nb.rfc8040.RestconfApplication">
-    <argument ref="schemaContextHandler"/>
+    <argument ref="databindProvider"/>
     <argument ref="dOMMountPointService"/>
     <argument ref="dOMDataBroker"/>
     <argument ref="dOMRpcService"/>
@@ -58,16 +52,18 @@
     <argument ref="scheduledThreadPool"/>
     <argument ref="configuration"/>
   </bean>
-  <bean id="schemaContextHandler" class="org.opendaylight.restconf.nb.rfc8040.handlers.SchemaContextHandler" init-method="init" destroy-method="close">
-    <argument ref="dOMDataBroker"/>
-    <argument ref="dOMSchemaService"/>
-  </bean>
   <bean id="webInitializer" class="org.opendaylight.restconf.nb.rfc8040.web.WebInitializer" destroy-method="close">
     <argument ref="webServer"/>
     <argument ref="webContextSecurer"/>
     <argument ref="servletSupport"/>
     <argument ref="restconfApplication"/>
-    <argument ref="dataStreamApplication"/>
+    <argument>
+      <bean class="org.opendaylight.restconf.nb.rfc8040.DataStreamApplication">
+        <argument ref="databindProvider"/>
+        <argument ref="dOMMountPointService"/>
+        <argument ref="restconfDataStreamServiceImpl"/>
+      </bean>
+    </argument>
     <argument ref="customFilterAdapterConfiguration"/>
     <argument ref="webSocketInitializer"/>
   </bean>
@@ -75,6 +71,7 @@
     <argument ref="scheduledThreadPool"/>
     <argument ref="configuration"/>
   </bean>
+  <reference id="databindProvider" interface="org.opendaylight.restconf.nb.rfc8040.databind.DatabindProvider"/>
   <reference id="customFilterAdapterConfiguration" interface="org.opendaylight.aaa.filterchain.configuration.CustomFilterAdapterConfiguration"/>
   <reference id="webContextSecurer" interface="org.opendaylight.aaa.web.WebContextSecurer"/>
   <reference id="webServer" interface="org.opendaylight.aaa.web.WebServer"/>