*/
package org.opendaylight.netconf.sal.connect.netconf.sal.tx;
-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.ListenableFuture;
+import com.google.common.util.concurrent.FluentFuture;
+import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.MoreExecutors;
-import org.opendaylight.controller.md.sal.common.api.MappingCheckedFuture;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction;
+import com.google.common.util.concurrent.SettableFuture;
+import java.util.Optional;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.common.api.ReadFailedException;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
import org.opendaylight.netconf.sal.connect.netconf.util.NetconfBaseOps;
import org.opendaylight.netconf.sal.connect.netconf.util.NetconfRpcFutureCallback;
import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public final class ReadOnlyTx implements DOMDataReadOnlyTransaction {
+public final class ReadOnlyTx implements DOMDataTreeReadTransaction {
private static final Logger LOG = LoggerFactory.getLogger(ReadOnlyTx.class);
this.id = id;
}
- private CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> readConfigurationData(
+ private FluentFuture<Optional<NormalizedNode<?, ?>>> readConfigurationData(
final YangInstanceIdentifier path) {
- final ListenableFuture<Optional<NormalizedNode<?, ?>>> configRunning = netconfOps.getConfigRunningData(
- new NetconfRpcFutureCallback("Data read", id), Optional.fromNullable(path));
-
- return MappingCheckedFuture.create(configRunning, ReadFailedException.MAPPER);
+ return remapException(netconfOps.getConfigRunningData(
+ new NetconfRpcFutureCallback("Data read", id), Optional.ofNullable(path)));
}
- private CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> readOperationalData(
+ private FluentFuture<Optional<NormalizedNode<?, ?>>> readOperationalData(
final YangInstanceIdentifier path) {
- final ListenableFuture<Optional<NormalizedNode<?, ?>>> configCandidate = netconfOps.getData(
- new NetconfRpcFutureCallback("Data read", id), Optional.fromNullable(path));
+ return remapException(netconfOps.getData(
+ new NetconfRpcFutureCallback("Data read", id), Optional.ofNullable(path)));
+ }
+
+ private static <T> FluentFuture<T> remapException(FluentFuture<T> input) {
+ final SettableFuture<T> ret = SettableFuture.create();
+ input.addCallback(new FutureCallback<T>() {
- return MappingCheckedFuture.create(configCandidate, ReadFailedException.MAPPER);
+ @Override
+ public void onSuccess(T result) {
+ ret.set(result);
+ }
+
+ @Override
+ public void onFailure(Throwable cause) {
+ ret.setException(cause instanceof ReadFailedException ? cause
+ : new ReadFailedException("NETCONF operation failed", cause));
+ }
+ }, MoreExecutors.directExecutor());
+ return ret;
}
@Override
}
@Override
- public CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> read(
- final LogicalDatastoreType store, final YangInstanceIdentifier path) {
+ public FluentFuture<Optional<NormalizedNode<?, ?>>> read(final LogicalDatastoreType store,
+ final YangInstanceIdentifier path) {
switch (store) {
case CONFIGURATION:
return readConfigurationData(path);
throw new IllegalArgumentException(String.format(
"%s, Cannot read data %s for %s datastore, unknown datastore type", id, path, store));
}
-
}
@Override
- public CheckedFuture<Boolean, ReadFailedException> exists(final LogicalDatastoreType store,
- final YangInstanceIdentifier path) {
- final ListenableFuture<Boolean> result = Futures.transform(read(store, path),
- optionalNode -> optionalNode != null && optionalNode.isPresent(), MoreExecutors.directExecutor());
- return MappingCheckedFuture.create(result, ReadFailedException.MAPPER);
+ public FluentFuture<Boolean> exists(final LogicalDatastoreType store, final YangInstanceIdentifier path) {
+ return read(store, path).transform(optionalNode -> optionalNode != null && optionalNode.isPresent(),
+ MoreExecutors.directExecutor());
}
@Override