diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2018-04-10 07:10:53 +0200 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2018-04-10 07:10:59 +0200 |
| commit | 7cde100cc6e732b0ff335e6f3de66d97544d06da (patch) | |
| tree | b423731d3041430d21419c61d68d565d08fd21e1 /infra/northbound | |
| parent | 023dc70e4c10ccba8b4676687d6629a93aa9f058 (diff) | |
Fix various Sonar warnings
Change-Id: I0883042a80525b72f33e66fdb0d5b9e600dcc713
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'infra/northbound')
2 files changed, 3 insertions, 5 deletions
diff --git a/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java b/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java index e402f046d..49e94bbb4 100644 --- a/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java +++ b/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java @@ -23,7 +23,6 @@ import io.fd.honeycomb.data.init.ShutdownHandler; import org.opendaylight.controller.config.yang.netconf.mdsal.notification.CapabilityChangeNotificationProducer; import org.opendaylight.controller.config.yang.netconf.mdsal.notification.NotificationToMdsalWriter; import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactoryListener; @@ -65,8 +64,7 @@ public class NetconfNotificationMapperProvider extends ProviderTrait<NetconfOper writer.start(); LOG.trace("Initializing CapabilityChangeNotificationProducer"); - final DataTreeChangeListener<Capabilities> publisher = - new CapabilityChangeNotificationProducer(notificationCollector, dataBroker); + new CapabilityChangeNotificationProducer(notificationCollector, dataBroker); LOG.trace("Providing NetconfNotificationOperationServiceFactory"); NetconfNotificationOperationServiceFactory netconfNotificationOperationServiceFactory = diff --git a/infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpsConnectorProvider.java b/infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpsConnectorProvider.java index 5a27bcb8e..b88819285 100644 --- a/infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpsConnectorProvider.java +++ b/infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpsConnectorProvider.java @@ -59,10 +59,10 @@ final class HttpsConnectorProvider extends ProviderTrait<ServerConnector> { URL keystoreURL = getClass().getResource(cfg.restconfKeystore.get()); sslContextFactory.setKeyStorePath(keystoreURL.getPath()); sslContextFactory.setKeyStorePassword(cfg.keystorePassword.get()); - sslContextFactory.setKeyManagerPassword((cfg.keystoreManagerPassword.get())); + sslContextFactory.setKeyManagerPassword(cfg.keystoreManagerPassword.get()); URL truststoreURL = getClass().getResource(cfg.restconfTruststore.get()); sslContextFactory.setTrustStorePath(truststoreURL.getPath()); - sslContextFactory.setTrustStorePassword((cfg.truststorePassword.get())); + sslContextFactory.setTrustStorePassword(cfg.truststorePassword.get()); // TODO HONEYCOMB-167 make this more configurable sslContextFactory.setExcludeCipherSuites("SSL_RSA_WITH_DES_CBC_SHA", "SSL_DHE_RSA_WITH_DES_CBC_SHA", "SSL_DHE_DSS_WITH_DES_CBC_SHA", "SSL_RSA_EXPORT_WITH_RC4_40_MD5", |