Bug 7051 - moving of SubstatementValidator into spi.meta package

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrderedByStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrderedByStatementImpl.java
index e5cbdfe1a2c5f3c80538eec89798add1e7cf3caa..1ae0143d33e45b6a5bf8b053288d5ee179c86681 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrderedByStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrderedByStatementImpl.java
@@ -8,23 +8,22 @@
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 
 import javax.annotation.Nonnull;
-import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping;
+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.OrderedByStatement;
-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.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.OrderedByEffectiveStatementImpl;
 
-public class OrderedByStatementImpl extends AbstractDeclaredStatement<String>
-        implements OrderedByStatement {
-    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(Rfc6020Mapping
+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);
     }
 
@@ -33,30 +32,39 @@ public class OrderedByStatementImpl extends AbstractDeclaredStatement<String>
             AbstractStatementSupport<String, OrderedByStatement, EffectiveStatement<String, OrderedByStatement>> {
 
         public Definition() {
-            super(Rfc6020Mapping.ORDERED_BY);
+            super(YangStmtMapping.ORDERED_BY);
         }
 
         @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);
-            SUBSTATEMENT_VALIDATOR.validate(stmt);
+        protected SubstatementValidator getSubstatementValidator() {
+            return SUBSTATEMENT_VALIDATOR;
+        }
+
+        @Override
+        public String internArgument(final String rawArgument) {
+            if ("user".equals(rawArgument)) {
+                return "user";
+            } else if ("system".equals(rawArgument)) {
+                return "system";
+            } else {
+                return rawArgument;
+            }
         }
     }