From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 16 Aug 2019 11:27:00 +0000 (+0200)
Subject: Optimize BindingSchemaContextUtils.findDataNodeContainer()
X-Git-Tag: v5.0.0~63
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=9501424992ebd40cedc2e29310aef4892e41e90b;p=mdsal.git

Optimize BindingSchemaContextUtils.findDataNodeContainer()

The method is performing duplicate instanceof check, refactor it
to to performing only one such check.

Change-Id: I64ba25f4c35dcc5aeaf81e1200ce50a971566973
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/BindingSchemaContextUtils.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingSchemaContextUtils.java
index 70345d0e6b..719e6095a0 100644
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingSchemaContextUtils.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingSchemaContextUtils.java
@@ -97,11 +97,12 @@ public final class BindingSchemaContextUtils {
                 if (potential != null) {
                     return Optional.of(potential);
                 }
-            } else if (child instanceof DataNodeContainer && child.getQName().equals(targetQName)) {
-                return Optional.of((DataNodeContainer) child);
-            } else if (child instanceof DataNodeContainer && child.isAddedByUses()
-                    && child.getQName().getLocalName().equals(targetQName.getLocalName())) {
-                return Optional.of((DataNodeContainer) child);
+            } else if (child instanceof DataNodeContainer) {
+                final QName qname = child.getQName();
+                if (qname.equals(targetQName)
+                        || child.isAddedByUses() && qname.getLocalName().equals(targetQName.getLocalName())) {
+                    return Optional.of((DataNodeContainer) child);
+                }
             }
 
         }