From 262bc8b859cd11fb11cdb70726586e722b5a9232 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 20 Jul 2020 11:50:56 +0200 Subject: [PATCH] Remove use of deprecated setters Using lists to populate unordered maps is deprecated, do not use those methods. Change-Id: Ie1abec61ee0e46917b5272e8e3f7a6906850626a Signed-off-by: Robert Varga --- .../dom/adapter/Bug2562DeserializedUnkeyedListTest.java | 3 ++- .../mdsal/binding/dom/adapter/Bug3090MultiKeyList.java | 3 ++- .../mdsal/binding/dom/adapter/Bug4494Test.java | 7 +++---- .../mdsal/binding/dom/adapter/Bug4513Test.java | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug2562DeserializedUnkeyedListTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug2562DeserializedUnkeyedListTest.java index 348e8dd1d5..d3a07ad6ef 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug2562DeserializedUnkeyedListTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug2562DeserializedUnkeyedListTest.java @@ -9,6 +9,7 @@ package org.opendaylight.mdsal.binding.dom.adapter; import com.google.common.collect.ImmutableSet; import java.util.Arrays; +import java.util.Map; import java.util.Set; import org.junit.Test; import org.opendaylight.mdsal.binding.api.ReadWriteTransaction; @@ -36,7 +37,7 @@ public class Bug2562DeserializedUnkeyedListTest extends AbstractDataTreeChangeLi @Test public void writeListToList2562Root() { final Barroot barRoot = new BarrootBuilder().setType(2).setValue(2).withKey(new BarrootKey(2)).build(); - final Fooroot fooRoot = new FoorootBuilder().setBarroot(Arrays.asList(barRoot)).build(); + final Fooroot fooRoot = new FoorootBuilder().setBarroot(Map.of(barRoot.key(), barRoot)).build(); final Root root = new RootBuilder().setFooroot(Arrays.asList(fooRoot)).build(); final TestListener listenerRoot = createListener(LogicalDatastoreType.CONFIGURATION, ROOT_PATH, diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug3090MultiKeyList.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug3090MultiKeyList.java index c99006800b..84e71a476d 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug3090MultiKeyList.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug3090MultiKeyList.java @@ -8,6 +8,7 @@ package org.opendaylight.mdsal.binding.dom.adapter; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Maps; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -48,7 +49,7 @@ public class Bug3090MultiKeyList extends AbstractDataTreeChangeListenerTest { ); } - final Root root = new RootBuilder().setListInRoot(listInRoots).build(); + final Root root = new RootBuilder().setListInRoot(Maps.uniqueIndex(listInRoots, ListInRoot::key)).build(); final TestListener listener = createListener(LogicalDatastoreType.CONFIGURATION, ROOT_PATH, match(ModificationType.WRITE, ROOT_PATH, Objects::isNull, diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug4494Test.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug4494Test.java index b1f13755db..54217bd758 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug4494Test.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug4494Test.java @@ -7,7 +7,7 @@ */ package org.opendaylight.mdsal.binding.dom.adapter; -import java.util.ArrayList; +import java.util.Map; import org.junit.Test; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadWriteTransaction; @@ -26,9 +26,8 @@ public class Bug4494Test extends AbstractDataBrokerTest { public void testDelete() throws Exception { DataBroker dataBroker = getDataBroker(); WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction(); - ArrayList list = new ArrayList<>(); - list.add(new TopLevelListBuilder().setName("name").build()); - TopBuilder builder = new TopBuilder().setTopLevelList(list); + TopLevelList list = new TopLevelListBuilder().setName("name").build(); + TopBuilder builder = new TopBuilder().setTopLevelList(Map.of(list.key(), list)); writeTransaction.put(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(Top.class), builder.build()); assertCommit(writeTransaction.commit()); diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug4513Test.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug4513Test.java index a378c92a9c..4b15ab1d48 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug4513Test.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug4513Test.java @@ -12,8 +12,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; -import java.util.Arrays; import java.util.Collection; +import java.util.Map; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.opendaylight.mdsal.binding.api.DataBroker; @@ -60,7 +60,7 @@ public class Bug4513Test extends AbstractDataBrokerTest { private ListItem writeListItem() { WriteTransaction writeTransaction = getDataBroker().newWriteOnlyTransaction(); final ListItem item = new ListItemBuilder().setSip("name").setOp(Uint32.valueOf(43)).build(); - ListenerTestBuilder builder = new ListenerTestBuilder().setListItem(Arrays.asList(item)); + ListenerTestBuilder builder = new ListenerTestBuilder().setListItem(Map.of(item.key(), item)); writeTransaction.put(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.builder( ListenerTest.class).build(), builder.build()); assertCommit(writeTransaction.commit()); -- 2.36.6