Bump upstream SNAPSHOTS

[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..065a0e97fb6acb0e8af346ad821244e88320192e 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
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.controller.cluster.databroker.actors.dds;
 
+import akka.actor.ActorRef;
 import akka.testkit.TestProbe;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.junit.Assert;
 import org.opendaylight.controller.cluster.access.ABIVersion;
 import org.opendaylight.controller.cluster.access.client.AbstractClientConnection;
@@ -17,7 +18,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;
@@ -43,20 +43,24 @@ class TransactionTester<T extends AbstractProxyTransaction> {
         this.backendProbe = backendProbe;
     }
 
+    ActorRef localActor() {
+        return connection.localActor();
+    }
+
     T getTransaction() {
         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>> 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,20 +82,21 @@ class TransactionTester<T extends AbstractProxyTransaction> {
     }
 
     private static class MockFailure extends RequestFailure<TransactionIdentifier, TransactionFailure> {
-        private MockFailure(@Nonnull final TransactionIdentifier target, final long sequence,
-                            @Nonnull final RequestException cause) {
+        private static final long serialVersionUID = 1L;
+
+        MockFailure(final @NonNull TransactionIdentifier target, final long sequence,
+                            final @NonNull RequestException cause) {
             super(target, sequence, cause);
         }
 
-        @Nonnull
         @Override
-        protected TransactionFailure cloneAsVersion(@Nonnull final ABIVersion targetVersion) {
+        protected TransactionFailure cloneAsVersion(final ABIVersion targetVersion) {
             throw new UnsupportedOperationException("Not implemented");
         }
 
         @Override
         protected AbstractRequestFailureProxy<TransactionIdentifier, TransactionFailure> externalizableProxy(
-                @Nonnull final ABIVersion version) {
+                final ABIVersion version) {
             throw new UnsupportedOperationException("Not implemented");
         }
     }