From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 8 Feb 2023 18:17:55 +0000 (+0100)
Subject: Inline dataStreamApplication
X-Git-Tag: v5.0.2~19
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=commitdiff_plain;h=fa9f7d5ab720f03462c77500129a5b581edef6a5;hp=2cb65605a91d4a03e369ae1d0b0af1de5807cb2a

Inline dataStreamApplication

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

Change-Id: I1540d48e3479a8bc62d0600e7845ab19772672a6
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 9c4a427829..bf0771166c 100644
--- 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,11 +38,6 @@
     <argument value="${use-sse}" />
   </bean>
 
-  <bean id="dataStreamApplication" class="org.opendaylight.restconf.nb.rfc8040.DataStreamApplication">
-    <argument ref="databindProvider"/>
-    <argument ref="dOMMountPointService"/>
-    <argument ref="restconfDataStreamServiceImpl"/>
-  </bean>
   <bean id="restconfApplication" class="org.opendaylight.restconf.nb.rfc8040.RestconfApplication">
     <argument ref="databindProvider"/>
     <argument ref="dOMMountPointService"/>
@@ -62,7 +57,13 @@
     <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>