Code Review
/
mdsal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Adopt odlparent-10.0.0/yangtools-8.0.0-SNAPSHOT
[mdsal.git]
/
dom
/
mdsal-dom-broker
/
src
/
main
/
java
/
org
/
opendaylight
/
mdsal
/
dom
/
broker
/
DOMDataBrokerTransactionChainImpl.java
diff --git
a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMDataBrokerTransactionChainImpl.java
b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMDataBrokerTransactionChainImpl.java
index 0551244a89dd1ba68ab4ebfc74f2ac95c4bb3b40..aa53c2afb9175ee1f365cfaa6d2e682529942281 100644
(file)
--- a/
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMDataBrokerTransactionChainImpl.java
+++ b/
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMDataBrokerTransactionChainImpl.java
@@
-5,13
+5,13
@@
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
* 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.mdsal.dom.broker;
package org.opendaylight.mdsal.dom.broker;
+import static java.util.Objects.requireNonNull;
+
import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.FluentFuture;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.base.Preconditions;
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 java.util.Collection;
import java.util.Map;
import com.google.common.util.concurrent.MoreExecutors;
import java.util.Collection;
import java.util.Map;
@@
-20,9
+20,9
@@
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
import org.opendaylight.mdsal.common.api.CommitInfo;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
import org.opendaylight.mdsal.common.api.CommitInfo;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.mdsal.common.api.TransactionChainListener;
import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
+import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener;
import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort;
import org.opendaylight.mdsal.dom.spi.store.DOMStoreTransactionChain;
import org.slf4j.Logger;
import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort;
import org.opendaylight.mdsal.dom.spi.store.DOMStoreTransactionChain;
import org.slf4j.Logger;
@@
-50,7
+50,7
@@
final class DOMDataBrokerTransactionChainImpl extends AbstractDOMForwardedTransa
private static final Logger LOG = LoggerFactory.getLogger(DOMDataBrokerTransactionChainImpl.class);
private final AtomicLong txNum = new AtomicLong();
private final AbstractDOMDataBroker broker;
private static final Logger LOG = LoggerFactory.getLogger(DOMDataBrokerTransactionChainImpl.class);
private final AtomicLong txNum = new AtomicLong();
private final AbstractDOMDataBroker broker;
- private final TransactionChainListener listener;
+ private final
DOM
TransactionChainListener listener;
private final long chainId;
private volatile State state = State.RUNNING;
private final long chainId;
private volatile State state = State.RUNNING;
@@
-74,11
+74,11
@@
final class DOMDataBrokerTransactionChainImpl extends AbstractDOMForwardedTransa
*/
DOMDataBrokerTransactionChainImpl(final long chainId,
final Map<LogicalDatastoreType, DOMStoreTransactionChain> chains,
*/
DOMDataBrokerTransactionChainImpl(final long chainId,
final Map<LogicalDatastoreType, DOMStoreTransactionChain> chains,
- final AbstractDOMDataBroker broker, final TransactionChainListener listener) {
+ final AbstractDOMDataBroker broker, final
DOM
TransactionChainListener listener) {
super(chains);
this.chainId = chainId;
super(chains);
this.chainId = chainId;
- this.broker =
Preconditions.checkNot
Null(broker);
- this.listener =
Preconditions.checkNot
Null(listener);
+ this.broker =
requireNon
Null(broker);
+ this.listener =
requireNon
Null(listener);
}
private void checkNotFailed() {
}
private void checkNotFailed() {
@@
-91,15
+91,15
@@
final class DOMDataBrokerTransactionChainImpl extends AbstractDOMForwardedTransa
}
@Override
}
@Override
- protected FluentFuture<? extends CommitInfo> commit(DOMDataTreeWriteTransaction transaction,
- Collection<DOMStoreThreePhaseCommitCohort> cohorts) {
+ protected FluentFuture<? extends CommitInfo> commit(
final
DOMDataTreeWriteTransaction transaction,
+
final
Collection<DOMStoreThreePhaseCommitCohort> cohorts) {
checkNotFailed();
checkNotClosed();
final FluentFuture<? extends CommitInfo> ret = broker.commit(transaction, cohorts);
COUNTER_UPDATER.incrementAndGet(this);
checkNotFailed();
checkNotClosed();
final FluentFuture<? extends CommitInfo> ret = broker.commit(transaction, cohorts);
COUNTER_UPDATER.incrementAndGet(this);
-
Futures.addCallback(ret,
new FutureCallback<CommitInfo>() {
+
ret.addCallback(
new FutureCallback<CommitInfo>() {
@Override
public void onSuccess(final CommitInfo result) {
transactionCompleted();
@Override
public void onSuccess(final CommitInfo result) {
transactionCompleted();