From fc9f0211809fea4f93ce20f9d3da7778cd1fab04 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 19 Jan 2021 20:43:13 +0100 Subject: [PATCH] Finish trivial conversions We have a few callers using CopyPolicy instead of StatementPolicy. This migrates them all, leaving only CopyPolicy.DECLARED_COPY users. JIRA: YANGTOOLS-1195 Change-Id: Id227c06c8fde05d2b86faef7edd25b3ec141462b Signed-off-by: Robert Varga --- .../yangtools/rfc6643/parser/MaxAccessStatementSupport.java | 2 +- .../yangtools/rfc6643/parser/OidStatementSupport.java | 2 +- .../yangtools/rfc6643/parser/SubIdStatementSupport.java | 2 +- .../yangtools/rfc7952/parser/AnnotationStatementSupport.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementSupport.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementSupport.java index ad401ecd27..4ebcf9fb8b 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementSupport.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementSupport.java @@ -29,7 +29,7 @@ public final class MaxAccessStatementSupport private static final MaxAccessStatementSupport INSTANCE = new MaxAccessStatementSupport(); private MaxAccessStatementSupport() { - super(IetfYangSmiv2ExtensionsMapping.MAX_ACCESS, CopyPolicy.CONTEXT_INDEPENDENT); + super(IetfYangSmiv2ExtensionsMapping.MAX_ACCESS, StatementPolicy.contextIndependent()); } public static MaxAccessStatementSupport getInstance() { diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementSupport.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementSupport.java index 26950f09ff..df4f046e03 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementSupport.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementSupport.java @@ -29,7 +29,7 @@ public final class OidStatementSupport private static final OidStatementSupport INSTANCE = new OidStatementSupport(); private OidStatementSupport() { - super(IetfYangSmiv2ExtensionsMapping.OBJECT_ID, CopyPolicy.CONTEXT_INDEPENDENT); + super(IetfYangSmiv2ExtensionsMapping.OBJECT_ID, StatementPolicy.contextIndependent()); } public static OidStatementSupport getInstance() { diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java index 54ab843b8f..9371088699 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java @@ -28,7 +28,7 @@ public final class SubIdStatementSupport private static final SubIdStatementSupport INSTANCE = new SubIdStatementSupport(); private SubIdStatementSupport() { - super(IetfYangSmiv2ExtensionsMapping.SUB_ID, CopyPolicy.CONTEXT_INDEPENDENT); + super(IetfYangSmiv2ExtensionsMapping.SUB_ID, StatementPolicy.contextIndependent()); } public static SubIdStatementSupport getInstance() { 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 f8f9348a81..c786ce6cf6 100644 --- 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 @@ -103,7 +103,7 @@ public final class AnnotationStatementSupport private final SubstatementValidator validator; AnnotationStatementSupport(final StatementDefinition definition) { - super(definition, CopyPolicy.REJECT); + super(definition, StatementPolicy.reject()); this.validator = SubstatementValidator.builder(definition) .addMandatory(YangStmtMapping.TYPE) .addOptional(YangStmtMapping.DESCRIPTION) -- 2.36.6