summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshivasubedi <shiva.subedi@est.tech>2021-08-03 11:08:52 +0100
committershivasubedi <shiva.subedi@est.tech>2021-08-03 17:04:29 +0100
commit0fca83f368f3af6b0d909be0982fee29344e0402 (patch)
treee44c75d21e49467396c0e49dd78f81e6a1f10dec
parent9e3fc4952acb7e9a8aa398edaef3f3f86e5c61b8 (diff)
CPS-521: Upgrade opendaylight yangtools to version 6.0.1
Issue-ID: CPS-521 Signed-off-by: shivasubedi <shiva.subedi@est.tech> Change-Id: I53fa992e3c651c444d4c823190a393b084fa7cc6
-rwxr-xr-xcps-dependencies/pom.xml2
-rw-r--r--cps-service/src/main/java/org/onap/cps/utils/YangUtils.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml
index 2751e46fc1..8d147abebe 100755
--- a/cps-dependencies/pom.xml
+++ b/cps-dependencies/pom.xml
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
- <version>5.0.7</version>
+ <version>6.0.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
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 e6c49ac8b2..8c32010d7b 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<DataSchemaNode> 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);