All StatementSupports must support DeclarationReference

[yangtools.git] / yang / rfc7952-parser-support / src / main / java / org / opendaylight / yangtools / rfc7952 / parser / AnnotationStatementSupport.java

diff --git a/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java b/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java
index 9d275b28250af65d5182afe54b452212efab8c95..bca16f5423f0f84892baefd594ed31490675c738 100644 (file)
--- a/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java
+++ b/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java
@@ -7,33 +7,19 @@
  */
 package org.opendaylight.yangtools.rfc7952.parser;
 
-import static com.google.common.base.Verify.verifyNotNull;
-
 import com.google.common.collect.ImmutableList;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.rfc7952.model.api.AnnotationEffectiveStatement;
-import org.opendaylight.yangtools.rfc7952.model.api.AnnotationSchemaNode;
 import org.opendaylight.yangtools.rfc7952.model.api.AnnotationStatement;
 import org.opendaylight.yangtools.rfc7952.model.api.MetadataStatements;
 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.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
+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.api.stmt.TypeEffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.UnitsEffectiveStatement;
-import org.opendaylight.yangtools.yang.model.ri.type.ConcreteTypeBuilder;
-import org.opendaylight.yangtools.yang.model.ri.type.ConcreteTypes;
-import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.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.AbstractStatementSupport;
 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.StmtContext.Mutable;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
@@ -42,67 +28,6 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 
 public final class AnnotationStatementSupport
          extends AbstractStatementSupport<QName, AnnotationStatement, AnnotationEffectiveStatement> {
-
-    private static final class Declared extends WithSubstatements implements AnnotationStatement {
-        Declared(final QName argument, final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-            super(argument, substatements);
-        }
-    }
-
-    private static final class Effective extends UnknownEffectiveStatementBase<QName, AnnotationStatement>
-            implements AnnotationEffectiveStatement, AnnotationSchemaNode {
-
-        private final @NonNull TypeDefinition<?> type;
-        private final @Nullable SchemaPath path;
-
-        Effective(final Current<QName, AnnotationStatement> stmt,
-                  final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-            super(stmt, substatements);
-            final QName qname = stmt.getArgument();
-
-            // FIXME: move this into onFullDefinitionDeclared()
-            final TypeEffectiveStatement<?> typeStmt = SourceException.throwIfNull(
-                firstSubstatementOfType(TypeEffectiveStatement.class), stmt,
-                "AnnotationStatementSupport %s is missing a 'type' statement", qname);
-
-            final ConcreteTypeBuilder<?> builder = ConcreteTypes.concreteTypeBuilder(typeStmt.getTypeDefinition(),
-                qname);
-            final UnitsEffectiveStatement unitsStmt = firstSubstatementOfType(UnitsEffectiveStatement.class);
-            if (unitsStmt != null) {
-                builder.setUnits(unitsStmt.argument());
-            }
-            type = builder.build();
-
-            path = SchemaPathSupport.toOptionalPath(stmt.getEffectiveParent().getSchemaPath().createChild(qname));
-        }
-
-        @Override
-        public QName getQName() {
-            return verifyNotNull(argument());
-        }
-
-        @Override
-        @Deprecated
-        public SchemaPath getPath() {
-            return SchemaNodeDefaults.throwUnsupportedIfNull(this, path);
-        }
-
-        @Override
-        public TypeDefinition<?> getType() {
-            return type;
-        }
-
-        @Override
-        public TypeDefinition<?> getTypeDefinition() {
-            return type;
-        }
-
-        @Override
-        public AnnotationEffectiveStatement asEffectiveStatement() {
-            return this;
-        }
-    }
-
     private static final SubstatementValidator VALIDATOR = SubstatementValidator.builder(MetadataStatements.ANNOTATION)
         .addMandatory(YangStmtMapping.TYPE)
         .addOptional(YangStmtMapping.DESCRIPTION)
@@ -136,12 +61,18 @@ public final class AnnotationStatementSupport
     @Override
     protected AnnotationStatement createDeclared(final StmtContext<QName, AnnotationStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new Declared(ctx.getArgument(), substatements);
+        return new AnnotationStatementImpl(ctx.getArgument(), substatements);
+    }
+
+    @Override
+    protected AnnotationStatement attachDeclarationReference(final AnnotationStatement stmt,
+            final DeclarationReference reference) {
+        return new RefAnnotationStatement(stmt, reference);
     }
 
     @Override
     protected AnnotationEffectiveStatement createEffective(final Current<QName, AnnotationStatement> stmt,
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        return new Effective(stmt, substatements);
+        return new AnnotationEffectiveStatementImpl(stmt, substatements);
     }
 }