Deprecate DOMDataTreeProducer-related classes

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / sharding / CDSShardAccessImplTest.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/CDSShardAccessImplTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/CDSShardAccessImplTest.java
index cbb07264ae8dab8ab9358a038b337efd2e4babb5..e79222fa51e56b1ca839b45735d92abbedb26209 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/CDSShardAccessImplTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/CDSShardAccessImplTest.java
@@ -10,8 +10,8 @@ package org.opendaylight.controller.cluster.sharding;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-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.doThrow;
@@ -21,14 +21,14 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import akka.actor.ActorRef;
 import akka.dispatch.Futures;
-import com.google.common.base.Optional;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.cluster.datastore.AbstractActorTest;
 import org.opendaylight.controller.cluster.datastore.DatastoreContext;
 import org.opendaylight.controller.cluster.datastore.exceptions.LocalShardNotFoundException;
-import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
+import org.opendaylight.controller.cluster.datastore.utils.ActorUtils;
 import org.opendaylight.controller.cluster.dom.api.LeaderLocation;
 import org.opendaylight.controller.cluster.dom.api.LeaderLocationListener;
 import org.opendaylight.controller.cluster.dom.api.LeaderLocationListenerRegistration;
@@ -39,17 +39,18 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 import scala.concurrent.Future;
 import scala.concurrent.duration.FiniteDuration;
 
+@Deprecated(forRemoval = true)
 public class CDSShardAccessImplTest extends AbstractActorTest {
 
     private static final DOMDataTreeIdentifier TEST_ID =
             new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, TestModel.TEST_PATH);
 
     private CDSShardAccessImpl shardAccess;
-    private ActorContext context;
+    private ActorUtils context;
 
     @Before
     public void setUp() {
-        context = mock(ActorContext.class);
+        context = mock(ActorUtils.class);
         final DatastoreContext datastoreContext = DatastoreContext.newBuilder().build();
         doReturn(Optional.of(getSystem().deadLetters())).when(context).findLocalShard(any());
         doReturn(datastoreContext).when(context).getDatastoreContext();
@@ -102,9 +103,9 @@ public class CDSShardAccessImplTest extends AbstractActorTest {
         final LeaderLocationListener listener3 = mock(LeaderLocationListener.class);
         doNothing().when(listener3).onLeaderLocationChanged(any());
 
-        final LeaderLocationListenerRegistration reg1 = shardAccess.registerLeaderLocationListener(listener1);
-        final LeaderLocationListenerRegistration reg2 = shardAccess.registerLeaderLocationListener(listener2);
-        final LeaderLocationListenerRegistration reg3 = shardAccess.registerLeaderLocationListener(listener3);
+        final LeaderLocationListenerRegistration<?> reg1 = shardAccess.registerLeaderLocationListener(listener1);
+        final LeaderLocationListenerRegistration<?> reg2 = shardAccess.registerLeaderLocationListener(listener2);
+        final LeaderLocationListenerRegistration<?> reg3 = shardAccess.registerLeaderLocationListener(listener3);
 
         // Error in listener1 should not affect dispatching change to other listeners
         shardAccess.onLeaderLocationChanged(LeaderLocation.LOCAL);