From cde047f709ab56c39012678faba8b56da458d05b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 25 Dec 2016 16:32:40 +0100 Subject: [PATCH] Eliminate superfluous onFullDefinitionDeclared overrides This patch moves invocation of the validator back into AbstractStatementSupport, rendering majority of overrides useless, as all they did was call (then no-op) super and then the validator. This also fixes problems if a subclass redefines the validator to be non-existent and fails to override (again) onFullDefinitionDeclared(). Drive-by cleanup reduces verbosity of specification implementation classes by importing the nested interface directly. The end effect is that it is again possible to reason about hooks being performed in statements by looking at what implementation overrides there are. Change-Id: Ibed4cd5eeb128e69637fcf124331aeeeaeb7b4ea Signed-off-by: Robert Varga --- .../spi/meta/AbstractStatementSupport.java | 5 +++- .../AnyxmlSchemaLocationStatementImpl.java | 2 +- .../stmt/rfc6020/AnyxmlStatementImpl.java | 9 +------ .../stmt/rfc6020/ArgumentStatementImpl.java | 7 ------ .../stmt/rfc6020/AugmentStatementImpl.java | 2 +- .../stmt/rfc6020/BaseStatementImpl.java | 7 ------ .../stmt/rfc6020/BelongsToStatementImpl.java | 7 ------ .../parser/stmt/rfc6020/BitStatementImpl.java | 7 ------ .../stmt/rfc6020/BitsSpecificationImpl.java | 7 ------ .../stmt/rfc6020/CaseStatementImpl.java | 7 ------ .../stmt/rfc6020/ChoiceStatementImpl.java | 7 ------ .../stmt/rfc6020/ConfigStatementImpl.java | 7 ------ .../stmt/rfc6020/ContactStatementImpl.java | 19 ++++++--------- .../stmt/rfc6020/ContainerStatementImpl.java | 6 ----- .../rfc6020/Decimal64SpecificationImpl.java | 7 ------ .../stmt/rfc6020/DefaultStatementImpl.java | 22 +++++++---------- .../rfc6020/DescriptionStatementImpl.java | 15 ++++-------- .../stmt/rfc6020/DeviateStatementImpl.java | 7 ------ .../stmt/rfc6020/DeviationStatementImpl.java | 7 ------ .../stmt/rfc6020/EnumSpecificationImpl.java | 7 ------ .../stmt/rfc6020/EnumStatementImpl.java | 7 ------ .../rfc6020/ErrorAppTagStatementImpl.java | 18 ++++---------- .../rfc6020/ErrorMessageStatementImpl.java | 15 ++++-------- .../stmt/rfc6020/ExtensionStatementImpl.java | 7 ------ .../stmt/rfc6020/FeatureStatementImpl.java | 7 ------ .../rfc6020/FractionDigitsStatementImpl.java | 7 ------ .../stmt/rfc6020/GroupingStatementImpl.java | 2 +- .../rfc6020/IdentityRefSpecificationImpl.java | 1 - .../stmt/rfc6020/IdentityStatementImpl.java | 7 ------ .../stmt/rfc6020/IfFeatureStatementImpl.java | 15 ++++-------- .../rfc6020/ImportStatementDefinition.java | 8 +------ .../stmt/rfc6020/IncludeStatementImpl.java | 6 ----- .../stmt/rfc6020/InputStatementImpl.java | 7 ------ .../InstanceIdentifierSpecificationImpl.java | 24 +++++++------------ .../parser/stmt/rfc6020/KeyStatementImpl.java | 7 ------ .../stmt/rfc6020/LeafListStatementImpl.java | 7 ------ .../stmt/rfc6020/LeafStatementImpl.java | 14 ++++------- .../rfc6020/LeafrefSpecificationImpl.java | 22 ++++++----------- .../stmt/rfc6020/LengthStatementImpl.java | 7 ------ .../stmt/rfc6020/ListStatementImpl.java | 7 ------ .../stmt/rfc6020/MandatoryStatementImpl.java | 7 ------ .../rfc6020/MaxElementsStatementImpl.java | 15 ++++-------- .../rfc6020/MinElementsStatementImpl.java | 15 ++++-------- .../stmt/rfc6020/ModuleStatementSupport.java | 6 ----- .../stmt/rfc6020/MustStatementImpl.java | 7 ------ .../stmt/rfc6020/NamespaceStatementImpl.java | 15 ++++-------- .../rfc6020/NotificationStatementImpl.java | 7 ------ .../rfc6020/NumericalRestrictionsImpl.java | 23 ++++++------------ .../stmt/rfc6020/OrderedByStatementImpl.java | 18 ++++---------- .../rfc6020/OrganizationStatementImpl.java | 18 ++++---------- .../stmt/rfc6020/OutputStatementImpl.java | 7 ------ .../stmt/rfc6020/PathStatementImpl.java | 7 ------ .../stmt/rfc6020/PatternStatementImpl.java | 7 ------ .../stmt/rfc6020/PositionStatementImpl.java | 9 +------ .../stmt/rfc6020/PrefixStatementImpl.java | 19 ++++++--------- .../stmt/rfc6020/PresenceStatementImpl.java | 15 ++++-------- .../stmt/rfc6020/RangeStatementImpl.java | 7 ------ .../stmt/rfc6020/ReferenceStatementImpl.java | 7 ------ .../stmt/rfc6020/RefineStatementImpl.java | 7 ------ .../rfc6020/RequireInstanceStatementImpl.java | 7 ------ .../rfc6020/RevisionDateStatementImpl.java | 7 ------ .../stmt/rfc6020/RevisionStatementImpl.java | 7 ------ .../parser/stmt/rfc6020/RpcStatementImpl.java | 6 ----- .../rfc6020/SemanticVersionStatementImpl.java | 9 ------- .../stmt/rfc6020/StatusStatementImpl.java | 17 ++++--------- .../stmt/rfc6020/StringRestrictionsImpl.java | 19 ++++----------- .../stmt/rfc6020/SubmoduleStatementImpl.java | 7 ------ .../stmt/rfc6020/TypeStatementImpl.java | 2 +- .../stmt/rfc6020/TypedefStatementImpl.java | 2 +- .../stmt/rfc6020/UnionSpecificationImpl.java | 21 +++++++--------- .../stmt/rfc6020/UniqueStatementImpl.java | 18 +++++--------- .../stmt/rfc6020/UnitsStatementImpl.java | 15 ++++-------- .../stmt/rfc6020/UsesStatementImpl.java | 3 +-- .../stmt/rfc6020/ValueStatementImpl.java | 7 ------ .../stmt/rfc6020/WhenStatementImpl.java | 7 ------ .../rfc6020/YangVersionStatementImpl.java | 7 ------ .../stmt/rfc6020/YinElementStatementImpl.java | 7 ------ .../stmt/rfc7950/ActionStatementImpl.java | 11 ++------- .../stmt/rfc7950/AnydataStatementImpl.java | 7 ------ .../stmt/rfc7950/ModifierStatementImpl.java | 7 ------ .../ThirdPartyExtensionStatementImpl.java | 1 + 81 files changed, 135 insertions(+), 634 deletions(-) diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractStatementSupport.java index 4e2c7c336f..02374622dd 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractStatementSupport.java @@ -118,7 +118,10 @@ public abstract class AbstractStatementSupport */ @Override public void onFullDefinitionDeclared(final StmtContext.Mutable stmt) { - // NOOP for most implementations + final SubstatementValidator validator = getSubstatementValidator(); + if (validator != null) { + validator.validate(stmt); + } } @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlSchemaLocationStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlSchemaLocationStatementImpl.java index 1337e288e0..ca8c7c89cd 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlSchemaLocationStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlSchemaLocationStatementImpl.java @@ -46,7 +46,7 @@ public final class AnyxmlSchemaLocationStatementImpl extends AbstractDeclaredSta @Override public void onFullDefinitionDeclared( final Mutable, EffectiveStatement>> stmt) { - getSubstatementValidator().validate(stmt); + super.onFullDefinitionDeclared(stmt); stmt.getParentContext().addToNs(AnyxmlSchemaLocationNamespace.class, SupportedExtensionsMapping.ANYXML_SCHEMA_LOCATION, stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlStatementImpl.java index 8a411b1ce9..b057490b38 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlStatementImpl.java @@ -93,14 +93,7 @@ public class AnyxmlStatementImpl extends AbstractDeclaredStatement implem return new AnyXmlEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - - private Optional getAnyXmlSchema( + private static Optional getAnyXmlSchema( final StmtContext> ctx, final SchemaNodeIdentifier contentSchemaPath) { final StatementContextBase findNode = Utils.findNode(ctx.getRoot(), contentSchemaPath); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ArgumentStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ArgumentStatementImpl.java index 12834004cd..0eca7b96b4 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ArgumentStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ArgumentStatementImpl.java @@ -56,13 +56,6 @@ public class ArgumentStatementImpl extends AbstractDeclaredStatement return new ArgumentEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentStatementImpl.java index b0cf05250a..47e59579de 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentStatementImpl.java @@ -111,7 +111,7 @@ public class AugmentStatementImpl extends AbstractDeclaredStatement implemen } } - @Override - public void onFullDefinitionDeclared( - final Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BelongsToStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BelongsToStatementImpl.java index 7207157bdb..8d91f3a238 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BelongsToStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BelongsToStatementImpl.java @@ -103,13 +103,6 @@ public class BelongsToStatementImpl extends AbstractDeclaredStatement Optional.of(SimpleDateFormatUtil.DEFAULT_BELONGS_TO_DATE)); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java index 7bb4cfe544..a433cd7229 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java @@ -60,13 +60,6 @@ public class BitStatementImpl extends AbstractDeclaredStatement implement return new BitEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitsSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitsSpecificationImpl.java index dd200733ec..cf4dd23fbf 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitsSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitsSpecificationImpl.java @@ -54,13 +54,6 @@ public class BitsSpecificationImpl extends AbstractDeclaredStatement imp return new BitsSpecificationEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/CaseStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/CaseStatementImpl.java index dd61581c6d..cd9d176507 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/CaseStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/CaseStatementImpl.java @@ -74,13 +74,6 @@ public class CaseStatementImpl extends AbstractDeclaredStatement implemen return new CaseEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ChoiceStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ChoiceStatementImpl.java index 164231321c..b45fc9238d 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ChoiceStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ChoiceStatementImpl.java @@ -84,13 +84,6 @@ public class ChoiceStatementImpl extends AbstractDeclaredStatement return new ChoiceEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ConfigStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ConfigStatementImpl.java index d4e0e61194..d7b5fe42c6 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ConfigStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ConfigStatementImpl.java @@ -61,13 +61,6 @@ public class ConfigStatementImpl extends AbstractDeclaredStatement impl return ret; } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContactStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContactStatementImpl.java index baabab3f54..aaa438d916 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContactStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContactStatementImpl.java @@ -22,38 +22,33 @@ public class ContactStatementImpl extends AbstractDeclaredStatement impl .CONTACT) .build(); - protected ContactStatementImpl(StmtContext context) { + protected ContactStatementImpl(final StmtContext context) { super(context); } - public static class Definition extends AbstractStatementSupport> { + public static class Definition extends + AbstractStatementSupport> { public Definition() { super(YangStmtMapping.CONTACT); } @Override - public String parseArgumentValue(StmtContext ctx, String value) { + public String parseArgumentValue(final StmtContext ctx, final String value) { return value; } @Override - public ContactStatement createDeclared(StmtContext ctx) { + public ContactStatement createDeclared(final StmtContext ctx) { return new ContactStatementImpl(ctx); } @Override - public EffectiveStatement createEffective(StmtContext> ctx) { + public EffectiveStatement createEffective( + final StmtContext> ctx) { return new ContactEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContainerStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContainerStatementImpl.java index 6c76a46000..b0d84057aa 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContainerStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContainerStatementImpl.java @@ -87,12 +87,6 @@ public class ContainerStatementImpl extends AbstractDeclaredStatement imp } @Override - public void onFullDefinitionDeclared(final Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Decimal64SpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Decimal64SpecificationImpl.java index 1a7c1703fb..c280e3fc20 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Decimal64SpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Decimal64SpecificationImpl.java @@ -53,13 +53,6 @@ public class Decimal64SpecificationImpl extends AbstractDeclaredStatement> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DefaultStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DefaultStatementImpl.java index 2103f0e895..f5deaf2d03 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DefaultStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DefaultStatementImpl.java @@ -24,7 +24,7 @@ public class DefaultStatementImpl extends AbstractDeclaredStatement impl .build(); protected DefaultStatementImpl( - StmtContext context) { + final StmtContext context) { super(context); } @@ -34,26 +34,20 @@ public class DefaultStatementImpl extends AbstractDeclaredStatement impl super(YangStmtMapping.DEFAULT); } - @Override public String parseArgumentValue( - StmtContext ctx, String value) { + @Override + public String parseArgumentValue(final StmtContext ctx, final String value) { return value; } - @Override public DefaultStatement createDeclared( - StmtContext ctx) { + @Override + public DefaultStatement createDeclared(final StmtContext ctx) { return new DefaultStatementImpl(ctx); } - @Override public EffectiveStatement createEffective( - StmtContext> ctx) { - return new DefaultEffectiveStatementImpl(ctx); - } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); + public EffectiveStatement createEffective( + final StmtContext> ctx) { + return new DefaultEffectiveStatementImpl(ctx); } @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DescriptionStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DescriptionStatementImpl.java index 7881487bee..c683fd8026 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DescriptionStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DescriptionStatementImpl.java @@ -23,7 +23,7 @@ public class DescriptionStatementImpl extends AbstractDeclaredStatement .build(); protected DescriptionStatementImpl( - StmtContext context) { + final StmtContext context) { super(context); } @@ -34,27 +34,20 @@ public class DescriptionStatementImpl extends AbstractDeclaredStatement } @Override - public String parseArgumentValue(StmtContext ctx, String value) { + public String parseArgumentValue(final StmtContext ctx, final String value) { return value; } @Override - public DescriptionStatement createDeclared(StmtContext ctx) { + public DescriptionStatement createDeclared(final StmtContext ctx) { return new DescriptionStatementImpl(ctx); } @Override - public EffectiveStatement createEffective(StmtContext> ctx) { + public EffectiveStatement createEffective(final StmtContext> ctx) { return new DescriptionEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviateStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviateStatementImpl.java index eae3c95c2e..ed2df6f8b7 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviateStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviateStatementImpl.java @@ -57,13 +57,6 @@ public class DeviateStatementImpl extends AbstractDeclaredStatement return new DeviateEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviationStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviationStatementImpl.java index da4d8d9f53..d75e3d6b93 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviationStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviationStatementImpl.java @@ -52,13 +52,6 @@ public class DeviationStatementImpl extends AbstractDeclaredStatement> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumSpecificationImpl.java index 9f222c7b70..d534788af1 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumSpecificationImpl.java @@ -54,13 +54,6 @@ public class EnumSpecificationImpl extends AbstractDeclaredStatement imp return new EnumSpecificationEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumStatementImpl.java index 74b0ee896d..87cd6ce544 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumStatementImpl.java @@ -60,13 +60,6 @@ public class EnumStatementImpl extends AbstractDeclaredStatement impleme return new EnumEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorAppTagStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorAppTagStatementImpl.java index d585bbff37..2258992d29 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorAppTagStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorAppTagStatementImpl.java @@ -24,12 +24,11 @@ public class ErrorAppTagStatementImpl extends AbstractDeclaredStatement .build(); protected ErrorAppTagStatementImpl( - StmtContext context) { + final StmtContext context) { super(context); } - public static class Definition - extends + public static class Definition extends AbstractStatementSupport> { public Definition() { @@ -37,29 +36,22 @@ public class ErrorAppTagStatementImpl extends AbstractDeclaredStatement } @Override - public String parseArgumentValue(StmtContext ctx, String value) { + public String parseArgumentValue(final StmtContext ctx, final String value) { return value; } @Override public ErrorAppTagStatement createDeclared( - StmtContext ctx) { + final StmtContext ctx) { return new ErrorAppTagStatementImpl(ctx); } @Override public EffectiveStatement createEffective( - StmtContext> ctx) { + final StmtContext> ctx) { return new ErrorAppTagEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorMessageStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorMessageStatementImpl.java index 467b052cb1..4c047ebba0 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorMessageStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorMessageStatementImpl.java @@ -24,7 +24,7 @@ public class ErrorMessageStatementImpl extends .build(); protected ErrorMessageStatementImpl( - StmtContext context) { + final StmtContext context) { super(context); } @@ -37,29 +37,22 @@ public class ErrorMessageStatementImpl extends } @Override - public String parseArgumentValue(StmtContext ctx, String value) { + public String parseArgumentValue(final StmtContext ctx, final String value) { return value; } @Override public ErrorMessageStatement createDeclared( - StmtContext ctx) { + final StmtContext ctx) { return new ErrorMessageStatementImpl(ctx); } @Override public EffectiveStatement createEffective( - StmtContext> ctx) { + final StmtContext> ctx) { return new ErrorMessageEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java index 3b33b742bb..888167da9f 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java @@ -76,13 +76,6 @@ public class ExtensionStatementImpl extends AbstractDeclaredStatement imp yinElement != null ? yinElement.getStatementArgument() : false))); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FeatureStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FeatureStatementImpl.java index f11d913b87..588db9d3d6 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FeatureStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FeatureStatementImpl.java @@ -63,13 +63,6 @@ public class FeatureStatementImpl extends AbstractDeclaredStatement return new FeatureEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FractionDigitsStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FractionDigitsStatementImpl.java index d960ea534c..1485de9fcd 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FractionDigitsStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FractionDigitsStatementImpl.java @@ -66,13 +66,6 @@ public class FractionDigitsStatementImpl extends AbstractDeclaredStatement> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingStatementImpl.java index 6b15f7e605..0ec64220de 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingStatementImpl.java @@ -79,7 +79,7 @@ public class GroupingStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(final Mutable> stmt) { - getSubstatementValidator().validate(stmt); + super.onFullDefinitionDeclared(stmt); if (stmt != null && stmt.getParentContext() != null) { stmt.getParentContext().addContext(GroupingNamespace.class, stmt.getStatementArgument(), stmt); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityRefSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityRefSpecificationImpl.java index 60744b476a..de0c513b93 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityRefSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityRefSpecificationImpl.java @@ -63,7 +63,6 @@ public class IdentityRefSpecificationImpl extends AbstractDeclaredStatement> stmt) { - getSubstatementValidator().validate(stmt); super.onFullDefinitionDeclared(stmt); final StmtContext baseStmt = StmtContextUtils.findFirstDeclaredSubstatement(stmt, diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityStatementImpl.java index 32373d8ee5..43fba277fc 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityStatementImpl.java @@ -68,13 +68,6 @@ public class IdentityStatementImpl extends AbstractDeclaredStatement stmt.addToNs(IdentityNamespace.class, stmt.getStatementArgument(), stmt); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IfFeatureStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IfFeatureStatementImpl.java index 76ad6c3cfc..e0d4e4e302 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IfFeatureStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IfFeatureStatementImpl.java @@ -25,7 +25,7 @@ public class IfFeatureStatementImpl extends AbstractDeclaredStatement .build(); protected IfFeatureStatementImpl( - StmtContext context) { + final StmtContext context) { super(context); } @@ -38,29 +38,22 @@ public class IfFeatureStatementImpl extends AbstractDeclaredStatement } @Override - public QName parseArgumentValue(StmtContext ctx, String value) { + public QName parseArgumentValue(final StmtContext ctx, final String value) { return Utils.qNameFromArgument(ctx, value); } @Override public IfFeatureStatement createDeclared( - StmtContext ctx) { + final StmtContext ctx) { return new IfFeatureStatementImpl(ctx); } @Override public EffectiveStatement createEffective( - StmtContext> ctx) { + final StmtContext> ctx) { return new IfFeatureEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java index 12a04b034c..74fb2afd1b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java @@ -81,13 +81,6 @@ public class ImportStatementDefinition extends return new ImportEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared( - final Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override public void onPreLinkageDeclared(final Mutable> stmt) { final String moduleName = stmt.getStatementArgument(); @@ -130,6 +123,7 @@ public class ImportStatementDefinition extends } } + @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java index 5b6c3ada26..df4cfd8e63 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java @@ -111,12 +111,6 @@ public class IncludeStatementImpl extends AbstractDeclaredStatement impl } @Override - public void onFullDefinitionDeclared(final Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InputStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InputStatementImpl.java index 4bf181e748..9b9dd4d14f 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InputStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InputStatementImpl.java @@ -73,13 +73,6 @@ public class InputStatementImpl extends AbstractDeclaredStatement return new InputEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InstanceIdentifierSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InstanceIdentifierSpecificationImpl.java index 780ea30127..816930e816 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InstanceIdentifierSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InstanceIdentifierSpecificationImpl.java @@ -11,7 +11,7 @@ import javax.annotation.Nonnull; import org.opendaylight.yangtools.yang.model.api.YangStmtMapping; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RequireInstanceStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.InstanceIdentifierSpecification; import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; @@ -19,21 +19,20 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.InstanceIdentifierSpecificationEffectiveStatementImpl; public class InstanceIdentifierSpecificationImpl extends - AbstractDeclaredStatement implements - TypeStatement.InstanceIdentifierSpecification { + AbstractDeclaredStatement implements InstanceIdentifierSpecification { private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping .TYPE) .addOptional(YangStmtMapping.REQUIRE_INSTANCE) .build(); protected InstanceIdentifierSpecificationImpl( - final StmtContext ctx) { + final StmtContext ctx) { super(ctx); } public static class Definition extends - AbstractStatementSupport> { + AbstractStatementSupport> { public Definition() { super(YangStmtMapping.TYPE); @@ -45,24 +44,17 @@ public class InstanceIdentifierSpecificationImpl extends } @Override - public TypeStatement.InstanceIdentifierSpecification createDeclared( - final StmtContext ctx) { + public InstanceIdentifierSpecification createDeclared( + final StmtContext ctx) { return new InstanceIdentifierSpecificationImpl(ctx); } @Override - public EffectiveStatement createEffective( - final StmtContext> ctx) { + public EffectiveStatement createEffective( + final StmtContext> ctx) { return new InstanceIdentifierSpecificationEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/KeyStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/KeyStatementImpl.java index 51c7413c42..0ba28ac401 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/KeyStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/KeyStatementImpl.java @@ -69,13 +69,6 @@ public class KeyStatementImpl extends AbstractDeclaredStatement, KeyStatement, - EffectiveStatement, KeyStatement>> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafListStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafListStatementImpl.java index 0453fe0402..4ecdcd6160 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafListStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafListStatementImpl.java @@ -89,13 +89,6 @@ public class LeafListStatementImpl extends AbstractDeclaredStatement return new LeafListEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafStatementImpl.java index 783607a420..9225075464 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafStatementImpl.java @@ -67,23 +67,17 @@ public class LeafStatementImpl extends AbstractDeclaredStatement implemen stmt.getParentContext().addToNs(ChildSchemaNodes.class, stmt.getStatementArgument(), stmt); } - @Override public LeafStatement createDeclared( - final StmtContext ctx) { + @Override + public LeafStatement createDeclared(final StmtContext ctx) { return new LeafStatementImpl(ctx); } - @Override public EffectiveStatement createEffective( + @Override + public EffectiveStatement createEffective( final StmtContext> ctx) { return new LeafEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafrefSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafrefSpecificationImpl.java index 263b829407..e9e802d3a0 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafrefSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafrefSpecificationImpl.java @@ -11,7 +11,7 @@ import javax.annotation.Nonnull; import org.opendaylight.yangtools.yang.model.api.YangStmtMapping; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PathStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.LeafrefSpecification; import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; @@ -19,7 +19,7 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.LeafrefSpecificationEffectiveStatementImpl; public class LeafrefSpecificationImpl extends AbstractDeclaredStatement - implements TypeStatement.LeafrefSpecification { + implements LeafrefSpecification { private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping .TYPE) .addMandatory(YangStmtMapping.PATH) @@ -27,13 +27,13 @@ public class LeafrefSpecificationImpl extends AbstractDeclaredStatement .build(); protected LeafrefSpecificationImpl( - final StmtContext context) { + final StmtContext context) { super(context); } public static class Definition extends - AbstractStatementSupport> { + AbstractStatementSupport> { public Definition() { super(YangStmtMapping.TYPE); @@ -45,24 +45,16 @@ public class LeafrefSpecificationImpl extends AbstractDeclaredStatement } @Override - public TypeStatement.LeafrefSpecification createDeclared( - final StmtContext ctx) { + public LeafrefSpecification createDeclared(final StmtContext ctx) { return new LeafrefSpecificationImpl(ctx); } @Override - public EffectiveStatement createEffective( - final StmtContext> ctx) { + public EffectiveStatement createEffective( + final StmtContext> ctx) { return new LeafrefSpecificationEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LengthStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LengthStatementImpl.java index 1fadef0bd6..cdf05f697d 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LengthStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LengthStatementImpl.java @@ -60,13 +60,6 @@ public class LengthStatementImpl extends AbstractDeclaredStatement, - LengthStatement, EffectiveStatement, LengthStatement>> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ListStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ListStatementImpl.java index 381addb75e..2a20d072b4 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ListStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ListStatementImpl.java @@ -99,13 +99,6 @@ public class ListStatementImpl extends AbstractDeclaredStatement return new ListEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MandatoryStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MandatoryStatementImpl.java index fae5a1a0f0..3f0f0b38a7 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MandatoryStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MandatoryStatementImpl.java @@ -61,13 +61,6 @@ public class MandatoryStatementImpl extends AbstractDeclaredStatement i return ret; } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MaxElementsStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MaxElementsStatementImpl.java index 27fdc9962e..aa8b284897 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MaxElementsStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MaxElementsStatementImpl.java @@ -24,7 +24,7 @@ public class MaxElementsStatementImpl extends AbstractDeclaredStatement .build(); protected MaxElementsStatementImpl( - StmtContext context) { + final StmtContext context) { super(context); } @@ -37,29 +37,22 @@ public class MaxElementsStatementImpl extends AbstractDeclaredStatement } @Override - public String parseArgumentValue(StmtContext ctx, String value) { + public String parseArgumentValue(final StmtContext ctx, final String value) { return value; } @Override public MaxElementsStatement createDeclared( - StmtContext ctx) { + final StmtContext ctx) { return new MaxElementsStatementImpl(ctx); } @Override public EffectiveStatement createEffective( - StmtContext> ctx) { + final StmtContext> ctx) { return new MaxElementsEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MinElementsStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MinElementsStatementImpl.java index 34057f7fcd..cb6534f798 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MinElementsStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MinElementsStatementImpl.java @@ -24,7 +24,7 @@ public class MinElementsStatementImpl extends .build(); protected MinElementsStatementImpl( - StmtContext context) { + final StmtContext context) { super(context); } @@ -37,29 +37,22 @@ public class MinElementsStatementImpl extends } @Override - public Integer parseArgumentValue(StmtContext ctx, String value) { + public Integer parseArgumentValue(final StmtContext ctx, final String value) { return Integer.parseInt(value); } @Override public MinElementsStatement createDeclared( - StmtContext ctx) { + final StmtContext ctx) { return new MinElementsStatementImpl(ctx); } @Override public EffectiveStatement createEffective( - StmtContext> ctx) { + final StmtContext> ctx) { return new MinElementsEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java index fe6e791e55..16e45ee35d 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java @@ -182,12 +182,6 @@ public class ModuleStatementSupport extends } @Override - public void onFullDefinitionDeclared(final Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MustStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MustStatementImpl.java index a33f45d72c..4d85e523bb 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MustStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MustStatementImpl.java @@ -59,13 +59,6 @@ public class MustStatementImpl extends AbstractDeclaredStatement> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NamespaceStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NamespaceStatementImpl.java index 0eee709600..cc3adbcadc 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NamespaceStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NamespaceStatementImpl.java @@ -30,34 +30,27 @@ public class NamespaceStatementImpl extends AbstractDeclaredStatement imple } @Override - public URI parseArgumentValue(StmtContext ctx, String value) { + public URI parseArgumentValue(final StmtContext ctx, final String value) { return URI.create(value); } @Override - public NamespaceStatement createDeclared(StmtContext ctx) { + public NamespaceStatement createDeclared(final StmtContext ctx) { return new NamespaceStatementImpl(ctx); } @Override - public EffectiveStatement createEffective(StmtContext> ctx) { + public EffectiveStatement createEffective(final StmtContext> ctx) { return new NamespaceEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; } } - NamespaceStatementImpl(StmtContext context) { + NamespaceStatementImpl(final StmtContext context) { super(context); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NotificationStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NotificationStatementImpl.java index a67bfaa783..933e3e9b78 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NotificationStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NotificationStatementImpl.java @@ -83,13 +83,6 @@ public class NotificationStatementImpl extends AbstractDeclaredStatement return new NotificationEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NumericalRestrictionsImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NumericalRestrictionsImpl.java index 810c48b5d1..2b7e7d88b0 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NumericalRestrictionsImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NumericalRestrictionsImpl.java @@ -11,26 +11,25 @@ import javax.annotation.Nonnull; import org.opendaylight.yangtools.yang.model.api.YangStmtMapping; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RangeStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.NumericalRestrictions; import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.NumericalRestrictionsEffectiveStatementImpl; -public class NumericalRestrictionsImpl extends AbstractDeclaredStatement implements - TypeStatement.NumericalRestrictions { +public class NumericalRestrictionsImpl extends AbstractDeclaredStatement implements NumericalRestrictions { private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping .TYPE) .addMandatory(YangStmtMapping.RANGE) .build(); - protected NumericalRestrictionsImpl(final StmtContext context) { + protected NumericalRestrictionsImpl(final StmtContext context) { super(context); } public static class Definition extends - AbstractStatementSupport> { + AbstractStatementSupport> { public Definition() { super(YangStmtMapping.TYPE); @@ -42,24 +41,16 @@ public class NumericalRestrictionsImpl extends AbstractDeclaredStatement } @Override - public TypeStatement.NumericalRestrictions createDeclared( - final StmtContext ctx) { + public NumericalRestrictions createDeclared(final StmtContext ctx) { return new NumericalRestrictionsImpl(ctx); } @Override - public EffectiveStatement createEffective( - final StmtContext> ctx) { + public EffectiveStatement createEffective( + final StmtContext> ctx) { return new NumericalRestrictionsEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrderedByStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrderedByStatementImpl.java index d4cdbad450..9750d178db 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrderedByStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrderedByStatementImpl.java @@ -17,14 +17,13 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.OrderedByEffectiveStatementImpl; -public class OrderedByStatementImpl extends AbstractDeclaredStatement - implements OrderedByStatement { +public class OrderedByStatementImpl extends AbstractDeclaredStatement implements OrderedByStatement { private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping .ORDERED_BY) .build(); protected OrderedByStatementImpl( - StmtContext context) { + final StmtContext context) { super(context); } @@ -37,28 +36,21 @@ public class OrderedByStatementImpl extends AbstractDeclaredStatement } @Override - public String parseArgumentValue(StmtContext ctx, String value) { + public String parseArgumentValue(final StmtContext ctx, final String value) { return value; } @Override - public OrderedByStatement createDeclared(StmtContext ctx) { + public OrderedByStatement createDeclared(final StmtContext ctx) { return new OrderedByStatementImpl(ctx); } @Override public EffectiveStatement createEffective( - StmtContext> ctx) { + final StmtContext> ctx) { return new OrderedByEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrganizationStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrganizationStatementImpl.java index 86b5252f40..ea72c9cfb3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrganizationStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrganizationStatementImpl.java @@ -17,14 +17,13 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.OrganizationEffectiveStatementImpl; -public class OrganizationStatementImpl extends - AbstractDeclaredStatement implements OrganizationStatement { +public class OrganizationStatementImpl extends AbstractDeclaredStatement implements OrganizationStatement { private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping .ORGANIZATION) .build(); protected OrganizationStatementImpl( - StmtContext context) { + final StmtContext context) { super(context); } @@ -37,29 +36,22 @@ public class OrganizationStatementImpl extends } @Override - public String parseArgumentValue(StmtContext ctx, String value) { + public String parseArgumentValue(final StmtContext ctx, final String value) { return value; } @Override public OrganizationStatement createDeclared( - StmtContext ctx) { + final StmtContext ctx) { return new OrganizationStatementImpl(ctx); } @Override public EffectiveStatement createEffective( - StmtContext> ctx) { + final StmtContext> ctx) { return new OrganizationEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OutputStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OutputStatementImpl.java index a2b1d0446e..53d1f327f5 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OutputStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OutputStatementImpl.java @@ -70,13 +70,6 @@ public class OutputStatementImpl extends AbstractDeclaredStatement implem return new OutputEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PathStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PathStatementImpl.java index bd805887d2..86c99d492f 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PathStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PathStatementImpl.java @@ -50,13 +50,6 @@ public class PathStatementImpl extends AbstractDeclaredStatement> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java index 4b59ae72ce..e711624e07 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java @@ -76,13 +76,6 @@ public class PatternStatementImpl extends AbstractDeclaredStatement> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PositionStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PositionStatementImpl.java index 69a9ab6a3d..65a32482e7 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PositionStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PositionStatementImpl.java @@ -7,7 +7,6 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.model.api.YangStmtMapping; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PositionStatement; @@ -15,6 +14,7 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; +import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.PositionEffectiveStatementImpl; public class PositionStatementImpl extends AbstractDeclaredStatement implements PositionStatement { @@ -53,13 +53,6 @@ public class PositionStatementImpl extends AbstractDeclaredStatement imple return new PositionEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared( - final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PrefixStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PrefixStatementImpl.java index 69a905d506..11f08f9a27 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PrefixStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PrefixStatementImpl.java @@ -22,41 +22,36 @@ public class PrefixStatementImpl extends AbstractDeclaredStatement imple .PREFIX) .build(); - public static class Definition extends AbstractStatementSupport> { + public static class Definition + extends AbstractStatementSupport> { public Definition() { super(YangStmtMapping.PREFIX); } @Override - public String parseArgumentValue(StmtContext ctx, String value) { + public String parseArgumentValue(final StmtContext ctx, final String value) { return value; } @Override - public PrefixStatement createDeclared(StmtContext ctx) { + public PrefixStatement createDeclared(final StmtContext ctx) { return new PrefixStatementImpl(ctx); } @Override - public EffectiveStatement createEffective(StmtContext> ctx) { + public EffectiveStatement createEffective( + final StmtContext> ctx) { return new PrefixEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; } } - PrefixStatementImpl(StmtContext context) { + PrefixStatementImpl(final StmtContext context) { super(context); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PresenceStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PresenceStatementImpl.java index 71a91252cf..c51f40ce11 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PresenceStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PresenceStatementImpl.java @@ -22,7 +22,7 @@ public class PresenceStatementImpl extends AbstractDeclaredStatement imp .PRESENCE) .build(); - protected PresenceStatementImpl(StmtContext context) { + protected PresenceStatementImpl(final StmtContext context) { super(context); } @@ -35,28 +35,21 @@ public class PresenceStatementImpl extends AbstractDeclaredStatement imp } @Override - public String parseArgumentValue(StmtContext ctx, String value) { + public String parseArgumentValue(final StmtContext ctx, final String value) { return value; } @Override - public PresenceStatement createDeclared(StmtContext ctx) { + public PresenceStatement createDeclared(final StmtContext ctx) { return new PresenceStatementImpl(ctx); } @Override public EffectiveStatement createEffective( - StmtContext> ctx) { + final StmtContext> ctx) { return new PresenceEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RangeStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RangeStatementImpl.java index a3e5c2c5c1..e50d4e0cd9 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RangeStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RangeStatementImpl.java @@ -66,13 +66,6 @@ public class RangeStatementImpl extends AbstractDeclaredStatement, RangeStatement, - EffectiveStatement, RangeStatement>> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ReferenceStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ReferenceStatementImpl.java index 88922e89b8..f0166e5a8e 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ReferenceStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ReferenceStatementImpl.java @@ -48,13 +48,6 @@ public class ReferenceStatementImpl extends AbstractDeclaredStatement im return new ReferenceEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RefineStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RefineStatementImpl.java index 3bd6ada915..75f5ea977b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RefineStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RefineStatementImpl.java @@ -65,13 +65,6 @@ public class RefineStatementImpl extends AbstractDeclaredStatement> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RequireInstanceStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RequireInstanceStatementImpl.java index 352e7ac330..d1316600c6 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RequireInstanceStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RequireInstanceStatementImpl.java @@ -48,13 +48,6 @@ public class RequireInstanceStatementImpl extends return new RequireInstanceEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RevisionDateStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RevisionDateStatementImpl.java index 3d4b75ba1f..8800a9810e 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RevisionDateStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RevisionDateStatementImpl.java @@ -57,13 +57,6 @@ public class RevisionDateStatementImpl extends AbstractDeclaredStatement i return new RevisionDateEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared( - final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RevisionStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RevisionStatementImpl.java index 54c2118aed..af019f71dd 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RevisionStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RevisionStatementImpl.java @@ -65,13 +65,6 @@ public class RevisionStatementImpl extends AbstractDeclaredStatement return new RevisionEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared( - final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RpcStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RpcStatementImpl.java index 59d1a7e580..35a8aaf578 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RpcStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RpcStatementImpl.java @@ -77,12 +77,6 @@ public class RpcStatementImpl extends AbstractDeclaredStatement return new RpcEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SemanticVersionStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SemanticVersionStatementImpl.java index ac12f906c0..33ef638c3b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SemanticVersionStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SemanticVersionStatementImpl.java @@ -16,8 +16,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.SemanticVersionNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.SemanticVersionEffectiveStatementImpl; @Beta @@ -49,13 +47,6 @@ public final class SemanticVersionStatementImpl extends AbstractDeclaredStatemen stmt.addToNs(SemanticVersionNamespace.class, stmt.getParentContext(), stmt.getStatementArgument()); } - @Override - public void onFullDefinitionDeclared( - final Mutable, EffectiveStatement>> stmt) - throws SourceException { - getSubstatementValidator().validate(stmt); - } - @Override public UnknownStatement createDeclared( final StmtContext, ?> ctx) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StatusStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StatusStatementImpl.java index 2b4d847487..5231a71252 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StatusStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StatusStatementImpl.java @@ -8,8 +8,8 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020; import javax.annotation.Nonnull; -import org.opendaylight.yangtools.yang.model.api.YangStmtMapping; import org.opendaylight.yangtools.yang.model.api.Status; +import org.opendaylight.yangtools.yang.model.api.YangStmtMapping; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.StatusStatement; import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; @@ -25,7 +25,7 @@ public class StatusStatementImpl extends AbstractDeclaredStatement .build(); protected StatusStatementImpl( - StmtContext context) { + final StmtContext context) { super(context); } @@ -38,29 +38,22 @@ public class StatusStatementImpl extends AbstractDeclaredStatement } @Override - public Status parseArgumentValue(StmtContext ctx, String value) { + public Status parseArgumentValue(final StmtContext ctx, final String value) { return Utils.parseStatus(value); } @Override public StatusStatement createDeclared( - StmtContext ctx) { + final StmtContext ctx) { return new StatusStatementImpl(ctx); } @Override public EffectiveStatement createEffective( - StmtContext> ctx) { + final StmtContext> ctx) { return new StatusEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java index ba3f2ebf4e..4de13f8c38 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java @@ -28,13 +28,13 @@ public class StringRestrictionsImpl extends AbstractDeclaredStatement im .addAny(YangStmtMapping.PATTERN) .build(); - protected StringRestrictionsImpl(final StmtContext context) { + protected StringRestrictionsImpl(final StmtContext context) { super(context); } public static class Definition extends - AbstractStatementSupport> { + AbstractStatementSupport> { public Definition() { super(YangStmtMapping.TYPE); @@ -46,24 +46,16 @@ public class StringRestrictionsImpl extends AbstractDeclaredStatement im } @Override - public TypeStatement.StringRestrictions createDeclared( - final StmtContext ctx) { + public StringRestrictions createDeclared(final StmtContext ctx) { return new StringRestrictionsImpl(ctx); } @Override - public EffectiveStatement createEffective( - final StmtContext> ctx) { + public EffectiveStatement createEffective( + final StmtContext> ctx) { return new StringRestrictionsEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; @@ -86,5 +78,4 @@ public class StringRestrictionsImpl extends AbstractDeclaredStatement im public Collection getPatterns() { return allDeclared(PatternStatement.class); } - } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java index 37177c29d7..bb84a520dd 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java @@ -113,13 +113,6 @@ public class SubmoduleStatementImpl extends AbstractRootStatement> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypeStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypeStatementImpl.java index 31555969d7..97326b64cd 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypeStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypeStatementImpl.java @@ -194,7 +194,7 @@ public class TypeStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared( final Mutable> stmt) { - getSubstatementValidator().validate(stmt); + super.onFullDefinitionDeclared(stmt); // if it is yang built-in type, no prerequisite is needed, so simply return if (TypeUtils.isYangBuiltInTypeString(stmt.getStatementArgument())) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypedefStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypedefStatementImpl.java index 9cae9923c8..1f2ae7182c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypedefStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypedefStatementImpl.java @@ -69,7 +69,7 @@ public class TypedefStatementImpl extends AbstractDeclaredStatement imple public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); + if (stmt != null && stmt.getParentContext() != null) { final StmtContext existing = stmt.getParentContext() .getFromNamespace(TypeNamespace.class, stmt.getStatementArgument()); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnionSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnionSpecificationImpl.java index d21464cf7c..dc555ed5bc 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnionSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnionSpecificationImpl.java @@ -12,6 +12,7 @@ import javax.annotation.Nonnull; import org.opendaylight.yangtools.yang.model.api.YangStmtMapping; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.UnionSpecification; import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; @@ -19,18 +20,19 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.UnionSpecificationEffectiveStatementImpl; public class UnionSpecificationImpl extends AbstractDeclaredStatement - implements TypeStatement.UnionSpecification { + implements UnionSpecification { private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping .TYPE) .addMultiple(YangStmtMapping.TYPE) .build(); protected UnionSpecificationImpl( - final StmtContext context) { + final StmtContext context) { super(context); } - public static class Definition extends AbstractStatementSupport> { + public static class Definition extends + AbstractStatementSupport> { public Definition() { super(YangStmtMapping.TYPE); @@ -42,23 +44,16 @@ public class UnionSpecificationImpl extends AbstractDeclaredStatement } @Override - public TypeStatement.UnionSpecification createDeclared( - final StmtContext ctx) { + public UnionSpecification createDeclared(final StmtContext ctx) { return new UnionSpecificationImpl(ctx); } @Override - public EffectiveStatement createEffective( - final StmtContext> ctx) { + public EffectiveStatement createEffective( + final StmtContext> ctx) { return new UnionSpecificationEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UniqueStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UniqueStatementImpl.java index d46937f7ef..542835c49a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UniqueStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UniqueStatementImpl.java @@ -22,12 +22,13 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.UniqueEffectiveStatementImpl; -public class UniqueStatementImpl extends AbstractDeclaredStatement> implements UniqueStatement { +public class UniqueStatementImpl extends AbstractDeclaredStatement> + implements UniqueStatement { private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping .UNIQUE) .build(); - protected UniqueStatementImpl(StmtContext, UniqueStatement, ?> context) { + protected UniqueStatementImpl(final StmtContext, UniqueStatement, ?> context) { super(context); } @@ -41,7 +42,7 @@ public class UniqueStatementImpl extends AbstractDeclaredStatement parseArgumentValue(StmtContext ctx, String value) { + public Collection parseArgumentValue(final StmtContext ctx, final String value) { final Collection uniqueConstraints = Utils.parseUniqueConstraintArgument(ctx, value); SourceException.throwIf(uniqueConstraints.isEmpty(), ctx.getStatementSourceReference(), "Invalid argument value '%s' of unique statement. The value must contains at least " @@ -50,24 +51,17 @@ public class UniqueStatementImpl extends AbstractDeclaredStatement, UniqueStatement, ?> ctx) { + public UniqueStatement createDeclared(final StmtContext, UniqueStatement, ?> ctx) { return new UniqueStatementImpl(ctx); } @Override public EffectiveStatement, UniqueStatement> createEffective - (StmtContext, UniqueStatement, EffectiveStatement, + (final StmtContext, UniqueStatement, EffectiveStatement, UniqueStatement>> ctx) { return new UniqueEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable, UniqueStatement, - EffectiveStatement, UniqueStatement>> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnitsStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnitsStatementImpl.java index 962a163efe..f826a58794 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnitsStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnitsStatementImpl.java @@ -23,7 +23,7 @@ public class UnitsStatementImpl extends AbstractDeclaredStatement .UNITS) .build(); - protected UnitsStatementImpl(StmtContext context) { + protected UnitsStatementImpl(final StmtContext context) { super(context); } @@ -36,29 +36,22 @@ public class UnitsStatementImpl extends AbstractDeclaredStatement } @Override - public String parseArgumentValue(StmtContext ctx, String value) { + public String parseArgumentValue(final StmtContext ctx, final String value) { return value; } @Override public UnitsStatement createDeclared( - StmtContext ctx) { + final StmtContext ctx) { return new UnitsStatementImpl(ctx); } @Override public EffectiveStatement createEffective( - StmtContext> ctx) { + final StmtContext> ctx) { return new UnitsEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java index e97a9771be..d70d595612 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java @@ -87,8 +87,7 @@ public class UsesStatementImpl extends AbstractDeclaredStatement implemen if (!StmtContextUtils.areFeaturesSupported(usesNode)) { return; } - - getSubstatementValidator().validate(usesNode); + super.onFullDefinitionDeclared(usesNode); if (StmtContextUtils.isInExtensionBody(usesNode)) { return; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ValueStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ValueStatementImpl.java index 63fee4c3bc..4408460474 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ValueStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ValueStatementImpl.java @@ -58,13 +58,6 @@ public class ValueStatementImpl extends AbstractDeclaredStatement imple return new ValueEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared( - final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/WhenStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/WhenStatementImpl.java index 553127e606..82c89bc92b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/WhenStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/WhenStatementImpl.java @@ -55,13 +55,6 @@ public class WhenStatementImpl extends AbstractDeclaredStatement> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangVersionStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangVersionStatementImpl.java index c52c6eee28..128e25be0b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangVersionStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangVersionStatementImpl.java @@ -58,13 +58,6 @@ public class YangVersionStatementImpl extends AbstractDeclaredStatement> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YinElementStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YinElementStatementImpl.java index 8ebf9361a8..6c32110d1c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YinElementStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YinElementStatementImpl.java @@ -48,13 +48,6 @@ public class YinElementStatementImpl extends AbstractDeclaredStatement return new YinElementEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementImpl.java index ae8d8729da..6aefea2f73 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementImpl.java @@ -48,11 +48,11 @@ public class ActionStatementImpl extends AbstractDeclaredStatement implem .addOptional(YangStmtMapping.STATUS) .addAny(YangStmtMapping.TYPEDEF) .build(); - + protected ActionStatementImpl(final StmtContext context) { super(context); } - + public static class Definition extends AbstractStatementSupport> { @@ -98,13 +98,6 @@ public class ActionStatementImpl extends AbstractDeclaredStatement implem return new ActionEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/AnydataStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/AnydataStatementImpl.java index e4174d7290..f104f22b13 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/AnydataStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/AnydataStatementImpl.java @@ -79,13 +79,6 @@ public final class AnydataStatementImpl extends AbstractDeclaredStatement return new AnyDataEffectiveStatementImpl(ctx); } - @Override - public void onFullDefinitionDeclared(final Mutable> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ModifierStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ModifierStatementImpl.java index 99f7172775..2abb0a4e45 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ModifierStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ModifierStatementImpl.java @@ -57,13 +57,6 @@ public final class ModifierStatementImpl extends AbstractDeclaredStatement> stmt) { - super.onFullDefinitionDeclared(stmt); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionStatementImpl.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionStatementImpl.java index cd94be8f0e..9fd5d660ec 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionStatementImpl.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionStatementImpl.java @@ -38,6 +38,7 @@ public class ThirdPartyExtensionStatementImpl extends AbstractDeclaredStatement< @Override public void onFullDefinitionDeclared( final Mutable, EffectiveStatement>> stmt) { + super.onFullDefinitionDeclared(stmt); stmt.addToNs(ThirdPartyNamespace.class, stmt, "Third-party namespace test."); } -- 2.36.6