Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Reduce JSR305 proliferation
[controller.git]
/
opendaylight
/
md-sal
/
sal-dom-spi
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
md
/
sal
/
dom
/
spi
/
ForwardingDOMDataWriteTransaction.java
diff --git
a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataWriteTransaction.java
b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataWriteTransaction.java
index 2afb4786ce71c7f1ee0af395937cc685469150ca..b260937a720d4b0332ba77f7f156709bed45f93d 100644
(file)
--- a/
opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataWriteTransaction.java
+++ b/
opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataWriteTransaction.java
@@
-8,14
+8,11
@@
package org.opendaylight.controller.md.sal.dom.spi;
import com.google.common.collect.ForwardingObject;
package org.opendaylight.controller.md.sal.dom.spi;
import com.google.common.collect.ForwardingObject;
-import com.google.common.util.concurrent.CheckedFuture;
-import com.google.common.util.concurrent.ListenableFuture;
-import javax.annotation.Nonnull;
-import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
+import com.google.common.util.concurrent.FluentFuture;
+import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
-import org.opendaylight.
yangtools.yang.common.RpcResult
;
+import org.opendaylight.
mdsal.common.api.CommitInfo
;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
@@
-25,7
+22,7
@@
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
*/
public abstract class ForwardingDOMDataWriteTransaction extends ForwardingObject implements DOMDataWriteTransaction {
@Override
*/
public abstract class ForwardingDOMDataWriteTransaction extends ForwardingObject implements DOMDataWriteTransaction {
@Override
- protected abstract @Non
n
ull DOMDataWriteTransaction delegate();
+ protected abstract @Non
N
ull DOMDataWriteTransaction delegate();
@Override
public Object getIdentifier() {
@Override
public Object getIdentifier() {
@@
-33,12
+30,14
@@
public abstract class ForwardingDOMDataWriteTransaction extends ForwardingObject
}
@Override
}
@Override
- public void put(final LogicalDatastoreType store, final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
+ public void put(final LogicalDatastoreType store, final YangInstanceIdentifier path,
+ final NormalizedNode<?, ?> data) {
delegate().put(store, path, data);
}
@Override
delegate().put(store, path, data);
}
@Override
- public void merge(final LogicalDatastoreType store, final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
+ public void merge(final LogicalDatastoreType store, final YangInstanceIdentifier path,
+ final NormalizedNode<?, ?> data) {
delegate().merge(store, path, data);
}
delegate().merge(store, path, data);
}
@@
-53,13
+52,7
@@
public abstract class ForwardingDOMDataWriteTransaction extends ForwardingObject
}
@Override
}
@Override
- public CheckedFuture<Void, TransactionCommitFailedException> submit() {
- return delegate().submit();
- }
-
- @Override
- @Deprecated
- public ListenableFuture<RpcResult<TransactionStatus>> commit() {
+ public FluentFuture<? extends CommitInfo> commit() {
return delegate().commit();
}
}
return delegate().commit();
}
}