X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-compat%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fcore%2Fcompat%2FDOMStoreReadTransactionAdapter.java;h=0f9b9c3e5bdba9d545e553a73ce8f57f37125054;hp=60b858fcde8976ec1386a3c3bf4007a4366ec617;hb=7aaa993c7f3ed5cb11ffede692ef23f4ed2c9e47;hpb=af84734ff224e68368522a4cfbd2c2bbbbc48aba diff --git a/opendaylight/md-sal/sal-dom-compat/src/main/java/org/opendaylight/controller/sal/core/compat/DOMStoreReadTransactionAdapter.java b/opendaylight/md-sal/sal-dom-compat/src/main/java/org/opendaylight/controller/sal/core/compat/DOMStoreReadTransactionAdapter.java index 60b858fcde..0f9b9c3e5b 100644 --- a/opendaylight/md-sal/sal-dom-compat/src/main/java/org/opendaylight/controller/sal/core/compat/DOMStoreReadTransactionAdapter.java +++ b/opendaylight/md-sal/sal-dom-compat/src/main/java/org/opendaylight/controller/sal/core/compat/DOMStoreReadTransactionAdapter.java @@ -9,11 +9,13 @@ package org.opendaylight.controller.sal.core.compat; import static java.util.Objects.requireNonNull; +import com.google.common.base.Optional; import com.google.common.collect.ForwardingObject; import com.google.common.util.concurrent.CheckedFuture; +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.ReadFailedException; import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction; -import org.opendaylight.mdsal.common.api.MappingCheckedFuture; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -43,7 +45,8 @@ public class DOMStoreReadTransactionAdapter>, ReadFailedException> read( final YangInstanceIdentifier path) { - return MappingCheckedFuture.create(delegate.read(path), ReadFailedExceptionAdapter.INSTANCE); + return MappingCheckedFuture.create(delegate.read(path).transform( + Optional::fromJavaUtil, MoreExecutors.directExecutor()), ReadFailedExceptionAdapter.INSTANCE); } @Override