X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fbinding%2Fimpl%2FBindingDOMTransactionChainAdapter.java;h=6d7b11d414671816753885c839a3bf4ccb1c371f;hp=4dc55d2e148c6d7f5c1c7dce1295b05f0ba17379;hb=2a6aa1775604906755883f810ee9ea6d5f286135;hpb=b830d5ede22e323fe724cd747fe99280dfa2240d diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java index 4dc55d2e14..6d7b11d414 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java @@ -7,10 +7,13 @@ */ package org.opendaylight.controller.md.sal.binding.impl; -import com.google.common.base.Preconditions; -import com.google.common.util.concurrent.CheckedFuture; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + +import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; -import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.MoreExecutors; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain; import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; @@ -18,16 +21,17 @@ import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.AsyncTransaction; import org.opendaylight.controller.md.sal.common.api.data.TransactionChain; 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.DOMDataBroker; import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction; import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction; 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.yangtools.concepts.Delegator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@Deprecated(forRemoval = true) final class BindingDOMTransactionChainAdapter implements BindingTransactionChain, Delegator { private static final Logger LOG = LoggerFactory.getLogger(BindingDOMTransactionChainAdapter.class); @@ -37,12 +41,12 @@ final class BindingDOMTransactionChainAdapter implements BindingTransactionChain private final DelegateChainListener domListener; private final TransactionChainListener bindingListener; - public BindingDOMTransactionChainAdapter(final DOMDataBroker chainFactory, + BindingDOMTransactionChainAdapter(final DOMDataBroker chainFactory, final BindingToNormalizedNodeCodec codec, final TransactionChainListener listener) { - Preconditions.checkNotNull(chainFactory, "DOM Transaction chain factory must not be null"); this.domListener = new DelegateChainListener(); this.bindingListener = listener; - this.delegate = chainFactory.createTransactionChain(domListener); + this.delegate = requireNonNull(chainFactory, "DOM Transaction chain factory must not be null") + .createTransactionChain(domListener); this.codec = codec; } @@ -63,8 +67,8 @@ final class BindingDOMTransactionChainAdapter implements BindingTransactionChain return new BindingDOMReadWriteTransactionAdapter(delegateTx, codec) { @Override - public CheckedFuture submit() { - return listenForFailure(this,super.submit()); + public FluentFuture commit() { + return listenForFailure(this, super.commit()); } }; @@ -76,38 +80,42 @@ final class BindingDOMTransactionChainAdapter implements BindingTransactionChain return new BindingDOMWriteTransactionAdapter(delegateTx, codec) { @Override - public CheckedFuture submit() { - return listenForFailure(this,super.submit()); + public FluentFuture commit() { + return listenForFailure(this, super.commit()); } }; } - private CheckedFuture listenForFailure( - final WriteTransaction tx, final CheckedFuture future) { - Futures.addCallback(future, new FutureCallback() { + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") + private FluentFuture listenForFailure( + final WriteTransaction tx, final FluentFuture future) { + future.addCallback(new FutureCallback() { @Override - public void onFailure(final Throwable t) { - failTransactionChain(tx,t); + public void onFailure(final Throwable ex) { + failTransactionChain(tx,ex); } @Override - public void onSuccess(final Void result) { + public void onSuccess(final CommitInfo result) { // Intentionally NOOP } - }); + }, MoreExecutors.directExecutor()); return future; } - private void failTransactionChain(final WriteTransaction tx, final Throwable t) { + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") + private void failTransactionChain(final WriteTransaction tx, final Throwable ex) { /* * We asume correct state change for underlaying transaction * * chain, so we are not changing any of our internal state * to mark that we failed. */ - this.bindingListener.onTransactionChainFailed(this, tx, t); + this.bindingListener.onTransactionChainFailed(this, tx, ex); } @Override @@ -116,12 +124,10 @@ final class BindingDOMTransactionChainAdapter implements BindingTransactionChain } private final class DelegateChainListener implements TransactionChainListener { - @Override public void onTransactionChainFailed(final TransactionChain chain, final AsyncTransaction transaction, final Throwable cause) { - Preconditions.checkState(delegate.equals(chain), - "Illegal state - listener for %s was invoked for incorrect chain %s.", delegate, chain); + checkChain(chain); /* * Intentionally NOOP, callback for failure, since we * are also listening on each transaction future for failure, @@ -129,17 +135,20 @@ final class BindingDOMTransactionChainAdapter implements BindingTransactionChain * of this transaction chain), instead of DOM transaction * which is known only to this chain, binding transaction implementation * and underlying transaction chain. - * */ LOG.debug("Transaction chain {} failed. Failed DOM Transaction {}",this,transaction,cause); } @Override public void onTransactionChainSuccessful(final TransactionChain chain) { - Preconditions.checkState(delegate.equals(chain), - "Illegal state - listener for %s was invoked for incorrect chain %s.", delegate, chain); + checkChain(chain); bindingListener.onTransactionChainSuccessful(BindingDOMTransactionChainAdapter.this); } + + private void checkChain(final TransactionChain chain) { + checkState(delegate.equals(chain), "Illegal state - listener for %s was invoked for incorrect chain %s.", + delegate, chain); + } } }