X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=bmp%2Fbmp-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fprotocol%2Fbmp%2Fimpl%2Fapp%2FTableContext.java;h=28a31a7f310425ab585fbb77e6ae3fa37261b99e;hb=ae61a7089e3a1c6a7f69dfe1c4981282a439e22d;hp=c7a457ce6acd8fd6c072790ba58243397c13302a;hpb=496eba69cdba49e64e7400978bd8e55544ae3232;p=bgpcep.git diff --git a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java index c7a457ce6a..28a31a7f31 100644 --- a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java +++ b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java @@ -5,7 +5,6 @@ * 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.protocol.bmp.impl.app; import static java.util.Objects.requireNonNull; @@ -14,12 +13,12 @@ import static org.opendaylight.protocol.bmp.impl.app.TablesUtil.BMP_ROUTES_QNAME import com.google.common.base.Preconditions; import java.util.Map; -import javax.annotation.concurrent.NotThreadSafe; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTree; import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeNode; +import org.opendaylight.mdsal.binding.dom.codec.api.BindingDataObjectCodecTreeNode; import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeCachingCodec; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; import org.opendaylight.protocol.bgp.rib.spi.RIBSupport; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Update; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes; @@ -28,21 +27,19 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mult import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes2; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpReachNlri; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpUnreachNlri; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.Route; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.tables.Routes; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; -import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableChoiceNodeBuilder; -@NotThreadSafe +// This class is NOT thread-safe final class TableContext { private static final ContainerNode EMPTY_TABLE_ATTRIBUTES = ImmutableNodes.containerNode(BMP_ATTRIBUTES_QNAME); @@ -54,7 +51,6 @@ final class TableContext { .child(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path .attributes.Attributes.class).augmentation(Attributes2.class).child(MpUnreachNlri.class); private static final NodeIdentifier BGP_ROUTES_NODE_ID = new NodeIdentifier(BMP_ROUTES_QNAME); - private static final NodeIdentifier ROUTES_NODE_ID = new NodeIdentifier(Routes.QNAME); private final YangInstanceIdentifier tableId; private final RIBSupport tableSupport; @@ -67,7 +63,8 @@ final class TableContext { this.tableSupport = requireNonNull(tableSupport); this.tableId = requireNonNull(tableId); final BindingCodecTreeNode tableCodecContext = tree.getSubtreeCodec(tableId); - final BindingCodecTreeNode routeListCodec = tableCodecContext + Preconditions.checkState(tableCodecContext instanceof BindingDataObjectCodecTreeNode); + final BindingDataObjectCodecTreeNode routeListCodec = ((BindingDataObjectCodecTreeNode)tableCodecContext) .streamChild(Routes.class) .streamChild(this.tableSupport.routesCaseClass()) .streamChild(this.tableSupport.routesContainerClass()) @@ -85,7 +82,7 @@ final class TableContext { return this.tableId; } - void createTable(final DOMDataWriteTransaction tx) { + void createTable(final DOMDataTreeWriteTransaction tx) { final DataContainerNodeBuilder tb = ImmutableNodes.mapEntryBuilder(); tb.withNodeIdentifier((NodeIdentifierWithPredicates) this.tableId.getLastPathArgument()); @@ -97,21 +94,19 @@ final class TableContext { for (final Map.Entry e : tableKey.getKeyValues().entrySet()) { tb.withChild(ImmutableNodes.leafNode(e.getKey(), e.getValue())); } - final ChoiceNode routes - = (ChoiceNode) this.tableSupport.emptyTable().getChild(ROUTES_NODE_ID).get(); tx.put(LogicalDatastoreType.OPERATIONAL, this.tableId, - tb.withChild(ImmutableChoiceNodeBuilder.create(routes).withNodeIdentifier( + tb.withChild(ImmutableChoiceNodeBuilder.create().withNodeIdentifier( new NodeIdentifier(TablesUtil.BMP_ROUTES_QNAME)).build()).build()); } - void writeRoutes(final DOMDataWriteTransaction tx, final MpReachNlri nlri, final Attributes attributes) { + void writeRoutes(final DOMDataTreeWriteTransaction tx, final MpReachNlri nlri, final Attributes attributes) { final ContainerNode domNlri = serializeReachNlri(nlri); final ContainerNode routeAttributes = serializeAttributes(attributes); this.tableSupport.putRoutes(tx, this.tableId, domNlri, routeAttributes, BGP_ROUTES_NODE_ID); } - void removeRoutes(final DOMDataWriteTransaction tx, final MpUnreachNlri nlri) { + void removeRoutes(final DOMDataTreeWriteTransaction tx, final MpUnreachNlri nlri) { this.tableSupport.deleteRoutes(tx, this.tableId, serializeUnreachNlri(nlri), BGP_ROUTES_NODE_ID); }