Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Eliminate use of deprecated mockito methods
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
sharding
/
DistributedShardedDOMDataTreeTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeTest.java
index 3e224a97156ed4eeb5f0a6adbdaf67cf6e9f3dff..9a855a9a883aabc1ceb8fe858e76d7566d77e1f1 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeTest.java
@@
-11,8
+11,8
@@
package org.opendaylight.controller.cluster.sharding;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyCollection;
-import static org.mockito.Matchers.anyMap;
+import static org.mockito.
Argument
Matchers.anyCollection;
+import static org.mockito.
Argument
Matchers.anyMap;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
@@
-28,16
+28,17
@@
import akka.actor.Address;
import akka.actor.AddressFromURIString;
import akka.actor.Props;
import akka.cluster.Cluster;
import akka.actor.AddressFromURIString;
import akka.actor.Props;
import akka.cluster.Cluster;
-import akka.testkit.JavaTestKit;
-import com.google.common.base.Optional;
+import akka.testkit.javadsl.TestKit;
import com.google.common.collect.Lists;
import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.util.concurrent.FluentFuture;
+import com.google.common.util.concurrent.ListenableFuture;
import com.typesafe.config.ConfigFactory;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import com.typesafe.config.ConfigFactory;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.TimeUnit;
import java.util.Set;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.TimeUnit;
@@
-71,7
+72,6
@@
import org.opendaylight.controller.cluster.sharding.DistributedShardFactory.Dist
import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper;
import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper;
import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
import org.opendaylight.mdsal.dom.api.DOMDataTreeCursorAwareTransaction;
import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
import org.opendaylight.mdsal.dom.api.DOMDataTreeListener;
import org.opendaylight.mdsal.dom.api.DOMDataTreeCursorAwareTransaction;
import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
import org.opendaylight.mdsal.dom.api.DOMDataTreeListener;
@@
-118,8
+118,7
@@
public class DistributedShardedDOMDataTreeTest extends AbstractTest {
DatastoreContext.newBuilder()
.shardHeartbeatIntervalInMillis(100)
.shardElectionTimeoutFactor(2)
DatastoreContext.newBuilder()
.shardHeartbeatIntervalInMillis(100)
.shardElectionTimeoutFactor(2)
- .logicalStoreType(
- org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType.CONFIGURATION);
+ .logicalStoreType(LogicalDatastoreType.CONFIGURATION);
private DistributedDataStore leaderDistributedDataStore;
private DistributedDataStore operDistributedDatastore;
private DistributedDataStore leaderDistributedDataStore;
private DistributedDataStore operDistributedDatastore;
@@
-149,7
+148,7
@@
public class DistributedShardedDOMDataTreeTest extends AbstractTest {
}
@After
}
@After
- public void tearDown()
throws Exception
{
+ public void tearDown() {
if (leaderDistributedDataStore != null) {
leaderDistributedDataStore.close();
}
if (leaderDistributedDataStore != null) {
leaderDistributedDataStore.close();
}
@@
-158,7
+157,7
@@
public class DistributedShardedDOMDataTreeTest extends AbstractTest {
operDistributedDatastore.close();
}
operDistributedDatastore.close();
}
-
Java
TestKit.shutdownActorSystem(leaderSystem);
+ TestKit.shutdownActorSystem(leaderSystem);
InMemoryJournal.clear();
InMemorySnapshotStore.clear();
InMemoryJournal.clear();
InMemorySnapshotStore.clear();
@@
-205,7
+204,7
@@
public class DistributedShardedDOMDataTreeTest extends AbstractTest {
cursor.write(test.getIdentifier(), test);
cursor.close();
cursor.write(test.getIdentifier(), test);
cursor.close();
- tx.
submit().checkedG
et();
+ tx.
commit().g
et();
}
@Test
}
@Test
@@
-235,7
+234,7
@@
public class DistributedShardedDOMDataTreeTest extends AbstractTest {
cursor.close();
LOG.debug("Got to pre submit");
cursor.close();
LOG.debug("Got to pre submit");
- tx.
submit().checkedG
et();
+ tx.
commit().g
et();
final DOMDataTreeListener mockedDataTreeListener = mock(DOMDataTreeListener.class);
doNothing().when(mockedDataTreeListener).onDataTreeChanged(anyCollection(), anyMap());
final DOMDataTreeListener mockedDataTreeListener = mock(DOMDataTreeListener.class);
doNothing().when(mockedDataTreeListener).onDataTreeChanged(anyCollection(), anyMap());
@@
-270,11
+269,9
@@
public class DistributedShardedDOMDataTreeTest extends AbstractTest {
final ClientLocalHistory localHistory = distributedDataStoreClient.createLocalHistory();
final ClientTransaction tx2 = localHistory.createTransaction();
final ClientLocalHistory localHistory = distributedDataStoreClient.createLocalHistory();
final ClientTransaction tx2 = localHistory.createTransaction();
- final CheckedFuture<Optional<NormalizedNode<?, ?>>,
- org.opendaylight.mdsal.common.api.ReadFailedException> read =
- tx2.read(YangInstanceIdentifier.EMPTY);
+ final FluentFuture<Optional<NormalizedNode<?, ?>>> read = tx2.read(YangInstanceIdentifier.EMPTY);
- final Optional<NormalizedNode<?, ?>> optional = read.
checkedG
et();
+ final Optional<NormalizedNode<?, ?>> optional = read.
g
et();
tx2.abort();
localHistory.close();
tx2.abort();
localHistory.close();
@@
-324,9
+321,9
@@
public class DistributedShardedDOMDataTreeTest extends AbstractTest {
cursor.write(new NodeIdentifier(TestModel.INNER_LIST_QNAME), innerList);
cursor.close();
cursor.write(new NodeIdentifier(TestModel.INNER_LIST_QNAME), innerList);
cursor.close();
- tx.
submit().checkedG
et();
+ tx.
commit().g
et();
- final ArrayList<
CheckedFuture<Void, TransactionCommitFailedException
>> futures = new ArrayList<>();
+ final ArrayList<
ListenableFuture<?
>> futures = new ArrayList<>();
for (int i = 0; i < 1000; i++) {
final Collection<MapEntryNode> innerListMapEntries = createInnerListMapEntries(1000, "run-" + i);
for (final MapEntryNode innerListMapEntry : innerListMapEntries) {
for (int i = 0; i < 1000; i++) {
final Collection<MapEntryNode> innerListMapEntries = createInnerListMapEntries(1000, "run-" + i);
for (final MapEntryNode innerListMapEntry : innerListMapEntries) {
@@
-336,11
+333,11
@@
public class DistributedShardedDOMDataTreeTest extends AbstractTest {
oid1.node(new NodeIdentifier(TestModel.INNER_LIST_QNAME))));
cursor1.write(innerListMapEntry.getIdentifier(), innerListMapEntry);
cursor1.close();
oid1.node(new NodeIdentifier(TestModel.INNER_LIST_QNAME))));
cursor1.write(innerListMapEntry.getIdentifier(), innerListMapEntry);
cursor1.close();
- futures.add(tx1.
sub
mit());
+ futures.add(tx1.
com
mit());
}
}
}
}
- futures.get(futures.size() - 1).
checkedG
et();
+ futures.get(futures.size() - 1).
g
et();
final DOMDataTreeListener mockedDataTreeListener = mock(DOMDataTreeListener.class);
doNothing().when(mockedDataTreeListener).onDataTreeChanged(anyCollection(), anyMap());
final DOMDataTreeListener mockedDataTreeListener = mock(DOMDataTreeListener.class);
doNothing().when(mockedDataTreeListener).onDataTreeChanged(anyCollection(), anyMap());
@@
-409,7
+406,7
@@
public class DistributedShardedDOMDataTreeTest extends AbstractTest {
cursor.write(testNode.getIdentifier(), testNode);
cursor.close();
cursor.write(testNode.getIdentifier(), testNode);
cursor.close();
- transaction.
submit().checkedG
et();
+ transaction.
commit().g
et();
final DOMDataTreeListener mockedDataTreeListener = mock(DOMDataTreeListener.class);
doNothing().when(mockedDataTreeListener).onDataTreeChanged(anyCollection(), anyMap());
final DOMDataTreeListener mockedDataTreeListener = mock(DOMDataTreeListener.class);
doNothing().when(mockedDataTreeListener).onDataTreeChanged(anyCollection(), anyMap());
@@
-424,7
+421,7
@@
public class DistributedShardedDOMDataTreeTest extends AbstractTest {
cursor.write(wholeList.getIdentifier(), wholeList);
cursor.close();
cursor.write(wholeList.getIdentifier(), wholeList);
cursor.close();
- transaction.
submit().checkedG
et();
+ transaction.
commit().g
et();
leaderShardFactory.registerListener(mockedDataTreeListener, Collections.singletonList(TEST_ID),
true, Collections.emptyList());
leaderShardFactory.registerListener(mockedDataTreeListener, Collections.singletonList(TEST_ID),
true, Collections.emptyList());