All StatementSupports must support DeclarationReference

[yangtools.git] / yang / openconfig-parser-support / src / main / java / org / opendaylight / yangtools / openconfig / parser / AbstractHashedValueStatementSupport.java

diff --git a/yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/AbstractHashedValueStatementSupport.java b/yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/AbstractHashedValueStatementSupport.java
index 8e792ebd98b99ac4b6007984761d2344b4d24cd5..768e1eea4f165558da53def56d81c8eda89ec1e1 100644 (file)
--- a/yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/AbstractHashedValueStatementSupport.java
+++ b/yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/AbstractHashedValueStatementSupport.java
@@ -7,83 +7,22 @@
  */
 package org.opendaylight.yangtools.openconfig.parser;
 
-import static java.util.Objects.requireNonNull;
-
 import com.google.common.collect.ImmutableList;
-import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.yangtools.concepts.Immutable;
 import org.opendaylight.yangtools.openconfig.model.api.OpenConfigHashedValueEffectiveStatement;
 import org.opendaylight.yangtools.openconfig.model.api.OpenConfigHashedValueStatement;
 import org.opendaylight.yangtools.yang.common.Empty;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.SchemaNodeDefaults;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.meta.DeclarationReference;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
-import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithoutArgument.WithSubstatements;
 import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.UnknownEffectiveStatementBase;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractEmptyStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;
-import org.opendaylight.yangtools.yang.parser.spi.meta.SchemaPathSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 
 abstract class AbstractHashedValueStatementSupport
         extends AbstractEmptyStatementSupport<OpenConfigHashedValueStatement, OpenConfigHashedValueEffectiveStatement> {
-
-    private static final class Declared extends WithSubstatements implements OpenConfigHashedValueStatement {
-        private final @NonNull StatementDefinition definition;
-
-        Declared(final StatementDefinition definition,
-                final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-            super(substatements);
-            this.definition = requireNonNull(definition);
-        }
-
-        @Override
-        public StatementDefinition statementDefinition() {
-            return definition;
-        }
-    }
-
-    private static final class Effective
-            extends UnknownEffectiveStatementBase<Empty, OpenConfigHashedValueStatement>
-            implements OpenConfigHashedValueEffectiveStatement {
-        private final @NonNull StatementDefinition definition;
-        private final @NonNull Immutable path;
-
-        Effective(final Current<Empty, OpenConfigHashedValueStatement> stmt,
-                final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-            super(stmt, substatements);
-            definition = stmt.publicDefinition();
-            path = SchemaPathSupport.toEffectivePath(stmt.getEffectiveParent().getSchemaPath()
-                    .createChild(stmt.publicDefinition().getStatementName()));
-        }
-
-        @Override
-        public QName getQName() {
-            return SchemaNodeDefaults.extractQName(path);
-        }
-
-        @Override
-        @Deprecated
-        public SchemaPath getPath() {
-            return SchemaNodeDefaults.extractPath(this, path);
-        }
-
-        @Override
-        public StatementDefinition statementDefinition() {
-            return definition;
-        }
-
-        @Override
-        public OpenConfigHashedValueEffectiveStatement asEffectiveStatement() {
-            return this;
-        }
-    }
-
     private final SubstatementValidator validator;
 
     AbstractHashedValueStatementSupport(final StatementDefinition definition, final YangParserConfiguration config) {
@@ -100,13 +39,19 @@ abstract class AbstractHashedValueStatementSupport
     protected final OpenConfigHashedValueStatement createDeclared(
             final StmtContext<Empty, OpenConfigHashedValueStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new Declared(getPublicView(), substatements);
+        return new OpenConfigHashedValueStatementImpl(getPublicView(), substatements);
+    }
+
+    @Override
+    protected final OpenConfigHashedValueStatement attachDeclarationReference(
+            final OpenConfigHashedValueStatement stmt, final DeclarationReference reference) {
+        return new RefOpenConfigHashedValueStatement(stmt, reference);
     }
 
     @Override
     protected OpenConfigHashedValueEffectiveStatement createEffective(
             final Current<Empty, OpenConfigHashedValueStatement> stmt,
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        return new Effective(stmt, substatements);
+        return new OpenConfigHashedValueEffectiveStatementImpl(stmt, substatements);
     }
 }