*/
package org.opendaylight.openflowplugin.applications.topology.manager;
-import com.google.common.base.Optional;
-import java.util.Collections;
-import java.util.List;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.openflowplugin.common.txchain.TransactionChainManager;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TpId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-class TopologyManagerUtil {
+final class TopologyManagerUtil {
private static final Logger LOG = LoggerFactory.getLogger(TopologyManagerUtil.class);
static void removeAffectedLinks(final NodeId id, final TransactionChainManager manager,
InstanceIdentifier<Topology> topology) {
- Optional<Topology> topologyOptional = Optional.absent();
+ Optional<Topology> topologyOptional = Optional.empty();
try {
- topologyOptional = manager.readFromTransaction(LogicalDatastoreType.OPERATIONAL, topology).checkedGet();
- } catch (ReadFailedException e) {
+ topologyOptional = manager.readFromTransaction(LogicalDatastoreType.OPERATIONAL, topology).get();
+ } catch (InterruptedException | ExecutionException e) {
LOG.warn("Error reading topology data for topology {}: {}", topology, e.getMessage());
LOG.debug("Error reading topology data for topology.. ", e);
}
return;
}
- List<Link> linkList =
- topologyOptional.get().getLink() != null ? topologyOptional.get().getLink() : Collections.emptyList();
- for (Link link : linkList) {
+ for (Link link : topologyOptional.get().nonnullLink().values()) {
if (id.equals(link.getSource().getSourceNode()) || id.equals(link.getDestination().getDestNode())) {
manager.addDeleteOperationToTxChain(LogicalDatastoreType.OPERATIONAL, linkPath(link, topology));
}
static void removeAffectedLinks(final TpId id, final TransactionChainManager manager,
final InstanceIdentifier<Topology> topology) {
- Optional<Topology> topologyOptional = Optional.absent();
+ Optional<Topology> topologyOptional = Optional.empty();
try {
- topologyOptional = manager.readFromTransaction(LogicalDatastoreType.OPERATIONAL, topology).checkedGet();
- } catch (ReadFailedException e) {
+ topologyOptional = manager.readFromTransaction(LogicalDatastoreType.OPERATIONAL, topology).get();
+ } catch (InterruptedException | ExecutionException e) {
LOG.warn("Error reading topology data for topology {}: {}", topology, e.getMessage());
LOG.debug("Error reading topology data for topology..", e);
}
return;
}
- List<Link> linkList = topologyOptional.get().getLink() != null ? topologyOptional.get()
- .getLink() : Collections.<Link>emptyList();
- for (Link link : linkList) {
+ for (Link link : topologyOptional.get().nonnullLink().values()) {
if (id.equals(link.getSource().getSourceTp()) || id.equals(link.getDestination().getDestTp())) {
manager.addDeleteOperationToTxChain(LogicalDatastoreType.OPERATIONAL, linkPath(link, topology));
}
}
static InstanceIdentifier<Link> linkPath(final Link link, final InstanceIdentifier<Topology> topology) {
- return topology.child(Link.class, link.getKey());
+ return topology.child(Link.class, link.key());
}