Use switch expressions in PathExpressionParser

We have two cases of trivially switch() statements, convert them to
switch expressions.

Change-Id: If5212d5e53dc12677e4973288d7ecd80c4192f3e
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/path/PathExpressionParser.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParser.java
index 667d44d34a2ff07f7a5a16cfd175355de3654843..5d3745a84c91110631031ef7385c072362579164 100644 (file)
--- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParser.java
+++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParser.java
@@ -218,26 +218,20 @@ class PathExpressionParser {
     }
 
     private static YangQNameExpr createChildExpr(final StmtContext<?, ?, ?> ctx, final Node_identifierContext qname) {
-        switch (qname.getChildCount()) {
-            case 1:
-                return YangQNameExpr.of(Unqualified.of(qname.getText()).intern());
-            case 3:
-                return YangQNameExpr.of(parseQName(ctx, qname));
-            default:
-                throw new IllegalStateException("Unexpected shape " + qname.getText());
-        }
+        return switch (qname.getChildCount()) {
+            case 1 -> YangQNameExpr.of(Unqualified.of(qname.getText()).intern());
+            case 3 -> YangQNameExpr.of(parseQName(ctx, qname));
+            default -> throw new IllegalStateException("Unexpected shape " + qname.getText());
+        };
     }
 
     private static QNameStep createChildStep(final StmtContext<?, ?, ?> ctx, final Node_identifierContext qname,
             final List<YangExpr> predicates) {
-        switch (qname.getChildCount()) {
-            case 1:
-                return YangXPathAxis.CHILD.asStep(Unqualified.of(qname.getText()).intern(), predicates);
-            case 3:
-                return YangXPathAxis.CHILD.asStep(parseQName(ctx, qname), predicates);
-            default:
-                throw new IllegalStateException("Unexpected shape " + qname.getText());
-        }
+        return switch (qname.getChildCount()) {
+            case 1 -> YangXPathAxis.CHILD.asStep(Unqualified.of(qname.getText()).intern(), predicates);
+            case 3 -> YangXPathAxis.CHILD.asStep(parseQName(ctx, qname), predicates);
+            default -> throw new IllegalStateException("Unexpected shape " + qname.getText());
+        };
     }
 
     private static @NonNull QName parseQName(final StmtContext<?, ?, ?> ctx, final Node_identifierContext qname) {