From caa18b2fc77d36e29765c8ebed5f105afd15a9aa Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 14 Mar 2023 13:37:00 +0100 Subject: [PATCH] Improve XmlCodecFactory a bit Remove an unneeded cast in test code by exposing the fact that instanceIdentifierCodec() operates on YangInstanceIdentifier. JIRA: YANGTOOLS-1473 Change-Id: Ib915a0b4c93674e1e266359070bb6b06da20094c Signed-off-by: Robert Varga (cherry picked from commit 90a498521a7ec3fd62ed91c2c0016ab334a93da2) --- .../yangtools/yang/data/codec/xml/XmlCodecFactory.java | 3 ++- .../opendaylight/yangtools/yang/data/codec/xml/YT1473Test.java | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/codec/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlCodecFactory.java b/codec/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlCodecFactory.java index 3a9f81d415..95a9262623 100644 --- a/codec/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlCodecFactory.java +++ b/codec/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlCodecFactory.java @@ -15,6 +15,7 @@ import java.util.List; import org.opendaylight.yangtools.rfc8528.data.api.MountPointContext; import org.opendaylight.yangtools.rfc8528.data.util.EmptyMountPointContext; import org.opendaylight.yangtools.yang.common.QNameModule; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.impl.codec.AbstractIntegerStringCodec; import org.opendaylight.yangtools.yang.data.impl.codec.BinaryStringCodec; import org.opendaylight.yangtools.yang.data.impl.codec.BitsStringCodec; @@ -112,7 +113,7 @@ public final class XmlCodecFactory extends AbstractCodecFactory> { } @Override - protected XmlCodec instanceIdentifierCodec(final InstanceIdentifierTypeDefinition type) { + protected XmlCodec instanceIdentifierCodec(final InstanceIdentifierTypeDefinition type) { return new XmlStringInstanceIdentifierCodec(getEffectiveModelContext(), this); } diff --git a/codec/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YT1473Test.java b/codec/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YT1473Test.java index d68424bc51..ff2b317b67 100644 --- a/codec/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YT1473Test.java +++ b/codec/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YT1473Test.java @@ -63,8 +63,7 @@ public class YT1473Test { assertTrue(id instanceof LeafSchemaNode); final var type = ((LeafSchemaNode) id).getType(); assertTrue(type instanceof InstanceIdentifierTypeDefinition); - CODEC = (XmlStringInstanceIdentifierCodec) XmlCodecFactory.create(modelContext) - .instanceIdentifierCodec((InstanceIdentifierTypeDefinition) type); + CODEC = XmlCodecFactory.create(modelContext).instanceIdentifierCodec((InstanceIdentifierTypeDefinition) type); } @AfterAll -- 2.36.6