From 6ecb0be267005d9b5bc74edeee0f253e4d1366ce Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 1 Oct 2018 10:39:27 +0200 Subject: [PATCH] Use LogicalDatastoreType.toMdsal() Use direct converter method rather than matching through name, which results in faster mapping. Change-Id: Ic247ebc5c5704d3eb1953eea4d7f36b1d3d49cb8 Signed-off-by: Robert Varga (cherry picked from commit bc83a3eb1d1bd51865f97bfb4262716fe7841293) --- .../compat/LegacyDOMDataBrokerAdapter.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/opendaylight/md-sal/sal-dom-compat/src/main/java/org/opendaylight/controller/sal/core/compat/LegacyDOMDataBrokerAdapter.java b/opendaylight/md-sal/sal-dom-compat/src/main/java/org/opendaylight/controller/sal/core/compat/LegacyDOMDataBrokerAdapter.java index 8f4d8fe3b5..9d68bd3bd9 100644 --- a/opendaylight/md-sal/sal-dom-compat/src/main/java/org/opendaylight/controller/sal/core/compat/LegacyDOMDataBrokerAdapter.java +++ b/opendaylight/md-sal/sal-dom-compat/src/main/java/org/opendaylight/controller/sal/core/compat/LegacyDOMDataBrokerAdapter.java @@ -102,8 +102,8 @@ public class LegacyDOMDataBrokerAdapter extends ForwardingObject implements DOMD final ListenerRegistration reg = delegateTreeChangeService.registerDataTreeChangeListener( - new org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier(convert(treeId.getDatastoreType()), - treeId.getRootIdentifier()), delegateListener); + new org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier( + treeId.getDatastoreType().toMdsal(), treeId.getRootIdentifier()), delegateListener); return new ListenerRegistration() { @Override @@ -202,10 +202,6 @@ public class LegacyDOMDataBrokerAdapter extends ForwardingObject implements DOMD return legacyChain.get(); } - private static org.opendaylight.mdsal.common.api.LogicalDatastoreType convert(LogicalDatastoreType datastoreType) { - return org.opendaylight.mdsal.common.api.LogicalDatastoreType.valueOf(datastoreType.name()); - } - private static class DOMDataTransactionAdapter implements DOMDataReadWriteTransaction { private final DOMDataTreeReadTransaction readDelegate; private final DOMDataTreeWriteTransaction writeDelegate; @@ -245,30 +241,30 @@ public class LegacyDOMDataBrokerAdapter extends ForwardingObject implements DOMD @Override public CheckedFuture>, ReadFailedException> read(LogicalDatastoreType store, YangInstanceIdentifier path) { - return MappingCheckedFuture.create(readDelegate().read(convert(store), path).transform( + return MappingCheckedFuture.create(readDelegate().read(store.toMdsal(), path).transform( Optional::fromJavaUtil, MoreExecutors.directExecutor()), ReadFailedExceptionAdapter.INSTANCE); } @Override public CheckedFuture exists(LogicalDatastoreType store, YangInstanceIdentifier path) { - return MappingCheckedFuture.create(readDelegate().exists(convert(store), path), + return MappingCheckedFuture.create(readDelegate().exists(store.toMdsal(), path), ReadFailedExceptionAdapter.INSTANCE); } @Override public void delete(LogicalDatastoreType store, YangInstanceIdentifier path) { - writeDelegate().delete(convert(store), path); + writeDelegate().delete(store.toMdsal(), path); } @Override public void put(LogicalDatastoreType store, YangInstanceIdentifier path, NormalizedNode data) { - writeDelegate().put(convert(store), path, data); + writeDelegate().put(store.toMdsal(), path, data); } @Override public void merge(LogicalDatastoreType store, YangInstanceIdentifier path, NormalizedNode data) { - writeDelegate().merge(convert(store), path, data); + writeDelegate().merge(store.toMdsal(), path, data); } @Override -- 2.36.6