Use instanceof pattern 35/102035/2
authorRobert Varga <robert.varga@pantheon.tech>
Wed, 10 Aug 2022 13:20:23 +0000 (15:20 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Wed, 10 Aug 2022 14:10:37 +0000 (16:10 +0200)
We can simplify things a bit by removing unneeded casts.

Change-Id: I553f14e70e5f1d6caa497b5fa4644367303fecf1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/leafref/LeafRefUtils.java

index 209e28c740f863853dbcd953695a0c5a6ae073e0..ac9fbe9708507e1167179f2316ab1e954ab52500 100644 (file)
@@ -65,14 +65,14 @@ public final class LeafRefUtils {
             final QName qname = nodePathIterator.next();
             final DataSchemaNode child = currenDataNodeContainer.dataChildByName(qname);
 
-            if (child instanceof DataNodeContainer) {
+            if (child instanceof DataNodeContainer container) {
                 if (!(child instanceof CaseSchemaNode)) {
                     xpath.add(new SimpleQNameWithPredicate(qname));
                 }
-                currenDataNodeContainer = (DataNodeContainer) child;
-            } else if (child instanceof ChoiceSchemaNode) {
+                currenDataNodeContainer = container;
+            } else if (child instanceof ChoiceSchemaNode choice) {
                 if (nodePathIterator.hasNext()) {
-                    currenDataNodeContainer = ((ChoiceSchemaNode) child).findCase(nodePathIterator.next()).orElse(null);
+                    currenDataNodeContainer = choice.findCase(nodePathIterator.next()).orElse(null);
                 } else {
                     break;
                 }