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%2FLegacyDOMDataBrokerAdapter.java;h=d0f42b7f9c0d3ae4df317cd2f18e0403a3a43231;hp=dfd0f14affc860f7e7387cbc7d6c0387041474a5;hb=466078ab1dc8a8cc2981b161051f6edecd6af85a;hpb=af84734ff224e68368522a4cfbd2c2bbbbc48aba 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 dfd0f14aff..d0f42b7f9c 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 @@ -20,12 +20,15 @@ import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Supplier; import javax.annotation.Nonnull; +import org.opendaylight.controller.md.sal.common.api.MappingCheckedFuture; import org.opendaylight.controller.md.sal.common.api.data.AsyncTransaction; import org.opendaylight.controller.md.sal.common.api.data.DataStoreUnavailableException; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.OptimisticLockFailedException; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; +import org.opendaylight.controller.md.sal.common.api.data.TransactionChainClosedException; import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.controller.md.sal.dom.api.ClusteredDOMDataTreeChangeListener; @@ -40,12 +43,12 @@ import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain; import org.opendaylight.mdsal.common.api.CommitInfo; -import org.opendaylight.mdsal.common.api.MappingCheckedFuture; -import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohort; -import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistration; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction; +import org.opendaylight.mdsal.dom.api.DOMDataTreeTransaction; import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; +import org.opendaylight.mdsal.dom.api.DOMTransactionChainClosedException; +import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.util.concurrent.ExceptionMapper; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -60,7 +63,7 @@ public class LegacyDOMDataBrokerAdapter extends ForwardingObject implements DOMD private static final ExceptionMapper COMMIT_EX_MAPPER = new ExceptionMapper("commit", TransactionCommitFailedException.class) { @Override - protected TransactionCommitFailedException newWithCause(String message, Throwable cause) { + protected TransactionCommitFailedException newWithCause(final String message, final Throwable cause) { if (cause instanceof org.opendaylight.mdsal.common.api.OptimisticLockFailedException) { return new OptimisticLockFailedException(cause.getMessage(), cause.getCause()); } else if (cause instanceof org.opendaylight.mdsal.common.api.TransactionCommitFailedException) { @@ -79,7 +82,7 @@ public class LegacyDOMDataBrokerAdapter extends ForwardingObject implements DOMD private final org.opendaylight.mdsal.dom.api.DOMDataBroker delegate; private final ClassToInstanceMap extensions; - public LegacyDOMDataBrokerAdapter(org.opendaylight.mdsal.dom.api.DOMDataBroker delegate) { + public LegacyDOMDataBrokerAdapter(final org.opendaylight.mdsal.dom.api.DOMDataBroker delegate) { this.delegate = delegate; ClassToInstanceMap delegateExtensions = @@ -93,19 +96,19 @@ public class LegacyDOMDataBrokerAdapter extends ForwardingObject implements DOMD extBuilder.put(DOMDataTreeChangeService.class, new DOMDataTreeChangeService() { @Override public ListenerRegistration registerDataTreeChangeListener( - DOMDataTreeIdentifier treeId, final L listener) { + final DOMDataTreeIdentifier treeId, final L listener) { final org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener delegateListener; if (listener instanceof ClusteredDOMDataTreeChangeListener) { delegateListener = (org.opendaylight.mdsal.dom.api.ClusteredDOMDataTreeChangeListener) - changes -> listener.onDataTreeChanged(changes); + listener::onDataTreeChanged; } else { - delegateListener = changes -> listener.onDataTreeChanged(changes); + delegateListener = listener::onDataTreeChanged; } 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 @@ -126,13 +129,7 @@ public class LegacyDOMDataBrokerAdapter extends ForwardingObject implements DOMD (org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistry) delegateExtensions.get( org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistry.class); if (delegateCohortRegistry != null) { - extBuilder.put(DOMDataTreeCommitCohortRegistry.class, new DOMDataTreeCommitCohortRegistry() { - @Override - public DOMDataTreeCommitCohortRegistration registerCommitCohort( - org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier path, T cohort) { - return delegateCohortRegistry.registerCommitCohort(path, cohort); - } - }); + extBuilder.put(DOMDataTreeCommitCohortRegistry.class, delegateCohortRegistry::registerCommitCohort); } extensions = extBuilder.build(); @@ -166,19 +163,19 @@ public class LegacyDOMDataBrokerAdapter extends ForwardingObject implements DOMD @Override public DOMTransactionChain createTransactionChain(final TransactionChainListener listener) { AtomicReference legacyChain = new AtomicReference<>(); - org.opendaylight.mdsal.common.api.TransactionChainListener delegateListener = - new org.opendaylight.mdsal.common.api.TransactionChainListener() { - @SuppressWarnings("rawtypes") + DOMTransactionChainListener delegateListener = + new DOMTransactionChainListener() { @Override - public void onTransactionChainFailed(final org.opendaylight.mdsal.common.api.TransactionChain chain, - final org.opendaylight.mdsal.common.api.AsyncTransaction transaction, final Throwable cause) { + @SuppressWarnings("rawtypes") + public void onTransactionChainFailed(final org.opendaylight.mdsal.dom.api.DOMTransactionChain chain, + final DOMDataTreeTransaction transaction, final Throwable cause) { listener.onTransactionChainFailed(legacyChain.get(), - (AsyncTransaction) () -> transaction.getIdentifier(), - cause instanceof Exception ? COMMIT_EX_MAPPER.apply((Exception)cause) : cause); + (AsyncTransaction) () -> transaction.getIdentifier(), + cause instanceof Exception ? COMMIT_EX_MAPPER.apply((Exception)cause) : cause); } @Override - public void onTransactionChainSuccessful(org.opendaylight.mdsal.common.api.TransactionChain chain) { + public void onTransactionChainSuccessful(final org.opendaylight.mdsal.dom.api.DOMTransactionChain chain) { listener.onTransactionChainSuccessful(legacyChain.get()); } }; @@ -188,17 +185,17 @@ public class LegacyDOMDataBrokerAdapter extends ForwardingObject implements DOMD legacyChain.set(new DOMTransactionChain() { @Override public DOMDataReadOnlyTransaction newReadOnlyTransaction() { - return new DOMDataReadOnlyTransactionAdapter(delegateChain.newReadOnlyTransaction()); + return new DOMDataReadOnlyTransactionAdapter(wrapException(delegateChain::newReadOnlyTransaction)); } @Override public DOMDataReadWriteTransaction newReadWriteTransaction() { - return new DOMDataTransactionAdapter(delegateChain.newReadWriteTransaction()); + return new DOMDataTransactionAdapter(wrapException(delegateChain::newReadWriteTransaction)); } @Override public DOMDataWriteTransaction newWriteOnlyTransaction() { - return new DOMDataTransactionAdapter(delegateChain.newWriteOnlyTransaction()); + return new DOMDataTransactionAdapter(wrapException(delegateChain::newWriteOnlyTransaction)); } @Override @@ -210,8 +207,12 @@ 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()); + static T wrapException(final Supplier supplier) { + try { + return supplier.get(); + } catch (DOMTransactionChainClosedException e) { + throw new TransactionChainClosedException("Transaction chain already closed", e); + } } private static class DOMDataTransactionAdapter implements DOMDataReadWriteTransaction { @@ -219,19 +220,19 @@ public class LegacyDOMDataBrokerAdapter extends ForwardingObject implements DOMD private final DOMDataTreeWriteTransaction writeDelegate; private final Object identifier; - DOMDataTransactionAdapter(@Nonnull DOMDataTreeReadTransaction readDelegate) { + DOMDataTransactionAdapter(@Nonnull final DOMDataTreeReadTransaction readDelegate) { this.readDelegate = Preconditions.checkNotNull(readDelegate); this.identifier = readDelegate.getIdentifier(); this.writeDelegate = null; } - DOMDataTransactionAdapter(@Nonnull DOMDataTreeWriteTransaction writeDelegate) { + DOMDataTransactionAdapter(@Nonnull final DOMDataTreeWriteTransaction writeDelegate) { this.writeDelegate = Preconditions.checkNotNull(writeDelegate); this.identifier = writeDelegate.getIdentifier(); this.readDelegate = null; } - DOMDataTransactionAdapter(@Nonnull DOMDataTreeReadWriteTransaction rwDelegate) { + DOMDataTransactionAdapter(@Nonnull final DOMDataTreeReadWriteTransaction rwDelegate) { this.readDelegate = Preconditions.checkNotNull(rwDelegate); this.writeDelegate = rwDelegate; this.identifier = readDelegate.getIdentifier(); @@ -253,30 +254,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), - ReadFailedExceptionAdapter.INSTANCE); + 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 @@ -289,12 +290,12 @@ public class LegacyDOMDataBrokerAdapter extends ForwardingObject implements DOMD final SettableFuture resultFuture = SettableFuture.create(); writeDelegate().commit().addCallback(new FutureCallback() { @Override - public void onSuccess(CommitInfo result) { + public void onSuccess(final CommitInfo result) { resultFuture.set(result); } @Override - public void onFailure(Throwable ex) { + public void onFailure(final Throwable ex) { if (ex instanceof Exception) { resultFuture.setException(COMMIT_EX_MAPPER.apply((Exception)ex)); } else { @@ -310,19 +311,19 @@ public class LegacyDOMDataBrokerAdapter extends ForwardingObject implements DOMD private static class DOMDataReadOnlyTransactionAdapter implements DOMDataReadOnlyTransaction { private final DOMDataTransactionAdapter adapter; - DOMDataReadOnlyTransactionAdapter(DOMDataTreeReadTransaction delegateTx) { + DOMDataReadOnlyTransactionAdapter(final DOMDataTreeReadTransaction delegateTx) { adapter = new DOMDataTransactionAdapter(delegateTx); } @Override - public CheckedFuture>, ReadFailedException> read(LogicalDatastoreType store, - YangInstanceIdentifier path) { + public CheckedFuture>, ReadFailedException> read(final LogicalDatastoreType store, + final YangInstanceIdentifier path) { return adapter.read(store, path); } @Override - public CheckedFuture exists(LogicalDatastoreType store, - YangInstanceIdentifier path) { + public CheckedFuture exists(final LogicalDatastoreType store, + final YangInstanceIdentifier path) { return adapter.exists(store, path); }