Fix NotificationDefinition

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PresenceStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PresenceStatementImpl.java
index e63f9a71254476a04ac2ef4a39e99339f4430ec3..c70fc9661db1af22797e797a27bd11bfdc558810 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PresenceStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PresenceStatementImpl.java
@@ -7,24 +7,22 @@
  */
 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.PresenceStatement;
-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.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.PresenceEffectiveStatementImpl;
 
-public class PresenceStatementImpl extends AbstractDeclaredStatement<String>
-        implements PresenceStatement {
-    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(Rfc6020Mapping
+public class PresenceStatementImpl extends AbstractDeclaredStatement<String> implements PresenceStatement {
+    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .PRESENCE)
             .build();
 
-    protected PresenceStatementImpl(
-            StmtContext<String, PresenceStatement, ?> context) {
+    protected PresenceStatementImpl(final StmtContext<String, PresenceStatement, ?> context) {
         super(context);
     }
 
@@ -33,34 +31,32 @@ public class PresenceStatementImpl extends AbstractDeclaredStatement<String>
             AbstractStatementSupport<String, PresenceStatement, EffectiveStatement<String, PresenceStatement>> {
 
         public Definition() {
-            super(Rfc6020Mapping.PRESENCE);
+            super(YangStmtMapping.PRESENCE);
         }
 
         @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) throws SourceException {
-            super.onFullDefinitionDeclared(stmt);
-            SUBSTATEMENT_VALIDATOR.validate(stmt);
+        protected SubstatementValidator getSubstatementValidator() {
+            return SUBSTATEMENT_VALIDATOR;
         }
     }
 
+    @Nonnull
     @Override
     public String getValue() {
         return argument();