commit 8a0429ad47c600e818d6f2d6836453059f4ff4db
author Simon Hunt <simon@onlab.us> Fri Jan 06 16:52:47 2017 -0800
committer Simon Hunt <simon@onlab.us> Fri Jan 06 18:10:40 2017 -0800
tree 8795cb6f724b74c705d546110a5ee6516d119eab
parent 73ae7d7458cf23f868088e4041bee60636c3fa29

Remove deprecated "sid" parameter in UI events.

Change-Id: Ib39fe563109068e7a97df809e9dd1f9f7506fbc6

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

diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java
index 56ab5ad..a04f616 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java
@@ -41,7 +41,6 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -181,7 +180,7 @@
         }
 
         @Override
-        public void process(long sid, ObjectNode payload) {
+        public void process(ObjectNode payload) {
             String id = string(payload, ID, ZERO_URI);
 
             DeviceId deviceId = deviceId(id);
@@ -206,7 +205,7 @@
             ArrayNode ports = arrayNode();
 
             List<Port> portList = new ArrayList<>(service.getPorts(deviceId));
-            Collections.sort(portList, (p1, p2) -> {
+            portList.sort((p1, p2) -> {
                 long delta = p1.number().toLong() - p2.number().toLong();
                 return delta == 0 ? 0 : (delta < 0 ? -1 : +1);
             });
@@ -218,7 +217,7 @@
 
             ObjectNode rootNode = objectNode();
             rootNode.set(DETAILS, data);
-            sendMessage(DEV_DETAILS_RESP, 0, rootNode);
+            sendMessage(DEV_DETAILS_RESP, rootNode);
         }
 
         private ObjectNode portData(Port p, DeviceId id) {
@@ -262,7 +261,7 @@
         }
 
         @Override
-        public void process(long sid, ObjectNode payload) {
+        public void process(ObjectNode payload) {
             DeviceId deviceId = deviceId(string(payload, ID, ZERO_URI));
             String name = emptyToNull(string(payload, NAME, null));
             log.debug("Name change request: {} -- '{}'", deviceId, name);
@@ -275,7 +274,7 @@
             // means that the friendly name should be unset.
             cfg.name(name);
             cfg.apply();
-            sendMessage(DEV_NAME_CHANGE_RESP, 0, payload);
+            sendMessage(DEV_NAME_CHANGE_RESP, payload);
         }
     }
 }