Eliminate superfluous onFullDefinitionDeclared overrides 98/49798/4
authorRobert Varga <rovarga@cisco.com>
Sun, 25 Dec 2016 15:32:40 +0000 (16:32 +0100)
committerRobert Varga <nite@hq.sk>
Wed, 4 Jan 2017 12:45:42 +0000 (12:45 +0000)
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 <rovarga@cisco.com>
81 files changed:
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractStatementSupport.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlSchemaLocationStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ArgumentStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BaseStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BelongsToStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitsSpecificationImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/CaseStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ChoiceStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ConfigStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContactStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContainerStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Decimal64SpecificationImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DefaultStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DescriptionStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviateStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviationStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumSpecificationImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorAppTagStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorMessageStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FeatureStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FractionDigitsStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityRefSpecificationImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IfFeatureStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InputStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InstanceIdentifierSpecificationImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/KeyStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafListStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafrefSpecificationImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LengthStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ListStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MandatoryStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MaxElementsStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MinElementsStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MustStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NamespaceStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NotificationStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NumericalRestrictionsImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrderedByStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrganizationStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OutputStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PathStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PositionStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PrefixStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PresenceStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RangeStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ReferenceStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RefineStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RequireInstanceStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RevisionDateStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RevisionStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RpcStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SemanticVersionStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StatusStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypeStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypedefStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnionSpecificationImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UniqueStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnitsStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ValueStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/WhenStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangVersionStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YinElementStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/AnydataStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ModifierStatementImpl.java
yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionStatementImpl.java

index 4e2c7c336f8e86bc5e23ec7fa9203641a9921505..02374622dd40c2b28918824679a5fc3fbc0970bd 100644 (file)
@@ -118,7 +118,10 @@ public abstract class AbstractStatementSupport<A, D extends DeclaredStatement<A>
      */
     @Override
     public void onFullDefinitionDeclared(final StmtContext.Mutable<A, D, E> stmt) {
-        // NOOP for most implementations
+        final SubstatementValidator validator = getSubstatementValidator();
+        if (validator != null) {
+            validator.validate(stmt);
+        }
     }
 
     @Override
index 1337e288e0bf6694ab2c1aa0763153619a9b92ba..ca8c7c89cd2e6708a356cf690422e14c4914b01c 100644 (file)
@@ -46,7 +46,7 @@ public final class AnyxmlSchemaLocationStatementImpl extends AbstractDeclaredSta
         @Override
         public void onFullDefinitionDeclared(
                 final Mutable<SchemaNodeIdentifier, UnknownStatement<SchemaNodeIdentifier>, EffectiveStatement<SchemaNodeIdentifier, UnknownStatement<SchemaNodeIdentifier>>> stmt) {
-            getSubstatementValidator().validate(stmt);
+            super.onFullDefinitionDeclared(stmt);
             stmt.getParentContext().addToNs(AnyxmlSchemaLocationNamespace.class,
                     SupportedExtensionsMapping.ANYXML_SCHEMA_LOCATION, stmt);
         }
index 8a411b1ce954e68c9519fdda113d71c77d19bbcf..b057490b38993e7f3960b71b7324cb26f1720303 100644 (file)
@@ -93,14 +93,7 @@ public class AnyxmlStatementImpl extends AbstractDeclaredStatement<QName> implem
             return new AnyXmlEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final Mutable<QName, AnyxmlStatement,
-                EffectiveStatement<QName, AnyxmlStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
-        private Optional<ContainerSchemaNode> getAnyXmlSchema(
+        private static Optional<ContainerSchemaNode> getAnyXmlSchema(
                 final StmtContext<QName, AnyxmlStatement, EffectiveStatement<QName, AnyxmlStatement>> ctx,
                 final SchemaNodeIdentifier contentSchemaPath) {
             final StatementContextBase<?, ?, ?> findNode = Utils.findNode(ctx.getRoot(), contentSchemaPath);
index 12834004cd32a01f8a5ae9e9b21272860750e16a..0eca7b96b46b770684802eea22971226deda41d4 100644 (file)
@@ -56,13 +56,6 @@ public class ArgumentStatementImpl extends AbstractDeclaredStatement<QName>
             return new ArgumentEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<QName, ArgumentStatement,
-                EffectiveStatement<QName, ArgumentStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index b0cf05250a531a949c622a2213e6fcf2dce1a6d2..47e59579de98ea69e5b5a9b7430b96c3cf7ec4a9 100644 (file)
@@ -111,7 +111,7 @@ public class AugmentStatementImpl extends AbstractDeclaredStatement<SchemaNodeId
                 return;
             }
 
-            getSubstatementValidator().validate(augmentNode);
+            super.onFullDefinitionDeclared(augmentNode);
 
             if (StmtContextUtils.isInExtensionBody(augmentNode)) {
                 return;
index 1d35d829614fbf66e917cc85cd58c7a16cc888b3..2ea1f0a4f68f4ce150925274cbd03e841de6ad48 100644 (file)
@@ -98,13 +98,6 @@ public class BaseStatementImpl extends AbstractDeclaredStatement<QName> implemen
             }
         }
 
-        @Override
-        public void onFullDefinitionDeclared(
-                final Mutable<QName, BaseStatement, EffectiveStatement<QName, BaseStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 7207157bdb4d2b29209df105814141265f741cf3..8d91f3a238c5aede7efe639c0b2c5616eeec98d8 100644 (file)
@@ -103,13 +103,6 @@ public class BelongsToStatementImpl extends AbstractDeclaredStatement<String>
                 Optional.of(SimpleDateFormatUtil.DEFAULT_BELONGS_TO_DATE));
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<String, BelongsToStatement,
-                EffectiveStatement<String, BelongsToStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 7bb4cfe544a3d5ccb26d61668f9889a2cfb42f2f..a433cd722932af08706607a8ffd7c4353f237a45 100644 (file)
@@ -60,13 +60,6 @@ public class BitStatementImpl extends AbstractDeclaredStatement<QName> implement
             return new BitEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<QName, BitStatement,
-                EffectiveStatement<QName, BitStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index dd200733ec49f4c275df8ec8975cbe3ce2360d5c..cf4dd23fbf69803c60cdb31f4ae38675d94986b3 100644 (file)
@@ -54,13 +54,6 @@ public class BitsSpecificationImpl extends AbstractDeclaredStatement<String> imp
             return new BitsSpecificationEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<String, BitsSpecification,
-                EffectiveStatement<String, BitsSpecification>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index dd61581c6d0c6a6aac2b563ac031c8ac2c66e0e1..cd9d176507ed01839fd55bbfa661aee34c27f4f9 100644 (file)
@@ -74,13 +74,6 @@ public class CaseStatementImpl extends AbstractDeclaredStatement<QName> implemen
             return new CaseEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final Mutable<QName, CaseStatement,
-                EffectiveStatement<QName, CaseStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 164231321cdbb120afb762fff4561542664b7432..b45fc9238d49aad2f4a904ff98932a3095cb7365 100644 (file)
@@ -84,13 +84,6 @@ public class ChoiceStatementImpl extends AbstractDeclaredStatement<QName>
             return new ChoiceEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final Mutable<QName, ChoiceStatement,
-                EffectiveStatement<QName, ChoiceStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index d4e0e611945deb0745eed4e402ec207fe7df5c28..d7b5fe42c6e713ba974761fe1ed508a9f5df5111 100644 (file)
@@ -61,13 +61,6 @@ public class ConfigStatementImpl extends AbstractDeclaredStatement<Boolean> impl
             return ret;
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<Boolean, ConfigStatement,
-                EffectiveStatement<Boolean, ConfigStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index baabab3f5441e5c170fc65a79cf12c9a25e5993e..aaa438d9166e88e39a02f528a29d8919ea71c334 100644 (file)
@@ -22,38 +22,33 @@ public class ContactStatementImpl extends AbstractDeclaredStatement<String> impl
             .CONTACT)
             .build();
 
