Remove NetconfCallHomeTlsService.init()

Initialization is inherent to the constructor, really, as otherwise we
end up with a bunch of single-use private fields. This restructures the
invocation so that we do not need a separate init() method and ensures
there are no side-effects we need to worry about.

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

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/NetconfCallHomeTlsService.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/NetconfCallHomeTlsService.java
index 19338192f41d62f44ff4895e8369e51af7ebaf03..3a13a6b55e28f13299b4c3466a2c48d0e74767da 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/NetconfCallHomeTlsService.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/NetconfCallHomeTlsService.java
@@ -15,21 +15,13 @@ import org.opendaylight.netconf.callhome.protocol.CallHomeNetconfSubsystemListen
 import org.opendaylight.netconf.callhome.protocol.tls.NetconfCallHomeTlsServer;
 import org.opendaylight.netconf.callhome.protocol.tls.NetconfCallHomeTlsServerBuilder;
 import org.opendaylight.netconf.callhome.protocol.tls.TlsAllowedDevicesMonitor;
-import org.opendaylight.netconf.client.SslHandlerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class NetconfCallHomeTlsService implements AutoCloseable {
     private static final Logger LOG = LoggerFactory.getLogger(NetconfCallHomeTlsService.class);
 
-    private final Configuration config;
-    private final SslHandlerFactory sslHandlerFactory;
-    private final CallHomeNetconfSubsystemListener subsystemListener;
-    private final EventLoopGroup bossGroup;
-    private final EventLoopGroup workerGroup;
-    private final TlsAllowedDevicesMonitor allowedDevicesMonitor;
-
-    private NetconfCallHomeTlsServer server;
+    private final NetconfCallHomeTlsServer server;
 
     public NetconfCallHomeTlsService(final DataBroker dataBroker, final TlsAllowedDevicesMonitor allowedDevicesMonitor,
             final CallHomeNetconfSubsystemListener subsystemListener, final EventLoopGroup bossGroup,
@@ -42,27 +34,17 @@ public class NetconfCallHomeTlsService implements AutoCloseable {
                                      final CallHomeNetconfSubsystemListener subsystemListener,
                                      final EventLoopGroup bossGroup,
                                      final EventLoopGroup workerGroup, final Configuration config) {
-        this.config = requireNonNull(config);
-        this.subsystemListener = requireNonNull(subsystemListener);
-        this.bossGroup = requireNonNull(bossGroup);
-        this.workerGroup = requireNonNull(workerGroup);
-        this.allowedDevicesMonitor = requireNonNull(allowedDevicesMonitor);
-        sslHandlerFactory = new SslHandlerFactoryAdapter(dataBroker, allowedDevicesMonitor);
-    }
-
-    public void init() {
         LOG.info("Initializing Call Home TLS server instance");
-
-        final NetconfCallHomeTlsServerBuilder builder = new NetconfCallHomeTlsServerBuilder();
-        server = builder.setHost(config.getHost())
+        server = new NetconfCallHomeTlsServerBuilder()
+            .setHost(config.getHost())
             .setPort(config.getPort())
             .setTimeout(config.getTimeout())
             .setMaxConnections(config.getMaxConnections())
-            .setSslHandlerFactory(sslHandlerFactory)
-            .setSubsystemListener(subsystemListener)
-            .setBossGroup(bossGroup)
-            .setWorkerGroup(workerGroup)
-            .setAllowedDevicesMonitor(allowedDevicesMonitor)
+            .setAllowedDevicesMonitor(requireNonNull(allowedDevicesMonitor))
+            .setSslHandlerFactory(new SslHandlerFactoryAdapter(dataBroker, allowedDevicesMonitor))
+            .setSubsystemListener(requireNonNull(subsystemListener))
+            .setBossGroup(requireNonNull(bossGroup))
+            .setWorkerGroup(requireNonNull(workerGroup))
             .build();
         server.start();
 

diff --git a/apps/callhome-provider/src/main/resources/OSGI-INF/blueprint/callhome-topology.xml b/apps/callhome-provider/src/main/resources/OSGI-INF/blueprint/callhome-topology.xml
index fe84d172a3e096d6d57af5bedafb37bf4afb8ecb..5b1c8889b889962d8b306a13e53f62406e19f8a5 100644 (file)
--- a/apps/callhome-provider/src/main/resources/OSGI-INF/blueprint/callhome-topology.xml
+++ b/apps/callhome-provider/src/main/resources/OSGI-INF/blueprint/callhome-topology.xml
@@ -62,7 +62,6 @@
     </bean>
 
     <bean id="netconfCallHomeService" class="org.opendaylight.netconf.callhome.mount.tls.NetconfCallHomeTlsService"
-          init-method="init"
           destroy-method="close">
         <argument ref="dataBroker" />
         <argument ref="allowedDevicesMonitor" />