Fixup collections return implementations

[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / AbstractDeclaredStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractDeclaredStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractDeclaredStatement.java
index 09e8a0ee2e9e3da525fc6d364848bd8ad1148222..1b149836b4c26b966987dd9d10d7c405a1ac061f 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractDeclaredStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractDeclaredStatement.java
@@ -16,7 +16,6 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
-import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 
 /**
  * An abstract base class for {@link DeclaredStatement} implementations. This is a direct competition to
@@ -57,11 +56,6 @@ public abstract class AbstractDeclaredStatement<A> extends AbstractModelStatemen
     public abstract static class WithRawArgument<A> extends AbstractDeclaredStatement<A> {
         private final String rawArgument;
 
-        @Deprecated
-        protected WithRawArgument(final StmtContext<A, ?, ?> context) {
-            this(context.rawStatementArgument());
-        }
-
         protected WithRawArgument(final String rawArgument) {
             this.rawArgument = rawArgument;
         }
@@ -109,13 +103,6 @@ public abstract class AbstractDeclaredStatement<A> extends AbstractModelStatemen
         public abstract static class WithSubstatements extends WithRawStringArgument {
             private final @NonNull Object substatements;
 
-            @Deprecated
-            protected WithSubstatements(final StmtContext<String, ?, ?> context,
-                    final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-                super(context);
-                this.substatements = maskList(substatements);
-            }
-
             protected WithSubstatements(final String rawArgument,
                     final ImmutableList<? extends DeclaredStatement<?>> substatements) {
                 super(rawArgument);
@@ -128,11 +115,6 @@ public abstract class AbstractDeclaredStatement<A> extends AbstractModelStatemen
             }
         }
 
-        @Deprecated
-        protected WithRawStringArgument(final StmtContext<String, ?, ?> context) {
-            super(context);
-        }
-
         protected WithRawStringArgument(final String rawArgument) {
             super(rawArgument);
         }
@@ -147,13 +129,6 @@ public abstract class AbstractDeclaredStatement<A> extends AbstractModelStatemen
         public abstract static class WithSubstatements<A> extends WithArgument<A> {
             private final @NonNull Object substatements;
 
-            @Deprecated
-            protected WithSubstatements(final StmtContext<A, ?, ?> context,
-                    final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-                super(context);
-                this.substatements = maskList(substatements);
-            }
-
             protected WithSubstatements(final String rawArgument, final A argument,
                     final ImmutableList<? extends DeclaredStatement<?>> substatements) {
                 super(rawArgument, argument);
@@ -168,13 +143,7 @@ public abstract class AbstractDeclaredStatement<A> extends AbstractModelStatemen
 
         private final A argument;
 
-        @Deprecated
-        protected WithArgument(final StmtContext<A, ?, ?> context) {
-            super(context);
-            argument = context.getStatementArgument();
-        }
-
-        protected WithArgument(final String rawArgument, A argument) {
+        protected WithArgument(final String rawArgument, final A argument) {
             super(rawArgument);
             this.argument = argument;
         }