We have a superfluous argument of the EffectiveStatement representation.
Remove it to simplify user verbosity.
Change-Id: I203431817313b8325a3599b29cffb85af7a11c4b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.DataSchemaNodeMixin;
import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.MandatoryMixin;
-public abstract class AbstractChoiceEffectiveStatement
- extends DefaultWithDataTree<QName, ChoiceStatement, ChoiceEffectiveStatement>
+public abstract class AbstractChoiceEffectiveStatement extends DefaultWithDataTree<QName, ChoiceStatement>
implements ChoiceEffectiveStatement, ChoiceSchemaNode, DataSchemaNodeMixin<ChoiceStatement>,
AugmentationTargetMixin<QName, ChoiceStatement>, MandatoryMixin<QName, ChoiceStatement> {
private final int flags;
import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.NotificationNodeContainerMixin;
import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.PresenceMixin;
-public abstract class AbstractContainerEffectiveStatement
- extends WithTypedefNamespace<QName, ContainerStatement, ContainerEffectiveStatement>
+public abstract class AbstractContainerEffectiveStatement extends WithTypedefNamespace<QName, ContainerStatement>
implements ContainerEffectiveStatement, ContainerSchemaNode, DataSchemaNodeMixin<ContainerStatement>,
DataNodeContainerMixin<QName, ContainerStatement>, ActionNodeContainerMixin<QName, ContainerStatement>,
ActionNodeContainerCompat<QName, ContainerStatement, ContainerEffectiveStatement>,
import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.NotificationNodeContainerMixin;
import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.SchemaNodeMixin;
-public abstract class AbstractGroupingEffectiveStatement
- extends WithTypedefNamespace<QName, GroupingStatement, GroupingEffectiveStatement>
+public abstract class AbstractGroupingEffectiveStatement extends WithTypedefNamespace<QName, GroupingStatement>
implements GroupingDefinition, GroupingEffectiveStatement,
DataNodeContainerMixin<QName, GroupingStatement>, SchemaNodeMixin<GroupingStatement>,
ActionNodeContainerMixin<QName, GroupingStatement>,
import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.UserOrderedAwareMixin;
import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.WhenConditionMixin;
-abstract class AbstractListEffectiveStatement
- extends WithTypedefNamespace<QName, ListStatement, ListEffectiveStatement>
+abstract class AbstractListEffectiveStatement extends WithTypedefNamespace<QName, ListStatement>
implements ListEffectiveStatement, ListSchemaNode,
ActionNodeContainerCompat<QName, ListStatement, ListEffectiveStatement>,
NotificationNodeContainerCompat<QName, ListStatement, ListEffectiveStatement>,
import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.CopyableMixin;
import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.OperationDefinitionMixin;
-public final class ActionEffectiveStatementImpl
- extends WithTypedefNamespace<QName, ActionStatement, ActionEffectiveStatement>
+public final class ActionEffectiveStatementImpl extends WithTypedefNamespace<QName, ActionStatement>
implements ActionDefinition, ActionEffectiveStatement, OperationDefinitionMixin<ActionStatement>,
CopyableMixin<QName, ActionStatement> {
private final @NonNull QName argument;
import org.opendaylight.yangtools.yang.model.api.stmt.CaseStatement;
import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredEffectiveStatement.DefaultWithDataTree;
-public final class DeclaredCaseEffectiveStatement
- extends DefaultWithDataTree<QName, CaseStatement, CaseEffectiveStatement>
+public final class DeclaredCaseEffectiveStatement extends DefaultWithDataTree<QName, CaseStatement>
implements CaseEffectiveStatementMixin {
private final @NonNull QName argument;
private final int flags;
import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredEffectiveStatement.DefaultWithDataTree.WithTypedefNamespace;
import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.OperationContainerMixin;
-public final class DeclaredInputEffectiveStatement
- extends WithTypedefNamespace<QName, InputStatement, InputEffectiveStatement>
+public final class DeclaredInputEffectiveStatement extends WithTypedefNamespace<QName, InputStatement>
implements InputEffectiveStatement, InputSchemaNode, OperationContainerMixin<InputStatement> {
private final @NonNull QName argument;
private final int flags;
import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredEffectiveStatement.DefaultWithDataTree.WithTypedefNamespace;
import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.OperationContainerMixin;
-public final class DeclaredOutputEffectiveStatement
- extends WithTypedefNamespace<QName, OutputStatement, OutputEffectiveStatement>
+public final class DeclaredOutputEffectiveStatement extends WithTypedefNamespace<QName, OutputStatement>
implements OutputEffectiveStatement, OutputSchemaNode, OperationContainerMixin<OutputStatement> {
private final @NonNull QName argument;
private final int flags;
import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.MustConstraintMixin;
import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.SchemaNodeMixin;
-public final class NotificationEffectiveStatementImpl
- extends WithTypedefNamespace<QName, NotificationStatement, NotificationEffectiveStatement>
+public final class NotificationEffectiveStatementImpl extends WithTypedefNamespace<QName, NotificationStatement>
implements NotificationDefinition, NotificationEffectiveStatement,
SchemaNodeMixin<NotificationStatement>, DataNodeContainerMixin<QName, NotificationStatement>,
AugmentationTargetMixin<QName, NotificationStatement>, CopyableMixin<QName, NotificationStatement>,
import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredEffectiveStatement.DefaultWithDataTree.WithTypedefNamespace;
import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.OperationDefinitionMixin;
-public final class RpcEffectiveStatementImpl extends WithTypedefNamespace<QName, RpcStatement, RpcEffectiveStatement>
+public final class RpcEffectiveStatementImpl extends WithTypedefNamespace<QName, RpcStatement>
implements RpcDefinition, RpcEffectiveStatement, OperationDefinitionMixin<RpcStatement> {
private final @NonNull QName argument;
private final int flags;
import org.opendaylight.yangtools.yang.model.api.stmt.CaseStatement;
import org.opendaylight.yangtools.yang.model.spi.meta.AbstractUndeclaredEffectiveStatement.DefaultWithDataTree;
-public final class UndeclaredCaseEffectiveStatement
- extends DefaultWithDataTree<QName, CaseStatement, CaseEffectiveStatement>
+public final class UndeclaredCaseEffectiveStatement extends DefaultWithDataTree<QName, CaseStatement>
implements CaseEffectiveStatementMixin {
private final @NonNull QName argument;
private final int flags;
import org.opendaylight.yangtools.yang.model.spi.meta.AbstractUndeclaredEffectiveStatement.DefaultWithDataTree;
import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.OperationContainerMixin;
-public final class UndeclaredInputEffectiveStatement
- extends DefaultWithDataTree<QName, InputStatement, InputEffectiveStatement>
+public final class UndeclaredInputEffectiveStatement extends DefaultWithDataTree<QName, InputStatement>
implements InputEffectiveStatement, InputSchemaNode, OperationContainerMixin<InputStatement> {
private final @NonNull QName argument;
private final int flags;
import org.opendaylight.yangtools.yang.model.spi.meta.AbstractUndeclaredEffectiveStatement.DefaultWithDataTree;
import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.OperationContainerMixin;
-public final class UndeclaredOutputEffectiveStatement
- extends DefaultWithDataTree<QName, OutputStatement, OutputEffectiveStatement>
+public final class UndeclaredOutputEffectiveStatement extends DefaultWithDataTree<QName, OutputStatement>
implements OutputEffectiveStatement, OutputSchemaNode, OperationContainerMixin<OutputStatement> {
private final @NonNull QName argument;
private final int flags;
*
* @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(
*
* @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(
*
* @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 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;
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;
*
* @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 WithTypedefNamespace<A, D extends DeclaredStatement<A>,
- E extends DataTreeAwareEffectiveStatement<A, D>> extends DefaultWithDataTree<A, D, E> {
+ 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);
createTypedefNamespace(substatements);
}
- protected WithTypedefNamespace(final WithTypedefNamespace<A, D, E> original) {
+ protected WithTypedefNamespace(final WithTypedefNamespace<A, D> original) {
super(original);
}
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;
*
* @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 AbstractUndeclaredEffectiveStatement<A, D> {
+ public abstract static class WithSchemaTree<A, D extends DeclaredStatement<A>>
+ extends AbstractUndeclaredEffectiveStatement<A, D> {
@Override
@SuppressWarnings("unchecked")
protected <K, V, N extends IdentifierNamespace<K, V>> Optional<? extends Map<K, V>> getNamespaceContents(
*
* @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(
*
* @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 DefaultWithSchemaTree<A, D extends DeclaredStatement<A>> extends WithSchemaTree<A, D> {
private final @NonNull Map<QName, SchemaTreeEffectiveStatement<?>> schemaTree;
private final @NonNull Object substatements;
this.schemaTree = immutableNamespaceOf(createSchemaTreeNamespace(substatements));
}
- protected DefaultWithSchemaTree(final DefaultWithSchemaTree<A, D, E> original) {
+ protected DefaultWithSchemaTree(final DefaultWithSchemaTree<A, D> original) {
this.schemaTree = original.schemaTree;
this.substatements = original.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 DefaultWithDataTree<A, D extends DeclaredStatement<A>,
- E extends DataTreeAwareEffectiveStatement<A, D>> extends WithDataTree<A, D, E> {
+ public abstract static class DefaultWithDataTree<A, D extends DeclaredStatement<A>> extends WithDataTree<A, D> {
private final @NonNull Map<QName, SchemaTreeEffectiveStatement<?>> schemaTree;
private final @NonNull Map<QName, DataTreeEffectiveStatement<?>> dataTree;
private final @NonNull Object substatements;
this.substatements = maskList(substatements);
}
- protected DefaultWithDataTree(final DefaultWithDataTree<A, D, E> original) {
+ protected DefaultWithDataTree(final DefaultWithDataTree<A, D> original) {
this.schemaTree = original.schemaTree;
this.dataTree = original.dataTree;
this.substatements = original.substatements;
@Beta
public abstract class AbstractEffectiveModule<D extends DeclaredStatement<Unqualified>,
E extends DataTreeAwareEffectiveStatement<Unqualified, D>>
- extends WithTypedefNamespace<Unqualified, D, E>
+ extends WithTypedefNamespace<Unqualified, D>
implements ModuleLike, DocumentedNodeMixin<Unqualified, D>, NotificationNodeContainerCompat<Unqualified, D, E> {
private final String prefix;
private final ImmutableSet<GroupingDefinition> groupings;
Code Review / yangtools.git / commitdiff