Make NetconfMessageTransformer.getActions() static

This method only requires a SchemaContext, hence we can easily
make it static.

Change-Id: Ic144c217b6eb5cd1b51532de3c585829189ebdb2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java
index fb450518c6424a35bc9722134d7c2909017b86ae..dda6fb53c2c94dd9178327eea78a0e0795002dab 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java
@@ -98,7 +98,7 @@ public class NetconfMessageTransformer implements MessageTransformer<NetconfMess
         this.counter = new MessageCounter();
         this.schemaContext = schemaContext;
         this.mappedRpcs = Maps.uniqueIndex(schemaContext.getOperations(), SchemaNode::getQName);
-        this.actions = getActions();
+        this.actions = getActions(schemaContext);
         this.mappedNotifications = Multimaps.index(schemaContext.getNotifications(),
             node -> node.getQName().withoutRevision());
         this.baseSchema = baseSchema;
@@ -106,7 +106,7 @@ public class NetconfMessageTransformer implements MessageTransformer<NetconfMess
     }
 
     @VisibleForTesting
-    Set<ActionDefinition> getActions() {
+    static Set<ActionDefinition> getActions(final SchemaContext schemaContext) {
         final Builder<ActionDefinition> builder = ImmutableSet.builder();
         for (DataSchemaNode dataSchemaNode : schemaContext.getChildNodes()) {
             if (dataSchemaNode instanceof ActionNodeContainer) {
@@ -116,7 +116,7 @@ public class NetconfMessageTransformer implements MessageTransformer<NetconfMess
         return builder.build();
     }
 
-    private void findAction(final DataSchemaNode dataSchemaNode, final Builder<ActionDefinition> builder) {
+    private static void findAction(final DataSchemaNode dataSchemaNode, final Builder<ActionDefinition> builder) {
         if (dataSchemaNode instanceof ActionNodeContainer) {
             final ActionNodeContainer containerSchemaNode = (ActionNodeContainer) dataSchemaNode;
             for (ActionDefinition actionDefinition : containerSchemaNode.getActions()) {

diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java
index b5003c9f028dd6efdda62ea9ee56a36b61fc8091..46ed509fa08809e278bdcf7ec31595fdfbdde69e 100644 (file)
--- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java
+++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java
@@ -420,7 +420,7 @@ public class NetconfMessageTransformerTest {
         QName enable = QName.create(open, "enable");
         QName kill = QName.create(URN_EXAMPLE_SERVER_FARM_2, REVISION_EXAMPLE_SERVER_FARM_2, "kill");
         Set<QName> qnames = new HashSet<>(Arrays.asList(reset, start, open, enable, kill));
-        Set<ActionDefinition> actions = actionNetconfMessageTransformer.getActions();
+        Set<ActionDefinition> actions = NetconfMessageTransformer.getActions(ACTION_SCHEMA);
         assertTrue(!actions.isEmpty());
         for (ActionDefinition actionDefinition : actions) {
             QName qname = actionDefinition.getQName();