BUG-7052: Move qnameFromArgument to StmtContextUtils

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java
index 93e227ac00c80ac80a8398f336b8b4e783a155e5..2446145c46585a4af1d2c18780ade364b9d11490 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -7,52 +7,64 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.BitEffectiveStatementImpl;
-
+import java.util.Collection;
+import javax.annotation.Nonnull;
+import org.opendaylight.yangtools.yang.common.QName;
+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.BitStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.PositionStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.StatusStatement;
-import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping;
-import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.BitStatement;
+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;
-
-public class BitStatementImpl extends AbstractDeclaredStatement<String>
-        implements BitStatement {
-
-    protected BitStatementImpl(
-            StmtContext<String, BitStatement, ?> context) {
+import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
+import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.BitEffectiveStatementImpl;
+
+public class BitStatementImpl extends AbstractDeclaredStatement<QName> implements BitStatement {
+    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
+            .BIT)
+            .addOptional(YangStmtMapping.DESCRIPTION)
+            .addOptional(YangStmtMapping.REFERENCE)
+            .addOptional(YangStmtMapping.STATUS)
+            .addOptional(YangStmtMapping.POSITION)
+            .build();
+
+    protected BitStatementImpl(final StmtContext<QName, BitStatement, ?> context) {
         super(context);
     }
 
-    public static class Definition
-            extends
-            AbstractStatementSupport<String, BitStatement, EffectiveStatement<String, BitStatement>> {
+    public static class Definition extends
+            AbstractStatementSupport<QName, BitStatement, EffectiveStatement<QName, BitStatement>> {
 
         public Definition() {
-            super(Rfc6020Mapping.BIT);
+            super(YangStmtMapping.BIT);
         }
 
         @Override
-        public String parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
-            return value;
+        public QName parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
+            return StmtContextUtils.qnameFromArgument(ctx, value);
         }
 
         @Override
-        public BitStatement createDeclared(
-                StmtContext<String, BitStatement, ?> ctx) {
+        public BitStatement createDeclared(final StmtContext<QName, BitStatement, ?> ctx) {
             return new BitStatementImpl(ctx);
         }
 
         @Override
-        public EffectiveStatement<String, BitStatement> createEffective(
-                StmtContext<String, BitStatement, EffectiveStatement<String, BitStatement>> ctx) {
+        public EffectiveStatement<QName, BitStatement> createEffective(
+                final StmtContext<QName, BitStatement, EffectiveStatement<QName, BitStatement>> ctx) {
             return new BitEffectiveStatementImpl(ctx);
         }
 
+        @Override
+        protected SubstatementValidator getSubstatementValidator() {
+            return SUBSTATEMENT_VALIDATOR;
+        }
     }
 
     @Override
@@ -65,14 +77,21 @@ public class BitStatementImpl extends AbstractDeclaredStatement<String>
         return firstDeclared(DescriptionStatement.class);
     }
 
+    @Nonnull
+    @Override
+    public Collection<? extends IfFeatureStatement> getIfFeatures() {
+        return allDeclared(IfFeatureStatement.class);
+    }
+
     @Override
     public ReferenceStatement getReference() {
         return firstDeclared(ReferenceStatement.class);
     }
 
+    @Nonnull
     @Override
     public String getName() {
-        return argument();
+        return argument().getLocalName();
     }
 
     @Override
@@ -80,4 +99,4 @@ public class BitStatementImpl extends AbstractDeclaredStatement<String>
         return firstDeclared(PositionStatement.class);
     }
 
-}
\ No newline at end of file
+}