commit 3678c2a440fd64e30b6c42a0c8502d4ecde793cb
author Simon Hunt <simon@onlab.us> Mon Mar 28 14:48:07 2016 -0700
committer Simon Hunt <simon@onlab.us> Mon Mar 28 14:48:07 2016 -0700
tree 161d94c117aa073bf39435513fd6eea919fed2b3
parent d9d6cc8ad257afeaf9b9097f3cc814ec9d49a368

Remove magic numbers and in-line string constants in UiExtensionManager.

Change-Id: I574db918c46835c6033a1a4b90a30caa3540f144

web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java

diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java b/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
index 55ff611..f402298 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
@@ -74,13 +74,20 @@
  */
 @Component(immediate = true)
 @Service
-public class UiExtensionManager implements UiExtensionService, UiPreferencesService, SpriteService {
+public class UiExtensionManager
+        implements UiExtensionService, UiPreferencesService, SpriteService {
 
     private static final ClassLoader CL = UiExtensionManager.class.getClassLoader();
+
+    private static final String ONOS_USER_PREFERENCES = "onos-user-preferences";
     private static final String CORE = "core";
     private static final String GUI_ADDED = "guiAdded";
     private static final String GUI_REMOVED = "guiRemoved";
     private static final String UPDATE_PREFS = "updatePrefs";
+    private static final String SLASH = "/";
+
+    private static final int IDX_USER = 0;
+    private static final int IDX_KEY = 1;
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
@@ -162,13 +169,13 @@
         KryoNamespace.Builder kryoBuilder = new KryoNamespace.Builder()
                 .register(KryoNamespaces.API)
                 .register(ObjectNode.class, ArrayNode.class,
-                          JsonNodeFactory.class, LinkedHashMap.class,
-                          TextNode.class, BooleanNode.class,
-                          LongNode.class, DoubleNode.class, ShortNode.class,
-                          IntNode.class, NullNode.class);
+                        JsonNodeFactory.class, LinkedHashMap.class,
+                        TextNode.class, BooleanNode.class,
+                        LongNode.class, DoubleNode.class, ShortNode.class,
+                        IntNode.class, NullNode.class);
 
         prefs = storageService.<String, ObjectNode>eventuallyConsistentMapBuilder()
-                .withName("onos-user-preferences")
+                .withName(ONOS_USER_PREFERENCES)
                 .withSerializer(kryoBuilder)
                 .withTimestampProvider((k, v) -> new WallClockTimestamp())
                 .withPersistence()
@@ -229,7 +236,7 @@
     public Map<String, ObjectNode> getPreferences(String userName) {
         ImmutableMap.Builder<String, ObjectNode> builder = ImmutableMap.builder();
         prefs.entrySet().stream()
-                .filter(e -> e.getKey().startsWith(userName + "/"))
+                .filter(e -> e.getKey().startsWith(userName + SLASH))
                 .forEach(e -> builder.put(keyName(e.getKey()), e.getValue()));
         return builder.build();
     }
@@ -261,15 +268,16 @@
     }
 
     private String key(String userName, String keyName) {
-        return userName + "/" + keyName;
+        return userName + SLASH + keyName;
     }
 
+
     private String userName(String key) {
-        return key.split("/")[0];
+        return key.split(SLASH)[IDX_USER];
     }
 
     private String keyName(String key) {
-        return key.split("/")[1];
+        return key.split(SLASH)[IDX_KEY];
     }
 
     // Auxiliary listener to preference map events.