From 9e6714ce7693d8e3c00adf72dafce78041d3a7cc Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 22 May 2017 13:14:05 +0200 Subject: [PATCH] Fix test warnings This fixes most raw type warnings. Change-Id: Iaec02aa9f40df6d04b9f1bfa7045c84b6cc40a53 Signed-off-by: Robert Varga --- .../AbstractLocalTransactionRequestTest.java | 2 +- .../AbstractReadTransactionRequestTest.java | 2 +- .../commands/AbstractRequestFailureTest.java | 2 +- .../commands/AbstractRequestSuccessTest.java | 2 +- .../AbstractTransactionRequestTest.java | 2 +- .../AbstractTransactionSuccessTest.java | 2 +- .../access/concepts/AbstractRequestTest.java | 2 +- .../access/client/ActorBehaviorTest.java | 8 +++---- .../access/client/ConnectionEntryMatcher.java | 4 ++-- .../client/HaltedTransmitQueueTest.java | 2 +- .../DistributedShardedDOMDataTree.java | 6 ++--- .../sharding/PrefixedShardConfigWriter.java | 4 ++-- .../actors/dds/AbstractClientHandleTest.java | 4 ++-- .../dds/AbstractProxyTransactionTest.java | 15 ++++++------- .../actors/dds/LocalProxyTransactionTest.java | 10 ++++----- .../LocalReadWriteProxyTransactionTest.java | 2 +- .../databroker/actors/dds/TestUtils.java | 2 +- .../actors/dds/TransactionTester.java | 2 +- .../cluster/datastore/IntegrationTestKit.java | 9 ++++---- .../messages/DatastoreSnapshotListTest.java | 22 +++++++++---------- 20 files changed, 52 insertions(+), 52 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 1355829c7d..e40a39450b 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,7 +12,7 @@ import org.junit.Assert; import org.junit.Test; import org.opendaylight.controller.cluster.access.ABIVersion; -public abstract class AbstractLocalTransactionRequestTest> +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 c1c7db1e8c..d769cbf04e 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,7 +12,7 @@ import org.junit.Assert; import org.junit.Test; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -public abstract class AbstractReadTransactionRequestTest> +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 9e3cf09003..a91828bc3d 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 8cafe9133a..8a81252233 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")); 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 f53d11cf55..58d24e4e53 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,7 +19,7 @@ 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> +public abstract class AbstractTransactionRequestTest> extends AbstractRequestTest { private static final FrontendIdentifier FRONTEND_IDENTIFIER = FrontendIdentifier.create( MemberName.forName("test"), FrontendType.forName("one")); 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 149844bd62..08c9abb3af 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,7 +9,7 @@ package org.opendaylight.controller.cluster.access.commands; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; -public abstract class AbstractTransactionSuccessTest> +public abstract class AbstractTransactionSuccessTest> extends AbstractRequestSuccessTest { protected static final TransactionIdentifier TRANSACTION_IDENTIFIER = new TransactionIdentifier( 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 d4378e9fd6..c65c1956c2 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(); diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ActorBehaviorTest.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ActorBehaviorTest.java index b0a6011222..7431813010 100644 --- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ActorBehaviorTest.java +++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ActorBehaviorTest.java @@ -144,7 +144,7 @@ public class ActorBehaviorTest { } @SuppressWarnings("unchecked") - private ClientActorBehavior createInitialBehaviorMock() throws Exception { + private static ClientActorBehavior createInitialBehaviorMock() throws Exception { final ClientActorBehavior initialBehavior = mock(ClientActorBehavior.class); //persistenceId() in AbstractClientActorBehavior is final and can't be mocked //use reflection to work around this @@ -173,13 +173,13 @@ public class ActorBehaviorTest { private static class MockedActor extends AbstractClientActor { - private final ClientActorBehavior initialBehavior; + private final ClientActorBehavior initialBehavior; - private static Props props(final FrontendIdentifier frontendId, final ClientActorBehavior initialBehavior) { + private static Props props(final FrontendIdentifier frontendId, final ClientActorBehavior initialBehavior) { return Props.create(MockedActor.class, () -> new MockedActor(frontendId, initialBehavior)); } - private MockedActor(final FrontendIdentifier frontendId, final ClientActorBehavior initialBehavior) { + private MockedActor(final FrontendIdentifier frontendId, final ClientActorBehavior initialBehavior) { super(frontendId); this.initialBehavior = initialBehavior; } diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectionEntryMatcher.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectionEntryMatcher.java index d2d2fd8bd9..7f40dc1b37 100644 --- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectionEntryMatcher.java +++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectionEntryMatcher.java @@ -16,7 +16,7 @@ import org.opendaylight.controller.cluster.access.concepts.Request; */ class ConnectionEntryMatcher extends BaseMatcher { - private final Request request; + private final Request request; /** * Creates a matcher that matches if the examined {@link ConnectionEntry} contains specified request. @@ -28,7 +28,7 @@ class ConnectionEntryMatcher extends BaseMatcher { return new ConnectionEntryMatcher(request); } - private ConnectionEntryMatcher(final Request request) { + private ConnectionEntryMatcher(final Request request) { this.request = request; } diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/HaltedTransmitQueueTest.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/HaltedTransmitQueueTest.java index 80394001a8..4251c87f59 100644 --- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/HaltedTransmitQueueTest.java +++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/HaltedTransmitQueueTest.java @@ -36,7 +36,7 @@ public class HaltedTransmitQueueTest extends AbstractTransmitQueueTest request = new TransactionPurgeRequest(TRANSACTION_IDENTIFIER, 0L, probe.ref()); final Consumer> callback = createConsumerMock(); final long now = Ticker.systemTicker().read(); final ConnectionEntry entry = new ConnectionEntry(request, callback, now); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java index 4ffc575c1a..35f5e99882 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java @@ -161,7 +161,7 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat createPrefixConfigShard(distributedOperDatastore); } - private void createPrefixConfigShard(final AbstractDataStore dataStore) { + private static void createPrefixConfigShard(final AbstractDataStore dataStore) { Configuration configuration = dataStore.getActorContext().getConfiguration(); Collection memberNames = configuration.getUniqueMemberNamesForAllShards(); CreateShard createShardMessage = @@ -451,12 +451,12 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat Futures.addCallback(future, new FutureCallback() { @Override - public void onSuccess(@Nullable Void result) { + public void onSuccess(@Nullable final Void result) { LOG.debug("{} - Succesfuly removed shard for {}", memberName, prefix); } @Override - public void onFailure(Throwable throwable) { + public void onFailure(final Throwable throwable) { LOG.error("Removal of shard {} from configuration failed.", prefix, throwable); } }); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigWriter.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigWriter.java index b0507f6383..f6e4d37857 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigWriter.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigWriter.java @@ -88,7 +88,7 @@ class PrefixedShardConfigWriter { submitBlocking(cohort); } - private void submitBlocking(final DOMStoreThreePhaseCommitCohort cohort) { + private static void submitBlocking(final DOMStoreThreePhaseCommitCohort cohort) { try { doSubmit(cohort).get(); } catch (final InterruptedException | ExecutionException e) { @@ -96,7 +96,7 @@ class PrefixedShardConfigWriter { } } - private ListenableFuture doSubmit(final DOMStoreThreePhaseCommitCohort cohort) { + private static ListenableFuture doSubmit(final DOMStoreThreePhaseCommitCohort cohort) { final AsyncFunction validateFunction = input -> cohort.preCommit(); final AsyncFunction prepareFunction = input -> cohort.commit(); 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 6e9305aba9..ade447eed8 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 @@ -170,7 +170,7 @@ public abstract class AbstractClientHandleTest expected request type * @return request message */ - protected > R backendRespondToRequest(final Class expectedRequestClass, + protected > R backendRespondToRequest(final Class expectedRequestClass, final Response response) { final RequestEnvelope envelope = backendProbe.expectMsgClass(RequestEnvelope.class); Assert.assertEquals(expectedRequestClass, envelope.getMessage().getClass()); @@ -208,4 +208,4 @@ public abstract class AbstractClientHandleTest> consumer, - final Class> expectedRequest, - final BiFunction> replySupplier) - throws Exception { + protected > void testRequestResponse(final Consumer> consumer, + final Class expectedRequest, + final BiFunction> replySupplier) throws Exception { final TransactionTester tester = getTester(); final VotingFuture future = mock(VotingFuture.class); transaction.seal(); @@ -233,18 +232,18 @@ public abstract class AbstractProxyTransactionTest> T testHandleForwardedRemoteRequest(final T request) throws Exception { + protected > R testHandleForwardedRemoteRequest(final R request) throws Exception { transaction.handleReplayedRemoteRequest(request, createCallbackMock(), Ticker.systemTicker().read()); final RequestEnvelope envelope = backendProbe.expectMsgClass(RequestEnvelope.class); - final T received = (T) envelope.getMessage(); + final R received = (R) envelope.getMessage(); Assert.assertTrue(received.getClass().equals(request.getClass())); Assert.assertEquals(TRANSACTION_ID, received.getTarget()); Assert.assertEquals(clientContextProbe.ref(), received.getReplyTo()); return received; } - protected > T testForwardToRemote(final TransactionRequest toForward, - final Class expectedMessageClass) { + protected > R testForwardToRemote(final TransactionRequest toForward, + final Class expectedMessageClass) { final Consumer> callback = createCallbackMock(); final TransactionTester transactionTester = createRemoteProxyTransactionTester(); final RemoteProxyTransaction successor = transactionTester.getTransaction(); 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 dccdf9ef70..3cf1b03493 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 @@ -114,7 +114,7 @@ public abstract class LocalProxyTransactionTest final CursorAwareDataTreeModification modification = mock(CursorAwareDataTreeModification.class); final CommitLocalTransactionRequest request = new CommitLocalTransactionRequest(TRANSACTION_ID, 0L, probe.ref(), modification, null, true); - doAnswer(this::applyToCursorAnswer).when(modification).applyToCursor(any()); + doAnswer(LocalProxyTransactionTest::applyToCursorAnswer).when(modification).applyToCursor(any()); final ModifyTransactionRequest modifyRequest = testForwardToRemote(request, ModifyTransactionRequest.class); verify(modification).applyToCursor(any()); Assert.assertTrue(modifyRequest.getPersistenceProtocol().isPresent()); @@ -136,8 +136,8 @@ public abstract class LocalProxyTransactionTest testForwardToLocal(request, TransactionPurgeRequest.class); } - protected > T testForwardToLocal(final TransactionRequest toForward, - final Class expectedMessageClass) { + protected > R testForwardToLocal(final TransactionRequest toForward, + final Class expectedMessageClass) { final Consumer> callback = createCallbackMock(); final TransactionTester transactionTester = createLocalProxy(); final LocalReadWriteProxyTransaction successor = transactionTester.getTransaction(); @@ -152,7 +152,7 @@ public abstract class LocalProxyTransactionTest * @param invocation invocation * @return void - always null */ - protected Answer applyToCursorAnswer(final InvocationOnMock invocation) { + protected static final Answer applyToCursorAnswer(final InvocationOnMock invocation) { final DataTreeModificationCursor cursor = invocation.getArgumentAt(0, DataTreeModificationCursor.class); cursor.write(PATH_1.getLastPathArgument(), DATA_1); @@ -161,4 +161,4 @@ public abstract class LocalProxyTransactionTest return null; } -} \ 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/LocalReadWriteProxyTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalReadWriteProxyTransactionTest.java index 7eebfe02ca..7f1508d4d4 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalReadWriteProxyTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalReadWriteProxyTransactionTest.java @@ -147,7 +147,7 @@ public class LocalReadWriteProxyTransactionTest extends LocalProxyTransactionTes public void testFlushState() throws Exception { final TransactionTester transactionTester = createRemoteProxyTransactionTester(); final RemoteProxyTransaction successor = transactionTester.getTransaction(); - doAnswer(this::applyToCursorAnswer).when(modification).applyToCursor(any()); + doAnswer(LocalProxyTransactionTest::applyToCursorAnswer).when(modification).applyToCursor(any()); transaction.doSeal(); transaction.flushState(successor); verify(modification).applyToCursor(any()); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/TestUtils.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/TestUtils.java index 4c82357d93..977ada54e6 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/TestUtils.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/TestUtils.java @@ -79,7 +79,7 @@ class TestUtils { if (!e.getClass().equals(expectedException)) { throw e; } - return (T) e; + return expectedException.cast(e); } } 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 b3fb51d458..c0ce539144 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 @@ -55,7 +55,7 @@ class TransactionTester { 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 String errorMsg = String.format("Expected instance of %s, received %s", expected, actual); 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 1c4bfcfbb2..a9179299f7 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 @@ -64,7 +64,8 @@ public class IntegrationTestKit extends ShardTestKit { this(actorSystem, datastoreContextBuilder, 7); } - public IntegrationTestKit(final ActorSystem actorSystem, final Builder datastoreContextBuilder, int commitTimeout) { + public IntegrationTestKit(final ActorSystem actorSystem, final Builder datastoreContextBuilder, + final int commitTimeout) { super(actorSystem); this.datastoreContextBuilder = datastoreContextBuilder; this.commitTimeout = commitTimeout; @@ -139,8 +140,8 @@ public class IntegrationTestKit extends ShardTestKit { ActorSystem.class, ClusterWrapper.class, Configuration.class, DatastoreContextFactory.class, DatastoreSnapshot.class); - final AbstractDataStore dataStore = constructor.newInstance( - getSystem(), cluster, config, mockContextFactory, restoreFromSnapshot); + final AbstractDataStore dataStore = constructor.newInstance(getSystem(), cluster, config, mockContextFactory, + restoreFromSnapshot); dataStore.onGlobalContextUpdated(schemaContext); @@ -152,7 +153,7 @@ public class IntegrationTestKit extends ShardTestKit { return dataStore; } - private void setDataStoreName(String typeName) { + private void setDataStoreName(final String typeName) { if ("config".equals(typeName)) { datastoreContextBuilder.logicalStoreType(LogicalDatastoreType.CONFIGURATION); } else if ("operational".equals(typeName)) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/DatastoreSnapshotListTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/DatastoreSnapshotListTest.java index 7ae0b1c498..021a60fbaf 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/DatastoreSnapshotListTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/DatastoreSnapshotListTest.java @@ -84,10 +84,10 @@ public class DatastoreSnapshotListTest { } @SuppressWarnings("unchecked") - private void assertDatastoreSnapshotEquals(DatastoreSnapshot legacy, - org.opendaylight.controller.cluster.datastore.persisted.DatastoreSnapshot actual, - org.opendaylight.controller.cluster.datastore.persisted.ShardManagerSnapshot expShardMgrSnapshot, - Optional>... shardRoots) throws IOException { + private static void assertDatastoreSnapshotEquals(final DatastoreSnapshot legacy, + final org.opendaylight.controller.cluster.datastore.persisted.DatastoreSnapshot actual, + final org.opendaylight.controller.cluster.datastore.persisted.ShardManagerSnapshot expShardMgrSnapshot, + final Optional>... shardRoots) throws IOException { assertEquals("Type", legacy.getType(), actual.getType()); if (legacy.getShardManagerSnapshot() == null) { @@ -112,8 +112,8 @@ public class DatastoreSnapshotListTest { } } - private static void assertSnapshotEquals(Snapshot expected, Optional> expRoot, - org.opendaylight.controller.cluster.raft.persisted.Snapshot actual) throws IOException { + private static void assertSnapshotEquals(final Snapshot expected, final Optional> expRoot, + final org.opendaylight.controller.cluster.raft.persisted.Snapshot actual) throws IOException { assertEquals("lastIndex", expected.getLastIndex(), actual.getLastIndex()); assertEquals("lastTerm", expected.getLastTerm(), actual.getLastTerm()); assertEquals("lastAppliedIndex", expected.getLastAppliedIndex(), actual.getLastAppliedIndex()); @@ -132,16 +132,16 @@ public class DatastoreSnapshotListTest { } } - private static ShardManagerSnapshot newLegacyShardManagerSnapshot(String... shards) { + private static ShardManagerSnapshot newLegacyShardManagerSnapshot(final String... shards) { return ShardManagerSnapshot.forShardList(Arrays.asList(shards)); } - private static DatastoreSnapshot.ShardSnapshot newLegacyShardSnapshot(String name, - org.opendaylight.controller.cluster.raft.Snapshot snapshot) { + private static DatastoreSnapshot.ShardSnapshot newLegacyShardSnapshot(final String name, + final org.opendaylight.controller.cluster.raft.Snapshot snapshot) { return new DatastoreSnapshot.ShardSnapshot(name, SerializationUtils.serialize(snapshot)); } - private static Snapshot newLegacySnapshot(NormalizedNode root) + private static Snapshot newLegacySnapshot(final NormalizedNode root) throws Exception { final ByteArrayOutputStream bos = new ByteArrayOutputStream(); if (root != null) { @@ -158,7 +158,7 @@ public class DatastoreSnapshotListTest { "member-1", null); } - private static NormalizedNode toRootNode(YangInstanceIdentifier path, NormalizedNode node) + private static NormalizedNode toRootNode(final YangInstanceIdentifier path, final NormalizedNode node) throws DataValidationFailedException { DataTree dataTree = InMemoryDataTreeFactory.getInstance().create(TreeType.OPERATIONAL); dataTree.setSchemaContext(SchemaContextHelper.full()); -- 2.36.6