X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fbroker%2Fimpl%2Flegacy%2Fsharded%2Fadapter%2FShardedDOMDataBrokerDelegatingReadWriteTransaction.java;h=e2bf680014038563acb4eebe7d6e8391d6ab3f2f;hp=f7705c1ba3bbdda227c2dc783e5cf909198bd994;hb=3859df9beca8f13f1ff2b2744ed3470a1715bec3;hpb=4ef15f7a7e3fb5bcaa6a3202d268a5c945e0aa71 diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransaction.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransaction.java index f7705c1ba3..e2bf680014 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransaction.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransaction.java @@ -5,42 +5,37 @@ * 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.Nullable; -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; +import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot; -import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @@ -57,13 +52,11 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; * 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> SUCCESS_FUTURE = Futures - .immediateFuture(RpcResultBuilder.success(TransactionStatus.COMMITED).build()); - private final DOMDataReadOnlyTransaction readTxDelegate; private final DOMDataWriteTransaction writeTxDelegate; private final Object txIdentifier; @@ -75,21 +68,21 @@ class ShardedDOMDataBrokerDelegatingReadWriteTransaction implements DOMDataReadW 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 = InMemoryDataTreeFactory.getInstance(); + final InMemoryDataTreeFactory treeFactory = new InMemoryDataTreeFactory(); final ImmutableMap.Builder snapshotMapBuilder = ImmutableMap.builder(); final ImmutableMap.Builder> modificationHistoryMapBuilder = ImmutableMap.builder(); for (final LogicalDatastoreType store : LogicalDatastoreType.values()) { - final DataTree tree = treeFactory.create(treeTypeForStore(store)); + final DataTree tree = treeFactory.create(treeConfigForStore(store)); tree.setSchemaContext(ctx); snapshotMapBuilder.put(store, tree.takeSnapshot()); - modificationHistoryMapBuilder.put(store, Lists.newLinkedList()); + modificationHistoryMapBuilder.put(store, new LinkedList<>()); } modificationHistoryMap = modificationHistoryMapBuilder.build(); @@ -113,13 +106,8 @@ class ShardedDOMDataBrokerDelegatingReadWriteTransaction implements DOMDataReadW } @Override - public CheckedFuture submit() { - return writeTxDelegate.submit(); - } - - @Override - public ListenableFuture> commit() { - return Futures.transformAsync(submit(), input -> SUCCESS_FUTURE, MoreExecutors.directExecutor()); + public FluentFuture commit() { + return writeTxDelegate.commit(); } @Override @@ -131,13 +119,13 @@ class ShardedDOMDataBrokerDelegatingReadWriteTransaction implements DOMDataReadW final Queue currentHistory = Lists.newLinkedList(modificationHistoryMap.get(store)); Futures.addCallback(initialReadMap.get(store), new FutureCallback>>() { @Override - public void onSuccess(@Nullable final Optional> result) { + public void onSuccess(final Optional> result) { final DataTreeModification mod = snapshotMap.get(store).newModification(); if (result.isPresent()) { mod.write(path, result.get()); } applyModificationHistoryToSnapshot(mod, currentHistory); - readResult.set(mod.readNode(path)); + readResult.set(Optional.fromJavaUtil(mod.readNode(path))); } @Override @@ -154,10 +142,8 @@ class ShardedDOMDataBrokerDelegatingReadWriteTransaction implements DOMDataReadW 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>, Boolean>) - Optional::isPresent), - ReadFailedException.MAPPER); + return Futures.makeChecked(Futures.transform(read(store, path), Optional::isPresent, + MoreExecutors.directExecutor()), ReadFailedException.MAPPER); } @Override @@ -190,17 +176,17 @@ class ShardedDOMDataBrokerDelegatingReadWriteTransaction implements DOMDataReadW private void initialRead(final YangInstanceIdentifier path) { root = path; - final InMemoryDataTreeFactory treeFactory = InMemoryDataTreeFactory.getInstance(); for (final LogicalDatastoreType store : LogicalDatastoreType.values()) { initialReadMap.put(store, readTxDelegate.read(store, path)); } } - private TreeType treeTypeForStore(final LogicalDatastoreType store) { - return store == LogicalDatastoreType.CONFIGURATION ? TreeType.CONFIGURATION : TreeType.OPERATIONAL; + private static DataTreeConfiguration treeConfigForStore(final LogicalDatastoreType store) { + return store == LogicalDatastoreType.CONFIGURATION ? DataTreeConfiguration.DEFAULT_CONFIGURATION + : DataTreeConfiguration.DEFAULT_OPERATIONAL; } - private void applyModificationHistoryToSnapshot(final DataTreeModification dataTreeModification, + private static void applyModificationHistoryToSnapshot(final DataTreeModification dataTreeModification, final Queue modificationHistory) { while (!modificationHistory.isEmpty()) { final Modification modification = modificationHistory.poll(); @@ -232,8 +218,8 @@ class ShardedDOMDataBrokerDelegatingReadWriteTransaction implements DOMDataReadW 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() {