X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fstmt%2Frfc6020%2FPrefixStatementImpl.java;h=11f08f9a273dced65d33f01646b51b77dc6087ff;hb=9ba2970f55594e4c2704b0c590bd92112e0441fb;hp=7628defa12fb0acb6ba7401dfd137dafd9fdd584;hpb=3e79ff3fef1772922809f6eaa7c15785afd5d403;p=yangtools.git

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PrefixStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PrefixStatementImpl.java
index 7628defa12..11f08f9a27 100644
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PrefixStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PrefixStatementImpl.java
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 
-import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping;
+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.PrefixStatement;
 import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator;
@@ -17,43 +18,44 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.PrefixEffectiveStatementImpl;
 
 public class PrefixStatementImpl extends AbstractDeclaredStatement<String> implements PrefixStatement {
-    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(Rfc6020Mapping
+    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .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(Rfc6020Mapping.PREFIX);
+            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);
-            SUBSTATEMENT_VALIDATOR.validate(stmt);
+        protected SubstatementValidator getSubstatementValidator() {
+            return SUBSTATEMENT_VALIDATOR;
         }
     }
 
-    PrefixStatementImpl(StmtContext<String, PrefixStatement,?> context) {
+    PrefixStatementImpl(final StmtContext<String, PrefixStatement,?> context) {
         super(context);
     }
 
+    @Nonnull
     @Override
     public String getValue() {
         return rawArgument();