Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix modernization issues
[controller.git]
/
opendaylight
/
md-sal
/
sal-dom-broker
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
md
/
sal
/
dom
/
broker
/
impl
/
PingPongTransaction.java
diff --git
a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java
b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java
index 51b28e14502459ae44cebeb6887828ac78c79648..22625ed156616984f84b6d90ee79664518aea0d3 100644
(file)
--- a/
opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java
+++ b/
opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java
@@
-7,36
+7,30
@@
*/
package org.opendaylight.controller.md.sal.dom.broker.impl;
*/
package org.opendaylight.controller.md.sal.dom.broker.impl;
+import static java.util.Objects.requireNonNull;
+
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.CheckedFuture;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
-import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.controller.md.sal.common.impl.service.AbstractDataTransaction;
import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction;
import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction;
-import org.opendaylight.
yangtools.yang.common.RpcResult
;
+import org.opendaylight.
mdsal.common.api.CommitInfo
;
/**
* Transaction context. Tracks the relationship with the backend transaction.
* We never leak this class to the user and have it implement the {@link FutureCallback}
* interface so we have a simple way of propagating the result.
*/
/**
* Transaction context. Tracks the relationship with the backend transaction.
* We never leak this class to the user and have it implement the {@link FutureCallback}
* interface so we have a simple way of propagating the result.
*/
-final class PingPongTransaction implements FutureCallback<Void> {
- private final CheckedFuture<Void, TransactionCommitFailedException> submitFuture;
- private final ListenableFuture<RpcResult<TransactionStatus>> commitFuture;
+@Deprecated
+final class PingPongTransaction implements FutureCallback<CommitInfo> {
private final DOMDataReadWriteTransaction delegate;
private final DOMDataReadWriteTransaction delegate;
- private final SettableFuture<
Void
> future;
+ private final SettableFuture<
CommitInfo
> future;
private DOMDataReadWriteTransaction frontendTransaction;
PingPongTransaction(final DOMDataReadWriteTransaction delegate) {
private DOMDataReadWriteTransaction frontendTransaction;
PingPongTransaction(final DOMDataReadWriteTransaction delegate) {
- this.delegate =
Preconditions.checkNot
Null(delegate);
+ this.delegate =
requireNon
Null(delegate);
future = SettableFuture.create();
future = SettableFuture.create();
- submitFuture = new PingPongFuture(future);
- commitFuture = AbstractDataTransaction.convertToLegacyCommitFuture(submitFuture);
}
DOMDataReadWriteTransaction getTransaction() {
}
DOMDataReadWriteTransaction getTransaction() {
@@
-47,22
+41,18
@@
final class PingPongTransaction implements FutureCallback<Void> {
return frontendTransaction;
}
return frontendTransaction;
}
- CheckedFuture<Void, TransactionCommitFailedException> getSubmitFuture() {
- return submitFuture;
- }
-
- ListenableFuture<RpcResult<TransactionStatus>> getCommitFuture() {
- return commitFuture;
+ ListenableFuture<CommitInfo> getCommitFuture() {
+ return future;
}
@Override
}
@Override
- public void onSuccess(final
Void
result) {
+ public void onSuccess(final
CommitInfo
result) {
future.set(result);
}
@Override
future.set(result);
}
@Override
- public void onFailure(final Throwable t) {
- future.setException(t);
+ public void onFailure(final Throwable t
hrowable
) {
+ future.setException(t
hrowable
);
}
void recordFrontendTransaction(final DOMDataReadWriteTransaction tx) {
}
void recordFrontendTransaction(final DOMDataReadWriteTransaction tx) {
@@
-79,4
+69,4
@@
final class PingPongTransaction implements FutureCallback<Void> {
protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) {
return toStringHelper.add("delegate", delegate);
}
protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) {
return toStringHelper.add("delegate", delegate);
}
-}
\ No newline at end of file
+}