From df326b64c49ebea6db0d7d644492faddf8c2d6de Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 2 Feb 2021 16:38:23 +0100
Subject: [PATCH] Eliminate StatementPolicy.legacyDeclaredCopy()

There is only two callers, one of which is going away anyway. Migrate
it to alwaysCopyDeclared() and remove legacyDeclaredCopy().

JIRA: YANGTOOLS-1208
Change-Id: Iad100c4f827e08421bc0d8a5f920032d2a6b7361
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../odlext/parser/AnyxmlSchemaLocationStatementSupport.java | 2 +-
 .../stmt/extension/UnrecognizedStatementSupport.java        | 4 +++-
 .../yangtools/yang/parser/spi/meta/StatementSupport.java    | 6 ------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlSchemaLocationStatementSupport.java b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlSchemaLocationStatementSupport.java
index 2fc2284d85..f138377ce4 100644
--- a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlSchemaLocationStatementSupport.java
+++ b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlSchemaLocationStatementSupport.java
@@ -32,7 +32,7 @@ public final class AnyxmlSchemaLocationStatementSupport
     private final SubstatementValidator validator;
 
     private AnyxmlSchemaLocationStatementSupport(final StatementDefinition definition) {
-        super(definition, StatementPolicy.legacyDeclaredCopy());
+        super(definition, StatementPolicy.alwaysCopyDeclared());
         validator = SubstatementValidator.builder(definition).build();
     }
 
diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java
index 7ee1ff8262..da8eeab28f 100644
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java
@@ -26,10 +26,12 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 
+// FIXME: YANGTOOLS-1196: remove this class
+@Deprecated
 final class UnrecognizedStatementSupport
         extends AbstractStatementSupport<String, UnrecognizedStatement, UnrecognizedEffectiveStatement> {
     UnrecognizedStatementSupport(final StatementDefinition publicDefinition) {
-        super(publicDefinition, StatementPolicy.legacyDeclaredCopy());
+        super(publicDefinition, StatementPolicy.alwaysCopyDeclared());
     }
 
     @Override
diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupport.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupport.java
index 82a3e37fb8..23cd6c7d96 100644
--- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupport.java
+++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupport.java
@@ -128,12 +128,6 @@ public abstract class StatementSupport<A, D extends DeclaredStatement<A>, E exte
             return (StatementPolicy<A, D>) EqualSemantics.ALWAYS_COPY;
         }
 
-        @Deprecated(forRemoval = true)
-        // FIXME: 7.0.0: remove this method
-        public static final <A, D extends DeclaredStatement<A>> @NonNull StatementPolicy<A, D> legacyDeclaredCopy() {
-            return alwaysCopyDeclared();
-        }
-
         abstract boolean canReuseCurrent(@NonNull Current<A, D> copy, @NonNull Current<A, D> current,
             @NonNull Collection<? extends EffectiveStatement<?, ?>> substatements);
 
-- 
2.36.6