-    protected ContactStatementImpl(StmtContext<String, ContactStatement,?> context) {
+    protected ContactStatementImpl(final StmtContext<String, ContactStatement,?> context) {
         super(context);
     }
 
-    public static class Definition extends AbstractStatementSupport<String,ContactStatement,EffectiveStatement<String,ContactStatement>> {
+    public static class Definition extends
+        AbstractStatementSupport<String, ContactStatement,EffectiveStatement<String, ContactStatement>> {
 
         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<String, ContactStatement, ?> ctx) {
+        public ContactStatement createDeclared(final StmtContext<String, ContactStatement, ?> ctx) {
             return new ContactStatementImpl(ctx);
         }
 
         @Override
-        public EffectiveStatement<String, ContactStatement> createEffective(StmtContext<String, ContactStatement, EffectiveStatement<String, ContactStatement>> ctx) {
+        public EffectiveStatement<String, ContactStatement> createEffective(
+                final StmtContext<String, ContactStatement, EffectiveStatement<String, ContactStatement>> ctx) {
             return new ContactEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<String, ContactStatement,
-                EffectiveStatement<String, ContactStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 6c76a4600017e2991d3e00a249fd9912e21818db..b0d84057aa909bbdda198b0dfc978177c2b52033 100644 (file)
@@ -87,12 +87,6 @@ public class ContainerStatementImpl extends AbstractDeclaredStatement<QName> imp
         }
 
         @Override
-        public void onFullDefinitionDeclared(final Mutable<QName, ContainerStatement,
-                EffectiveStatement<QName, ContainerStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
         }
index 1a7c1703fb3c677e8f9f334d725853d0abd72370..c280e3fc2034ba82ddcc7c68bbbd037ac051d77b 100644 (file)
@@ -53,13 +53,6 @@ public class Decimal64SpecificationImpl extends AbstractDeclaredStatement<String
             return new Decimal64SpecificationEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<String, Decimal64Specification,
-                EffectiveStatement<String, Decimal64Specification>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 2103f0e895abb47186d6e49042100455b4b9a3d8..f5deaf2d03e65c473774c58fe953ae0959af6a02 100644 (file)
@@ -24,7 +24,7 @@ public class DefaultStatementImpl extends AbstractDeclaredStatement<String> impl
             .build();
 
     protected DefaultStatementImpl(
-            StmtContext<String, DefaultStatement, ?> context) {
+            final StmtContext<String, DefaultStatement, ?> context) {
         super(context);
     }
 
@@ -34,26 +34,20 @@ public class DefaultStatementImpl extends AbstractDeclaredStatement<String> 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<String, DefaultStatement, ?> ctx) {
+        @Override
+        public DefaultStatement createDeclared(final StmtContext<String, DefaultStatement, ?> ctx) {
             return new DefaultStatementImpl(ctx);
         }
 
-        @Override public EffectiveStatement<String, DefaultStatement> createEffective(
-                StmtContext<String, DefaultStatement, EffectiveStatement<String, DefaultStatement>> ctx) {
-            return new DefaultEffectiveStatementImpl(ctx);
-        }
-
         @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<String, DefaultStatement,
-                EffectiveStatement<String, DefaultStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
+        public EffectiveStatement<String, DefaultStatement> createEffective(
+                final StmtContext<String, DefaultStatement, EffectiveStatement<String, DefaultStatement>> ctx) {
+            return new DefaultEffectiveStatementImpl(ctx);
         }
 
         @Override
index 7881487bee974b38643303f6d898418675ac3d75..c683fd8026538319b9f4d8c7f1b761f48bcf5298 100644 (file)
@@ -23,7 +23,7 @@ public class DescriptionStatementImpl extends AbstractDeclaredStatement<String>
             .build();
 
     protected DescriptionStatementImpl(
-            StmtContext<String, DescriptionStatement, ?> context) {
+            final StmtContext<String, DescriptionStatement, ?> context) {
         super(context);
     }
 
@@ -34,27 +34,20 @@ public class DescriptionStatementImpl extends AbstractDeclaredStatement<String>
         }
 
         @Override
-        public String parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
+        public String parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
             return value;
         }
 
         @Override
-        public DescriptionStatement createDeclared(StmtContext<String, DescriptionStatement, ?> ctx) {
+        public DescriptionStatement createDeclared(final StmtContext<String, DescriptionStatement, ?> ctx) {
             return new DescriptionStatementImpl(ctx);
         }
 
         @Override
-        public EffectiveStatement<String, DescriptionStatement> createEffective(StmtContext<String, DescriptionStatement, EffectiveStatement<String, DescriptionStatement>> ctx) {
+        public EffectiveStatement<String, DescriptionStatement> createEffective(final StmtContext<String, DescriptionStatement, EffectiveStatement<String, DescriptionStatement>> ctx) {
             return new DescriptionEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<String, DescriptionStatement,
-                EffectiveStatement<String, DescriptionStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index eae3c95c2e23437dbbcda8c7188ccafca31d46ef..ed2df6f8b7962eb87028053d378270c87a1e6216 100644 (file)
@@ -57,13 +57,6 @@ public class DeviateStatementImpl extends AbstractDeclaredStatement<DeviateKind>
             return new DeviateEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<DeviateKind, DeviateStatement,
-                EffectiveStatement<DeviateKind, DeviateStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index da4d8d9f536596fe5b95cc1ea0551923d0a5b8cd..d75e3d6b939c88c8487db3ae18822c062f1ca9e6 100644 (file)
@@ -52,13 +52,6 @@ public class DeviationStatementImpl extends AbstractDeclaredStatement<SchemaNode
             return new DeviationEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<SchemaNodeIdentifier, DeviationStatement,
-                EffectiveStatement<SchemaNodeIdentifier, DeviationStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 9f222c7b703ec3cf5e9a8158a014e47ec36fe8fb..d534788af1e60e2199d0f7fd3c76870a97b26364 100644 (file)
@@ -54,13 +54,6 @@ public class EnumSpecificationImpl extends AbstractDeclaredStatement<String> imp
             return new EnumSpecificationEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<String, EnumSpecification,
-                EffectiveStatement<String, EnumSpecification>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 74b0ee896ddc0577bccd756deab63152257bf370..87cd6ce544ddfc625e4e4bc27d17aa50ebc8b402 100644 (file)
@@ -60,13 +60,6 @@ public class EnumStatementImpl extends AbstractDeclaredStatement<String> impleme
             return new EnumEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<String, EnumStatement,
-                EffectiveStatement<String, EnumStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index d585bbff37d817f4bf01e3185623d9d06d615301..2258992d29f40094f3247c3cbef44772e9aadac4 100644 (file)
@@ -24,12 +24,11 @@ public class ErrorAppTagStatementImpl extends AbstractDeclaredStatement<String>
             .build();
 
     protected ErrorAppTagStatementImpl(
-            StmtContext<String, ErrorAppTagStatement, ?> context) {
+            final StmtContext<String, ErrorAppTagStatement, ?> context) {
         super(context);
     }
 
-    public static class Definition
-            extends
+    public static class Definition extends
             AbstractStatementSupport<String, ErrorAppTagStatement, EffectiveStatement<String, ErrorAppTagStatement>> {
 
         public Definition() {
@@ -37,29 +36,22 @@ public class ErrorAppTagStatementImpl extends AbstractDeclaredStatement<String>
         }
 
         @Override
-        public String parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
+        public String parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
             return value;
         }
 
         @Override
         public ErrorAppTagStatement createDeclared(
-                StmtContext<String, ErrorAppTagStatement, ?> ctx) {
+                final StmtContext<String, ErrorAppTagStatement, ?> ctx) {
             return new ErrorAppTagStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<String, ErrorAppTagStatement> createEffective(
-                StmtContext<String, ErrorAppTagStatement, EffectiveStatement<String, ErrorAppTagStatement>> ctx) {
+                final StmtContext<String, ErrorAppTagStatement, EffectiveStatement<String, ErrorAppTagStatement>> ctx) {
             return new ErrorAppTagEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<String, ErrorAppTagStatement,
-                EffectiveStatement<String, ErrorAppTagStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 467b052cb1c603906eebf229cb24c8d4a3856f39..4c047ebba0312d2517ca0854a8586438ec60ef0c 100644 (file)
@@ -24,7 +24,7 @@ public class ErrorMessageStatementImpl extends
             .build();
 
     protected ErrorMessageStatementImpl(
-            StmtContext<String, ErrorMessageStatement, ?> context) {
+            final StmtContext<String, ErrorMessageStatement, ?> 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<String, ErrorMessageStatement, ?> ctx) {
+                final StmtContext<String, ErrorMessageStatement, ?> ctx) {
             return new ErrorMessageStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<String, ErrorMessageStatement> createEffective(
-                StmtContext<String, ErrorMessageStatement, EffectiveStatement<String, ErrorMessageStatement>> ctx) {
+                final StmtContext<String, ErrorMessageStatement, EffectiveStatement<String, ErrorMessageStatement>> ctx) {
             return new ErrorMessageEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<String, ErrorMessageStatement,
-                EffectiveStatement<String, ErrorMessageStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 3b33b742bb78eb23d3481b82461b2d8c3d7d7abf..888167da9f7e8a930b31de70c837e53c6b11cf38 100644 (file)
@@ -76,13 +76,6 @@ public class ExtensionStatementImpl extends AbstractDeclaredStatement<QName> imp
                             yinElement != null ? yinElement.getStatementArgument() : false)));
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<QName, ExtensionStatement,
-                EffectiveStatement<QName, ExtensionStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index f11d913b8779854e29e6cbaa48392e09b86fa403..588db9d3d6ce4485c9392dfb8a29167a3cab027f 100644 (file)
@@ -63,13 +63,6 @@ public class FeatureStatementImpl extends AbstractDeclaredStatement<QName>
             return new FeatureEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<QName, FeatureStatement,
-                EffectiveStatement<QName, FeatureStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index d960ea534cf34141b614eb973c4634fa23fbca9b..1485de9fcd481c460434e2116bf77fd4d71c12fd 100644 (file)
@@ -66,13 +66,6 @@ public class FractionDigitsStatementImpl extends AbstractDeclaredStatement<Integ
             return new FractionDigitsEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<Integer, FractionDigitsStatement,
-                EffectiveStatement<Integer, FractionDigitsStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 6b15f7e6053516856397ba02eccc44cb4f0902bc..0ec64220dead1fc42a2a3545ea40f78c4385c69c 100644 (file)
@@ -79,7 +79,7 @@ public class GroupingStatementImpl extends AbstractDeclaredStatement<QName>
         @Override
         public void onFullDefinitionDeclared(final Mutable<QName, GroupingStatement,
                 EffectiveStatement<QName, GroupingStatement>> stmt) {
-            getSubstatementValidator().validate(stmt);
+            super.onFullDefinitionDeclared(stmt);
 
             if (stmt != null && stmt.getParentContext() != null) {
                 stmt.getParentContext().addContext(GroupingNamespace.class, stmt.getStatementArgument(), stmt);
index 60744b476ad664546dfc271741be6f388f2c6b01..de0c513b93f2413e7174dc366a58853b215b2a49 100644 (file)
@@ -63,7 +63,6 @@ public class IdentityRefSpecificationImpl extends AbstractDeclaredStatement<Stri
         @Override
         public void onFullDefinitionDeclared(final StmtContext.Mutable<String, IdentityRefSpecification,
                 EffectiveStatement<String, IdentityRefSpecification>> stmt) {
-            getSubstatementValidator().validate(stmt);
             super.onFullDefinitionDeclared(stmt);
 
             final StmtContext<QName, ?, ?> baseStmt = StmtContextUtils.findFirstDeclaredSubstatement(stmt,
index 32373d8ee58614161b93a9b022e7f9bff05be75f..43fba277fc61d62958bf3c37429a0911302ef04f 100644 (file)
@@ -68,13 +68,6 @@ public class IdentityStatementImpl extends AbstractDeclaredStatement<QName>
             stmt.addToNs(IdentityNamespace.class, stmt.getStatementArgument(), stmt);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<QName, IdentityStatement,
-                EffectiveStatement<QName, IdentityStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 76ad6c3cfc408c24fe93aaffafefe9b59341d608..e0d4e4e30251e32cb6c7a5e27fadce994edaa40a 100644 (file)
@@ -25,7 +25,7 @@ public class IfFeatureStatementImpl extends AbstractDeclaredStatement<QName>
             .build();
 
     protected IfFeatureStatementImpl(
-            StmtContext<QName, IfFeatureStatement, ?> context) {
+            final StmtContext<QName, IfFeatureStatement, ?> context) {
         super(context);
     }
 
@@ -38,29 +38,22 @@ public class IfFeatureStatementImpl extends AbstractDeclaredStatement<QName>
         }
 
         @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<QName, IfFeatureStatement, ?> ctx) {
+                final StmtContext<QName, IfFeatureStatement, ?> ctx) {
             return new IfFeatureStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<QName, IfFeatureStatement> createEffective(
-                StmtContext<QName, IfFeatureStatement, EffectiveStatement<QName, IfFeatureStatement>> ctx) {
+                final StmtContext<QName, IfFeatureStatement, EffectiveStatement<QName, IfFeatureStatement>> ctx) {
             return new IfFeatureEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<QName, IfFeatureStatement,
-                EffectiveStatement<QName, IfFeatureStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 12a04b034c62c30242194c4c56087ffa238a5dad..74fb2afd1bbaca846a058aae005f7d1a2dec2607 100644 (file)
@@ -81,13 +81,6 @@ public class ImportStatementDefinition extends
         return new ImportEffectiveStatementImpl(ctx);
     }
 
-    @Override
-    public void onFullDefinitionDeclared(
-            final Mutable<String, ImportStatement, EffectiveStatement<String, ImportStatement>> stmt) {
-        super.onFullDefinitionDeclared(stmt);
-        getSubstatementValidator().validate(stmt);
-    }
-
     @Override
     public void onPreLinkageDeclared(final Mutable<String, ImportStatement, EffectiveStatement<String, ImportStatement>> stmt) {
         final String moduleName = stmt.getStatementArgument();
@@ -130,6 +123,7 @@ public class ImportStatementDefinition extends
         }
     }
 
+    @Override
     protected SubstatementValidator getSubstatementValidator() {
         return SUBSTATEMENT_VALIDATOR;
     }
index 5b6c3ada26aff1d328649821c71705302e7a1ee9..df4cfd8e6336057330b58a0730df95984f40e8c4 100644 (file)
@@ -111,12 +111,6 @@ public class IncludeStatementImpl extends AbstractDeclaredStatement<String> impl
         }
 
         @Override
-        public void onFullDefinitionDeclared(final Mutable<String, IncludeStatement,
-                EffectiveStatement<String, IncludeStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
         }
index 4bf181e7486a57c7150328ac230de8d26a563235..9b9dd4d14fb6d271a27b577851d004ef1da83c17 100644 (file)
@@ -73,13 +73,6 @@ public class InputStatementImpl extends AbstractDeclaredStatement<QName>
             return new InputEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final Mutable<QName, InputStatement,
-                EffectiveStatement<QName, InputStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 780ea3012745c62e55c3e0490b0796e1ba94b2d0..816930e8166444964c25b9a710222bc82a5b1d56 100644 (file)
@@ -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<String> implements
-        TypeStatement.InstanceIdentifierSpecification {
+        AbstractDeclaredStatement<String> implements InstanceIdentifierSpecification {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .TYPE)
             .addOptional(YangStmtMapping.REQUIRE_INSTANCE)
             .build();
 
     protected InstanceIdentifierSpecificationImpl(
-            final StmtContext<String, TypeStatement.InstanceIdentifierSpecification, ?> ctx) {
+            final StmtContext<String, InstanceIdentifierSpecification, ?> ctx) {
         super(ctx);
     }
 
     public static class Definition
             extends
-            AbstractStatementSupport<String, TypeStatement.InstanceIdentifierSpecification, EffectiveStatement<String, TypeStatement.InstanceIdentifierSpecification>> {
+            AbstractStatementSupport<String, InstanceIdentifierSpecification, EffectiveStatement<String, InstanceIdentifierSpecification>> {
 
         public Definition() {
             super(YangStmtMapping.TYPE);
@@ -45,24 +44,17 @@ public class InstanceIdentifierSpecificationImpl extends
         }
 
         @Override
-        public TypeStatement.InstanceIdentifierSpecification createDeclared(
-                final StmtContext<String, TypeStatement.InstanceIdentifierSpecification, ?> ctx) {
+        public InstanceIdentifierSpecification createDeclared(
+                final StmtContext<String, InstanceIdentifierSpecification, ?> ctx) {
             return new InstanceIdentifierSpecificationImpl(ctx);
         }
 
         @Override
-        public EffectiveStatement<String, TypeStatement.InstanceIdentifierSpecification> createEffective(
-                final StmtContext<String, TypeStatement.InstanceIdentifierSpecification, EffectiveStatement<String, TypeStatement.InstanceIdentifierSpecification>> ctx) {
+        public EffectiveStatement<String, InstanceIdentifierSpecification> createEffective(
+                final StmtContext<String, InstanceIdentifierSpecification, EffectiveStatement<String, InstanceIdentifierSpecification>> ctx) {
             return new InstanceIdentifierSpecificationEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<String, InstanceIdentifierSpecification,
-                EffectiveStatement<String, InstanceIdentifierSpecification>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 51c7413c42cee62611363a6fcde5aac40b034ca8..0ba28ac4015304447bf2b73ac226f1182367c703 100644 (file)
@@ -69,13 +69,6 @@ public class KeyStatementImpl extends AbstractDeclaredStatement<Collection<Schem
             return new KeyEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<Collection<SchemaNodeIdentifier>, KeyStatement,
-                EffectiveStatement<Collection<SchemaNodeIdentifier>, KeyStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 0453fe04028de7c1b9d4b2d1067831ed46b74b44..4ecdcd616038425d6339bc248ca652bd1e84dbba 100644 (file)
@@ -89,13 +89,6 @@ public class LeafListStatementImpl extends AbstractDeclaredStatement<QName>
             return new LeafListEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final Mutable<QName, LeafListStatement,
-                EffectiveStatement<QName, LeafListStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 783607a42058fa5eb4487f2409ca9d563903b292..9225075464239807261e5e6251aabfb697da1c08 100644 (file)
@@ -67,23 +67,17 @@ public class LeafStatementImpl extends AbstractDeclaredStatement<QName> implemen
             stmt.getParentContext().addToNs(ChildSchemaNodes.class, stmt.getStatementArgument(), stmt);
         }
 
-        @Override public LeafStatement createDeclared(
-                final StmtContext<QName, LeafStatement, ?> ctx) {
+        @Override
+        public LeafStatement createDeclared(final StmtContext<QName, LeafStatement, ?> ctx) {
             return new LeafStatementImpl(ctx);
         }
 
-        @Override public EffectiveStatement<QName, LeafStatement> createEffective(
+        @Override
+        public EffectiveStatement<QName, LeafStatement> createEffective(
                 final StmtContext<QName, LeafStatement, EffectiveStatement<QName, LeafStatement>> ctx) {
             return new LeafEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final Mutable<QName, LeafStatement,
-                EffectiveStatement<QName, LeafStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 263b8294078640208da4b42722b04660dc1b84c3..e9e802d3a06fdeb393d8a7cfc34d47bdc44dab55 100644 (file)
@@ -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<String>
-        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<String>
             .build();
 
     protected LeafrefSpecificationImpl(
-            final StmtContext<String, TypeStatement.LeafrefSpecification, ?> context) {
+            final StmtContext<String, LeafrefSpecification, ?> context) {
         super(context);
     }
 
     public static class Definition
             extends
-            AbstractStatementSupport<String, TypeStatement.LeafrefSpecification, EffectiveStatement<String, TypeStatement.LeafrefSpecification>> {
+            AbstractStatementSupport<String, LeafrefSpecification, EffectiveStatement<String, LeafrefSpecification>> {
 
         public Definition() {
             super(YangStmtMapping.TYPE);
@@ -45,24 +45,16 @@ public class LeafrefSpecificationImpl extends AbstractDeclaredStatement<String>
         }
 
         @Override
-        public TypeStatement.LeafrefSpecification createDeclared(
-                final StmtContext<String, TypeStatement.LeafrefSpecification, ?> ctx) {
+        public LeafrefSpecification createDeclared(final StmtContext<String, LeafrefSpecification, ?> ctx) {
             return new LeafrefSpecificationImpl(ctx);
         }
 
         @Override
-        public EffectiveStatement<String, TypeStatement.LeafrefSpecification> createEffective(
-                final StmtContext<String, TypeStatement.LeafrefSpecification, EffectiveStatement<String, TypeStatement.LeafrefSpecification>> ctx) {
+        public EffectiveStatement<String, LeafrefSpecification> createEffective(
+                final StmtContext<String, LeafrefSpecification, EffectiveStatement<String, LeafrefSpecification>> ctx) {
             return new LeafrefSpecificationEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<String, LeafrefSpecification,
-                EffectiveStatement<String, LeafrefSpecification>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 1fadef0bd63a3ff750067a05d3c19a109521af59..cdf05f697d2b1ab2530842ab5703cce15bce7f86 100644 (file)
@@ -60,13 +60,6 @@ public class LengthStatementImpl extends AbstractDeclaredStatement<List<LengthCo
             return new LengthEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<List<LengthConstraint>,
-                LengthStatement, EffectiveStatement<List<LengthConstraint>, LengthStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 381addb75e66f7da9e1f6e4fd40fb150561a51f9..2a20d072b4051e94f9b09eb6442a297f2a2b7599 100644 (file)
@@ -99,13 +99,6 @@ public class ListStatementImpl extends AbstractDeclaredStatement<QName>
             return new ListEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final Mutable<QName, ListStatement,
-                EffectiveStatement<QName, ListStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index fae5a1a0f0c339ce3792da2443565d4ac72561de..3f0f0b38a73bdd5e27396f4f3e76362529a78c66 100644 (file)
@@ -61,13 +61,6 @@ public class MandatoryStatementImpl extends AbstractDeclaredStatement<Boolean> i
             return ret;
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<Boolean, MandatoryStatement,
-                EffectiveStatement<Boolean, MandatoryStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 27fdc9962ebeb0197c05f894e6f8f3000e98287c..aa8b28489781c523d5b532d43c7878f66be71240 100644 (file)
@@ -24,7 +24,7 @@ public class MaxElementsStatementImpl extends AbstractDeclaredStatement<String>
             .build();
 
     protected MaxElementsStatementImpl(
-            StmtContext<String, MaxElementsStatement, ?> context) {
+            final StmtContext<String, MaxElementsStatement, ?> context) {
         super(context);
     }
 
@@ -37,29 +37,22 @@ public class MaxElementsStatementImpl extends AbstractDeclaredStatement<String>
         }
 
         @Override
-        public String parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
+        public String parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
             return value;
         }
 
         @Override
         public MaxElementsStatement createDeclared(
-                StmtContext<String, MaxElementsStatement, ?> ctx) {
+                final StmtContext<String, MaxElementsStatement, ?> ctx) {
             return new MaxElementsStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<String, MaxElementsStatement> createEffective(
-                StmtContext<String, MaxElementsStatement, EffectiveStatement<String, MaxElementsStatement>> ctx) {
+                final StmtContext<String, MaxElementsStatement, EffectiveStatement<String, MaxElementsStatement>> ctx) {
             return new MaxElementsEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<String, MaxElementsStatement,
-                EffectiveStatement<String, MaxElementsStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 34057f7fcd37752675e2f88fc5b8cc0d6aca3aa6..cb6534f79815d34dc893086436db6e6f5d5f71ec 100644 (file)
@@ -24,7 +24,7 @@ public class MinElementsStatementImpl extends
             .build();
 
     protected MinElementsStatementImpl(
-            StmtContext<Integer, MinElementsStatement, ?> context) {
+            final StmtContext<Integer, MinElementsStatement, ?> 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<Integer, MinElementsStatement, ?> ctx) {
+                final StmtContext<Integer, MinElementsStatement, ?> ctx) {
             return new MinElementsStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<Integer, MinElementsStatement> createEffective(
-                StmtContext<Integer, MinElementsStatement, EffectiveStatement<Integer, MinElementsStatement>> ctx) {
+                final StmtContext<Integer, MinElementsStatement, EffectiveStatement<Integer, MinElementsStatement>> ctx) {
             return new MinElementsEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<Integer, MinElementsStatement,
-                EffectiveStatement<Integer, MinElementsStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index fe6e791e55463b76e741603a2c999e9e842e7753..16e45ee35d76bfdd58031c37612591692c18a696 100644 (file)
@@ -182,12 +182,6 @@ public class ModuleStatementSupport extends
     }
 
     @Override
-    public void onFullDefinitionDeclared(final Mutable<String, ModuleStatement,
-            EffectiveStatement<String, ModuleStatement>> stmt) {
-        super.onFullDefinitionDeclared(stmt);
-        getSubstatementValidator().validate(stmt);
-    }
-
     protected SubstatementValidator getSubstatementValidator() {
         return SUBSTATEMENT_VALIDATOR;
     }
index a33f45d72cab042dbbd48da77978a7d810ff4106..4d85e523bbff7bd3127da493575fd2232e5987a3 100644 (file)
@@ -59,13 +59,6 @@ public class MustStatementImpl extends AbstractDeclaredStatement<RevisionAwareXP
             return new MustEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<RevisionAwareXPath, MustStatement,
-                EffectiveStatement<RevisionAwareXPath, MustStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 0eee709600f317ba1f3408242b671d19062a7d6e..cc3adbcadc410c47cbbac59cdf101c81b5b078e1 100644 (file)
@@ -30,34 +30,27 @@ public class NamespaceStatementImpl extends AbstractDeclaredStatement<URI> 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<URI, NamespaceStatement,?> ctx) {
+        public NamespaceStatement createDeclared(final StmtContext<URI, NamespaceStatement,?> ctx) {
             return new NamespaceStatementImpl(ctx);
         }
 
         @Override
-        public EffectiveStatement<URI,NamespaceStatement> createEffective(StmtContext<URI, NamespaceStatement,EffectiveStatement<URI,NamespaceStatement>> ctx) {
+        public EffectiveStatement<URI,NamespaceStatement> createEffective(final StmtContext<URI, NamespaceStatement,EffectiveStatement<URI,NamespaceStatement>> ctx) {
             return new NamespaceEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<URI, NamespaceStatement,
-                EffectiveStatement<URI, NamespaceStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
         }
     }
 
-    NamespaceStatementImpl(StmtContext<URI, NamespaceStatement,?> context) {
+    NamespaceStatementImpl(final StmtContext<URI, NamespaceStatement,?> context) {
         super(context);
     }
 
index a67bfaa7836208f6170bca481b2c6806cbecf7ae..933e3e9b78b0a5a3edfa4eaaf0d6948b44d546ea 100644 (file)
@@ -83,13 +83,6 @@ public class NotificationStatementImpl extends AbstractDeclaredStatement<QName>
             return new NotificationEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final Mutable<QName, NotificationStatement,
-                EffectiveStatement<QName, NotificationStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 810c48b5d1eff53673298136716fdc1ffd5477dc..2b7e7d88b00f199677c6f520a84451b6eb85154c 100644 (file)
@@ -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<String> implements
-        TypeStatement.NumericalRestrictions {
+public class NumericalRestrictionsImpl extends AbstractDeclaredStatement<String> implements NumericalRestrictions {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .TYPE)
             .addMandatory(YangStmtMapping.RANGE)
             .build();
 
-    protected NumericalRestrictionsImpl(final StmtContext<String, TypeStatement.NumericalRestrictions, ?> context) {
+    protected NumericalRestrictionsImpl(final StmtContext<String, NumericalRestrictions, ?> context) {
         super(context);
     }
 
     public static class Definition extends
-            AbstractStatementSupport<String, TypeStatement.NumericalRestrictions, EffectiveStatement<String, TypeStatement.NumericalRestrictions>> {
+            AbstractStatementSupport<String, NumericalRestrictions, EffectiveStatement<String, NumericalRestrictions>> {
 
         public Definition() {
             super(YangStmtMapping.TYPE);
@@ -42,24 +41,16 @@ public class NumericalRestrictionsImpl extends AbstractDeclaredStatement<String>
         }
 
         @Override
-        public TypeStatement.NumericalRestrictions createDeclared(
-                final StmtContext<String, TypeStatement.NumericalRestrictions, ?> ctx) {
+        public NumericalRestrictions createDeclared(final StmtContext<String, NumericalRestrictions, ?> ctx) {
             return new NumericalRestrictionsImpl(ctx);
         }
 
         @Override
-        public EffectiveStatement<String, TypeStatement.NumericalRestrictions> createEffective(
-                final StmtContext<String, TypeStatement.NumericalRestrictions, EffectiveStatement<String, TypeStatement.NumericalRestrictions>> ctx) {
+        public EffectiveStatement<String, NumericalRestrictions> createEffective(
+                final StmtContext<String, NumericalRestrictions, EffectiveStatement<String, NumericalRestrictions>> ctx) {
             return new NumericalRestrictionsEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<String, NumericalRestrictions,
-                EffectiveStatement<String, NumericalRestrictions>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index d4cdbad450328ccf43d4ebb90ea83e4645520763..9750d178db696048d45066f081c5a96991ef35c4 100644 (file)
@@ -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<String>
-        implements OrderedByStatement {
+public class OrderedByStatementImpl extends AbstractDeclaredStatement<String> implements OrderedByStatement {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .ORDERED_BY)
             .build();
 
     protected OrderedByStatementImpl(
-            StmtContext<String, OrderedByStatement, ?> context) {
+            final StmtContext<String, OrderedByStatement, ?> context) {
         super(context);
     }
 
@@ -37,28 +36,21 @@ public class OrderedByStatementImpl extends AbstractDeclaredStatement<String>
         }
 
         @Override
-        public String parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
+        public String parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
             return value;
         }
 
         @Override
-        public OrderedByStatement createDeclared(StmtContext<String, OrderedByStatement, ?> ctx) {
+        public OrderedByStatement createDeclared(final StmtContext<String, OrderedByStatement, ?> ctx) {
             return new OrderedByStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<String, OrderedByStatement> createEffective(
-                StmtContext<String, OrderedByStatement, EffectiveStatement<String, OrderedByStatement>> ctx) {
+                final StmtContext<String, OrderedByStatement, EffectiveStatement<String, OrderedByStatement>> ctx) {
             return new OrderedByEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<String, OrderedByStatement,
-                EffectiveStatement<String, OrderedByStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 86b5252f402c202d4ac0767aca4643c8a858b3a7..ea72c9cfb3a1a3b667d542ce98c933cb33a10b85 100644 (file)
@@ -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<String> implements OrganizationStatement {
+public class OrganizationStatementImpl extends AbstractDeclaredStatement<String> implements OrganizationStatement {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .ORGANIZATION)
             .build();
 
     protected OrganizationStatementImpl(
-            StmtContext<String, OrganizationStatement, ?> context) {
+            final StmtContext<String, OrganizationStatement, ?> 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<String, OrganizationStatement, ?> ctx) {
+                final StmtContext<String, OrganizationStatement, ?> ctx) {
             return new OrganizationStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<String, OrganizationStatement> createEffective(
-                StmtContext<String, OrganizationStatement, EffectiveStatement<String, OrganizationStatement>> ctx) {
+                final StmtContext<String, OrganizationStatement, EffectiveStatement<String, OrganizationStatement>> ctx) {
             return new OrganizationEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<String, OrganizationStatement,
-                EffectiveStatement<String, OrganizationStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index a2b1d0446efd1459001ca90314bf624a96d5c413..53d1f327f58ca28069c789fd1f5ba83588fa5b7a 100644 (file)
@@ -70,13 +70,6 @@ public class OutputStatementImpl extends AbstractDeclaredStatement<QName> implem
             return new OutputEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final Mutable<QName, OutputStatement,
-                EffectiveStatement<QName, OutputStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index bd805887d2185ea9a9ae4d27c06907787dc094fa..86c99d492f300e62c3662fdf8df6fd0c93a35849 100644 (file)
@@ -50,13 +50,6 @@ public class PathStatementImpl extends AbstractDeclaredStatement<RevisionAwareXP
             return new PathEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<RevisionAwareXPath, PathStatement,
-                EffectiveStatement<RevisionAwareXPath, PathStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 4b59ae72cee2bc5baf521110c1d9b604033046a0..e711624e070a67573fa23d6a241714bf0e419dd2 100644 (file)
@@ -76,13 +76,6 @@ public class PatternStatementImpl extends AbstractDeclaredStatement<PatternConst
             return new PatternEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<PatternConstraint, PatternStatement,
-                EffectiveStatement<PatternConstraint, PatternStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 69a9ab6a3d35d51506d8882edbee9ed5cdc71b16..65a32482e7e1753742dbdeea591f8c2d34aa16f3 100644 (file)
@@ -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<Long> implements PositionStatement {
@@ -53,13 +53,6 @@ public class PositionStatementImpl extends AbstractDeclaredStatement<Long> imple
             return new PositionEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(
-                final StmtContext.Mutable<Long, PositionStatement, EffectiveStatement<Long, PositionStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 69a905d506e828ad777f6a5151841996ceca7d7b..11f08f9a273dced65d33f01646b51b77dc6087ff 100644 (file)
@@ -22,41 +22,36 @@ public class PrefixStatementImpl extends AbstractDeclaredStatement<String> imple
             .PREFIX)
             .build();
 
-    public static class Definition extends AbstractStatementSupport<String,PrefixStatement,EffectiveStatement<String,PrefixStatement>> {
+    public static class Definition
+        extends AbstractStatementSupport<String, PrefixStatement, EffectiveStatement<String, PrefixStatement>> {
 
         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<String, PrefixStatement,?> ctx) {
+        public PrefixStatement createDeclared(final StmtContext<String, PrefixStatement,?> ctx) {
             return new PrefixStatementImpl(ctx);
         }
 
         @Override
-        public EffectiveStatement<String,PrefixStatement> createEffective(StmtContext<String, PrefixStatement,EffectiveStatement<String,PrefixStatement>> ctx) {
+        public EffectiveStatement<String,PrefixStatement> createEffective(
+                final StmtContext<String, PrefixStatement, EffectiveStatement<String, PrefixStatement>> ctx) {
             return new PrefixEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<String, PrefixStatement,
-                EffectiveStatement<String, PrefixStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
         }
     }
 
-    PrefixStatementImpl(StmtContext<String, PrefixStatement,?> context) {
+    PrefixStatementImpl(final StmtContext<String, PrefixStatement,?> context) {
         super(context);
     }
 
index 71a91252cf54cbd5dcaa9d0096cbc8df9c4c75c0..c51f40ce11d868ce530426e648d7da4549c2bb44 100644 (file)
@@ -22,7 +22,7 @@ public class PresenceStatementImpl extends AbstractDeclaredStatement<String> imp
             .PRESENCE)
             .build();
 
-    protected PresenceStatementImpl(StmtContext<String, PresenceStatement, ?> context) {
+    protected PresenceStatementImpl(final StmtContext<String, PresenceStatement, ?> context) {
         super(context);
     }
 
@@ -35,28 +35,21 @@ public class PresenceStatementImpl extends AbstractDeclaredStatement<String> 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<String, PresenceStatement, ?> ctx) {
+        public PresenceStatement createDeclared(final StmtContext<String, PresenceStatement, ?> ctx) {
             return new PresenceStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<String, PresenceStatement> createEffective(
-                StmtContext<String, PresenceStatement, EffectiveStatement<String, PresenceStatement>> ctx) {
+                final StmtContext<String, PresenceStatement, EffectiveStatement<String, PresenceStatement>> ctx) {
             return new PresenceEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<String, PresenceStatement,
-                EffectiveStatement<String, PresenceStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index a3e5c2c5c123d3325c6f1fedb30cfe35e7e18f5d..e50d4e0cd97212508fd00bdad48c102304212ecf 100644 (file)
@@ -66,13 +66,6 @@ public class RangeStatementImpl extends AbstractDeclaredStatement<List<RangeCons
             return new RangeEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<List<RangeConstraint>, RangeStatement,
-                EffectiveStatement<List<RangeConstraint>, RangeStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 88922e89b86282e5c18d65a6c0c24de8d0a84171..f0166e5a8eedb0d5cc301b9edd90107ae4322846 100644 (file)
@@ -48,13 +48,6 @@ public class ReferenceStatementImpl extends AbstractDeclaredStatement<String> im
             return new ReferenceEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<String, ReferenceStatement,
-                EffectiveStatement<String, ReferenceStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 3bd6ada915c3bbc4899c9f74315e857a1eb3a516..75f5ea977b2adf519e34d1ba409544b9f25237c7 100644 (file)
@@ -65,13 +65,6 @@ public class RefineStatementImpl extends AbstractDeclaredStatement<SchemaNodeIde
             return new RefineEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<SchemaNodeIdentifier, RefineStatement,
-                EffectiveStatement<SchemaNodeIdentifier, RefineStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 352e7ac330c8a4163edae53be071119d1e746ee4..d1316600c67d575918680f4f5f61ec9796240b29 100644 (file)
@@ -48,13 +48,6 @@ public class RequireInstanceStatementImpl extends
             return new RequireInstanceEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<Boolean, RequireInstanceStatement,
-                EffectiveStatement<Boolean, RequireInstanceStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 3d4b75ba1f268d4c225ad91fe78d774729466f12..8800a9810e50481b4062b392fe84539675f597f3 100644 (file)
@@ -57,13 +57,6 @@ public class RevisionDateStatementImpl extends AbstractDeclaredStatement<Date> i
             return new RevisionDateEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(
-                final StmtContext.Mutable<Date, RevisionDateStatement, EffectiveStatement<Date, RevisionDateStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 54c2118aed357987e8892776edb67271c15fa9b5..af019f71ddd692580bf4d2999a3584d5bb52ff9e 100644 (file)
@@ -65,13 +65,6 @@ public class RevisionStatementImpl extends AbstractDeclaredStatement<Date>
             return new RevisionEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(
-                final StmtContext.Mutable<Date, RevisionStatement, EffectiveStatement<Date, RevisionStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 59d1a7e5802ad25b2bb4a576c3bb778f778d0904..35a8aaf578dc666c9795e32c0ff68ccbcf80e6d7 100644 (file)
@@ -77,12 +77,6 @@ public class RpcStatementImpl extends AbstractDeclaredStatement<QName>
             return new RpcEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final Mutable<QName, RpcStatement, EffectiveStatement<QName, RpcStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index ac12f906c02c1acbf2baa106bfe86e6aa33d84b8..33ef638c3b5443d0bfb4846472e4d0fb55c4c806 100644 (file)
@@ -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<SemVer, UnknownStatement<SemVer>, EffectiveStatement<SemVer, UnknownStatement<SemVer>>> stmt)
-                throws SourceException {
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         public UnknownStatement<SemVer> createDeclared(
                 final StmtContext<SemVer, UnknownStatement<SemVer>, ?> ctx) {
index 2b4d8474877c83fa0a6bb89bda3986f4f8528c0a..5231a7125272eb663171c75e2cb6907f5bd42c5a 100644 (file)
@@ -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<Status>
             .build();
 
     protected StatusStatementImpl(
-            StmtContext<Status, StatusStatement, ?> context) {
+            final StmtContext<Status, StatusStatement, ?> context) {
         super(context);
     }
 
@@ -38,29 +38,22 @@ public class StatusStatementImpl extends AbstractDeclaredStatement<Status>
         }
 
         @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<Status, StatusStatement, ?> ctx) {
+                final StmtContext<Status, StatusStatement, ?> ctx) {
             return new StatusStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<Status, StatusStatement> createEffective(
-                StmtContext<Status, StatusStatement, EffectiveStatement<Status, StatusStatement>> ctx) {
+                final StmtContext<Status, StatusStatement, EffectiveStatement<Status, StatusStatement>> ctx) {
             return new StatusEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<Status, StatusStatement,
-                EffectiveStatement<Status, StatusStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index ba3f2ebf4e75ca88b367ba8138c05c0e429247b5..4de13f8c380b92a48b5bdee61c6ed696bf91af35 100644 (file)
@@ -28,13 +28,13 @@ public class StringRestrictionsImpl extends AbstractDeclaredStatement<String> im
             .addAny(YangStmtMapping.PATTERN)
             .build();
 
-    protected StringRestrictionsImpl(final StmtContext<String, TypeStatement.StringRestrictions, ?> context) {
+    protected StringRestrictionsImpl(final StmtContext<String, StringRestrictions, ?> context) {
         super(context);
     }
 
     public static class Definition
             extends
-            AbstractStatementSupport<String, TypeStatement.StringRestrictions, EffectiveStatement<String, TypeStatement.StringRestrictions>> {
+            AbstractStatementSupport<String, StringRestrictions, EffectiveStatement<String, StringRestrictions>> {
 
         public Definition() {
             super(YangStmtMapping.TYPE);
@@ -46,24 +46,16 @@ public class StringRestrictionsImpl extends AbstractDeclaredStatement<String> im
         }
 
         @Override
-        public TypeStatement.StringRestrictions createDeclared(
-                final StmtContext<String, TypeStatement.StringRestrictions, ?> ctx) {
+        public StringRestrictions createDeclared(final StmtContext<String, StringRestrictions, ?> ctx) {
             return new StringRestrictionsImpl(ctx);
         }
 
         @Override
-        public EffectiveStatement<String, TypeStatement.StringRestrictions> createEffective(
-                final StmtContext<String, TypeStatement.StringRestrictions, EffectiveStatement<String, TypeStatement.StringRestrictions>> ctx) {
+        public EffectiveStatement<String, StringRestrictions> createEffective(
+                final StmtContext<String, StringRestrictions, EffectiveStatement<String, StringRestrictions>> ctx) {
             return new StringRestrictionsEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<String, StringRestrictions,
-                EffectiveStatement<String, StringRestrictions>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
@@ -86,5 +78,4 @@ public class StringRestrictionsImpl extends AbstractDeclaredStatement<String> im
     public Collection<? extends PatternStatement> getPatterns() {
         return allDeclared(PatternStatement.class);
     }
-
 }
index 37177c29d783efc7188a14b15c8e6e81b5de84cf..bb84a520dd22652bcc6a4a76af462f25faf3c9db 100644 (file)
@@ -113,13 +113,6 @@ public class SubmoduleStatementImpl extends AbstractRootStatement<SubmoduleState
             stmt.addToNs(BelongsToPrefixToModuleName.class, prefix, belongsToModuleName);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final Mutable<String, SubmoduleStatement,
-                EffectiveStatement<String, SubmoduleStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 31555969d7c920ecb531d24759b37bb1e4901472..97326b64cd0ff1dffb26c14c01adb74eb00c5780 100644 (file)
@@ -194,7 +194,7 @@ public class TypeStatementImpl extends AbstractDeclaredStatement<String>
         @Override
         public void onFullDefinitionDeclared(
                 final Mutable<String, TypeStatement, EffectiveStatement<String, TypeStatement>> 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())) {
index 9cae9923c8adb4fbc7e9f4daf56eae87be4382b5..1f2ae7182ceda2ae1fbefcab85704e5aeb0e12b4 100644 (file)
@@ -69,7 +69,7 @@ public class TypedefStatementImpl extends AbstractDeclaredStatement<QName> imple
         public void onFullDefinitionDeclared(final StmtContext.Mutable<QName, TypedefStatement,
                 EffectiveStatement<QName, TypedefStatement>> stmt) {
             super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
+
             if (stmt != null && stmt.getParentContext() != null) {
                 final StmtContext<?, TypedefStatement, TypedefEffectiveStatement> existing = stmt.getParentContext()
                         .getFromNamespace(TypeNamespace.class, stmt.getStatementArgument());
index d21464cf7cc71a84de9719910c31c52357d49b89..dc555ed5bc40e8682eda3ed8f309761ab95bbc69 100644 (file)
@@ -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<String>
-        implements TypeStatement.UnionSpecification {
+        implements UnionSpecification {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .TYPE)
             .addMultiple(YangStmtMapping.TYPE)
             .build();
 
     protected UnionSpecificationImpl(
-            final StmtContext<String, TypeStatement.UnionSpecification, ?> context) {
+            final StmtContext<String, UnionSpecification, ?> context) {
         super(context);
     }
 
-    public static class Definition extends AbstractStatementSupport<String, TypeStatement.UnionSpecification, EffectiveStatement<String, TypeStatement.UnionSpecification>> {
+    public static class Definition extends
+        AbstractStatementSupport<String, UnionSpecification, EffectiveStatement<String, UnionSpecification>> {
 
         public Definition() {
             super(YangStmtMapping.TYPE);
@@ -42,23 +44,16 @@ public class UnionSpecificationImpl extends AbstractDeclaredStatement<String>
         }
 
         @Override
-        public TypeStatement.UnionSpecification createDeclared(
-                final StmtContext<String, TypeStatement.UnionSpecification, ?> ctx) {
+        public UnionSpecification createDeclared(final StmtContext<String, UnionSpecification, ?> ctx) {
             return new UnionSpecificationImpl(ctx);
         }
 
         @Override
-        public EffectiveStatement<String, TypeStatement.UnionSpecification> createEffective(
-                final StmtContext<String, TypeStatement.UnionSpecification, EffectiveStatement<String, TypeStatement.UnionSpecification>> ctx) {
+        public EffectiveStatement<String, UnionSpecification> createEffective(
+                final StmtContext<String, UnionSpecification, EffectiveStatement<String, UnionSpecification>> ctx) {
             return new UnionSpecificationEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<String, UnionSpecification, EffectiveStatement<String, UnionSpecification>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index d46937f7ef8d32d07948bb3df694eadad952ce0c..542835c49ad33e69d233aa7753ef78f5d6f7a4de 100644 (file)
@@ -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<Collection<SchemaNodeIdentifier.Relative>> implements UniqueStatement {
+public class UniqueStatementImpl extends AbstractDeclaredStatement<Collection<SchemaNodeIdentifier.Relative>>
+        implements UniqueStatement {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .UNIQUE)
             .build();
 
-    protected UniqueStatementImpl(StmtContext<Collection<SchemaNodeIdentifier.Relative>, UniqueStatement, ?> context) {
+    protected UniqueStatementImpl(final StmtContext<Collection<SchemaNodeIdentifier.Relative>, UniqueStatement, ?> context) {
         super(context);
     }
 
@@ -41,7 +42,7 @@ public class UniqueStatementImpl extends AbstractDeclaredStatement<Collection<Sc
         }
 
         @Override
-        public Collection<SchemaNodeIdentifier.Relative> parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
+        public Collection<SchemaNodeIdentifier.Relative> parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
             final Collection<Relative> 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<Collection<Sc
         }
 
         @Override
-        public UniqueStatement createDeclared(StmtContext<Collection<Relative>, UniqueStatement, ?> ctx) {
+        public UniqueStatement createDeclared(final StmtContext<Collection<Relative>, UniqueStatement, ?> ctx) {
             return new UniqueStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<Collection<Relative>, UniqueStatement> createEffective
-                (StmtContext<Collection<Relative>, UniqueStatement, EffectiveStatement<Collection<Relative>,
+                (final StmtContext<Collection<Relative>, UniqueStatement, EffectiveStatement<Collection<Relative>,
                         UniqueStatement>> ctx) {
             return new UniqueEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<Collection<Relative>, UniqueStatement,
-                EffectiveStatement<Collection<Relative>, UniqueStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 962a163efea1abde84289457a29684f2a9f885e9..f826a58794d80325d0f4340bb984ee47a29f9b91 100644 (file)
@@ -23,7 +23,7 @@ public class UnitsStatementImpl extends AbstractDeclaredStatement<String>
             .UNITS)
             .build();
 
-    protected UnitsStatementImpl(StmtContext<String, UnitsStatement, ?> context) {
+    protected UnitsStatementImpl(final StmtContext<String, UnitsStatement, ?> context) {
         super(context);
     }
 
@@ -36,29 +36,22 @@ public class UnitsStatementImpl extends AbstractDeclaredStatement<String>
         }
 
         @Override
-        public String parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
+        public String parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
             return value;
         }
 
         @Override
         public UnitsStatement createDeclared(
-                StmtContext<String, UnitsStatement, ?> ctx) {
+                final StmtContext<String, UnitsStatement, ?> ctx) {
             return new UnitsStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<String, UnitsStatement> createEffective(
-                StmtContext<String, UnitsStatement, EffectiveStatement<String, UnitsStatement>> ctx) {
+                final StmtContext<String, UnitsStatement, EffectiveStatement<String, UnitsStatement>> ctx) {
             return new UnitsEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<String, UnitsStatement,
-                EffectiveStatement<String, UnitsStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index e97a9771beffaf6eac04478a8d89e00eba4499fb..d70d595612ec545f8d87a6ea8519045818de1279 100644 (file)
@@ -87,8 +87,7 @@ public class UsesStatementImpl extends AbstractDeclaredStatement<QName> implemen
             if (!StmtContextUtils.areFeaturesSupported(usesNode)) {
                 return;
             }
-
-            getSubstatementValidator().validate(usesNode);
+            super.onFullDefinitionDeclared(usesNode);
 
             if (StmtContextUtils.isInExtensionBody(usesNode)) {
                 return;
index 63fee4c3bcb0568c1764608ae94340dd98654416..4408460474c67a45fd7b5c6f7e7c014f99c04fef 100644 (file)
@@ -58,13 +58,6 @@ public class ValueStatementImpl extends AbstractDeclaredStatement<Integer> imple
             return new ValueEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(
-                final StmtContext.Mutable<Integer, ValueStatement, EffectiveStatement<Integer, ValueStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 553127e60696897e48252fab93740a51254bd590..82c89bc92bc5e08baf1991f4c3abf2d8ec9aa996 100644 (file)
@@ -55,13 +55,6 @@ public class WhenStatementImpl extends AbstractDeclaredStatement<RevisionAwareXP
             return new WhenEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<RevisionAwareXPath, WhenStatement,
-                EffectiveStatement<RevisionAwareXPath, WhenStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index c52c6eee287efe7e2f61085c162b1413f33a3835..128e25be0b2137b88fea637eec973529f87c53e2 100644 (file)
@@ -58,13 +58,6 @@ public class YangVersionStatementImpl extends AbstractDeclaredStatement<YangVers
             return new YangVersionEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<YangVersion, YangVersionStatement,
-                EffectiveStatement<YangVersion, YangVersionStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 8ebf9361a81314d2bceac27228b6aefe5e79e456..6c32110d1cd31c827ff70159083ac75173edb2fc 100644 (file)
@@ -48,13 +48,6 @@ public class YinElementStatementImpl extends AbstractDeclaredStatement<Boolean>
             return new YinElementEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<Boolean, YinElementStatement,
-                EffectiveStatement<Boolean, YinElementStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index ae8d8729dad0380f43afff89fc249273f105f928..6aefea2f734b1d7d8f426e3c0b5a815728e54a15 100644 (file)
@@ -48,11 +48,11 @@ public class ActionStatementImpl extends AbstractDeclaredStatement<QName> implem
             .addOptional(YangStmtMapping.STATUS)
             .addAny(YangStmtMapping.TYPEDEF)
             .build();
-    
+
     protected ActionStatementImpl(final StmtContext<QName,ActionStatement, ?> context) {
         super(context);
     }
-    
+
     public static class Definition
             extends AbstractStatementSupport<QName, ActionStatement, EffectiveStatement<QName, ActionStatement>> {
 
@@ -98,13 +98,6 @@ public class ActionStatementImpl extends AbstractDeclaredStatement<QName> implem
             return new ActionEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<QName, ActionStatement,
-                EffectiveStatement<QName, ActionStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index e4174d7290992f0a387149cae5d0b9a06444ded3..f104f22b1361bb85d51edb9a22f2e84b8f67f68a 100644 (file)
@@ -79,13 +79,6 @@ public final class AnydataStatementImpl extends AbstractDeclaredStatement<QName>
             return new AnyDataEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final Mutable<QName, AnydataStatement,
-                EffectiveStatement<QName, AnydataStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index 99f717277501524422a538d747ba8e009fc61643..2abb0a4e45c6209cce2a91a37a4be3d048901c20 100644 (file)
@@ -57,13 +57,6 @@ public final class ModifierStatementImpl extends AbstractDeclaredStatement<Modif
             return new ModifierEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(
-                final StmtContext.Mutable<ModifierKind, ModifierStatement, EffectiveStatement<ModifierKind, ModifierStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
index cd94be8f0e8fd92671bbff44c45d16652e746fc2..9fd5d660ecbeba09352e6927890ff11e322c87a7 100644 (file)
@@ -38,6 +38,7 @@ public class ThirdPartyExtensionStatementImpl extends AbstractDeclaredStatement<
         @Override
         public void onFullDefinitionDeclared(
                 final Mutable<String, UnknownStatement<String>, EffectiveStatement<String, UnknownStatement<String>>> stmt) {
+            super.onFullDefinitionDeclared(stmt);
             stmt.addToNs(ThirdPartyNamespace.class, stmt, "Third-party namespace test.");
         }