Use ActionNodeContainer.findAction()

This removes custom-coded lookup in favor of the common utility
method.

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

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java
index 97aa9f86b00cb1b197a1a905839e35b3a5a5bfc6..6d697783fc79a0ba46c32a012c13b96d2a327f78 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java
@@ -463,8 +463,7 @@ abstract class AbstractTypeGenerator {
     private Optional<ActionDefinition> findOrigAction(final DataNodeContainer parent, final ActionDefinition action) {
         for (UsesNode uses : parent.getUses()) {
             final GroupingDefinition grp = findUsedGrouping(uses);
-            final Optional<ActionDefinition> found = grp.getActions().stream()
-                    .filter(act -> action.getQName().equals(act.getQName())).findFirst();
+            final Optional<ActionDefinition> found = grp.findAction(action.getQName());
             if (found.isPresent()) {
                 final ActionDefinition result = found.get();
                 return result.isAddedByUses() ? findOrigAction(grp, result) : found;

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMActionRoutingTable.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMActionRoutingTable.java
index 2446cd277aca694e36741631e2ce871294553bc7..00a062cba17f398ad32a07bca5736d2d5e38fb9a 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMActionRoutingTable.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMActionRoutingTable.java
@@ -70,11 +70,7 @@ final class DOMActionRoutingTable extends AbstractDOMRoutingTable<DOMActionInsta
     private static ActionDefinition findActionDefinition(final SchemaContext context, final SchemaPath path) {
         final SchemaNode node = SchemaContextUtil.findDataSchemaNode(context, path.getParent());
         if (node instanceof ActionNodeContainer) {
-            for (ActionDefinition action : ((ActionNodeContainer) node).getActions()) {
-                if (action.getQName().equals(path.getLastComponent())) {
-                    return action;
-                }
-            }
+            return ((ActionNodeContainer) node).findAction(path.getLastComponent()).orElse(null);
         }
         return null;
     }