From 45adcb9a0266de375ee82728825e57014834202f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 6 Oct 2020 11:55:45 +0200 Subject: [PATCH] Refactor simple statements Statements which have obvious argument/rawArgument interactions are refactored to make it clear they have no StmtContext interactions. JIRA: YANGTOOLS-1065 Change-Id: I217f3fed816783a6581a7d84e93754011a5abcdb Signed-off-by: Robert Varga --- .../stmt/augment/AbstractAugmentStatementSupport.java | 5 +++-- .../parser/rfc7950/stmt/augment/EmptyAugmentStatement.java | 5 ++--- .../rfc7950/stmt/augment/RegularAugmentStatement.java | 6 +++--- .../rfc7950/stmt/belongs_to/BelongsToStatementSupport.java | 4 ++-- .../rfc7950/stmt/belongs_to/EmptyBelongsToStatement.java | 5 ++--- .../rfc7950/stmt/belongs_to/RegularBelongsToStatement.java | 6 +++--- .../rfc7950/stmt/contact/ContactStatementSupport.java | 4 ++-- .../parser/rfc7950/stmt/contact/EmptyContactStatement.java | 6 +++--- .../rfc7950/stmt/contact/RegularContactStatement.java | 6 +++--- .../rfc7950/stmt/default_/DefaultStatementSupport.java | 4 ++-- .../rfc7950/stmt/default_/EmptyDefaultStatement.java | 6 +++--- .../rfc7950/stmt/default_/RegularDefaultStatement.java | 6 +++--- .../stmt/description/DescriptionStatementSupport.java | 4 ++-- .../stmt/description/EmptyDescriptionStatement.java | 6 +++--- .../stmt/description/RegularDescriptionStatement.java | 6 +++--- .../stmt/error_app_tag/EmptyErrorAppTagStatement.java | 6 +++--- .../stmt/error_app_tag/ErrorAppTagStatementSupport.java | 4 ++-- .../stmt/error_app_tag/RegularErrorAppTagStatement.java | 6 +++--- .../stmt/error_message/EmptyErrorMessageStatement.java | 6 +++--- .../stmt/error_message/ErrorMessageStatementSupport.java | 4 ++-- .../stmt/error_message/RegularErrorMessageStatement.java | 6 +++--- .../yang/parser/rfc7950/stmt/key/AbstractKeyStatement.java | 7 +++---- .../yang/parser/rfc7950/stmt/key/EmptyKeyStatement.java | 6 +++--- .../yang/parser/rfc7950/stmt/key/KeyStatementSupport.java | 4 ++-- .../yang/parser/rfc7950/stmt/key/RegularKeyStatement.java | 5 ++--- .../stmt/organization/EmptyOrganizationStatement.java | 6 +++--- .../stmt/organization/OrganizationStatementSupport.java | 4 ++-- .../stmt/organization/RegularOrganizationStatement.java | 6 +++--- .../parser/rfc7950/stmt/prefix/EmptyPrefixStatement.java | 6 +++--- .../parser/rfc7950/stmt/prefix/PrefixStatementSupport.java | 4 ++-- .../parser/rfc7950/stmt/prefix/RegularPrefixStatement.java | 6 +++--- .../rfc7950/stmt/presence/EmptyPresenceStatement.java | 6 +++--- .../rfc7950/stmt/presence/PresenceStatementSupport.java | 2 +- .../rfc7950/stmt/reference/EmptyReferenceStatement.java | 6 +++--- .../rfc7950/stmt/reference/ReferenceStatementSupport.java | 4 ++-- .../rfc7950/stmt/reference/RegularReferenceStatement.java | 6 +++--- .../parser/rfc7950/stmt/units/EmptyUnitsStatement.java | 6 +++--- .../parser/rfc7950/stmt/units/RegularUnitsStatement.java | 6 +++--- .../parser/rfc7950/stmt/units/UnitsStatementSupport.java | 4 ++-- 39 files changed, 101 insertions(+), 104 deletions(-) diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java index 9c938ac6b6..3925f22046 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java @@ -149,13 +149,14 @@ abstract class AbstractAugmentStatementSupport @Override protected final AugmentStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularAugmentStatement(ctx, substatements); + return new RegularAugmentStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), + substatements); } @Override protected final AugmentStatement createEmptyDeclared( final StmtContext ctx) { - return new EmptyAugmentStatement(ctx); + return new EmptyAugmentStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/EmptyAugmentStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/EmptyAugmentStatement.java index 9a784bcf2b..314d467fdc 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/EmptyAugmentStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/EmptyAugmentStatement.java @@ -10,10 +10,9 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.augment; import org.opendaylight.yangtools.yang.model.api.stmt.AugmentStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithArgument; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class EmptyAugmentStatement extends WithArgument implements AugmentStatement { - EmptyAugmentStatement(final StmtContext context) { - super(context); + EmptyAugmentStatement(final String rawArgument, final SchemaNodeIdentifier argument) { + super(rawArgument, argument); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/RegularAugmentStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/RegularAugmentStatement.java index ca39c66bcb..7d39d540d7 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/RegularAugmentStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/RegularAugmentStatement.java @@ -8,15 +8,15 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.augment; import com.google.common.collect.ImmutableList; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.AugmentStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithArgument.WithSubstatements; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class RegularAugmentStatement extends WithSubstatements implements AugmentStatement { - RegularAugmentStatement(final StmtContext ctx, + RegularAugmentStatement(final @NonNull String rawArgument, final @NonNull SchemaNodeIdentifier argument, final ImmutableList> substatements) { - super(ctx, substatements); + super(rawArgument, argument, substatements); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java index 8b5ea38ed4..9813dca4da 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java @@ -85,12 +85,12 @@ public final class BelongsToStatementSupport @Override protected BelongsToStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularBelongsToStatement(ctx, substatements); + return new RegularBelongsToStatement(ctx.coerceRawStatementArgument(), substatements); } @Override protected BelongsToStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyBelongsToStatement(ctx); + return new EmptyBelongsToStatement(ctx.coerceRawStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/EmptyBelongsToStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/EmptyBelongsToStatement.java index 9e8718a70f..a8b7db39bf 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/EmptyBelongsToStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/EmptyBelongsToStatement.java @@ -9,10 +9,9 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.belongs_to; import org.opendaylight.yangtools.yang.model.api.stmt.BelongsToStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class EmptyBelongsToStatement extends WithRawStringArgument implements BelongsToStatement { - EmptyBelongsToStatement(final StmtContext context) { - super(context); + EmptyBelongsToStatement(final String rawArgument) { + super(rawArgument); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/RegularBelongsToStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/RegularBelongsToStatement.java index cb393fa0b3..91218fa869 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/RegularBelongsToStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/RegularBelongsToStatement.java @@ -8,14 +8,14 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.belongs_to; import com.google.common.collect.ImmutableList; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.BelongsToStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class RegularBelongsToStatement extends WithSubstatements implements BelongsToStatement { - RegularBelongsToStatement(final StmtContext context, + RegularBelongsToStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { - super(context, substatements); + super(rawArgument, substatements); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/ContactStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/ContactStatementSupport.java index d23c9b2a03..d55b384e93 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/ContactStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/ContactStatementSupport.java @@ -39,12 +39,12 @@ public final class ContactStatementSupport @Override protected ContactStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularContactStatement(ctx, substatements); + return new RegularContactStatement(ctx.coerceRawStatementArgument(), substatements); } @Override protected ContactStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyContactStatement(ctx); + return new EmptyContactStatement(ctx.coerceRawStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/EmptyContactStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/EmptyContactStatement.java index 36aaaf690e..92bfd6929c 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/EmptyContactStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/EmptyContactStatement.java @@ -7,12 +7,12 @@ */ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.contact; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.ContactStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class EmptyContactStatement extends WithRawStringArgument implements ContactStatement { - EmptyContactStatement(final StmtContext context) { - super(context); + EmptyContactStatement(final @NonNull String rawArgument) { + super(rawArgument); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/RegularContactStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/RegularContactStatement.java index da44a1c2df..bc1cfe5f25 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/RegularContactStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/RegularContactStatement.java @@ -8,14 +8,14 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.contact; import com.google.common.collect.ImmutableList; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ContactStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class RegularContactStatement extends WithSubstatements implements ContactStatement { - RegularContactStatement(final StmtContext context, + RegularContactStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { - super(context, substatements); + super(rawArgument, substatements); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java index fb29097f22..ae2a41d24b 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java @@ -39,12 +39,12 @@ public final class DefaultStatementSupport @Override protected DefaultStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularDefaultStatement(ctx, substatements); + return new RegularDefaultStatement(ctx.coerceRawStatementArgument(), substatements); } @Override protected DefaultStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyDefaultStatement(ctx); + return new EmptyDefaultStatement(ctx.coerceRawStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/EmptyDefaultStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/EmptyDefaultStatement.java index 9e8f750feb..1e2c7d5600 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/EmptyDefaultStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/EmptyDefaultStatement.java @@ -7,12 +7,12 @@ */ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.default_; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.DefaultStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class EmptyDefaultStatement extends WithRawStringArgument implements DefaultStatement { - EmptyDefaultStatement(final StmtContext context) { - super(context); + EmptyDefaultStatement(final @NonNull String rawArgument) { + super(rawArgument); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/RegularDefaultStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/RegularDefaultStatement.java index 02c2917d18..efdc04d73b 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/RegularDefaultStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/RegularDefaultStatement.java @@ -8,14 +8,14 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.default_; import com.google.common.collect.ImmutableList; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DefaultStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class RegularDefaultStatement extends WithSubstatements implements DefaultStatement { - RegularDefaultStatement(final StmtContext context, + RegularDefaultStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { - super(context, substatements); + super(rawArgument, substatements); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/DescriptionStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/DescriptionStatementSupport.java index 0428d2443e..54ee112466 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/DescriptionStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/DescriptionStatementSupport.java @@ -39,12 +39,12 @@ public final class DescriptionStatementSupport @Override protected DescriptionStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularDescriptionStatement(ctx, substatements); + return new RegularDescriptionStatement(ctx.coerceRawStatementArgument(), substatements); } @Override protected DescriptionStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyDescriptionStatement(ctx); + return new EmptyDescriptionStatement(ctx.coerceRawStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/EmptyDescriptionStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/EmptyDescriptionStatement.java index a0cc766ae0..03d0060fa7 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/EmptyDescriptionStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/EmptyDescriptionStatement.java @@ -7,12 +7,12 @@ */ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.description; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class EmptyDescriptionStatement extends WithRawStringArgument implements DescriptionStatement { - EmptyDescriptionStatement(final StmtContext context) { - super(context); + EmptyDescriptionStatement(final @NonNull String rawArgument) { + super(rawArgument); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/RegularDescriptionStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/RegularDescriptionStatement.java index 6cebdf4e6d..13207353cc 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/RegularDescriptionStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/RegularDescriptionStatement.java @@ -8,14 +8,14 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.description; import com.google.common.collect.ImmutableList; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class RegularDescriptionStatement extends WithSubstatements implements DescriptionStatement { - RegularDescriptionStatement(final StmtContext context, + RegularDescriptionStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { - super(context, substatements); + super(rawArgument, substatements); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/EmptyErrorAppTagStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/EmptyErrorAppTagStatement.java index 6a42a7856c..0161cfd73a 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/EmptyErrorAppTagStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/EmptyErrorAppTagStatement.java @@ -7,12 +7,12 @@ */ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.error_app_tag; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorAppTagStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class EmptyErrorAppTagStatement extends WithRawStringArgument implements ErrorAppTagStatement { - EmptyErrorAppTagStatement(final StmtContext context) { - super(context); + EmptyErrorAppTagStatement(final @NonNull String rawArgument) { + super(rawArgument); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/ErrorAppTagStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/ErrorAppTagStatementSupport.java index 02ffab91f7..3c5bc94998 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/ErrorAppTagStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/ErrorAppTagStatementSupport.java @@ -39,12 +39,12 @@ public final class ErrorAppTagStatementSupport @Override protected ErrorAppTagStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularErrorAppTagStatement(ctx, substatements); + return new RegularErrorAppTagStatement(ctx.coerceRawStatementArgument(), substatements); } @Override protected ErrorAppTagStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyErrorAppTagStatement(ctx); + return new EmptyErrorAppTagStatement(ctx.coerceRawStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/RegularErrorAppTagStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/RegularErrorAppTagStatement.java index f37ebb1fa5..932e0c4798 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/RegularErrorAppTagStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/RegularErrorAppTagStatement.java @@ -8,14 +8,14 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.error_app_tag; import com.google.common.collect.ImmutableList; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorAppTagStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class RegularErrorAppTagStatement extends WithSubstatements implements ErrorAppTagStatement { - RegularErrorAppTagStatement(final StmtContext context, + RegularErrorAppTagStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { - super(context, substatements); + super(rawArgument, substatements); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/EmptyErrorMessageStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/EmptyErrorMessageStatement.java index d9a6500768..bd4a887a03 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/EmptyErrorMessageStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/EmptyErrorMessageStatement.java @@ -7,12 +7,12 @@ */ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.error_message; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorMessageStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class EmptyErrorMessageStatement extends WithRawStringArgument implements ErrorMessageStatement { - EmptyErrorMessageStatement(final StmtContext context) { - super(context); + EmptyErrorMessageStatement(final @NonNull String rawArgument) { + super(rawArgument); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/ErrorMessageStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/ErrorMessageStatementSupport.java index c0a0c0378d..0d404ef5db 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/ErrorMessageStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/ErrorMessageStatementSupport.java @@ -39,12 +39,12 @@ public final class ErrorMessageStatementSupport @Override protected ErrorMessageStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularErrorMessageStatement(ctx, substatements); + return new RegularErrorMessageStatement(ctx.coerceRawStatementArgument(), substatements); } @Override protected ErrorMessageStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyErrorMessageStatement(ctx); + return new EmptyErrorMessageStatement(ctx.coerceRawStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/RegularErrorMessageStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/RegularErrorMessageStatement.java index 8d420c7438..0969eb0c74 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/RegularErrorMessageStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/RegularErrorMessageStatement.java @@ -8,14 +8,14 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.error_message; import com.google.common.collect.ImmutableList; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorMessageStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class RegularErrorMessageStatement extends WithSubstatements implements ErrorMessageStatement { - RegularErrorMessageStatement(final StmtContext context, + RegularErrorMessageStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { - super(context, substatements); + super(rawArgument, substatements); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/AbstractKeyStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/AbstractKeyStatement.java index ca497e5028..89d758ce31 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/AbstractKeyStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/AbstractKeyStatement.java @@ -12,14 +12,13 @@ import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.KeyStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawArgument; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; abstract class AbstractKeyStatement extends WithRawArgument> implements KeyStatement { final @NonNull Object argument; - AbstractKeyStatement(final StmtContext, ?, ?> context) { - super(context); - this.argument = KeyStatementSupport.maskSet(context.coerceStatementArgument()); + AbstractKeyStatement(final @NonNull String rawArgument, final @NonNull Set argument) { + super(rawArgument); + this.argument = KeyStatementSupport.maskSet(argument); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/EmptyKeyStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/EmptyKeyStatement.java index 4e853cf9c2..41a8168ae4 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/EmptyKeyStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/EmptyKeyStatement.java @@ -8,11 +8,11 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.key; import java.util.Set; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class EmptyKeyStatement extends AbstractKeyStatement { - EmptyKeyStatement(final StmtContext, ?, ?> context) { - super(context); + EmptyKeyStatement(final @NonNull String rawArgument, final @NonNull Set argument) { + super(rawArgument, argument); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java index d99dfd9275..3383496cfd 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java @@ -88,12 +88,12 @@ public final class KeyStatementSupport @Override protected KeyStatement createDeclared(final StmtContext, KeyStatement, ?> ctx, final ImmutableList> substatements) { - return new RegularKeyStatement(ctx, substatements); + return new RegularKeyStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), substatements); } @Override protected KeyStatement createEmptyDeclared(final StmtContext, KeyStatement, ?> ctx) { - return new EmptyKeyStatement(ctx); + return new EmptyKeyStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/RegularKeyStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/RegularKeyStatement.java index 2403434636..a90000aa19 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/RegularKeyStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/RegularKeyStatement.java @@ -13,14 +13,13 @@ import java.util.Set; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class RegularKeyStatement extends AbstractKeyStatement { private final @NonNull Object substatements; - RegularKeyStatement(final StmtContext, ?, ?> context, + RegularKeyStatement(final @NonNull String rawArgument, final @NonNull Set argument, final ImmutableList> substatements) { - super(context); + super(rawArgument, argument); this.substatements = maskList(substatements); } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/EmptyOrganizationStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/EmptyOrganizationStatement.java index 429ff59e69..0ff15a8609 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/EmptyOrganizationStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/EmptyOrganizationStatement.java @@ -7,12 +7,12 @@ */ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.organization; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.OrganizationStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class EmptyOrganizationStatement extends WithRawStringArgument implements OrganizationStatement { - EmptyOrganizationStatement(final StmtContext context) { - super(context); + EmptyOrganizationStatement(final @NonNull String rawArgument) { + super(rawArgument); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/OrganizationStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/OrganizationStatementSupport.java index c14e77afc5..b78e2622e5 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/OrganizationStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/OrganizationStatementSupport.java @@ -40,12 +40,12 @@ public final class OrganizationStatementSupport @Override protected OrganizationStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularOrganizationStatement(ctx, substatements); + return new RegularOrganizationStatement(ctx.coerceRawStatementArgument(), substatements); } @Override protected OrganizationStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyOrganizationStatement(ctx); + return new EmptyOrganizationStatement(ctx.coerceRawStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/RegularOrganizationStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/RegularOrganizationStatement.java index afd5b58a4c..4566f39909 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/RegularOrganizationStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/RegularOrganizationStatement.java @@ -8,14 +8,14 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.organization; import com.google.common.collect.ImmutableList; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OrganizationStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class RegularOrganizationStatement extends WithSubstatements implements OrganizationStatement { - RegularOrganizationStatement(final StmtContext context, + RegularOrganizationStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { - super(context, substatements); + super(rawArgument, substatements); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/EmptyPrefixStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/EmptyPrefixStatement.java index 1e55f5f651..a3409381cb 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/EmptyPrefixStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/EmptyPrefixStatement.java @@ -7,12 +7,12 @@ */ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.prefix; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class EmptyPrefixStatement extends WithRawStringArgument implements PrefixStatement { - EmptyPrefixStatement(final StmtContext context) { - super(context); + EmptyPrefixStatement(final @NonNull String rawArgument) { + super(rawArgument); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/PrefixStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/PrefixStatementSupport.java index cfdf31a832..5341e9858e 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/PrefixStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/PrefixStatementSupport.java @@ -39,12 +39,12 @@ public final class PrefixStatementSupport @Override protected PrefixStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularPrefixStatement(ctx, substatements); + return new RegularPrefixStatement(ctx.coerceRawStatementArgument(), substatements); } @Override protected PrefixStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyPrefixStatement(ctx); + return new EmptyPrefixStatement(ctx.coerceRawStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/RegularPrefixStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/RegularPrefixStatement.java index bf6cc76784..d1e298414b 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/RegularPrefixStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/RegularPrefixStatement.java @@ -8,14 +8,14 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.prefix; import com.google.common.collect.ImmutableList; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class RegularPrefixStatement extends WithSubstatements implements PrefixStatement { - RegularPrefixStatement(final StmtContext context, + RegularPrefixStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { - super(context, substatements); + super(rawArgument, substatements); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/presence/EmptyPresenceStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/presence/EmptyPresenceStatement.java index 233df9ebae..2f1226ff8c 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/presence/EmptyPresenceStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/presence/EmptyPresenceStatement.java @@ -7,12 +7,12 @@ */ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.presence; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.PresenceStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class EmptyPresenceStatement extends WithRawStringArgument implements PresenceStatement { - EmptyPresenceStatement(final StmtContext context) { - super(context); + EmptyPresenceStatement(final @NonNull String rawArgument) { + super(rawArgument); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/presence/PresenceStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/presence/PresenceStatementSupport.java index 47dd2c4121..430651f064 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/presence/PresenceStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/presence/PresenceStatementSupport.java @@ -44,7 +44,7 @@ public final class PresenceStatementSupport @Override protected PresenceStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyPresenceStatement(ctx); + return new EmptyPresenceStatement(ctx.coerceRawStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/EmptyReferenceStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/EmptyReferenceStatement.java index ad14da01cb..8af5338dc9 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/EmptyReferenceStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/EmptyReferenceStatement.java @@ -7,12 +7,12 @@ */ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.reference; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class EmptyReferenceStatement extends WithRawStringArgument implements ReferenceStatement { - EmptyReferenceStatement(final StmtContext context) { - super(context); + EmptyReferenceStatement(final @NonNull String rawArgument) { + super(rawArgument); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/ReferenceStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/ReferenceStatementSupport.java index ababd737c9..1b4761b9a5 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/ReferenceStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/ReferenceStatementSupport.java @@ -40,12 +40,12 @@ public final class ReferenceStatementSupport @Override protected ReferenceStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularReferenceStatement(ctx, substatements); + return new RegularReferenceStatement(ctx.coerceRawStatementArgument(), substatements); } @Override protected ReferenceStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyReferenceStatement(ctx); + return new EmptyReferenceStatement(ctx.coerceRawStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/RegularReferenceStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/RegularReferenceStatement.java index 4c0d936b9c..eadee041bc 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/RegularReferenceStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/RegularReferenceStatement.java @@ -8,14 +8,14 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.reference; import com.google.common.collect.ImmutableList; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class RegularReferenceStatement extends WithSubstatements implements ReferenceStatement { - RegularReferenceStatement(final StmtContext context, + RegularReferenceStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { - super(context, substatements); + super(rawArgument, substatements); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/EmptyUnitsStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/EmptyUnitsStatement.java index 1b2707ce0e..af2b519300 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/EmptyUnitsStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/EmptyUnitsStatement.java @@ -7,12 +7,12 @@ */ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.units; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.UnitsStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class EmptyUnitsStatement extends WithRawStringArgument implements UnitsStatement { - EmptyUnitsStatement(final StmtContext context) { - super(context); + EmptyUnitsStatement(final @NonNull String rawArgument) { + super(rawArgument); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/RegularUnitsStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/RegularUnitsStatement.java index e1785678ce..db1746e38c 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/RegularUnitsStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/RegularUnitsStatement.java @@ -8,14 +8,14 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.units; import com.google.common.collect.ImmutableList; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UnitsStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class RegularUnitsStatement extends WithSubstatements implements UnitsStatement { - RegularUnitsStatement(final StmtContext context, + RegularUnitsStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { - super(context, substatements); + super(rawArgument, substatements); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/UnitsStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/UnitsStatementSupport.java index 095f63a734..9e0ee37d26 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/UnitsStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/UnitsStatementSupport.java @@ -40,12 +40,12 @@ public final class UnitsStatementSupport @Override protected UnitsStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularUnitsStatement(ctx, substatements); + return new RegularUnitsStatement(ctx.coerceRawStatementArgument(), substatements); } @Override protected UnitsStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyUnitsStatement(ctx); + return new EmptyUnitsStatement(ctx.coerceRawStatementArgument()); } @Override -- 2.36.6