From 55d1e6f8bf04ff3742708ea0ef2b90418679fef1 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 4 Jun 2014 21:16:53 +0200 Subject: [PATCH] BUG-1089: use a string constant for "::::" This just makes sure the class is always consistent in naming things. Change-Id: I442eec4204e9a5a7073e023bad7e392c2c56c1be Signed-off-by: Robert Varga --- .../md/compatibility/topology/TopologyMapping.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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())); } -- 2.36.6