Require allowedDevicesMonitor

We cannot reasonably operate without the monitor, make sure to require
it.

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

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/SslHandlerFactoryAdapter.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/SslHandlerFactoryAdapter.java
index a64357ee0212f6ee5890652356b4f5e320bfabc3..14dfc14a8246cd7a84662ecd48d0f97a1c1a7ce2 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/SslHandlerFactoryAdapter.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/SslHandlerFactoryAdapter.java
@@ -7,8 +7,11 @@
  */
 package org.opendaylight.netconf.callhome.mount.tls;
 
+import static java.util.Objects.requireNonNull;
+
 import io.netty.handler.ssl.SslHandler;
 import java.util.Set;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.netconf.callhome.protocol.tls.TlsAllowedDevicesMonitor;
 import org.opendaylight.netconf.client.SslHandlerFactory;
@@ -23,10 +26,10 @@ public class SslHandlerFactoryAdapter implements SslHandlerFactory {
     private final TlsAllowedDevicesMonitor allowedDevicesMonitor;
     private final SslHandlerFactory sslHandlerFactory;
 
-    public SslHandlerFactoryAdapter(final DataBroker dataBroker, final TlsAllowedDevicesMonitor allowedDevicesMonitor) {
-        final NetconfKeystoreAdapter keystoreAdapter = new NetconfKeystoreAdapter(dataBroker);
-        this.sslHandlerFactory = new SslHandlerFactoryImpl(keystoreAdapter);
-        this.allowedDevicesMonitor = allowedDevicesMonitor;
+    public SslHandlerFactoryAdapter(final DataBroker dataBroker,
+            final @NonNull TlsAllowedDevicesMonitor allowedDevicesMonitor) {
+        this.allowedDevicesMonitor = requireNonNull(allowedDevicesMonitor);
+        sslHandlerFactory = new SslHandlerFactoryImpl(new NetconfKeystoreAdapter(dataBroker));
     }
 
     @Override