From 5877d8afb2bb9c4a98f77a3e812d79c6e1b41ced Mon Sep 17 00:00:00 2001 From: Ivan Hrasko Date: Tue, 21 May 2024 09:46:48 +0200 Subject: [PATCH] Code review Code review suggestions. Signed-off-by: Ivan Hrasko --- .../main/java/io/lighty/codecs/util/ConverterUtils.java | 7 ++++--- .../java/io/lighty/modules/bgp/deployer/BgpModule.java | 2 +- .../southbound/netconf/impl/NetconfTopologyPlugin.java | 6 ++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/ConverterUtils.java b/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/ConverterUtils.java index 164217527..a336a822f 100644 --- a/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/ConverterUtils.java +++ b/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/ConverterUtils.java @@ -90,14 +90,15 @@ public static Optional loadNotification( * @return {@link QName} for input data or empty. */ public static Optional getRpcQName(final XmlElement xmlElement) { - String namespace = xmlElement.namespace(); + String nxmlNamespace = xmlElement.namespace(); String name = xmlElement.getName(); if (Strings.isNullOrEmpty(name)) { return Optional.empty(); } String revision = null; - if (namespace != null) { - String[] split = namespace.split("\\?"); + String namespace; + if (nxmlNamespace != null) { + String[] split = nxmlNamespace.split("\\?"); if (split.length > 1 && split[1].contains("revision=")) { revision = split[1].replace("revision=", ""); diff --git a/lighty-modules/lighty-bgp/src/main/java/io/lighty/modules/bgp/deployer/BgpModule.java b/lighty-modules/lighty-bgp/src/main/java/io/lighty/modules/bgp/deployer/BgpModule.java index 60a09f422..ec6e55d18 100644 --- a/lighty-modules/lighty-bgp/src/main/java/io/lighty/modules/bgp/deployer/BgpModule.java +++ b/lighty-modules/lighty-bgp/src/main/java/io/lighty/modules/bgp/deployer/BgpModule.java @@ -151,7 +151,7 @@ protected boolean stopProcedure() { try { bgpNettyGroups.close(); } catch (Exception e) { - LOG.warn("Failed to stop BGP dispatcher", e); + LOG.warn("Failed to stop BGP Netty groups", e); closeSuccess = false; } try { diff --git a/lighty-modules/lighty-netconf-sb/src/main/java/io/lighty/modules/southbound/netconf/impl/NetconfTopologyPlugin.java b/lighty-modules/lighty-netconf-sb/src/main/java/io/lighty/modules/southbound/netconf/impl/NetconfTopologyPlugin.java index 4848d10f8..f2c65473d 100644 --- a/lighty-modules/lighty-netconf-sb/src/main/java/io/lighty/modules/southbound/netconf/impl/NetconfTopologyPlugin.java +++ b/lighty-modules/lighty-netconf-sb/src/main/java/io/lighty/modules/southbound/netconf/impl/NetconfTopologyPlugin.java @@ -55,10 +55,8 @@ protected boolean initProcedure() { lightyServices.getBindingDataBroker(), lightyServices.getRpcProviderService(), lightyServices.getClusterSingletonServiceProvider(), encryptionService); final NetconfClientFactory netconfFactory = new NetconfClientFactoryImpl(new DefaultNetconfTimer()); - final CredentialProvider credentialProvider - = new DefaultCredentialProvider(service); - final SslContextFactoryProvider factoryProvider - = new DefaultSslContextFactoryProvider(service); + final CredentialProvider credentialProvider = new DefaultCredentialProvider(service); + final SslContextFactoryProvider factoryProvider = new DefaultSslContextFactoryProvider(service); final NetconfClientConfigurationBuilderFactory factory = new NetconfClientConfigurationBuilderFactoryImpl( encryptionService, credentialProvider, factoryProvider); final NetconfTopologySchemaAssembler assembler = new NetconfTopologySchemaAssembler(1,1,10, TimeUnit.SECONDS);