Inline netconfServerSessionNegotiatorFactory

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

JIRA: NETCONF-951
Change-Id: If0430936c0ad85346ad26ee8903d2f3bfa73b870
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 8ea1f5fec3a1018a047a98ccdb4a400a7f696d0f..eb8f650feefd65242862471288d4c311a7326775 100644 (file)
--- 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,18 +51,17 @@
         </argument>
     </bean>
 
-    <bean id="netconfServerSessionNegotiatorFactory"
-          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>
-
     <bean id="serverChannelInitializer"
           class="org.opendaylight.netconf.impl.ServerChannelInitializer">
-        <argument ref="netconfServerSessionNegotiatorFactory"/>
+        <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>
 
     <bean id="netconfServerDispatcherImpl"