From 808a02471eef0f975c13fc948f933fac34ada387 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 10 Apr 2017 20:12:47 +0200 Subject: [PATCH] Fix warnings in tests This fixes up initialization failures and use of raw classes where possible. Change-Id: Icfa9bd0a08a6dd838d794c509612f711099ea0fe Signed-off-by: Robert Varga --- .../AbstractLocalTransactionRequestTest.java | 4 +- .../AbstractReadTransactionRequestTest.java | 4 +- .../commands/AbstractRequestFailureTest.java | 2 +- .../commands/AbstractRequestSuccessTest.java | 4 +- .../AbstractTransactionRequestTest.java | 4 +- .../AbstractTransactionSuccessTest.java | 4 +- .../access/concepts/AbstractEnvelopeTest.java | 6 +-- .../access/concepts/AbstractRequestTest.java | 4 +- .../persisted/ShardManagerSnapshot.java | 6 +-- .../sharding/DistributedShardFrontend.java | 1 - .../ClientBackedReadTransactionTest.java | 3 +- .../ClientBackedReadWriteTransactionTest.java | 2 +- .../ClientBackedWriteTransactionTest.java | 2 +- .../actors/dds/AbstractClientHandleTest.java | 12 +++--- .../actors/dds/AbstractClientHistoryTest.java | 6 +-- .../dds/AbstractProxyTransactionTest.java | 18 ++++----- .../ClientTransactionCommitCohortTest.java | 39 +++++++++---------- .../actors/dds/LocalProxyTransactionTest.java | 8 ++-- .../actors/dds/TransactionTester.java | 13 ++++--- .../cluster/datastore/IntegrationTestKit.java | 4 +- .../AbstractIdentifiablePayloadTest.java | 2 +- .../sharding/CDSShardAccessImplTest.java | 6 +-- 22 files changed, 75 insertions(+), 79 deletions(-) diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractLocalTransactionRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractLocalTransactionRequestTest.java index 2696767a14..1355829c7d 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractLocalTransactionRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractLocalTransactionRequestTest.java @@ -12,8 +12,8 @@ import org.junit.Assert; import org.junit.Test; import org.opendaylight.controller.cluster.access.ABIVersion; -public abstract class AbstractLocalTransactionRequestTest - extends AbstractTransactionRequestTest { +public abstract class AbstractLocalTransactionRequestTest> + extends AbstractTransactionRequestTest { @Override protected abstract T object(); diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestTest.java index 376e13f4b8..c1c7db1e8c 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestTest.java @@ -12,8 +12,8 @@ import org.junit.Assert; import org.junit.Test; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -public abstract class AbstractReadTransactionRequestTest - extends AbstractTransactionRequestTest { +public abstract class AbstractReadTransactionRequestTest> + extends AbstractTransactionRequestTest { protected static final YangInstanceIdentifier PATH = YangInstanceIdentifier.EMPTY; protected static final boolean SNAPSHOT_ONLY = true; diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestFailureTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestFailureTest.java index 69c9ea263f..9e3cf09003 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestFailureTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestFailureTest.java @@ -20,7 +20,7 @@ import org.opendaylight.controller.cluster.access.concepts.RequestFailure; import org.opendaylight.controller.cluster.access.concepts.RuntimeRequestException; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; -public abstract class AbstractRequestFailureTest { +public abstract class AbstractRequestFailureTest> { private static final FrontendIdentifier FRONTEND_IDENTIFIER = FrontendIdentifier.create( MemberName.forName("member"), FrontendType.forName("frontend")); diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java index f0bb6f325f..34bd2cc348 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java @@ -17,7 +17,7 @@ import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifie import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.access.concepts.RequestSuccess; -public abstract class AbstractRequestSuccessTest { +public abstract class AbstractRequestSuccessTest> { private static final FrontendIdentifier FRONTEND_IDENTIFIER = FrontendIdentifier.create( MemberName.forName("test"), FrontendType.forName("one")); @@ -35,7 +35,7 @@ public abstract class AbstractRequestSuccessTest { Assert.assertEquals(object().getTarget(), ((T) deserialize).getTarget()); Assert.assertEquals(object().getVersion(), ((T) deserialize).getVersion()); Assert.assertEquals(object().getSequence(), ((T) deserialize).getSequence()); - doAdditionalAssertions((T) deserialize); + doAdditionalAssertions(deserialize); } protected abstract void doAdditionalAssertions(final Object deserialize); diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionRequestTest.java index 87a0af1c6b..f53d11cf55 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionRequestTest.java @@ -19,8 +19,8 @@ import org.opendaylight.controller.cluster.access.concepts.RequestException; import org.opendaylight.controller.cluster.access.concepts.RuntimeRequestException; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; -public abstract class AbstractTransactionRequestTest - extends AbstractRequestTest { +public abstract class AbstractTransactionRequestTest> + extends AbstractRequestTest { private static final FrontendIdentifier FRONTEND_IDENTIFIER = FrontendIdentifier.create( MemberName.forName("test"), FrontendType.forName("one")); private static final ClientIdentifier CLIENT_IDENTIFIER = ClientIdentifier.create(FRONTEND_IDENTIFIER, 0); diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionSuccessTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionSuccessTest.java index de9d9ff3d5..149844bd62 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionSuccessTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionSuccessTest.java @@ -9,8 +9,8 @@ package org.opendaylight.controller.cluster.access.commands; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; -public abstract class AbstractTransactionSuccessTest - extends AbstractRequestSuccessTest { +public abstract class AbstractTransactionSuccessTest> + extends AbstractRequestSuccessTest { protected static final TransactionIdentifier TRANSACTION_IDENTIFIER = new TransactionIdentifier( HISTORY_IDENTIFIER, 0); diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractEnvelopeTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractEnvelopeTest.java index 43746cef15..f31054905e 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractEnvelopeTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractEnvelopeTest.java @@ -12,7 +12,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public abstract class AbstractEnvelopeTest { +public abstract class AbstractEnvelopeTest> { private static final FrontendIdentifier FRONTEND = new FrontendIdentifier(MemberName.forName("test"), FrontendIdentifierTest.ONE_FRONTEND_TYPE); private static final ClientIdentifier CLIENT = new ClientIdentifier(FRONTEND, 0); @@ -36,8 +36,8 @@ public abstract class AbstractEnvelopeTest { private void checkDeserialized(final E deserializedEnvelope) { Assert.assertEquals(envelope.getSessionId(), deserializedEnvelope.getSessionId()); Assert.assertEquals(envelope.getTxSequence(), deserializedEnvelope.getTxSequence()); - final Message expectedMessage = envelope.getMessage(); - final Message actualMessage = deserializedEnvelope.getMessage(); + final Message expectedMessage = envelope.getMessage(); + final Message actualMessage = deserializedEnvelope.getMessage(); Assert.assertEquals(expectedMessage.getSequence(), actualMessage.getSequence()); Assert.assertEquals(expectedMessage.getTarget(), actualMessage.getTarget()); Assert.assertEquals(expectedMessage.getVersion(), actualMessage.getVersion()); diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestTest.java index 2229aff022..31c19f4faa 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestTest.java @@ -18,7 +18,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public abstract class AbstractRequestTest { +public abstract class AbstractRequestTest> { private static final ActorSystem SYSTEM = ActorSystem.create("test"); protected static final ActorRef ACTOR_REF = TestProbe.apply(SYSTEM).ref(); @@ -48,7 +48,7 @@ public abstract class AbstractRequestTest { Assert.assertEquals(object().getTarget(), ((T) deserialize).getTarget()); Assert.assertEquals(object().getVersion(), ((T) deserialize).getVersion()); Assert.assertEquals(object().getSequence(), ((T) deserialize).getSequence()); - doAdditionalAssertions((T) deserialize); + doAdditionalAssertions(deserialize); } protected abstract void doAdditionalAssertions(final Object deserialize); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardManagerSnapshot.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardManagerSnapshot.java index 93846758ec..9dc95c058a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardManagerSnapshot.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardManagerSnapshot.java @@ -47,21 +47,21 @@ public class ShardManagerSnapshot implements Serializable { } @Override - public void writeExternal(ObjectOutput out) throws IOException { + public void writeExternal(final ObjectOutput out) throws IOException { out.writeInt(snapshot.shardList.size()); for (String shard: snapshot.shardList) { out.writeObject(shard); } out.writeInt(snapshot.prefixShardConfiguration.size()); - for (Map.Entry prefixShardConfigEntry : snapshot.prefixShardConfiguration.entrySet()) { + for (Map.Entry prefixShardConfigEntry : snapshot.prefixShardConfiguration.entrySet()) { out.writeObject(prefixShardConfigEntry.getKey()); out.writeObject(prefixShardConfigEntry.getValue()); } } @Override - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { int size = in.readInt(); List shardList = new ArrayList<>(size); for (int i = 0; i < size; i++) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardFrontend.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardFrontend.java index f6060a89fd..b148b918b8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardFrontend.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardFrontend.java @@ -137,7 +137,6 @@ class DistributedShardFrontend implements ReadableWriteableDOMDataTreeShard { @Nonnull @Override - @SuppressWarnings("unchecked") public ListenerRegistration registerTreeChangeListener( final YangInstanceIdentifier treeId, final L listener) { return publisher.registerTreeChangeListener(treeId, listener); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransactionTest.java index 92cd99d825..ee8280f4e9 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransactionTest.java @@ -26,7 +26,7 @@ public class ClientBackedReadTransactionTest extends ClientBackedTransactionTest private ClientBackedReadTransaction object; @Mock - private NormalizedNode data; + private NormalizedNode data; @Mock private ClientActorContext clientContext; @Mock @@ -38,7 +38,6 @@ public class ClientBackedReadTransactionTest extends ClientBackedTransactionTest } @Before - @SuppressWarnings("unchecked") public void setUp() throws Exception { MockitoAnnotations.initMocks(this); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadWriteTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadWriteTransactionTest.java index a1af473ebf..bb3b215ac2 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadWriteTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadWriteTransactionTest.java @@ -29,7 +29,7 @@ public class ClientBackedReadWriteTransactionTest @Mock private ClientTransaction delegate; @Mock - private NormalizedNode data; + private NormalizedNode data; @Mock private DOMStoreThreePhaseCommitCohort readyCohort; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java index 26b875011c..2f297b568c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java @@ -24,7 +24,7 @@ public class ClientBackedWriteTransactionTest extends ClientBackedTransactionTes @Mock private ClientTransaction delegate; @Mock - private NormalizedNode data; + private NormalizedNode data; @Mock private YangInstanceIdentifier path; @Mock 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 3dfaac50b2..6e9305aba9 100644 --- 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 @@ -86,7 +86,7 @@ public abstract class AbstractClientHandleTest command = clientContextProbe.expectMsgClass(InternalCommand.class); command.execute(client); //data tree mock when(dataTree.takeSnapshot()).thenReturn(dataTreeSnapshot); @@ -118,7 +118,7 @@ public abstract class AbstractClientHandleTest envelope = backendProbe.expectMsgClass(Envelope.class); final AbortLocalTransactionRequest request = (AbortLocalTransactionRequest) envelope.getMessage(); Assert.assertEquals(TRANSACTION_ID, request.getTarget()); checkClosed(); @@ -128,7 +128,7 @@ public abstract class AbstractClientHandleTest envelope = backendProbe.expectMsgClass(Envelope.class); final AbortLocalTransactionRequest request = (AbortLocalTransactionRequest) envelope.getMessage(); Assert.assertEquals(TRANSACTION_ID, request.getTarget()); checkClosed(); @@ -170,8 +170,8 @@ public abstract class AbstractClientHandleTest expected request type * @return request message */ - protected R backendRespondToRequest(final Class expectedRequestClass, - final Response response) { + protected > R backendRespondToRequest(final Class expectedRequestClass, + final Response response) { final RequestEnvelope envelope = backendProbe.expectMsgClass(RequestEnvelope.class); Assert.assertEquals(expectedRequestClass, envelope.getMessage().getClass()); final AbstractClientConnection connection = client.getConnection(0L); @@ -187,7 +187,7 @@ public abstract class AbstractClientHandleTest } @Test - @SuppressWarnings("unchecked") public void testStartReconnect() throws Exception { // cookie and shard are the same final Long cookie = 0L; @@ -152,7 +151,7 @@ public abstract class AbstractClientHistoryTest final ShardBackendInfo info = new ShardBackendInfo(clientActorContext().self(), 0L, ABIVersion.current(), SHARD_NAME, UnsignedLong.ZERO, Optional.of(tree), 10); - final ConnectedClientConnection newConn = AccessClientUtil.createConnectedConnection( + final ConnectedClientConnection newConn = AccessClientUtil.createConnectedConnection( clientActorContext(), cookie, info); object().createSnapshotProxy(TRANSACTION_ID, shard); @@ -161,7 +160,6 @@ public abstract class AbstractClientHistoryTest } @Test - @SuppressWarnings("unchecked") public void testStartReconnectMissingOldProxy() throws Exception { // cookie and shard are different final Long cookie = 1L; @@ -169,7 +167,7 @@ public abstract class AbstractClientHistoryTest final ShardBackendInfo info = new ShardBackendInfo(clientActorContext().self(), 0L, ABIVersion.current(), SHARD_NAME, UnsignedLong.ZERO, Optional.of(tree), 10); - final ConnectedClientConnection newConn = AccessClientUtil.createConnectedConnection( + final ConnectedClientConnection newConn = AccessClientUtil.createConnectedConnection( clientActorContext(), cookie, info); object().createSnapshotProxy(TRANSACTION_ID, shard); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransactionTest.java index 6b37bc0743..6054eb3f6f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransactionTest.java @@ -195,20 +195,20 @@ public abstract class AbstractProxyTransactionTest consumer, - final Class expectedRequest, - final BiFunction replySupplier) + protected void testRequestResponse(final Consumer> consumer, + final Class> expectedRequest, + final BiFunction> replySupplier) throws Exception { final TransactionTester tester = getTester(); - final VotingFuture future = mock(VotingFuture.class); + final VotingFuture future = mock(VotingFuture.class); transaction.seal(); consumer.accept(future); - final TransactionRequest req = tester.expectTransactionRequest(expectedRequest); + final TransactionRequest req = tester.expectTransactionRequest(expectedRequest); tester.replySuccess(replySupplier.apply(TRANSACTION_ID, req.getSequence())); verify(future).voteYes(); } - protected T testHandleForwardedRemoteRequest(final T request) throws Exception { + protected > T testHandleForwardedRemoteRequest(final T request) throws Exception { transaction.handleForwardedRemoteRequest(request, createCallbackMock()); final RequestEnvelope envelope = backendProbe.expectMsgClass(RequestEnvelope.class); final T received = (T) envelope.getMessage(); @@ -218,7 +218,7 @@ public abstract class AbstractProxyTransactionTest T testForwardToRemote(final TransactionRequest toForward, + protected > T testForwardToRemote(final TransactionRequest toForward, final Class expectedMessageClass) { final Consumer> callback = createCallbackMock(); final TransactionTester transactionTester = createRemoteProxyTransactionTester(); @@ -232,8 +232,8 @@ public abstract class AbstractProxyTransactionTest Consumer createCallbackMock() { - return (Consumer) mock(Consumer.class); + protected static Consumer createCallbackMock() { + return mock(Consumer.class); } protected static BaseMatcher hasPath(final YangInstanceIdentifier path) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionCommitCohortTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionCommitCohortTest.java index 294c62a23c..f9eb6ed6af 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionCommitCohortTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionCommitCohortTest.java @@ -56,7 +56,7 @@ public class ClientTransactionCommitCohortTest { @Mock private AbstractClientHistory history; private ActorSystem system; - private List transactions; + private List> transactions; private ClientTransactionCommitCohort cohort; @Before @@ -130,43 +130,43 @@ public class ClientTransactionCommitCohortTest { Assert.assertEquals(PersistenceProtocol.THREE_PHASE, request.getPersistenceProtocol().get()); } - void expectPreCommit(final TransactionTester tester) { + void expectPreCommit(final TransactionTester tester) { tester.expectTransactionRequest(TransactionPreCommitRequest.class); } - void expectCommit(final TransactionTester tester) { + void expectCommit(final TransactionTester tester) { tester.expectTransactionRequest(TransactionDoCommitRequest.class); } - void expectAbort(final TransactionTester tester) { + void expectAbort(final TransactionTester tester) { tester.expectTransactionRequest(TransactionAbortRequest.class); } - void replyCanCommitSuccess(final TransactionTester tester) { + void replyCanCommitSuccess(final TransactionTester tester) { final RequestSuccess success = new TransactionCanCommitSuccess(tester.getTransaction().getIdentifier(), tester.getLastReceivedMessage().getSequence()); tester.replySuccess(success); } - void replyPreCommitSuccess(final TransactionTester tester) { + void replyPreCommitSuccess(final TransactionTester tester) { final RequestSuccess success = new TransactionPreCommitSuccess(tester.getTransaction().getIdentifier(), tester.getLastReceivedMessage().getSequence()); tester.replySuccess(success); } - void replyCommitSuccess(final TransactionTester tester) { + void replyCommitSuccess(final TransactionTester tester) { final RequestSuccess success = new TransactionCommitSuccess(tester.getTransaction().getIdentifier(), tester.getLastReceivedMessage().getSequence()); tester.replySuccess(success); } - void replyAbortSuccess(final TransactionTester tester) { + void replyAbortSuccess(final TransactionTester tester) { final RequestSuccess success = new TransactionAbortSuccess(tester.getTransaction().getIdentifier(), tester.getLastReceivedMessage().getSequence()); tester.replySuccess(success); } - private static TransactionTester createTransactionTester(final TestProbe backendProbe, + private static TransactionTester createTransactionTester(final TestProbe backendProbe, final ClientActorContext context, final AbstractClientHistory history) { final ShardBackendInfo backend = new ShardBackendInfo(backendProbe.ref(), 0L, ABIVersion.BORON, @@ -176,13 +176,12 @@ public class ClientTransactionCommitCohortTest { final ProxyHistory proxyHistory = ProxyHistory.createClient(history, connection, HISTORY_ID); final RemoteProxyTransaction transaction = new RemoteProxyTransaction(proxyHistory, TRANSACTION_ID, false, false); - return new TransactionTester(transaction, connection, backendProbe); + return new TransactionTester<>(transaction, connection, backendProbe); } - private void replySuccess(final Collection transactions, - final Consumer expect, - final Consumer reply) { - for (final TransactionTester transaction : transactions) { + private static > void replySuccess(final Collection transactions, + final Consumer expect, final Consumer reply) { + for (final T transaction : transactions) { expect.accept(transaction); reply.accept(transaction); } @@ -201,8 +200,8 @@ public class ClientTransactionCommitCohortTest { * @throws Exception unexpected exception */ private void testOpSuccess(final Function> operation, - final Consumer expectFunction, - final Consumer replyFunction, + final Consumer> expectFunction, + final Consumer> replyFunction, final T expectedResult) throws Exception { final ListenableFuture result = operation.apply(cohort); replySuccess(transactions, expectFunction, replyFunction); @@ -221,13 +220,13 @@ public class ClientTransactionCommitCohortTest { * @throws Exception unexpected exception */ private void testOpFail(final Function> operation, - final Consumer expectFunction, - final Consumer replyFunction) throws Exception { + final Consumer> expectFunction, + final Consumer> replyFunction) throws Exception { final ListenableFuture canCommit = operation.apply(cohort); //reply success to all except last transaction replySuccess(transactions.subList(0, transactions.size() - 1), expectFunction, replyFunction); //reply fail to last transaction - final TransactionTester last = transactions.get(transactions.size() - 1); + final TransactionTester last = transactions.get(transactions.size() - 1); expectFunction.accept(last); final RuntimeRequestException cause = new RuntimeRequestException("fail", new RuntimeException()); last.replyFailure(cause); @@ -237,4 +236,4 @@ public class ClientTransactionCommitCohortTest { Assert.assertEquals(cause, exception.getCause()); } -} \ No newline at end of file +} diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransactionTest.java index 6f66b3e933..7815a26208 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransactionTest.java @@ -66,7 +66,7 @@ public abstract class LocalProxyTransactionTest transaction.handleForwardedRemoteRequest(request, callback); final ArgumentCaptor captor = ArgumentCaptor.forClass(Response.class); verify(callback).accept(captor.capture()); - final Response value = captor.getValue(); + final Response value = captor.getValue(); Assert.assertTrue(value instanceof ReadTransactionSuccess); final ReadTransactionSuccess success = (ReadTransactionSuccess) value; Assert.assertTrue(success.getData().isPresent()); @@ -82,7 +82,7 @@ public abstract class LocalProxyTransactionTest transaction.handleForwardedRemoteRequest(request, callback); final ArgumentCaptor captor = ArgumentCaptor.forClass(Response.class); verify(callback).accept(captor.capture()); - final Response value = captor.getValue(); + final Response value = captor.getValue(); Assert.assertTrue(value instanceof ExistsTransactionSuccess); final ExistsTransactionSuccess success = (ExistsTransactionSuccess) value; Assert.assertTrue(success.getExists()); @@ -135,7 +135,7 @@ public abstract class LocalProxyTransactionTest testForwardToLocal(request, TransactionPurgeRequest.class); } - protected T testForwardToLocal(final TransactionRequest toForward, + protected > T testForwardToLocal(final TransactionRequest toForward, final Class expectedMessageClass) { final Consumer> callback = createCallbackMock(); final TransactionTester transactionTester = createLocalProxy(); @@ -151,7 +151,7 @@ public abstract class LocalProxyTransactionTest * @param invocation invocation * @return void - always null */ - protected Answer applyToCursorAnswer(final InvocationOnMock invocation) { + protected Answer applyToCursorAnswer(final InvocationOnMock invocation) { final DataTreeModificationCursor cursor = invocation.getArgumentAt(0, DataTreeModificationCursor.class); cursor.write(PATH_1.getLastPathArgument(), DATA_1); 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 1bcf5569f0..2876c032e3 100644 --- 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 { return transaction; } - TransactionRequest getLastReceivedMessage() { - return (TransactionRequest) envelope.getMessage(); + TransactionRequest getLastReceivedMessage() { + return (TransactionRequest) envelope.getMessage(); } - R expectTransactionRequest(final Class expected) { + > R expectTransactionRequest(final Class expected) { envelope = backendProbe.expectMsgClass(RequestEnvelope.class); - final Class 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 { } private static class MockFailure extends RequestFailure { + private static final long serialVersionUID = 1L; + private MockFailure(@Nonnull final TransactionIdentifier target, final long sequence, @Nonnull final RequestException cause) { super(target, sequence, cause); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/IntegrationTestKit.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/IntegrationTestKit.java index 9570e0e4aa..93c3e5bc2b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/IntegrationTestKit.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/IntegrationTestKit.java @@ -129,11 +129,11 @@ public class IntegrationTestKit extends ShardTestKit { Mockito.doReturn(datastoreContext).when(mockContextFactory).getBaseDatastoreContext(); Mockito.doReturn(datastoreContext).when(mockContextFactory).getShardDatastoreContext(Mockito.anyString()); - final Constructor constructor = implementation.getDeclaredConstructor( + final Constructor constructor = implementation.getDeclaredConstructor( ActorSystem.class, ClusterWrapper.class, Configuration.class, DatastoreContextFactory.class, DatastoreSnapshot.class); - final AbstractDataStore dataStore = (AbstractDataStore) constructor.newInstance( + final AbstractDataStore dataStore = constructor.newInstance( getSystem(), cluster, config, mockContextFactory, restoreFromSnapshot); dataStore.onGlobalContextUpdated(schemaContext); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractIdentifiablePayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractIdentifiablePayloadTest.java index e53b026023..a04c169198 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractIdentifiablePayloadTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractIdentifiablePayloadTest.java @@ -12,7 +12,7 @@ import org.junit.Assert; import org.junit.Test; import org.opendaylight.controller.cluster.datastore.AbstractTest; -public abstract class AbstractIdentifiablePayloadTest extends AbstractTest { +public abstract class AbstractIdentifiablePayloadTest> extends AbstractTest { abstract T object(); 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 cbb07264ae..1ece8627d5 100644 --- 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 @@ -102,9 +102,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); -- 2.36.6