commit 423660876e75e7ceb6a0257fc3ef67603428b75e
author Simon Hunt <simon@onlab.us> Mon Jun 08 09:57:05 2015 -0700
committer Simon Hunt <simon@onlab.us> Mon Jun 08 10:12:43 2015 -0700
tree 5bb7a0e7d9e56ce5e9ea6988125b28a4c24558c6
parent 8bd51bfda588096d1278696607dd2ad854e89032

CORD GUI - Shenanigans clean up

Change-Id: Ied8472102f537e51956c509a1a4511434b2d0cd5

apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/CordModelCache.java

diff --git a/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/CordModelCache.java b/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/CordModelCache.java
index 273bdec..87edd3d 100644
--- a/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/CordModelCache.java
+++ b/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/CordModelCache.java
@@ -48,8 +48,6 @@
 
     private static final String KEY_SSID_MAP = "ssidmap";
     private static final String KEY_SSID = "service_specific_id";
-    // FIXME: remove once the key has been fixed
-    private static final String KEY_SSID_ALT = "service_specific_id:";
     private static final String KEY_SUB_ID = "subscriber_id";
 
     private static final int DEMO_SSID = 1234;
@@ -96,18 +94,7 @@
         StringBuilder msg = new StringBuilder();
         while (iter.hasNext()) {
             ObjectNode node = (ObjectNode) iter.next();
-
-            // FIXME: clean up once the colon has been removed from the key
-            JsonNode s = node.get(KEY_SSID);
-            if (s == null) {
-                s = node.get(KEY_SSID_ALT);
-                if (s == null) {
-                    log.error("missing {} property!", KEY_SSID);
-                    continue;
-                }
-            }
-
-            String ssidStr = s.asText();
+            String ssidStr = node.get(KEY_SSID).asText();
             int ssid = Integer.valueOf(ssidStr);
             int subId = node.get(KEY_SUB_ID).asInt();
             LOOKUP.put(ssid, subId);