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%2FMockRaftActorContext.java;h=2424d4d557f7f1dc58e65a1718e44a6a84db501f;hp=ca34a34ca49337783ec7fda8a9b9966fba1f16ac;hb=82be26d1da9096cb86f2f36e142854003415f4ae;hpb=35f74293edf98402e2b622e060185f7874d10857 diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActorContext.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActorContext.java index ca34a34ca4..2424d4d557 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActorContext.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActorContext.java @@ -16,13 +16,12 @@ import akka.event.Logging; import akka.event.LoggingAdapter; import com.google.common.base.Preconditions; import com.google.protobuf.GeneratedMessage; -import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload; -import org.opendaylight.controller.protobuff.messages.cluster.raft.AppendEntriesMessages; -import org.opendaylight.controller.protobuff.messages.cluster.raft.test.MockPayloadMessages; - import java.io.Serializable; import java.util.HashMap; import java.util.Map; +import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload; +import org.opendaylight.controller.protobuff.messages.cluster.raft.AppendEntriesMessages; +import org.opendaylight.controller.protobuff.messages.cluster.raft.test.MockPayloadMessages; public class MockRaftActorContext implements RaftActorContext { @@ -33,7 +32,7 @@ public class MockRaftActorContext implements RaftActorContext { private long lastApplied = 0; private final ElectionTerm electionTerm; private ReplicatedLog replicatedLog; - private Map peerAddresses = new HashMap(); + private Map peerAddresses = new HashMap<>(); private ConfigParams configParams; public MockRaftActorContext(){ @@ -192,14 +191,24 @@ public class MockRaftActorContext implements RaftActorContext { append(replicatedLogEntry); } + @Override + public int dataSize() { + return -1; + } + @Override public void removeFromAndPersist(long index) { removeFrom(index); } } public static class MockPayload extends Payload implements Serializable { + private static final long serialVersionUID = 1L; private String value = ""; + public MockPayload(){ + + } + public MockPayload(String s) { this.value = s; } @@ -217,6 +226,11 @@ public class MockRaftActorContext implements RaftActorContext { return this; } + @Override + public int size() { + return value.length(); + } + @Override public String getClientPayloadClassName() { return MockPayload.class.getName(); } @@ -227,6 +241,7 @@ public class MockRaftActorContext implements RaftActorContext { } public static class MockReplicatedLogEntry implements ReplicatedLogEntry, Serializable { + private static final long serialVersionUID = 1L; private final long term; private final long index; @@ -250,5 +265,30 @@ public class MockRaftActorContext implements RaftActorContext { @Override public long getIndex() { return index; } + + @Override + public int size() { + return getData().size(); + } + } + + public static class MockReplicatedLogBuilder { + private ReplicatedLog mockLog = new SimpleReplicatedLog(); + + public MockReplicatedLogBuilder createEntries(int start, int end, int term) { + for (int i=start; i