* 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.controller.md.sal.dom.broker.impl.legacy.sharded.adapter;
-import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
-import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.google.common.util.concurrent.CheckedFuture;
+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.EnumMap;
+import java.util.LinkedList;
import java.util.Map;
import java.util.Queue;
-import javax.annotation.Nonnull;
-import javax.annotation.concurrent.NotThreadSafe;
-import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
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.yangtools.yang.common.RpcResult;
-import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.mdsal.common.api.CommitInfo;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
* subtree in conceptual data tree. We define this subtree by first write
* operation performed on transaction. All next read and write operations
* should be performed just in this initial subtree.
+ *
*/
// FIXME explicitly enforce just one subtree requirement
-@NotThreadSafe
+@Deprecated
class ShardedDOMDataBrokerDelegatingReadWriteTransaction implements DOMDataReadWriteTransaction {
- private static final ListenableFuture<RpcResult<TransactionStatus>> SUCCESS_FUTURE = Futures
- .immediateFuture(RpcResultBuilder.success(TransactionStatus.COMMITED).build());
-
private final DOMDataReadOnlyTransaction readTxDelegate;
private final DOMDataWriteTransaction writeTxDelegate;
private final Object txIdentifier;
ShardedDOMDataBrokerDelegatingReadWriteTransaction(final Object readWriteTxId, final SchemaContext ctx,
final DOMDataReadOnlyTransaction readTxDelegate,
final DOMDataWriteTransaction writeTxDelegate) {
- this.readTxDelegate = checkNotNull(readTxDelegate);
- this.writeTxDelegate = checkNotNull(writeTxDelegate);
- this.txIdentifier = checkNotNull(readWriteTxId);
- this.initialReadMap = Maps.newEnumMap(LogicalDatastoreType.class);
+ this.readTxDelegate = requireNonNull(readTxDelegate);
+ this.writeTxDelegate = requireNonNull(writeTxDelegate);
+ this.txIdentifier = requireNonNull(readWriteTxId);
+ this.initialReadMap = new EnumMap<>(LogicalDatastoreType.class);
final InMemoryDataTreeFactory treeFactory = new InMemoryDataTreeFactory();
final ImmutableMap.Builder<LogicalDatastoreType, DataTreeSnapshot> snapshotMapBuilder = ImmutableMap.builder();
tree.setSchemaContext(ctx);
snapshotMapBuilder.put(store, tree.takeSnapshot());
- modificationHistoryMapBuilder.put(store, Lists.newLinkedList());
+ modificationHistoryMapBuilder.put(store, new LinkedList<>());
}
modificationHistoryMap = modificationHistoryMapBuilder.build();
}
@Override
- public CheckedFuture<Void, TransactionCommitFailedException> submit() {
- return writeTxDelegate.submit();
- }
-
- @Override
- public ListenableFuture<RpcResult<TransactionStatus>> commit() {
- return Futures.transformAsync(submit(), input -> SUCCESS_FUTURE, MoreExecutors.directExecutor());
+ public FluentFuture<? extends CommitInfo> commit() {
+ return writeTxDelegate.commit();
}
@Override
final Queue<Modification> currentHistory = Lists.newLinkedList(modificationHistoryMap.get(store));
Futures.addCallback(initialReadMap.get(store), new FutureCallback<Optional<NormalizedNode<?, ?>>>() {
@Override
- public void onSuccess(@Nonnull final Optional<NormalizedNode<?, ?>> result) {
+ public void onSuccess(final Optional<NormalizedNode<?, ?>> result) {
final DataTreeModification mod = snapshotMap.get(store).newModification();
if (result.isPresent()) {
mod.write(path, result.get());
final YangInstanceIdentifier path) {
checkState(root != null,
"A modify operation (put, merge or delete) must be performed prior to an exists operation");
- return Futures.makeChecked(Futures.transform(read(store, path),
- (Function<Optional<NormalizedNode<?, ?>>, Boolean>)
- Optional::isPresent),
- ReadFailedException.MAPPER);
+ return Futures.makeChecked(Futures.transform(read(store, path), Optional::isPresent,
+ MoreExecutors.directExecutor()), ReadFailedException.MAPPER);
}
@Override
Modification(final Operation operation, final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
this.data = data;
- this.path = checkNotNull(path);
- this.operation = checkNotNull(operation);
+ this.path = requireNonNull(path);
+ this.operation = requireNonNull(operation);
}
Operation getOperation() {
Code Review / controller.git / blobdiff