From 2fdcd6472ec5094fd2fc72afd03d309d90d649fd Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 26 Nov 2022 11:05:31 +0100
Subject: [PATCH 1/1] 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>
---
 .../parser/rfc7950/stmt/meta/ChoiceStatementSupport.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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 1161d149ef..4b99a13371 100644
--- 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;
             }
         }
 
-- 
2.36.6