Merge instanceof and qname check

Pattern matching allows these to be merged, as pointed out by Sonar.

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

diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ChoiceStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ChoiceStatementSupport.java
index 1161d149ef13a2500d19b6fdbe399fe9eaabd56d..4b99a133712769ee06642734e853e78fd075b586 100644 (file)
--- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ChoiceStatementSupport.java
+++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ChoiceStatementSupport.java
@@ -193,10 +193,9 @@ public final class ChoiceStatementSupport
     private static CaseSchemaNode findCase(final QName qname,
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
         for (final EffectiveStatement<?, ?> effectiveStatement : substatements) {
-            if (effectiveStatement instanceof CaseSchemaNode choiceCaseNode) {
-                if (qname.equals(choiceCaseNode.getQName())) {
-                    return choiceCaseNode;
-                }
+            if (effectiveStatement instanceof CaseSchemaNode choiceCaseNode
+                && qname.equals(choiceCaseNode.getQName())) {
+                return choiceCaseNode;
             }
         }