X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Fconnect%2Fnetconf%2Fsal%2Ftx%2FAbstractWriteTx.java;h=2ed86685a5baeb560547022a8f349bcb91c063c6;hb=4e99f8da93b99168e8f43f68e238ff4e1fdda8cd;hp=835b0506ba5210e27bea72bef7fa551eec181eff;hpb=a68e1b7f48a47e710a82d3e0309d312090795b88;p=netconf.git diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java index 835b0506ba..2ed86685a5 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java @@ -5,28 +5,27 @@ * 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.netconf.sal.connect.netconf.sal.tx; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkState; + 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.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; +import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Optional; import java.util.concurrent.CopyOnWriteArrayList; -import javax.annotation.Nonnull; -import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; -import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult; import org.opendaylight.mdsal.common.api.CommitInfo; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.common.api.TransactionCommitFailedException; +import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; +import org.opendaylight.mdsal.dom.api.DOMRpcResult; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.NetconfDocumentedException; import org.opendaylight.netconf.sal.connect.netconf.util.NetconfBaseOps; @@ -42,14 +41,14 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public abstract class AbstractWriteTx implements DOMDataWriteTransaction { +public abstract class AbstractWriteTx implements DOMDataTreeWriteTransaction { private static final Logger LOG = LoggerFactory.getLogger(AbstractWriteTx.class); protected final RemoteDeviceId id; protected final NetconfBaseOps netOps; protected final boolean rollbackSupport; - protected final List> resultsFutures; + protected final List> resultsFutures = new ArrayList<>(); private final List listeners = new CopyOnWriteArrayList<>(); // Allow commit to be called only once protected volatile boolean finished = false; @@ -58,7 +57,6 @@ public abstract class AbstractWriteTx implements DOMDataWriteTransaction { this.netOps = netOps; this.id = id; this.rollbackSupport = rollbackSupport; - this.resultsFutures = Lists.newArrayList(); init(); } @@ -67,7 +65,7 @@ public abstract class AbstractWriteTx implements DOMDataWriteTransaction { } protected void checkNotFinished() { - Preconditions.checkState(!isFinished(), "%s: Transaction %s already finished", id, getIdentifier()); + checkState(!isFinished(), "%s: Transaction %s already finished", id, getIdentifier()); } protected boolean isFinished() { @@ -106,10 +104,9 @@ public abstract class AbstractWriteTx implements DOMDataWriteTransaction { return; } - final DataContainerChild editStructure = - netOps.createEditConfigStrcture(Optional.fromNullable(data), + final DataContainerChild editStructure = netOps.createEditConfigStrcture(Optional.ofNullable(data), Optional.of(ModifyAction.REPLACE), path); - editConfig(path, Optional.fromNullable(data), editStructure, Optional.absent(), "put"); + editConfig(path, Optional.ofNullable(data), editStructure, Optional.empty(), "put"); } @Override @@ -124,10 +121,9 @@ public abstract class AbstractWriteTx implements DOMDataWriteTransaction { return; } - final DataContainerChild editStructure = - netOps.createEditConfigStrcture(Optional.fromNullable(data), - Optional.absent(), path); - editConfig(path, Optional.fromNullable(data), editStructure, Optional.absent(), "merge"); + final DataContainerChild editStructure = netOps.createEditConfigStrcture(Optional.ofNullable(data), + Optional.empty(), path); + editConfig(path, Optional.ofNullable(data), editStructure, Optional.empty(), "merge"); } /** @@ -143,19 +139,17 @@ public abstract class AbstractWriteTx implements DOMDataWriteTransaction { @Override public synchronized void delete(final LogicalDatastoreType store, final YangInstanceIdentifier path) { checkEditable(store); - final DataContainerChild editStructure = - netOps.createEditConfigStrcture(Optional.absent(), + final DataContainerChild editStructure = netOps.createEditConfigStrcture(Optional.empty(), Optional.of(ModifyAction.DELETE), path); - editConfig(path, Optional.absent(), - editStructure, Optional.of(ModifyAction.NONE), "delete"); + editConfig(path, Optional.empty(), editStructure, Optional.of(ModifyAction.NONE), "delete"); } @Override - public @NonNull FluentFuture commit() { + public FluentFuture commit() { final SettableFuture resultFuture = SettableFuture.create(); Futures.addCallback(commitConfiguration(), new FutureCallback>() { @Override - public void onSuccess(RpcResult result) { + public void onSuccess(final RpcResult result) { if (!result.isSuccessful()) { final Collection errors = result.getErrors(); resultFuture.setException(new TransactionCommitFailedException( @@ -168,7 +162,7 @@ public abstract class AbstractWriteTx implements DOMDataWriteTransaction { } @Override - public void onFailure(Throwable failure) { + public void onFailure(final Throwable failure) { resultFuture.setException(new TransactionCommitFailedException( String.format("Commit of transaction %s failed", getIdentifier()), failure)); } @@ -184,7 +178,7 @@ public abstract class AbstractWriteTx implements DOMDataWriteTransaction { final ListenableFuture> result = performCommit(); Futures.addCallback(result, new FutureCallback>() { @Override - public void onSuccess(@Nonnull final RpcResult rpcResult) { + public void onSuccess(final RpcResult rpcResult) { if (rpcResult.isSuccessful()) { listeners.forEach(txListener -> txListener.onTransactionSuccessful(AbstractWriteTx.this)); } else { @@ -207,7 +201,7 @@ public abstract class AbstractWriteTx implements DOMDataWriteTransaction { private void checkEditable(final LogicalDatastoreType store) { checkNotFinished(); - Preconditions.checkArgument(store == LogicalDatastoreType.CONFIGURATION, + checkArgument(store == LogicalDatastoreType.CONFIGURATION, "Can edit only configuration data, not %s", store); } @@ -220,7 +214,7 @@ public abstract class AbstractWriteTx implements DOMDataWriteTransaction { Futures.addCallback(Futures.allAsList(resultsFutures), new FutureCallback>() { @Override - public void onSuccess(@Nonnull final List domRpcResults) { + public void onSuccess(final List domRpcResults) { if (!transformed.isDone()) { extractResult(domRpcResults, transformed); }