From 013f29eaacb7a4be2eb9c65b696f6278661a5b02 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 24 Jun 2019 12:32:26 +0200 Subject: [PATCH] Remove use of getKeyValues() This adjusts callers of deprecated method, fixing warnings and allowing better integration in future. Change-Id: I6f5bb82af22cfa94e7c532f596c813058b3511d4 Signed-off-by: Robert Varga --- .../mdsal/binding/dom/codec/impl/IdentifiableItemCodec.java | 2 +- .../codec/test/InstanceIdentifierSerializeDeserializeTest.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/IdentifiableItemCodec.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/IdentifiableItemCodec.java index 2f420ebe31..4c1ea58eaa 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/IdentifiableItemCodec.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/IdentifiableItemCodec.java @@ -161,7 +161,7 @@ abstract class IdentifiableItemCodec implements Codec deserializeIdentifier(final NodeIdentifierWithPredicates input) { try { - return deserializeIdentifier(input.getKeyValues()); + return deserializeIdentifier(input.asMap()); } catch (Throwable e) { Throwables.throwIfUnchecked(e); throw new IllegalStateException("Failed to deserialize " + input, e); diff --git a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/test/InstanceIdentifierSerializeDeserializeTest.java b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/test/InstanceIdentifierSerializeDeserializeTest.java index b7434ac90a..3b765e47fb 100644 --- a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/test/InstanceIdentifierSerializeDeserializeTest.java +++ b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/test/InstanceIdentifierSerializeDeserializeTest.java @@ -106,8 +106,7 @@ public class InstanceIdentifierSerializeDeserializeTest extends AbstractBindingC InstanceIdentifier.create(Top.class).child(TopLevelList.class, TOP_FOO_KEY)); final PathArgument lastPathArgument = yangInstanceIdentifier.getLastPathArgument(); assertTrue(lastPathArgument instanceof NodeIdentifierWithPredicates); - assertTrue(((NodeIdentifierWithPredicates) lastPathArgument).getKeyValues().containsValue( - TOP_LEVEL_LIST_KEY_VALUE)); + assertTrue(((NodeIdentifierWithPredicates) lastPathArgument).values().contains(TOP_LEVEL_LIST_KEY_VALUE)); assertEquals(TopLevelList.QNAME, lastPathArgument.getNodeType()); } -- 2.36.6