Inline restconfApplication

This bean is used only once, inline it in its sole user.

Change-Id: I00f886cee80d4c6e6279fe6de0f97b35067078f8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 bf0771166c3c9ad9b1f3a44e403c9714742bc2fc..29613be3b2c658ac75d1ae1641ca836ac279786a 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
@@ -38,16 +38,6 @@
     <argument value="${use-sse}" />
   </bean>
 
-  <bean id="restconfApplication" class="org.opendaylight.restconf.nb.rfc8040.RestconfApplication">
-    <argument ref="databindProvider"/>
-    <argument ref="dOMMountPointService"/>
-    <argument ref="dOMDataBroker"/>
-    <argument ref="dOMRpcService"/>
-    <argument ref="dOMActionService"/>
-    <argument ref="dOMNotificationService"/>
-    <argument ref="dOMSchemaService"/>
-    <argument ref="configuration"/>
-  </bean>
   <bean id="restconfDataStreamServiceImpl" class="org.opendaylight.restconf.nb.rfc8040.rests.services.impl.RestconfDataStreamServiceImpl">
     <argument ref="scheduledThreadPool"/>
     <argument ref="configuration"/>
@@ -56,7 +46,18 @@
     <argument ref="webServer"/>
     <argument ref="webContextSecurer"/>
     <argument ref="servletSupport"/>
-    <argument ref="restconfApplication"/>
+    <argument>
+      <bean class="org.opendaylight.restconf.nb.rfc8040.RestconfApplication">
+        <argument ref="databindProvider"/>
+        <argument ref="dOMMountPointService"/>
+        <argument ref="dOMDataBroker"/>
+        <argument ref="dOMRpcService"/>
+        <argument ref="dOMActionService"/>
+        <argument ref="dOMNotificationService"/>
+        <argument ref="dOMSchemaService"/>
+        <argument ref="configuration"/>
+      </bean>
+    </argument>
     <argument>
       <bean class="org.opendaylight.restconf.nb.rfc8040.DataStreamApplication">
         <argument ref="databindProvider"/>