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 <robert.varga@pantheon.tech>

diff --git a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/GeneratorImpl.xtend b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/GeneratorImpl.xtend
index 3be1b90b3981af210b110374ed46cc8da694481d..188be43d8b7cde67329b2e8781c5a382dc03c9ef 100644 (file)
--- a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/GeneratorImpl.xtend
+++ b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/GeneratorImpl.xtend
@@ -1196,7 +1196,7 @@ class GeneratorImpl {
             append(arg.nodeType.localName);
             previous = true;
             if(arg instanceof NodeIdentifierWithPredicates) {
-                for(qname : arg.getKeyValues.keySet) {
+                for(qname : arg.keySet) {
                     append("/{");
                     append(qname.localName)
                     append('}')

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 2f420ebe318975e21de53bdbc538ad9ccd88c756..4c1ea58eaa3e117e793210dd52605da0814a2c73 100644 (file)
--- 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<NodeIdentifierWithPredicat
     @SuppressWarnings("checkstyle:illegalCatch")
     final @NonNull Identifier<?> 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 b7434ac90ad56a2b3a59da2bab699c628a936370..3b765e47fbc83d6e966669aa32d538875f8df949 100644 (file)
--- 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());
     }
 

diff --git a/entityownership/mdsal-eos-dom-api/src/test/java/org/opendaylight/mdsal/eos/dom/api/DOMEntityTest.java b/entityownership/mdsal-eos-dom-api/src/test/java/org/opendaylight/mdsal/eos/dom/api/DOMEntityTest.java
index 7e5c6cb72bfeac29ed5296a1f17ee79e9186e70a..7f867c293b692b5c395a9951e8ad55258219b138 100644 (file)
--- a/entityownership/mdsal-eos-dom-api/src/test/java/org/opendaylight/mdsal/eos/dom/api/DOMEntityTest.java
+++ b/entityownership/mdsal-eos-dom-api/src/test/java/org/opendaylight/mdsal/eos/dom/api/DOMEntityTest.java
@@ -8,7 +8,9 @@
 package org.opendaylight.mdsal.eos.dom.api;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
 import static org.opendaylight.mdsal.eos.dom.api.DOMEntity.ENTITY;
 
 import java.util.List;
@@ -44,12 +46,12 @@ public class DOMEntityTest {
     public void testEquals() {
         DOMEntity entity1 = new DOMEntity(ENTITY_TYPE1, ID1);
 
-        assertEquals("Same", true, entity1.equals(entity1));
-        assertEquals("Same", true, entity1.equals(new DOMEntity(ENTITY_TYPE1, ID1)));
-        assertEquals("Different entity type", false, entity1.equals(new DOMEntity(ENTITY_TYPE2, ID1)));
-        assertEquals("Different entity ID", false, entity1.equals(new DOMEntity(ENTITY_TYPE1, ID2)));
-        assertEquals("Different Object", false, entity1.equals(new Object()));
-        assertEquals("Equals null", false, entity1.equals(null));
+        assertTrue("Same", entity1.equals(entity1));
+        assertTrue("Same", entity1.equals(new DOMEntity(ENTITY_TYPE1, ID1)));
+        assertFalse("Different entity type", entity1.equals(new DOMEntity(ENTITY_TYPE2, ID1)));
+        assertFalse("Different entity ID", entity1.equals(new DOMEntity(ENTITY_TYPE1, ID2)));
+        assertFalse("Different Object", entity1.equals(new Object()));
+        assertFalse("Equals null", entity1.equals(null));
     }
 
     @Test
@@ -60,8 +62,7 @@ public class DOMEntityTest {
         assertEquals("pathArgs size", 2, pathArgs.size());
         assertEquals("First PathArgument node type", ENTITY, pathArgs.get(0).getNodeType());
         assertEquals("Second PathArgument node type", ENTITY, pathArgs.get(1).getNodeType());
-        Entry<QName, Object> key = ((NodeIdentifierWithPredicates) pathArgs.get(1)).getKeyValues().entrySet()
-                .iterator().next();
+        Entry<QName, Object> key = ((NodeIdentifierWithPredicates) pathArgs.get(1)).entrySet().iterator().next();
         assertEquals("Key node type", QName.create(ENTITY, "name"), key.getKey());
         assertEquals("Key value", "foo", key.getValue());
     }

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/DOMClusterSingletonServiceProviderImpl.java b/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/DOMClusterSingletonServiceProviderImpl.java
index e834a0eead0af7dcdba1b39e735aa254146d07bf..d0b6c061b7363497e95e0de191ccf2e12cb31bcc 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/DOMClusterSingletonServiceProviderImpl.java
+++ b/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/DOMClusterSingletonServiceProviderImpl.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.mdsal.singleton.dom.impl;
 
 import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipService;
@@ -52,6 +51,6 @@ public final class DOMClusterSingletonServiceProviderImpl extends
     protected String getServiceIdentifierFromEntity(final DOMEntity entity) {
         final YangInstanceIdentifier yii = entity.getIdentifier();
         final NodeIdentifierWithPredicates niiwp = (NodeIdentifierWithPredicates) yii.getLastPathArgument();
-        return niiwp.getKeyValues().values().iterator().next().toString();
+        return niiwp.values().iterator().next().toString();
     }
 }