Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Migrate use of AbstractDOMStoreTransaction
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
databroker
/
ClientBackedReadTransaction.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransaction.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransaction.java
index 3d10c3976069da637cc9935a16a6828831d4c7e3..30a51dea4a5d74985010429863eba54440c1db9d 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransaction.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransaction.java
@@
-7,14
+7,12
@@
*/
package org.opendaylight.controller.cluster.databroker;
*/
package org.opendaylight.controller.cluster.databroker;
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
-import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.FluentFuture;
+import java.util.Optional;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
-import
javax
.annotation.Nullable;
+import
org.eclipse.jdt
.annotation.Nullable;
import org.opendaylight.controller.cluster.databroker.actors.dds.ClientSnapshot;
import org.opendaylight.controller.cluster.databroker.actors.dds.ClientSnapshot;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction;
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;
@@
-33,19
+31,20
@@
final class ClientBackedReadTransaction extends ClientBackedTransaction<ClientSn
@SuppressWarnings("unused")
private volatile ClientBackedTransactionChain parent;
@SuppressWarnings("unused")
private volatile ClientBackedTransactionChain parent;
- ClientBackedReadTransaction(final ClientSnapshot delegate, @Nullable final ClientBackedTransactionChain parent) {
- super(delegate);
+ ClientBackedReadTransaction(final ClientSnapshot delegate, final @Nullable ClientBackedTransactionChain parent,
+ final @Nullable Throwable allocationContext) {
+ super(delegate, allocationContext);
this.parent = parent;
}
@Override
this.parent = parent;
}
@Override
- public
CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException
> read(final YangInstanceIdentifier path) {
- return
Futures.makeChecked(delegate().read(path), ReadFailedException.MAPPER
);
+ public
FluentFuture<Optional<NormalizedNode<?, ?>>
> read(final YangInstanceIdentifier path) {
+ return
delegate().read(path
);
}
@Override
}
@Override
- public
CheckedFuture<Boolean, ReadFailedExceptio
n> exists(final YangInstanceIdentifier path) {
- return
Futures.makeChecked(delegate().exists(path), ReadFailedException.MAPPER
);
+ public
FluentFuture<Boolea
n> exists(final YangInstanceIdentifier path) {
+ return
delegate().exists(path
);
}
@Override
}
@Override