From ec7bce2e607ae67c783df0490c03ec0bc61d598c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 26 Dec 2019 13:51:40 +0100 Subject: [PATCH] Split out RFC7950 ANTLR grammars ANTLR-generated code does not pass SpotBugs validation, leaving a lot of code uncovered by SpotBugs enforcement. This patch splits the grammars into a separate artifact, allowing the rest of the parser to be cleaned up. JIRA: YANGTOOLS-1057 Change-Id: If65bf28e1add5085cb43a2fc2ad71cafc4cd6adb Signed-off-by: Robert Varga --- artifacts/pom.xml | 5 ++ docs/pom.xml | 4 ++ yang/pom.xml | 1 + yang/yang-parser-antlr/pom.xml | 56 +++++++++++++++++++ .../parser/antlr}/IfFeatureExpressionLexer.g4 | 0 .../antlr}/IfFeatureExpressionParser.g4 | 0 .../yang/parser/antlr}/LeafRefPathLexer.g4 | 0 .../yang/parser/antlr}/LeafRefPathParser.g4 | 0 .../yang/parser/antlr}/YangStatementLexer.g4 | 0 .../yang/parser/antlr}/YangStatementParser.g4 | 0 .../src/main/java/module-info.java | 12 ++++ .../yang/parser/antlr/package-info.java | 12 ++++ .../repo/SharedSchemaContextFactory.java | 2 +- yang/yang-parser-rfc7950/pom.xml | 26 ++------- .../rfc7950/repo/ArgumentContextUtils.java | 2 +- .../rfc7950/repo/StatementContextVisitor.java | 6 +- .../rfc7950/repo/YangModelDependencyInfo.java | 4 +- .../repo/YangStatementStreamSource.java | 6 +- .../if_feature/IfFeaturePredicateVisitor.java | 16 +++--- .../stmt/path/PathExpressionParser.java | 28 +++++----- 20 files changed, 127 insertions(+), 53 deletions(-) create mode 100644 yang/yang-parser-antlr/pom.xml rename yang/{yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen => yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr}/IfFeatureExpressionLexer.g4 (100%) rename yang/{yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen => yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr}/IfFeatureExpressionParser.g4 (100%) rename yang/{yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen => yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr}/LeafRefPathLexer.g4 (100%) rename yang/{yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen => yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr}/LeafRefPathParser.g4 (100%) rename yang/{yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen => yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr}/YangStatementLexer.g4 (100%) rename yang/{yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen => yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr}/YangStatementParser.g4 (100%) create mode 100644 yang/yang-parser-antlr/src/main/java/module-info.java create mode 100644 yang/yang-parser-antlr/src/main/java/org/opendaylight/yangtools/yang/parser/antlr/package-info.java diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 1eb26fa34c..7fa70f5f32 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -114,6 +114,11 @@ yang-parser-impl 4.0.4-SNAPSHOT + + org.opendaylight.yangtools + yang-parser-antlr + 4.0.4-SNAPSHOT + org.opendaylight.yangtools yang-parser-rfc7950 diff --git a/docs/pom.xml b/docs/pom.xml index 1f203f1ba3..9f6e9f56f1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -94,6 +94,10 @@ org.opendaylight.yangtools yang-parser-impl + + org.opendaylight.yangtools + yang-parser-antlr + org.opendaylight.yangtools yang-parser-rfc7950 diff --git a/yang/pom.xml b/yang/pom.xml index 9732c75d2c..fe9987951e 100644 --- a/yang/pom.xml +++ b/yang/pom.xml @@ -62,6 +62,7 @@ yang-parser-reactor + yang-parser-antlr yang-parser-rfc7950 diff --git a/yang/yang-parser-antlr/pom.xml b/yang/yang-parser-antlr/pom.xml new file mode 100644 index 0000000000..72db3a5cca --- /dev/null +++ b/yang/yang-parser-antlr/pom.xml @@ -0,0 +1,56 @@ + + + + + 4.0.0 + + org.opendaylight.yangtools + bundle-parent + 4.0.4-SNAPSHOT + ../../bundle-parent + + + yang-parser-antlr + bundle + ${project.artifactId} + RFC6020/RFC7950 ANTLR grammars + + + + true + + + + + org.antlr + antlr4-runtime + + + + + + + org.antlr + antlr4-maven-plugin + + + + antlr4 + + + + + true + false + + + + + + diff --git a/yang/yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen/IfFeatureExpressionLexer.g4 b/yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/IfFeatureExpressionLexer.g4 similarity index 100% rename from yang/yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen/IfFeatureExpressionLexer.g4 rename to yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/IfFeatureExpressionLexer.g4 diff --git a/yang/yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen/IfFeatureExpressionParser.g4 b/yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/IfFeatureExpressionParser.g4 similarity index 100% rename from yang/yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen/IfFeatureExpressionParser.g4 rename to yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/IfFeatureExpressionParser.g4 diff --git a/yang/yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen/LeafRefPathLexer.g4 b/yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/LeafRefPathLexer.g4 similarity index 100% rename from yang/yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen/LeafRefPathLexer.g4 rename to yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/LeafRefPathLexer.g4 diff --git a/yang/yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen/LeafRefPathParser.g4 b/yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/LeafRefPathParser.g4 similarity index 100% rename from yang/yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen/LeafRefPathParser.g4 rename to yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/LeafRefPathParser.g4 diff --git a/yang/yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen/YangStatementLexer.g4 b/yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/YangStatementLexer.g4 similarity index 100% rename from yang/yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen/YangStatementLexer.g4 rename to yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/YangStatementLexer.g4 diff --git a/yang/yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen/YangStatementParser.g4 b/yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/YangStatementParser.g4 similarity index 100% rename from yang/yang-parser-rfc7950/src/main/antlr4/org/opendaylight/yangtools/antlrv4/code/gen/YangStatementParser.g4 rename to yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/YangStatementParser.g4 diff --git a/yang/yang-parser-antlr/src/main/java/module-info.java b/yang/yang-parser-antlr/src/main/java/module-info.java new file mode 100644 index 0000000000..458a210e99 --- /dev/null +++ b/yang/yang-parser-antlr/src/main/java/module-info.java @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2019 PANTHEON.tech, s.r.o. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +module org.opendaylight.yangtools.yang.parser.antlr { + exports org.opendaylight.yangtools.yang.parser.antlr; + + requires org.antlr.antlr4.runtime; +} diff --git a/yang/yang-parser-antlr/src/main/java/org/opendaylight/yangtools/yang/parser/antlr/package-info.java b/yang/yang-parser-antlr/src/main/java/org/opendaylight/yangtools/yang/parser/antlr/package-info.java new file mode 100644 index 0000000000..db9b8a1fe9 --- /dev/null +++ b/yang/yang-parser-antlr/src/main/java/org/opendaylight/yangtools/yang/parser/antlr/package-info.java @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2019 PANTHEON.tech, s.r.o. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +/** + * ANTLR grammars for parsing RFC7950 constructs. This package is considered an implementation detail and does not + * fall under API stability contract. Use at your own risk. + */ +package org.opendaylight.yangtools.yang.parser.antlr; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java index 95405b1ee4..396bd754b6 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java @@ -36,7 +36,6 @@ import java.util.concurrent.ExecutionException; import org.antlr.v4.runtime.ParserRuleContext; import org.eclipse.jdt.annotation.NonNull; import org.gaul.modernizer_maven_annotations.SuppressModernizer; -import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParser.StatementContext; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.repo.api.EffectiveModelContextFactory; import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactoryConfiguration; @@ -44,6 +43,7 @@ import org.opendaylight.yangtools.yang.model.repo.api.SchemaRepository; import org.opendaylight.yangtools.yang.model.repo.api.SchemaResolutionException; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; +import org.opendaylight.yangtools.yang.parser.antlr.YangStatementParser.StatementContext; import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors; import org.opendaylight.yangtools.yang.parser.rfc7950.repo.ASTSchemaSource; import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YangModelDependencyInfo; diff --git a/yang/yang-parser-rfc7950/pom.xml b/yang/yang-parser-rfc7950/pom.xml index c0b8578cae..9ac9f9120d 100644 --- a/yang/yang-parser-rfc7950/pom.xml +++ b/yang/yang-parser-rfc7950/pom.xml @@ -22,7 +22,7 @@ RFC6020/RFC7950 parser support - + false @@ -57,16 +57,15 @@ org.opendaylight.yangtools - yang-model-util + yang-parser-antlr org.opendaylight.yangtools - openconfig-model-api + yang-model-util - - org.antlr - antlr4-runtime + org.opendaylight.yangtools + openconfig-model-api @@ -83,21 +82,6 @@ - - org.antlr - antlr4-maven-plugin - - - - antlr4 - - - - - true - false - - org.apache.felix maven-bundle-plugin diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/ArgumentContextUtils.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/ArgumentContextUtils.java index 329e323a37..49cc96f16e 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/ArgumentContextUtils.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/ArgumentContextUtils.java @@ -13,8 +13,8 @@ import java.util.Collections; import java.util.List; import java.util.regex.Pattern; import org.antlr.v4.runtime.tree.TerminalNode; -import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParser.ArgumentContext; import org.opendaylight.yangtools.yang.common.YangVersion; +import org.opendaylight.yangtools.yang.parser.antlr.YangStatementParser.ArgumentContext; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementContextVisitor.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementContextVisitor.java index 5672a36391..faefa05cc1 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementContextVisitor.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementContextVisitor.java @@ -12,14 +12,14 @@ import static java.util.Objects.requireNonNull; import java.util.Optional; import org.antlr.v4.runtime.tree.ParseTree; -import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParser.ArgumentContext; -import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParser.KeywordContext; -import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParser.StatementContext; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.YangConstants; import org.opendaylight.yangtools.yang.common.YangVersion; import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; +import org.opendaylight.yangtools.yang.parser.antlr.YangStatementParser.ArgumentContext; +import org.opendaylight.yangtools.yang.parser.antlr.YangStatementParser.KeywordContext; +import org.opendaylight.yangtools.yang.parser.antlr.YangStatementParser.StatementContext; import org.opendaylight.yangtools.yang.parser.spi.source.DeclarationInTextSource; import org.opendaylight.yangtools.yang.parser.spi.source.PrefixToModule; import org.opendaylight.yangtools.yang.parser.spi.source.QNameToStatementDefinition; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java index d06e15ea06..1c8c5bf750 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java @@ -23,8 +23,6 @@ import java.util.Set; import org.antlr.v4.runtime.ParserRuleContext; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParser.ArgumentContext; -import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParser.StatementContext; import org.opendaylight.yangtools.concepts.SemVer; import org.opendaylight.yangtools.openconfig.model.api.OpenConfigStatements; import org.opendaylight.yangtools.yang.common.QName; @@ -35,6 +33,8 @@ import org.opendaylight.yangtools.yang.model.api.YangStmtMapping; import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; +import org.opendaylight.yangtools.yang.parser.antlr.YangStatementParser.ArgumentContext; +import org.opendaylight.yangtools.yang.parser.antlr.YangStatementParser.StatementContext; import org.opendaylight.yangtools.yang.parser.spi.source.DeclarationInTextSource; import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangStatementStreamSource.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangStatementStreamSource.java index 354e8d93af..588cac66ad 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangStatementStreamSource.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangStatementStreamSource.java @@ -21,9 +21,6 @@ import org.antlr.v4.runtime.tree.ErrorNode; import org.antlr.v4.runtime.tree.ParseTreeListener; import org.antlr.v4.runtime.tree.ParseTreeWalker; import org.antlr.v4.runtime.tree.TerminalNode; -import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementLexer; -import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParser; -import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParser.StatementContext; import org.opendaylight.yangtools.concepts.AbstractIdentifiable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; @@ -32,6 +29,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; +import org.opendaylight.yangtools.yang.parser.antlr.YangStatementLexer; +import org.opendaylight.yangtools.yang.parser.antlr.YangStatementParser; +import org.opendaylight.yangtools.yang.parser.antlr.YangStatementParser.StatementContext; import org.opendaylight.yangtools.yang.parser.spi.source.PrefixToModule; import org.opendaylight.yangtools.yang.parser.spi.source.QNameToStatementDefinition; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeaturePredicateVisitor.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeaturePredicateVisitor.java index 117101620d..5191e190ff 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeaturePredicateVisitor.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeaturePredicateVisitor.java @@ -16,14 +16,14 @@ import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CommonTokenStream; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yangtools.antlrv4.code.gen.IfFeatureExpressionLexer; -import org.opendaylight.yangtools.antlrv4.code.gen.IfFeatureExpressionParser; -import org.opendaylight.yangtools.antlrv4.code.gen.IfFeatureExpressionParser.Identifier_ref_argContext; -import org.opendaylight.yangtools.antlrv4.code.gen.IfFeatureExpressionParser.If_feature_exprContext; -import org.opendaylight.yangtools.antlrv4.code.gen.IfFeatureExpressionParser.If_feature_factorContext; -import org.opendaylight.yangtools.antlrv4.code.gen.IfFeatureExpressionParser.If_feature_termContext; -import org.opendaylight.yangtools.antlrv4.code.gen.IfFeatureExpressionParserBaseVisitor; import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureExpr; +import org.opendaylight.yangtools.yang.parser.antlr.IfFeatureExpressionLexer; +import org.opendaylight.yangtools.yang.parser.antlr.IfFeatureExpressionParser; +import org.opendaylight.yangtools.yang.parser.antlr.IfFeatureExpressionParser.Identifier_ref_argContext; +import org.opendaylight.yangtools.yang.parser.antlr.IfFeatureExpressionParser.If_feature_exprContext; +import org.opendaylight.yangtools.yang.parser.antlr.IfFeatureExpressionParser.If_feature_factorContext; +import org.opendaylight.yangtools.yang.parser.antlr.IfFeatureExpressionParser.If_feature_termContext; +import org.opendaylight.yangtools.yang.parser.antlr.IfFeatureExpressionParserBaseVisitor; import org.opendaylight.yangtools.yang.parser.rfc7950.antlr.SourceExceptionParser; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; @@ -86,4 +86,4 @@ final class IfFeaturePredicateVisitor extends IfFeatureExpressionParserBaseVisit public IfFeatureExpr visitIdentifier_ref_arg(final @Nullable Identifier_ref_argContext ctx) { return IfFeatureExpr.isPresent(StmtContextUtils.parseNodeIdentifier(stmtCtx, ctx.getText())); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParser.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParser.java index 91d1da54a7..02b92bce9c 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParser.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParser.java @@ -17,26 +17,26 @@ import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.TerminalNode; -import org.opendaylight.yangtools.antlrv4.code.gen.LeafRefPathLexer; -import org.opendaylight.yangtools.antlrv4.code.gen.LeafRefPathParser; -import org.opendaylight.yangtools.antlrv4.code.gen.LeafRefPathParser.Absolute_pathContext; -import org.opendaylight.yangtools.antlrv4.code.gen.LeafRefPathParser.Deref_exprContext; -import org.opendaylight.yangtools.antlrv4.code.gen.LeafRefPathParser.Deref_function_invocationContext; -import org.opendaylight.yangtools.antlrv4.code.gen.LeafRefPathParser.Descendant_pathContext; -import org.opendaylight.yangtools.antlrv4.code.gen.LeafRefPathParser.Node_identifierContext; -import org.opendaylight.yangtools.antlrv4.code.gen.LeafRefPathParser.Path_argContext; -import org.opendaylight.yangtools.antlrv4.code.gen.LeafRefPathParser.Path_equality_exprContext; -import org.opendaylight.yangtools.antlrv4.code.gen.LeafRefPathParser.Path_key_exprContext; -import org.opendaylight.yangtools.antlrv4.code.gen.LeafRefPathParser.Path_predicateContext; -import org.opendaylight.yangtools.antlrv4.code.gen.LeafRefPathParser.Path_strContext; -import org.opendaylight.yangtools.antlrv4.code.gen.LeafRefPathParser.Rel_path_keyexprContext; -import org.opendaylight.yangtools.antlrv4.code.gen.LeafRefPathParser.Relative_pathContext; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.UnqualifiedQName; import org.opendaylight.yangtools.yang.model.api.PathExpression; import org.opendaylight.yangtools.yang.model.api.PathExpression.DerefSteps; import org.opendaylight.yangtools.yang.model.api.PathExpression.LocationPathSteps; import org.opendaylight.yangtools.yang.model.api.PathExpression.Steps; +import org.opendaylight.yangtools.yang.parser.antlr.LeafRefPathLexer; +import org.opendaylight.yangtools.yang.parser.antlr.LeafRefPathParser; +import org.opendaylight.yangtools.yang.parser.antlr.LeafRefPathParser.Absolute_pathContext; +import org.opendaylight.yangtools.yang.parser.antlr.LeafRefPathParser.Deref_exprContext; +import org.opendaylight.yangtools.yang.parser.antlr.LeafRefPathParser.Deref_function_invocationContext; +import org.opendaylight.yangtools.yang.parser.antlr.LeafRefPathParser.Descendant_pathContext; +import org.opendaylight.yangtools.yang.parser.antlr.LeafRefPathParser.Node_identifierContext; +import org.opendaylight.yangtools.yang.parser.antlr.LeafRefPathParser.Path_argContext; +import org.opendaylight.yangtools.yang.parser.antlr.LeafRefPathParser.Path_equality_exprContext; +import org.opendaylight.yangtools.yang.parser.antlr.LeafRefPathParser.Path_key_exprContext; +import org.opendaylight.yangtools.yang.parser.antlr.LeafRefPathParser.Path_predicateContext; +import org.opendaylight.yangtools.yang.parser.antlr.LeafRefPathParser.Path_strContext; +import org.opendaylight.yangtools.yang.parser.antlr.LeafRefPathParser.Rel_path_keyexprContext; +import org.opendaylight.yangtools.yang.parser.antlr.LeafRefPathParser.Relative_pathContext; import org.opendaylight.yangtools.yang.parser.rfc7950.antlr.SourceExceptionParser; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; -- 2.36.6