import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.MoreExecutors;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.opendaylight.mdsal.common.api.CommitInfo;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidate;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidateNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
final BGPTableTypeRegistryConsumer tableTypeRegistry,
final ApplicationRibId applicationRibId, final Ipv4AddressNoZone ipAddress, final RIB rib) {
super(rib, applicationRibId.getValue(), APP_PEER_GROUP, PeerRole.Internal,
- new IpAddressNoZone(ipAddress), Collections.emptySet());
+ new IpAddressNoZone(ipAddress), Set.of());
this.tableTypeRegistry = requireNonNull(tableTypeRegistry);
final RIB targetRib = requireNonNull(rib);
- this.peerId = RouterIds.createPeerId(ipAddress);
+ peerId = RouterIds.createPeerId(ipAddress);
final YangInstanceIdentifier peerRib = targetRib.getYangRibId().node(PEER_NID)
.node(IdentifierUtils.domPeerId(peerId));
- this.adjRibsInId = peerRib.node(ADJRIBIN_NID).node(TABLES_NID).toOptimized();
- this.peerRibOutIId = peerRib.node(ADJRIBOUT_NID).node(TABLES_NID).toOptimized();
+ adjRibsInId = peerRib.node(ADJRIBIN_NID).node(TABLES_NID).toOptimized();
+ peerRibOutIId = peerRib.node(ADJRIBOUT_NID).node(TABLES_NID).toOptimized();
}
public synchronized void instantiateServiceInstance(final DOMDataTreeChangeService dataTreeChangeService,
final DOMDataTreeIdentifier appPeerDOMId) {
setActive(true);
- final Set<TablesKey> localTables = this.rib.getLocalTablesKeys();
- localTables.forEach(tablesKey -> this.supportedTables.add(RibSupportUtils.toYangTablesKey(tablesKey)));
- setAdvertizedGracefulRestartTableTypes(Collections.emptyList());
+ final Set<TablesKey> localTables = rib.getLocalTablesKeys();
+ localTables.forEach(tablesKey -> supportedTables.add(RibSupportUtils.toYangTablesKey(tablesKey)));
+ setAdvertizedGracefulRestartTableTypes(List.of());
createDomChain();
- this.adjRibInWriter = AdjRibInWriter.create(this.rib.getYangRibId(), PeerRole.Internal, this);
- final RIBSupportContextRegistry context = this.rib.getRibSupportContext();
+ adjRibInWriter = AdjRibInWriter.create(rib.getYangRibId(), PeerRole.Internal, this);
+ final RIBSupportContextRegistry context = rib.getRibSupportContext();
final RegisterAppPeerListener registerAppPeerListener = () -> {
synchronized (this) {
if (getDomChain() != null) {
- this.registration = dataTreeChangeService.registerDataTreeChangeListener(appPeerDOMId, this);
+ registration = dataTreeChangeService.registerDataTreeChangeListener(appPeerDOMId, this);
}
}
};
- this.peerPath = createPeerPath(this.peerId);
- this.adjRibInWriter = this.adjRibInWriter.transform(this.peerId, this.peerPath, context, localTables,
- Collections.emptyMap(), registerAppPeerListener);
- this.effectiveRibInWriter = new EffectiveRibInWriter(this, this.rib,
- this.rib.createPeerDOMChain(this), this.peerPath, localTables, this.tableTypeRegistry,
- new ArrayList<>(), this.rtCache);
- this.effectiveRibInWriter.init();
- this.bgpSessionState.registerMessagesCounter(this);
- this.trackerRegistration = this.rib.getPeerTracker().registerPeer(this);
+ peerPath = createPeerPath(peerId);
+ adjRibInWriter = adjRibInWriter.transform(peerId, peerPath, context, localTables,
+ Map.of(), registerAppPeerListener);
+ effectiveRibInWriter = new EffectiveRibInWriter(this, rib,
+ rib.createPeerDOMChain(this), peerPath, localTables, tableTypeRegistry,
+ new ArrayList<>(), rtCache);
+ effectiveRibInWriter.init();
+ bgpSessionState.registerMessagesCounter(this);
+ trackerRegistration = rib.getPeerTracker().registerPeer(this);
}
@Override
* be determined in LocRib.
*/
@Override
- public synchronized void onDataTreeChanged(final Collection<DataTreeCandidate> changes) {
+ public synchronized void onDataTreeChanged(final List<DataTreeCandidate> changes) {
final DOMTransactionChain chain = getDomChain();
if (chain == null) {
LOG.trace("Skipping data changed called to Application Peer. Change : {}", changes);
verify(lastArg instanceof NodeIdentifierWithPredicates,
"Unexpected type %s in path %s", lastArg.getClass(), path);
final NodeIdentifierWithPredicates tableKey = (NodeIdentifierWithPredicates) lastArg;
- if (!this.supportedTables.contains(tableKey)) {
+ if (!supportedTables.contains(tableKey)) {
LOG.trace("Skipping received data change for non supported family {}.", tableKey);
continue;
}
for (final DataTreeCandidateNode child : tc.getRootNode().getChildNodes()) {
final PathArgument childIdentifier = child.getIdentifier();
- final YangInstanceIdentifier tableId = this.adjRibsInId.node(tableKey).node(childIdentifier);
+ final YangInstanceIdentifier tableId = adjRibsInId.node(tableKey).node(childIdentifier);
switch (child.getModificationType()) {
case DELETE:
case DISAPPEARED:
@Override
public synchronized FluentFuture<? extends CommitInfo> close() {
setActive(false);
- if (this.registration != null) {
- this.registration.close();
- this.registration = null;
+ if (registration != null) {
+ registration.close();
+ registration = null;
}
- if (this.adjRibInWriter != null) {
- this.adjRibInWriter.releaseChain();
+ if (adjRibInWriter != null) {
+ adjRibInWriter.releaseChain();
}
- if (this.effectiveRibInWriter != null) {
- this.effectiveRibInWriter.close();
+ if (effectiveRibInWriter != null) {
+ effectiveRibInWriter.close();
}
- final FluentFuture<? extends CommitInfo> future = removePeer(this.peerPath);
+ final FluentFuture<? extends CommitInfo> future = removePeer(peerPath);
closeDomChain();
- if (this.trackerRegistration != null) {
- this.trackerRegistration.close();
- this.trackerRegistration = null;
+ if (trackerRegistration != null) {
+ trackerRegistration.close();
+ trackerRegistration = null;
}
return future;
}
@Override
public boolean supportsTable(final TablesKey tableKey) {
- return this.rib.supportsTable(tableKey);
+ return rib.supportsTable(tableKey);
}
@Override
public YangInstanceIdentifier getRibOutIId(final NodeIdentifierWithPredicates tablekey) {
- return this.tablesIId.getUnchecked(tablekey);
+ return tablesIId.getUnchecked(tablekey);
}
@Override
@Override
public BGPSessionState getBGPSessionState() {
- return this.bgpSessionState;
+ return bgpSessionState;
}
@Override
public BGPTimersState getBGPTimersState() {
- return this.bgpSessionState;
+ return bgpSessionState;
}
@Override
public BGPTransportState getBGPTransportState() {
- return this.bgpSessionState;
+ return bgpSessionState;
}
}
Code Review / bgpcep.git / blobdiff