Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use Empty instead of Void in cohorts
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
NoOpDOMStoreThreePhaseCommitCohort.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/NoOpDOMStoreThreePhaseCommitCohort.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/NoOpDOMStoreThreePhaseCommitCohort.java
index 1f5f5bcf79351764eb7776634a950f59077f63dc..9b477320e56df40136c6f6c47cee76c8700bea5c 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/NoOpDOMStoreThreePhaseCommitCohort.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/NoOpDOMStoreThreePhaseCommitCohort.java
@@
-10,6
+10,8
@@
package org.opendaylight.controller.cluster.datastore;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.Collections;
import java.util.List;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.Collections;
import java.util.List;
+import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.yangtools.yang.common.Empty;
import scala.concurrent.Future;
/**
import scala.concurrent.Future;
/**
@@
-29,18
+31,18
@@
final class NoOpDOMStoreThreePhaseCommitCohort extends AbstractThreePhaseCommitC
}
@Override
}
@Override
- public ListenableFuture<
Void
> preCommit() {
- return IMMEDIATE_
VOID
_SUCCESS;
+ public ListenableFuture<
Empty
> preCommit() {
+ return IMMEDIATE_
EMPTY
_SUCCESS;
}
@Override
}
@Override
- public ListenableFuture<
Void
> abort() {
- return IMMEDIATE_
VOID
_SUCCESS;
+ public ListenableFuture<
Empty
> abort() {
+ return IMMEDIATE_
EMPTY
_SUCCESS;
}
@Override
}
@Override
- public ListenableFuture<
Void
> commit() {
- return
IMMEDIATE_VOID_SUCCESS
;
+ public ListenableFuture<
CommitInfo
> commit() {
+ return
CommitInfo.emptyFluentFuture()
;
}
@Override
}
@Override