Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump odlparent/yangtools/mdsal
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
databroker
/
actors
/
dds
/
ClientTransaction.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransaction.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransaction.java
index c706d99a1b3bb0aea1ef8f16701ea0c9404c0f68..9b4c5a962f9b62959ffc3464b475c27a7d198b59 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransaction.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransaction.java
@@
-13,10
+13,7
@@
import com.google.common.collect.Iterables;
import com.google.common.util.concurrent.FluentFuture;
import java.util.Collection;
import java.util.Optional;
import com.google.common.util.concurrent.FluentFuture;
import java.util.Collection;
import java.util.Optional;
-import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
-import org.opendaylight.mdsal.dom.api.DOMDataTreeCursor;
-import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteCursor;
import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
@@
-53,9
+50,6
@@
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
*/
@Beta
public class ClientTransaction extends AbstractClientHandle<AbstractProxyTransaction> {
*/
@Beta
public class ClientTransaction extends AbstractClientHandle<AbstractProxyTransaction> {
-
- private ClientTransactionCursor cursor;
-
ClientTransaction(final AbstractClientHistory parent, final TransactionIdentifier transactionId) {
super(parent, transactionId);
}
ClientTransaction(final AbstractClientHistory parent, final TransactionIdentifier transactionId) {
super(parent, transactionId);
}
@@
-64,17
+58,11
@@
public class ClientTransaction extends AbstractClientHandle<AbstractProxyTransac
return ensureProxy(path);
}
return ensureProxy(path);
}
- public DOMDataTreeWriteCursor openCursor() {
- Preconditions.checkState(cursor == null, "Transaction %s has open cursor", getIdentifier());
- cursor = new ClientTransactionCursor(this);
- return cursor;
- }
-
public FluentFuture<Boolean> exists(final YangInstanceIdentifier path) {
return ensureTransactionProxy(path).exists(path);
}
public FluentFuture<Boolean> exists(final YangInstanceIdentifier path) {
return ensureTransactionProxy(path).exists(path);
}
- public FluentFuture<Optional<NormalizedNode
<?, ?>
>> read(final YangInstanceIdentifier path) {
+ public FluentFuture<Optional<NormalizedNode>> read(final YangInstanceIdentifier path) {
return ensureTransactionProxy(path).read(path);
}
return ensureTransactionProxy(path).read(path);
}
@@
-82,11
+70,11
@@
public class ClientTransaction extends AbstractClientHandle<AbstractProxyTransac
ensureTransactionProxy(path).delete(path);
}
ensureTransactionProxy(path).delete(path);
}
- public void merge(final YangInstanceIdentifier path, final NormalizedNode
<?, ?>
data) {
+ public void merge(final YangInstanceIdentifier path, final NormalizedNode data) {
ensureTransactionProxy(path).merge(path, data);
}
ensureTransactionProxy(path).merge(path, data);
}
- public void write(final YangInstanceIdentifier path, final NormalizedNode
<?, ?>
data) {
+ public void write(final YangInstanceIdentifier path, final NormalizedNode data) {
ensureTransactionProxy(path).write(path, data);
}
ensureTransactionProxy(path).write(path, data);
}
@@
-116,10
+104,4
@@
public class ClientTransaction extends AbstractClientHandle<AbstractProxyTransac
final AbstractProxyTransaction createProxy(final Long shard) {
return parent().createTransactionProxy(getIdentifier(), shard);
}
final AbstractProxyTransaction createProxy(final Long shard) {
return parent().createTransactionProxy(getIdentifier(), shard);
}
-
- void closeCursor(final @NonNull DOMDataTreeCursor cursorToClose) {
- if (cursorToClose.equals(this.cursor)) {
- this.cursor = null;
- }
- }
}
}