Clarify NetconfSessionPreferences usage

Remove the only one usage of NetconfSessionPreferences method
fromStrings(collection) from production code and mark it
as visible for testing because now it is used only in tests.

Change-Id: Ib17ddafaed113e3f18588e1870b0d53bf26e1513
Signed-off-by: Ivan Hrasko <ivan.hrasko@pantheon.tech>

diff --git a/apps/netconf-topology/src/main/java/org/opendaylight/netconf/topology/spi/NetconfNodeUtils.java b/apps/netconf-topology/src/main/java/org/opendaylight/netconf/topology/spi/NetconfNodeUtils.java
index 3218a40ab03550e7eda18f5b722a5ee87fffe90d..657a66d3b9ea15f4ff826186f790e4ac63083a8b 100644 (file)
--- a/apps/netconf-topology/src/main/java/org/opendaylight/netconf/topology/spi/NetconfNodeUtils.java
+++ b/apps/netconf-topology/src/main/java/org/opendaylight/netconf/topology/spi/NetconfNodeUtils.java
@@ -102,7 +102,8 @@ public final class NetconfNodeUtils {
         }
 
         //non-module capabilities should not exist in yang module capabilities
-        final var sessionPreferences = NetconfSessionPreferences.fromStrings(capabilities);
+        final var sessionPreferences = NetconfSessionPreferences.fromStrings(capabilities,
+            CapabilityOrigin.DeviceAdvertised);
         final var nonModulePrefs = sessionPreferences.nonModuleCaps();
         if (!nonModulePrefs.isEmpty()) {
             throw new IllegalArgumentException("List yang-module-capabilities/capability should contain only module "

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java b/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java
index 4228f955ce3491c3a4cff37446e23cfd9b7a92f1..32aa0a3a68e5344b6b4a50636f96a29f3ecf9be7 100644 (file)
--- a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java
+++ b/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java
@@ -9,6 +9,7 @@ package org.opendaylight.netconf.sal.connect.netconf.listener;
 
 import static java.util.Objects.requireNonNull;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Predicate;
 import com.google.common.base.Splitter;
@@ -48,6 +49,7 @@ public record NetconfSessionPreferences(
         return fromStrings(session.getServerCapabilities());
     }
 
+    @VisibleForTesting
     public static @NonNull NetconfSessionPreferences fromStrings(final Collection<String> capabilities) {
         // we do not know origin of capabilities from only Strings, so we set it to default value
         return fromStrings(capabilities, CapabilityOrigin.DeviceAdvertised);