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

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 bf0771166c..29613be3b2 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,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"/>