Fix test warnings

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / databroker / actors / dds / AbstractClientHandleTest.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHandleTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHandleTest.java
index 95791788b1d1bb4473e866beafe8fd5ecff2b54a..ade447eed8776e4c2c04927d7651be5bbe50000b 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHandleTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHandleTest.java
@@ -11,6 +11,9 @@ import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.opendaylight.controller.cluster.databroker.actors.dds.TestUtils.CLIENT_ID;
+import static org.opendaylight.controller.cluster.databroker.actors.dds.TestUtils.HISTORY_ID;
+import static org.opendaylight.controller.cluster.databroker.actors.dds.TestUtils.TRANSACTION_ID;
 
 import akka.actor.ActorRef;
 import akka.actor.ActorSelection;
@@ -33,20 +36,14 @@ import org.opendaylight.controller.cluster.access.client.InternalCommand;
 import org.opendaylight.controller.cluster.access.commands.AbortLocalTransactionRequest;
 import org.opendaylight.controller.cluster.access.commands.ConnectClientRequest;
 import org.opendaylight.controller.cluster.access.commands.ConnectClientSuccess;
-import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier;
 import org.opendaylight.controller.cluster.access.concepts.Envelope;
 import org.opendaylight.controller.cluster.access.concepts.FailureEnvelope;
-import org.opendaylight.controller.cluster.access.concepts.FrontendIdentifier;
-import org.opendaylight.controller.cluster.access.concepts.FrontendType;
-import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifier;
-import org.opendaylight.controller.cluster.access.concepts.MemberName;
 import org.opendaylight.controller.cluster.access.concepts.Request;
 import org.opendaylight.controller.cluster.access.concepts.RequestEnvelope;
 import org.opendaylight.controller.cluster.access.concepts.RequestFailure;
 import org.opendaylight.controller.cluster.access.concepts.RequestSuccess;
 import org.opendaylight.controller.cluster.access.concepts.Response;
 import org.opendaylight.controller.cluster.access.concepts.SuccessEnvelope;
-import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 import org.opendaylight.controller.cluster.datastore.messages.PrimaryShardInfo;
 import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
@@ -56,14 +53,8 @@ import scala.concurrent.Promise;
 
 public abstract class AbstractClientHandleTest<T extends AbstractClientHandle<AbstractProxyTransaction>> {
 
-    private static final MemberName MEMBER_NAME = MemberName.forName("member-1");
-    private static final FrontendType FRONTEND_TYPE = FrontendType.forName("type-1");
-    private static final FrontendIdentifier FRONTEND_ID = FrontendIdentifier.create(MEMBER_NAME, FRONTEND_TYPE);
-    private static final ClientIdentifier CLIENT_ID = ClientIdentifier.create(FRONTEND_ID, 0);
-    private static final LocalHistoryIdentifier HISTORY_ID = new LocalHistoryIdentifier(CLIENT_ID, 0L);
     private static final String PERSISTENCE_ID = "per-1";
     private static final YangInstanceIdentifier PATH = YangInstanceIdentifier.EMPTY;
-    protected static final TransactionIdentifier TRANSACTION_ID = new TransactionIdentifier(HISTORY_ID, 0L);
 
     @Mock
     private DataTree dataTree;
@@ -95,7 +86,7 @@ public abstract class AbstractClientHandleTest<T extends AbstractClientHandle<Ab
         final long sequence = 0L;
         contextProbe.reply(new ConnectClientSuccess(CLIENT_ID, sequence, backendProbe.ref(),
                 Collections.emptyList(), dataTree, 3));
-        final InternalCommand command = clientContextProbe.expectMsgClass(InternalCommand.class);
+        final InternalCommand<ShardBackendInfo> command = clientContextProbe.expectMsgClass(InternalCommand.class);
         command.execute(client);
         //data tree mock
         when(dataTree.takeSnapshot()).thenReturn(dataTreeSnapshot);
@@ -127,7 +118,7 @@ public abstract class AbstractClientHandleTest<T extends AbstractClientHandle<Ab
     public void testAbort() throws Exception {
         doHandleOperation(handle);
         handle.abort();
-        final Envelope envelope = backendProbe.expectMsgClass(Envelope.class);
+        final Envelope<?> envelope = backendProbe.expectMsgClass(Envelope.class);
         final AbortLocalTransactionRequest request = (AbortLocalTransactionRequest) envelope.getMessage();
         Assert.assertEquals(TRANSACTION_ID, request.getTarget());
         checkClosed();
@@ -137,7 +128,7 @@ public abstract class AbstractClientHandleTest<T extends AbstractClientHandle<Ab
     public void testLocalAbort() throws Exception {
         doHandleOperation(handle);
         handle.localAbort(new RuntimeException("fail"));
-        final Envelope envelope = backendProbe.expectMsgClass(Envelope.class);
+        final Envelope<?> envelope = backendProbe.expectMsgClass(Envelope.class);
         final AbortLocalTransactionRequest request = (AbortLocalTransactionRequest) envelope.getMessage();
         Assert.assertEquals(TRANSACTION_ID, request.getTarget());
         checkClosed();
@@ -179,8 +170,8 @@ public abstract class AbstractClientHandleTest<T extends AbstractClientHandle<Ab
      * @param <R>                  expected request type
      * @return request message
      */
-    protected <R extends Request> R backendRespondToRequest(final Class<R> expectedRequestClass,
-                                                            final Response response) {
+    protected <R extends Request<?, R>> R backendRespondToRequest(final Class<R> expectedRequestClass,
+                                                            final Response<?, ?> response) {
         final RequestEnvelope envelope = backendProbe.expectMsgClass(RequestEnvelope.class);
         Assert.assertEquals(expectedRequestClass, envelope.getMessage().getClass());
         final AbstractClientConnection<ShardBackendInfo> connection = client.getConnection(0L);
@@ -196,7 +187,7 @@ public abstract class AbstractClientHandleTest<T extends AbstractClientHandle<Ab
             final FailureEnvelope responseEnvelope = new FailureEnvelope(fail, sessionId, txSequence, executionTime);
             AccessClientUtil.completeRequest(connection, responseEnvelope);
         }
-        return (R) envelope.getMessage();
+        return expectedRequestClass.cast(envelope.getMessage());
     }
 
     protected T getHandle() {
@@ -217,4 +208,4 @@ public abstract class AbstractClientHandleTest<T extends AbstractClientHandle<Ab
         return mock;
     }
 
-}
\ No newline at end of file
+}