X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcompatibility%2Finventory-topology-compatibility%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fcompatibility%2Ftopology%2FTopologyMapping.java;h=8e50bd881e0c39bd01013b23bc0ee31d8ada66f1;hb=6b9c0bb57b65343df31fd68d178821a22afd0fe2;hp=dbb6bdcbae46f033882f03157058912ba387e9e3;hpb=635ae9aceb9228e4dec51aace16092333050ae1d;p=controller.git diff --git a/opendaylight/md-sal/compatibility/inventory-topology-compatibility/src/main/java/org/opendaylight/controller/md/compatibility/topology/TopologyMapping.java b/opendaylight/md-sal/compatibility/inventory-topology-compatibility/src/main/java/org/opendaylight/controller/md/compatibility/topology/TopologyMapping.java index dbb6bdcbae..8e50bd881e 100644 --- a/opendaylight/md-sal/compatibility/inventory-topology-compatibility/src/main/java/org/opendaylight/controller/md/compatibility/topology/TopologyMapping.java +++ b/opendaylight/md-sal/compatibility/inventory-topology-compatibility/src/main/java/org/opendaylight/controller/md/compatibility/topology/TopologyMapping.java @@ -30,7 +30,8 @@ import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import com.google.common.base.Splitter; public class TopologyMapping { - private static final Splitter QUAD_COLON_SPLITTER = Splitter.on("::::"); + private static final String HEAD_TAIL_STRING = "::::"; + private static final Splitter HEAD_TAIL_SPLITTER = Splitter.on(HEAD_TAIL_STRING); public TopologyMapping(final TopologyKey path, final InstanceIdentifier key) { // No-op for now. Multi-instance will require fixing InventoryMapping first. @@ -40,7 +41,7 @@ public class TopologyMapping { @SuppressWarnings("unchecked") final LinkKey linkKey = ((KeyedInstanceIdentifier)identifier).getKey(); - final Iterator it = QUAD_COLON_SPLITTER.split(linkKey.getLinkId().getValue()).iterator(); + final Iterator it = HEAD_TAIL_SPLITTER.split(linkKey.getLinkId().getValue()).iterator(); final NodeConnector tail = InventoryMapping.nodeConnectorFromId(it.next()); final NodeConnector head = InventoryMapping.nodeConnectorFromId(it.next()); return new Edge(tail, head); @@ -74,7 +75,7 @@ public class TopologyMapping { final StringBuilder sb = new StringBuilder(); sb.append(sourceTp.getTpId().toString()); - sb.append("::::"); + sb.append(HEAD_TAIL_STRING); sb.append(destTp.getTpId().toString()); return new LinkKey(new LinkId(sb.toString())); }