Fix warnings in tests

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/TransactionTester.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/TransactionTester.java
index 1bcf5569f095df77edb60e2c49ae21bdb624f06a..2876c032e3480299fff3b014a401bed1cd532a9e 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/TransactionTester.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/TransactionTester.java
@@ -17,7 +17,6 @@ import org.opendaylight.controller.cluster.access.commands.TransactionFailure;
 import org.opendaylight.controller.cluster.access.commands.TransactionRequest;
 import org.opendaylight.controller.cluster.access.concepts.AbstractRequestFailureProxy;
 import org.opendaylight.controller.cluster.access.concepts.FailureEnvelope;
-import org.opendaylight.controller.cluster.access.concepts.Request;
 import org.opendaylight.controller.cluster.access.concepts.RequestEnvelope;
 import org.opendaylight.controller.cluster.access.concepts.RequestException;
 import org.opendaylight.controller.cluster.access.concepts.RequestFailure;
@@ -47,16 +46,16 @@ class TransactionTester<T extends AbstractProxyTransaction> {
         return transaction;
     }
 
-    TransactionRequest getLastReceivedMessage() {
-        return (TransactionRequest) envelope.getMessage();
+    TransactionRequest<?> getLastReceivedMessage() {
+        return (TransactionRequest<?>) envelope.getMessage();
     }
 
-    <R extends TransactionRequest> R expectTransactionRequest(final Class<R> expected) {
+    <R extends TransactionRequest<?>> R expectTransactionRequest(final Class<R> expected) {
         envelope = backendProbe.expectMsgClass(RequestEnvelope.class);
-        final Class<? extends Request> actual = envelope.getMessage().getClass();
+        final Class<?> actual = envelope.getMessage().getClass();
         final String errorMsg = String.format("Expected instance of %s, received %s", expected, actual);
         Assert.assertTrue(errorMsg, expected.isAssignableFrom(actual));
-        return (R) envelope.getMessage();
+        return expected.cast(envelope.getMessage());
     }
 
     void replySuccess(final RequestSuccess<?, ?> success) {
@@ -78,6 +77,8 @@ class TransactionTester<T extends AbstractProxyTransaction> {
     }
 
     private static class MockFailure extends RequestFailure<TransactionIdentifier, TransactionFailure> {
+        private static final long serialVersionUID = 1L;
+
         private MockFailure(@Nonnull final TransactionIdentifier target, final long sequence,
                             @Nonnull final RequestException cause) {
             super(target, sequence, cause);