Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG-2288: deprecate old binding Notification API elements"
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
MockRaftActorContext.java
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 63f0df2f8c74c42e6a4d45bcf95a0f4aa707a48a..4aa3b2fb4e62349f8c96b06e235b5ea8e7378bcf 100644
(file)
--- 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
@@
-19,6
+19,8
@@
import com.google.protobuf.GeneratedMessage;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
+import org.opendaylight.controller.cluster.DataPersistenceProvider;
+import org.opendaylight.controller.cluster.NonPersistentDataProvider;
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 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;
@@
-38,6
+40,7
@@
public class MockRaftActorContext implements RaftActorContext {
private ConfigParams configParams;
private boolean snapshotCaptureInitiated;
private SnapshotManager snapshotManager;
private ConfigParams configParams;
private boolean snapshotCaptureInitiated;
private SnapshotManager snapshotManager;
+ private DataPersistenceProvider persistenceProvider = new NonPersistentDataProvider();
public MockRaftActorContext(){
electionTerm = new ElectionTerm() {
public MockRaftActorContext(){
electionTerm = new ElectionTerm() {
@@
-197,6
+200,7
@@
public class MockRaftActorContext implements RaftActorContext {
public SnapshotManager getSnapshotManager() {
if(this.snapshotManager == null){
this.snapshotManager = new SnapshotManager(this, getLogger());
public SnapshotManager getSnapshotManager() {
if(this.snapshotManager == null){
this.snapshotManager = new SnapshotManager(this, getLogger());
+ this.snapshotManager.setCreateSnapshotCallable(NoopProcedure.<Void>instance());
}
return this.snapshotManager;
}
}
return this.snapshotManager;
}
@@
-219,6
+223,15
@@
public class MockRaftActorContext implements RaftActorContext {
return getPeerAddresses().keySet().size() > 0;
}
return getPeerAddresses().keySet().size() > 0;
}
+ @Override
+ public DataPersistenceProvider getPersistenceProvider() {
+ return persistenceProvider;
+ }
+
+ public void setPersistenceProvider(DataPersistenceProvider persistenceProvider) {
+ this.persistenceProvider = persistenceProvider;
+ }
+
public static class SimpleReplicatedLog extends AbstractReplicatedLogImpl {
@Override public void appendAndPersist(
ReplicatedLogEntry replicatedLogEntry) {
public static class SimpleReplicatedLog extends AbstractReplicatedLogImpl {
@Override public void appendAndPersist(
ReplicatedLogEntry replicatedLogEntry) {
@@
-266,8
+279,8
@@
public class MockRaftActorContext implements RaftActorContext {
this.size = size;
}
this.size = size;
}
- @Override public
Map<GeneratedMessage.GeneratedExtension
, String> encode() {
- Map<GeneratedMessage.GeneratedExtension
, String> map = new HashMap<GeneratedMessage.GeneratedExtension, String
>();
+ @Override public
Map<GeneratedMessage.GeneratedExtension<?, ?>
, String> encode() {
+ Map<GeneratedMessage.GeneratedExtension
<?, ?>, String> map = new HashMap<
>();
map.put(MockPayloadMessages.value, value);
return map;
}
map.put(MockPayloadMessages.value, value);
return map;
}