X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fbroker%2Fimpl%2Flegacy%2Fsharded%2Fadapter%2FShardedDOMDataBrokerDelegatingReadWriteTransactionTest.java;h=828690992006ef88c0bb356b3f0d9588ebec5468;hb=c717ea8fc42cad3f1f802bdfab5e4990d86913dd;hp=8475b284b21b430f6de3a0139a31096e867fac7b;hpb=4ef15f7a7e3fb5bcaa6a3202d268a5c945e0aa71;p=controller.git diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransactionTest.java b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransactionTest.java index 8475b284b2..8286909920 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransactionTest.java +++ b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransactionTest.java @@ -9,14 +9,15 @@ package org.opendaylight.controller.md.sal.dom.broker.impl.legacy.sharded.adapter; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import com.google.common.base.Optional; import com.google.common.util.concurrent.Futures; +import org.gaul.modernizer_maven_annotations.SuppressModernizer; import org.junit.Before; import org.junit.Test; import org.mockito.Matchers; @@ -35,6 +36,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; +@Deprecated public class ShardedDOMDataBrokerDelegatingReadWriteTransactionTest { @Mock @@ -66,6 +68,7 @@ public class ShardedDOMDataBrokerDelegatingReadWriteTransactionTest { } @Test + @SuppressModernizer public void testReadWriteOperations() throws Exception { doReturn(Futures.immediateCheckedFuture(Optional.absent())).when(readTx).read(any(), any()); rwTx.put(LogicalDatastoreType.OPERATIONAL, TestModel.TEST_PATH, testNodeWithOuter(1, 2, 3)); @@ -87,7 +90,7 @@ public class ShardedDOMDataBrokerDelegatingReadWriteTransactionTest { assertEquals(Optional.absent(), rwTx.read(LogicalDatastoreType.OPERATIONAL, TestModel.TEST_PATH).checkedGet()); } - private DataContainerChild outerNode(int... ids) { + private static DataContainerChild outerNode(final int... ids) { CollectionNodeBuilder outer = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME); for (int id : ids) { outer.addChild(ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, id)); @@ -96,11 +99,11 @@ public class ShardedDOMDataBrokerDelegatingReadWriteTransactionTest { return outer.build(); } - private NormalizedNode testNodeWithOuter(int... ids) { + private static NormalizedNode testNodeWithOuter(final int... ids) { return testNodeWithOuter(outerNode(ids)); } - private NormalizedNode testNodeWithOuter(DataContainerChild outer) { + private static NormalizedNode testNodeWithOuter(final DataContainerChild outer) { return ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)).withChild(outer) .build();