X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fbroker%2Fimpl%2Flegacy%2Fsharded%2Fadapter%2FShardedDOMDataBrokerDelegatingReadTransaction.java;h=dcc2176aade70e4ced520aaea7860d5afa9354cc;hb=aaea3e9a92ae9d6fac04c4a065db4b35cbca9ed0;hp=2e29c255dd7839ad062fbd8b8928dbf98d3a6b26;hpb=7e62b4a59f9e43bcd0585845f1aeb55c44199f27;p=controller.git

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadTransaction.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadTransaction.java
index 2e29c255dd..dcc2176aad 100644
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadTransaction.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadTransaction.java
@@ -5,11 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.controller.md.sal.dom.broker.impl.legacy.sharded.adapter;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.opendaylight.controller.md.sal.dom.broker.impl.legacy.sharded.adapter.LegacyShardedDOMDataBrokerAdapterUtils.translateDataStoreType;
+import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;
@@ -32,30 +30,28 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
  * return all relevant data, we cannot guarantee it neither. Best effort is to
  * return all data we get from first initial data change event received.
  */
+@Deprecated(forRemoval = true)
 class ShardedDOMDataBrokerDelegatingReadTransaction implements DOMDataReadOnlyTransaction {
     private final DOMDataTreeReadTransaction delegateTx;
     private final Object txIdentifier;
 
     ShardedDOMDataBrokerDelegatingReadTransaction(final Object txIdentifier,
                                                          final DOMDataTreeReadTransaction delegateTx) {
-        this.delegateTx = checkNotNull(delegateTx);
-        this.txIdentifier = checkNotNull(txIdentifier);
+        this.delegateTx = requireNonNull(delegateTx);
+        this.txIdentifier = requireNonNull(txIdentifier);
     }
 
     @Override
     public CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> read(final LogicalDatastoreType store,
                                                                                    final YangInstanceIdentifier path) {
-        return Futures.makeChecked(delegateTx.read(translateDataStoreType(store), path).transformAsync(
-            optional -> Futures.immediateFuture(Optional.fromJavaUtil(optional)), MoreExecutors.directExecutor()),
-            ReadFailedException.MAPPER);
+        return Futures.makeChecked(delegateTx.read(store.toMdsal(), path).transform(
+            Optional::fromJavaUtil, MoreExecutors.directExecutor()), ReadFailedException.MAPPER);
     }
 
     @Override
     public CheckedFuture<Boolean, ReadFailedException> exists(final LogicalDatastoreType store,
                                                               final YangInstanceIdentifier path) {
-        return Futures.makeChecked(
-                delegateTx.exists(LegacyShardedDOMDataBrokerAdapterUtils.translateDataStoreType(store), path),
-                ReadFailedException.MAPPER);
+        return Futures.makeChecked(delegateTx.exists(store.toMdsal(), path), ReadFailedException.MAPPER);
     }
 
     @Override