From cb4098c47db62a2ee3bee0a2204d5671fc3c2d86 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 8 Feb 2023 11:56:36 +0100
Subject: [PATCH] Inline serverChannelInitializer

This bean is used only as an argument, inline it to make things clearer.

JIRA: NETCONF-951
Change-Id: Ie461efe86b7b80d087ad41770e8c75275db4b170
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../OSGI-INF/blueprint/mdsal-netconf-impl.xml | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/netconf/mdsal-netconf-impl/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-impl.xml b/netconf/mdsal-netconf-impl/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-impl.xml
index eb8f650fee..288991df5f 100644
--- a/netconf/mdsal-netconf-impl/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-impl.xml
+++ b/netconf/mdsal-netconf-impl/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-impl.xml
@@ -51,22 +51,21 @@
         </argument>
     </bean>
 
-    <bean id="serverChannelInitializer"
-          class="org.opendaylight.netconf.impl.ServerChannelInitializer">
+    <bean id="netconfServerDispatcherImpl"
+          class="org.opendaylight.netconf.impl.NetconfServerDispatcherImpl">
         <argument>
-            <bean class="org.opendaylight.netconf.impl.NetconfServerSessionNegotiatorFactory">
-                <argument ref="global-timer"/>
-                <argument ref="aggregatedNetconfOperationServiceFactoryMappers"/>
-                <argument ref="sessionIdProvider"/>
-                <argument value="${connection-timeout-millis}"/>
-                <argument ref="netconfMonitoringService"/>
+            <bean class="org.opendaylight.netconf.impl.ServerChannelInitializer">
+                <argument>
+                    <bean class="org.opendaylight.netconf.impl.NetconfServerSessionNegotiatorFactory">
+                        <argument ref="global-timer"/>
+                        <argument ref="aggregatedNetconfOperationServiceFactoryMappers"/>
+                        <argument ref="sessionIdProvider"/>
+                        <argument value="${connection-timeout-millis}"/>
+                        <argument ref="netconfMonitoringService"/>
+                    </bean>
+                </argument>
             </bean>
         </argument>
-    </bean>
-
-    <bean id="netconfServerDispatcherImpl"
-          class="org.opendaylight.netconf.impl.NetconfServerDispatcherImpl">
-        <argument ref="serverChannelInitializer"/>
         <argument ref="globalBossGroup"/>
         <argument ref="globalWorkerGroup"/>
     </bean>
-- 
2.36.6