BUG-5222: Reuse substatements across phases

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / stmt / rfc6020 / StringRestrictionsImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java
index b57bf59c80e29b91e719d4e8587e7db9becefd3a..4de13f8c380b92a48b5bdee61c6ed696bf91af35 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java
@@ -8,7 +8,8 @@
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 
 import java.util.Collection;
-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.LengthStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.PatternStatement;
@@ -21,22 +22,22 @@ import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.String
 
 public class StringRestrictionsImpl extends AbstractDeclaredStatement<String> implements
         TypeStatement.StringRestrictions {
-    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(Rfc6020Mapping
+    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .TYPE)
-            .addOptional(Rfc6020Mapping.LENGTH)
-            .addAny(Rfc6020Mapping.PATTERN)
+            .addOptional(YangStmtMapping.LENGTH)
+            .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(Rfc6020Mapping.TYPE);
+            super(YangStmtMapping.TYPE);
         }
 
         @Override
@@ -45,25 +46,23 @@ 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);
-            SUBSTATEMENT_VALIDATOR.validate(stmt);
+        protected SubstatementValidator getSubstatementValidator() {
+            return SUBSTATEMENT_VALIDATOR;
         }
     }
 
+    @Nonnull
     @Override
     public String getName() {
         return argument();
@@ -74,9 +73,9 @@ public class StringRestrictionsImpl extends AbstractDeclaredStatement<String> im
         return firstDeclared(LengthStatement.class);
     }
 
+    @Nonnull
     @Override
     public Collection<? extends PatternStatement> getPatterns() {
         return allDeclared(PatternStatement.class);
     }
-
 }