X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2FMockRaftActor.java;h=d72d40416f3b3288a1b3f2b1aaa97f48c473af82;hp=53110b3583a4f7353e3d17b1ec7ac91bf8ec7891;hb=a89f83014714207a4ccb704eb75050d758266d71;hpb=dcf327e8c3a8a10e2a7a433e473157ed50395b99 diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActor.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActor.java index 53110b3583..d72d40416f 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActor.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActor.java @@ -29,6 +29,8 @@ import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payloa public class MockRaftActor extends RaftActor implements RaftActorRecoveryCohort, RaftActorSnapshotCohort { + public static final short PAYLOAD_VERSION = 5; + final RaftActor actorDelegate; final RaftActorRecoveryCohort recoveryCohortDelegate; final RaftActorSnapshotCohort snapshotCohortDelegate; @@ -70,7 +72,7 @@ public class MockRaftActor extends RaftActor implements RaftActorRecoveryCohort, public MockRaftActor(String id, Map peerAddresses, Optional config, DataPersistenceProvider dataPersistenceProvider) { - super(id, peerAddresses, config); + super(id, peerAddresses, config, PAYLOAD_VERSION); state = new ArrayList<>(); this.actorDelegate = mock(RaftActor.class); this.recoveryCohortDelegate = mock(RaftActorRecoveryCohort.class); @@ -154,10 +156,11 @@ public class MockRaftActor extends RaftActor implements RaftActorRecoveryCohort, return Props.create(new MockRaftActorCreator(peerAddresses, id, config, dataPersistenceProvider, roleChangeNotifier)); } - @Override protected void applyState(ActorRef clientActor, String identifier, Object data) { actorDelegate.applyState(clientActor, identifier, data); - LOG.info("{}: applyState called", persistenceId()); + LOG.info("{}: applyState called: {}", persistenceId(), data); + + state.add(data); } @Override @@ -235,7 +238,7 @@ public class MockRaftActor extends RaftActor implements RaftActorRecoveryCohort, return this.getId(); } - private Object toObject(byte[] bs) throws ClassNotFoundException, IOException { + public static Object toObject(byte[] bs) throws ClassNotFoundException, IOException { Object obj = null; ByteArrayInputStream bis = null; ObjectInputStream ois = null;