From 0fca83f368f3af6b0d909be0982fee29344e0402 Mon Sep 17 00:00:00 2001 From: shivasubedi Date: Tue, 3 Aug 2021 11:08:52 +0100 Subject: [PATCH] CPS-521: Upgrade opendaylight yangtools to version 6.0.1 Issue-ID: CPS-521 Signed-off-by: shivasubedi Change-Id: I53fa992e3c651c444d4c823190a393b084fa7cc6 --- cps-dependencies/pom.xml | 2 +- cps-service/src/main/java/org/onap/cps/utils/YangUtils.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml index 2751e46fc..8d147abeb 100755 --- a/cps-dependencies/pom.xml +++ b/cps-dependencies/pom.xml @@ -78,7 +78,7 @@ org.opendaylight.yangtools yangtools-artifacts - 5.0.7 + 6.0.1 pom import diff --git a/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java b/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java index e6c49ac8b..8c32010d7 100644 --- a/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java +++ b/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java @@ -44,6 +44,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeS import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @Slf4j @@ -83,7 +84,7 @@ public class YangUtils { private static NormalizedNode parseJsonData(final String jsonData, final SchemaContext schemaContext, final Optional optionalParentSchemaNode) { final var jsonCodecFactory = JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02 - .getShared(schemaContext); + .getShared((EffectiveModelContext) schemaContext); final var normalizedNodeResult = new NormalizedNodeResult(); final var normalizedNodeStreamWriter = ImmutableNormalizedNodeStreamWriter .from(normalizedNodeResult); -- 2.16.6