From 7ee5d3dee4f360f82d5017b92b00f49de6dc19ad Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 7 Nov 2018 18:50:55 +0100 Subject: [PATCH] Remove LegacyShardedDOMDataBrokerAdapterUtils LogicalDatastoreType.toMdsal() renders this utility class useless, remove it. Change-Id: I0bf6e66f83338fff7d2ab7e54be10a56398c44dc Signed-off-by: Robert Varga --- ...egacyShardedDOMDataBrokerAdapterUtils.java | 25 ------------------- ...OMDataBrokerDelegatingReadTransaction.java | 7 ++---- ...MDataBrokerDelegatingWriteTransaction.java | 6 ++--- 3 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/LegacyShardedDOMDataBrokerAdapterUtils.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/LegacyShardedDOMDataBrokerAdapterUtils.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/LegacyShardedDOMDataBrokerAdapterUtils.java deleted file mode 100644 index e4bdc423d4..0000000000 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/LegacyShardedDOMDataBrokerAdapterUtils.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * 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 org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; - -final class LegacyShardedDOMDataBrokerAdapterUtils { - - private LegacyShardedDOMDataBrokerAdapterUtils() { - throw new AssertionError("Util class should not be instantiated"); - } - - public static org.opendaylight.mdsal.common.api.LogicalDatastoreType translateDataStoreType( - final LogicalDatastoreType store) { - return store - .equals(LogicalDatastoreType.CONFIGURATION) ? org.opendaylight.mdsal.common.api.LogicalDatastoreType - .CONFIGURATION : org.opendaylight.mdsal.common.api.LogicalDatastoreType.OPERATIONAL; - } -} 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 d3e4d82ee6..98c236ad90 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 @@ -8,7 +8,6 @@ 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 com.google.common.base.Optional; import com.google.common.util.concurrent.CheckedFuture; @@ -44,16 +43,14 @@ class ShardedDOMDataBrokerDelegatingReadTransaction implements DOMDataReadOnlyTr @Override public CheckedFuture>, ReadFailedException> read(final LogicalDatastoreType store, final YangInstanceIdentifier path) { - return Futures.makeChecked(delegateTx.read(translateDataStoreType(store), path).transform( + return Futures.makeChecked(delegateTx.read(store.toMdsal(), path).transform( Optional::fromJavaUtil, MoreExecutors.directExecutor()), ReadFailedException.MAPPER); } @Override public CheckedFuture 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 diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingWriteTransaction.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingWriteTransaction.java index 853aa711f7..b6deaea3f5 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingWriteTransaction.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingWriteTransaction.java @@ -31,13 +31,13 @@ class ShardedDOMDataBrokerDelegatingWriteTransaction implements DOMDataWriteTran @Override public void put(final LogicalDatastoreType store, final YangInstanceIdentifier path, final NormalizedNode data) { - delegateTx.put(LegacyShardedDOMDataBrokerAdapterUtils.translateDataStoreType(store), path, data); + delegateTx.put(store.toMdsal(), path, data); } @Override public void merge(final LogicalDatastoreType store, final YangInstanceIdentifier path, final NormalizedNode data) { - delegateTx.merge(LegacyShardedDOMDataBrokerAdapterUtils.translateDataStoreType(store), path, data); + delegateTx.merge(store.toMdsal(), path, data); } @Override @@ -47,7 +47,7 @@ class ShardedDOMDataBrokerDelegatingWriteTransaction implements DOMDataWriteTran @Override public void delete(final LogicalDatastoreType store, final YangInstanceIdentifier path) { - delegateTx.delete(LegacyShardedDOMDataBrokerAdapterUtils.translateDataStoreType(store), path); + delegateTx.delete(store.toMdsal(), path); } @Override -- 2.36.6