import com.google.common.annotations.Beta;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
import java.util.Map;
import java.util.Optional;
import org.eclipse.jdt.annotation.NonNull;
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.IdentifierNamespace;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeAwareEffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeAwareEffectiveStatement.DataTreeNamespace;
import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeEffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeAwareEffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeAwareEffectiveStatement.SchemaTreeNamespace;
import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.TypedefNamespace;
/**
* Base stateless superclass for statements which (logically) always have an associated {@link DeclaredStatement}. This
@Beta
public abstract class AbstractDeclaredEffectiveStatement<A, D extends DeclaredStatement<A>>
extends AbstractEffectiveStatement<A, D> {
- @Override
- public final StatementOrigin statementOrigin() {
- return StatementOrigin.DECLARATION;
- }
-
@Override
public abstract @NonNull D getDeclared();
*
* @param <A> Argument type ({@link Empty} if statement does not have argument.)
* @param <D> Class representing declared version of this statement.
- * @param <E> Class representing effective version of this statement.
*/
- public abstract static class WithSchemaTree<A, D extends DeclaredStatement<A>,
-
E extends SchemaTreeAwareEffectiveStatement<A, D>> extends AbstractDeclaredEffectiveStatement<A, D> {
+ public abstract static class WithSchemaTree<A, D extends DeclaredStatement<A>>
+ extends AbstractDeclaredEffectiveStatement<A, D> {
@Override
@SuppressWarnings("unchecked")
protected <K, V, N extends IdentifierNamespace<K, V>> Optional<? extends Map<K, V>> getNamespaceContents(
final Class<N> namespace) {
- if (SchemaTreeAwareEffectiveStatement.Namespace.class.equals(namespace)) {
+ if (SchemaTreeNamespace.class.equals(namespace)) {
return Optional.of((Map<K, V>) schemaTreeNamespace());
}
return super.getNamespaceContents(namespace);
}
/**
- * Base stateless superclass form {@link DataTreeAwareEffectiveStatement}s. It maintains the contents of data tree
+ * Base stateless superclass for {@link DataTreeAwareEffectiveStatement}s. It maintains the contents of data tree
* namespace based of effective substatements.
*
* @param <A> Argument type ({@link Empty} if statement does not have argument.)
* @param <D> Class representing declared version of this statement.
- * @param <E> Class representing effective version of this statement.
*/
- public abstract static class WithDataTree<A, D extends DeclaredStatement<A>,
- E extends DataTreeAwareEffectiveStatement<A, D>> extends WithSchemaTree<A, D, E> {
+ public abstract static class WithDataTree<A, D extends DeclaredStatement<A>> extends WithSchemaTree<A, D> {
@Override
@SuppressWarnings("unchecked")
protected <K, V, N extends IdentifierNamespace<K, V>> Optional<? extends Map<K, V>> getNamespaceContents(
final Class<N> namespace) {
- if (DataTreeAwareEffectiveStatement.Namespace.class.equals(namespace)) {
+ if (DataTreeNamespace.class.equals(namespace)) {
return Optional.of((Map<K, V>) dataTreeNamespace());
}
return super.getNamespaceContents(namespace);
*
* @param <A> Argument type ({@link Empty} if statement does not have argument.)
* @param <D> Class representing declared version of this statement.
- * @param <E> Class representing effective version of this statement.
*/
- public abstract static class DefaultWithSchemaTree<A, D extends DeclaredStatement<A>,
- E extends SchemaTreeAwareEffectiveStatement<A, D>> extends WithSchemaTree<A, D, E> {
- public abstract static class WithSubstatements<A, D extends DeclaredStatement<A>,
- E extends SchemaTreeAwareEffectiveStatement<A, D>> extends DefaultWithSchemaTree<A, D, E> {
- private final @NonNull Object substatements;
-
- protected WithSubstatements(final D declared,
- final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
- super(declared, substatements);
- this.substatements = maskList(substatements);
- }
-
- protected WithSubstatements(final WithSubstatements<A, D, E> original) {
- super(original);
- this.substatements = original.substatements;
- }
-
- @Override
- public final ImmutableList<? extends EffectiveStatement<?, ?>> effectiveSubstatements() {
- return unmaskList(substatements);
- }
- }
-
- private final @NonNull ImmutableMap<QName, SchemaTreeEffectiveStatement<?>> schemaTree;
+ public abstract static class DefaultWithSchemaTree<A, D extends DeclaredStatement<A>> extends WithSchemaTree<A, D> {
+ private final @NonNull Map<QName, SchemaTreeEffectiveStatement<?>> schemaTree;
+ private final @NonNull Object substatements;
private final @NonNull D declared;
protected DefaultWithSchemaTree(final D declared,
final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
this.declared = requireNonNull(declared);
- this.schemaTree = ImmutableMap.copyOf(createSchemaTreeNamespace(substatements));
+ this.substatements = maskList(substatements);
+ this.schemaTree = immutableNamespaceOf(createSchemaTreeNamespace(substatements));
}
- protected DefaultWithSchemaTree(final DefaultWithSchemaTree<A, D, E> original) {
+ protected DefaultWithSchemaTree(final DefaultWithSchemaTree<A, D> original) {
this.declared = original.declared;
this.schemaTree = original.schemaTree;
+ this.substatements = original.substatements;
}
@Override
return declared;
}
+ @Override
+ public final ImmutableList<? extends EffectiveStatement<?, ?>> effectiveSubstatements() {
+ return unmaskList(substatements);
+ }
+
@Override
protected final Map<QName, SchemaTreeEffectiveStatement<?>> schemaTreeNamespace() {
return schemaTree;
*
* @param <A> Argument type ({@link Empty} if statement does not have argument.)
* @param <D> Class representing declared version of this statement.
- * @param <E> Class representing effective version of this statement.
*/
- public abstract static class DefaultWithDataTree<A, D extends DeclaredStatement<A>,
- E extends DataTreeAwareEffectiveStatement<A, D>> extends WithDataTree<A, D, E> {
- public abstract static class WithSubstatements<A, D extends DeclaredStatement<A>,
- E extends DataTreeAwareEffectiveStatement<A, D>> extends DefaultWithDataTree<A, D, E> {
- private final @NonNull Object substatements;
-
- protected WithSubstatements(final D declared,
- final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+ public abstract static class DefaultWithDataTree<A, D extends DeclaredStatement<A>> extends WithDataTree<A, D> {
+ public abstract static class WithTypedefNamespace<A, D extends DeclaredStatement<A>>
+ extends DefaultWithDataTree<A, D> {
+ protected WithTypedefNamespace(final D declared,
+ final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
super(declared, substatements);
- this.substatements = maskList(substatements);
+ // Consistency check only
+ createTypedefNamespace(substatements);
}
- protected WithSubstatements(final WithSubstatements<A, D, E> original) {
+ protected WithTypedefNamespace(final WithTypedefNamespace<A, D> original) {
super(original);
- this.substatements = original.substatements;
}
@Override
- public final ImmutableList<? extends EffectiveStatement<?, ?>> effectiveSubstatements() {
- return unmaskList(substatements);
+ @SuppressWarnings("unchecked")
+ protected <K, V, N extends IdentifierNamespace<K, V>> Optional<? extends Map<K, V>> getNamespaceContents(
+ final Class<N> namespace) {
+ if (TypedefNamespace.class.equals(namespace)) {
+ return Optional.of((Map<K, V>) new LinearTypedefNamespace(effectiveSubstatements()));
+ }
+ return super.getNamespaceContents(namespace);
}
}
- private final @NonNull ImmutableMap<QName, SchemaTreeEffectiveStatement<?>> schemaTree;
- private final @NonNull ImmutableMap<QName, DataTreeEffectiveStatement<?>> dataTree;
+ private final @NonNull Map<QName, SchemaTreeEffectiveStatement<?>> schemaTree;
+ private final @NonNull Map<QName, DataTreeEffectiveStatement<?>> dataTree;
+ private final @NonNull Object substatements;
private final @NonNull D declared;
protected DefaultWithDataTree(final D declared,
final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
this.declared = requireNonNull(declared);
+ this.substatements = maskList(substatements);
+
+ // Note we call schema.values() so we do not retain them, as that is just pure memory overhead
final Map<QName, SchemaTreeEffectiveStatement<?>> schema = createSchemaTreeNamespace(substatements);
- this.schemaTree = ImmutableMap.copyOf(schema);
+ this.schemaTree = immutableNamespaceOf(schema);
this.dataTree = createDataTreeNamespace(schema.values(), schemaTree);
}
- protected DefaultWithDataTree(final DefaultWithDataTree<A, D, E> original) {
+ protected DefaultWithDataTree(final DefaultWithDataTree<A, D> original) {
this.declared = original.declared;
this.schemaTree = original.schemaTree;
this.dataTree = original.dataTree;
+ this.substatements = original.substatements;
}
@Override
return declared;
}
+ @Override
+ public final ImmutableList<? extends EffectiveStatement<?, ?>> effectiveSubstatements() {
+ return unmaskList(substatements);
+ }
+
@Override
protected final Map<QName, SchemaTreeEffectiveStatement<?>> schemaTreeNamespace() {
return schemaTree;
Code Review / yangtools.git / blobdiff