X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-rfc7950%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Frfc7950%2Fstmt%2Ftype%2FUnionSpecificationSupport.java;h=6504bbd131e6da7cb8abe583ca8035f4637c8839;hb=5db72610e7358baa1f5c9dd85abc9e93f3c8b020;hp=9f069355b4b461d7ea1dfac7b1682770c96dead4;hpb=88aeb1cd912d37fcadf671b622fece9a01297e90;p=yangtools.git diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java index 9f069355b4..6504bbd131 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java @@ -17,11 +17,11 @@ import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.UnionSpecifi import org.opendaylight.yangtools.yang.model.util.type.BaseTypes; import org.opendaylight.yangtools.yang.model.util.type.UnionTypeBuilder; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStatementSupport; +import org.opendaylight.yangtools.yang.parser.spi.meta.CommonStmtCtx; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; -import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference; final class UnionSpecificationSupport extends BaseStatementSupport> { @@ -52,7 +52,7 @@ final class UnionSpecificationSupport @Override protected UnionSpecification createEmptyDeclared(final StmtContext ctx) { - throw noType(ctx.getStatementSourceReference()); + throw noType(ctx); } @Override @@ -60,7 +60,7 @@ final class UnionSpecificationSupport final Current stmt, final ImmutableList> substatements) { if (substatements.isEmpty()) { - throw noType(stmt.sourceReference()); + throw noType(stmt); } final UnionTypeBuilder builder = BaseTypes.unionTypeBuilder(stmt.getSchemaPath()); @@ -74,13 +74,13 @@ final class UnionSpecificationSupport return new TypeEffectiveStatementImpl<>(stmt.declared(), substatements, builder); } - private static SourceException noType(final @NonNull StatementSourceReference ref) { + private static SourceException noType(final @NonNull CommonStmtCtx stmt) { /* * https://tools.ietf.org/html/rfc7950#section-9.12 * * When the type is "union", the "type" statement (Section 7.4) MUST be * present. */ - return new SourceException("At least one type statement has to be present", ref); + return new SourceException("At least one type statement has to be present", stmt.sourceReference()); } }