Remove deprecated "sid" parameter in UI events.
Change-Id: Ib39fe563109068e7a97df809e9dd1f9f7506fbc6
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/ApplicationViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/ApplicationViewMessageHandler.java
index 6cb06fb..43b871b 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/ApplicationViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/ApplicationViewMessageHandler.java
@@ -133,20 +133,27 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
String action = string(payload, "action");
String name = string(payload, "name");
+
if (action != null && name != null) {
ApplicationAdminService service = get(ApplicationAdminService.class);
ApplicationId appId = service.getId(name);
- if (action.equals("activate")) {
- service.activate(appId);
- } else if (action.equals("deactivate")) {
- service.deactivate(appId);
- } else if (action.equals("uninstall")) {
- service.uninstall(appId);
+ switch (action) {
+ case "activate":
+ service.activate(appId);
+ break;
+ case "deactivate":
+ service.deactivate(appId);
+ break;
+ case "uninstall":
+ service.uninstall(appId);
+ break;
+ default:
+ break;
}
- chain(APP_DATA_REQ, sid, payload);
+ chain(APP_DATA_REQ, payload);
}
}
}
@@ -158,7 +165,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
String id = string(payload, ID);
ApplicationService as = get(ApplicationService.class);
@@ -204,7 +211,7 @@
ObjectNode rootNode = objectNode();
rootNode.set(DETAILS, data);
- sendMessage(APP_DETAILS_RESP, 0, rootNode);
+ sendMessage(APP_DETAILS_RESP, rootNode);
}
}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/ClusterViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/ClusterViewMessageHandler.java
index dbc7a83..3e3799b 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/ClusterViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/ClusterViewMessageHandler.java
@@ -168,7 +168,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
String id = string(payload, ID);
ClusterService cs = get(ClusterService.class);
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);
}
}
}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java
index 18c3637..46f9f9e 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java
@@ -132,17 +132,17 @@
private void populateRow(TableModel.Row row, FlowEntry flow) {
row.cell(ID, flow.id().value())
- .cell(APP_ID, flow.appId())
- .cell(GROUP_ID, flow.groupId().id())
- .cell(TABLE_ID, flow.tableId())
- .cell(PRIORITY, flow.priority())
- .cell(TIMEOUT, flow.timeout())
- .cell(PERMANENT, flow.isPermanent())
- .cell(STATE, flow.state())
- .cell(PACKETS, flow.packets())
- .cell(BYTES, flow.bytes())
- .cell(SELECTOR, flow)
- .cell(TREATMENT, flow);
+ .cell(APP_ID, flow.appId())
+ .cell(GROUP_ID, flow.groupId().id())
+ .cell(TABLE_ID, flow.tableId())
+ .cell(PRIORITY, flow.priority())
+ .cell(TIMEOUT, flow.timeout())
+ .cell(PERMANENT, flow.isPermanent())
+ .cell(STATE, flow.state())
+ .cell(PACKETS, flow.packets())
+ .cell(BYTES, flow.bytes())
+ .cell(SELECTOR, flow)
+ .cell(TREATMENT, flow);
}
private final class SelectorFormatter implements CellFormatter {
@@ -258,7 +258,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
String flowId = string(payload, FLOW_ID);
String appId = string(payload, APP_ID);
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/GroupViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/GroupViewMessageHandler.java
index f5ca81f..95fdd53 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/GroupViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/GroupViewMessageHandler.java
@@ -127,12 +127,12 @@
private void populateRow(TableModel.Row row, Group g) {
row.cell(ID, g.id().id())
- .cell(APP_ID, g.appId().name())
- .cell(STATE, g.state())
- .cell(TYPE, g.type())
- .cell(PACKETS, g.packets())
- .cell(BYTES, g.bytes())
- .cell(BUCKETS, g.buckets().buckets());
+ .cell(APP_ID, g.appId().name())
+ .cell(STATE, g.state())
+ .cell(TYPE, g.type())
+ .cell(PACKETS, g.packets())
+ .cell(BYTES, g.bytes())
+ .cell(BUCKETS, g.buckets().buckets());
}
private final class BucketFormatter implements CellFormatter {
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/IntentViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/IntentViewMessageHandler.java
index 1b97592..0d1c062 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/IntentViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/IntentViewMessageHandler.java
@@ -112,12 +112,12 @@
private void populateRow(TableModel.Row row, Intent intent, IntentService is) {
row.cell(APP_ID, intent.appId())
- .cell(KEY, intent.key())
- .cell(TYPE, intent.getClass().getSimpleName())
- .cell(PRIORITY, intent.priority())
- .cell(STATE, is.getIntentState(intent.key()))
- .cell(RESOURCES, intent)
- .cell(DETAILS, intent);
+ .cell(KEY, intent.key())
+ .cell(TYPE, intent.getClass().getSimpleName())
+ .cell(PRIORITY, intent.priority())
+ .cell(STATE, is.getIntentState(intent.key()))
+ .cell(RESOURCES, intent)
+ .cell(DETAILS, intent);
}
private final class ResourcesFormatter implements CellFormatter {
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/MapSelectorMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/MapSelectorMessageHandler.java
index fdb2467..621bf84 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/MapSelectorMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/MapSelectorMessageHandler.java
@@ -20,10 +20,10 @@
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.ImmutableSet;
import org.onosproject.ui.RequestHandler;
-import org.onosproject.ui.UiMessageHandler;
import org.onosproject.ui.UiExtensionService;
-import org.onosproject.ui.UiTopoMapFactory;
+import org.onosproject.ui.UiMessageHandler;
import org.onosproject.ui.UiTopoMap;
+import org.onosproject.ui.UiTopoMapFactory;
import java.util.Collection;
import java.util.List;
@@ -56,8 +56,8 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
- sendMessage(MAP_LIST_RESP, 0, mapsJson());
+ public void process(ObjectNode payload) {
+ sendMessage(MAP_LIST_RESP, mapsJson());
}
}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/SettingsViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/SettingsViewMessageHandler.java
index 57e380f..632f721 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/SettingsViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/SettingsViewMessageHandler.java
@@ -79,12 +79,6 @@
}
@Override
- protected TableModel createTableModel() {
- TableModel tm = super.createTableModel();
- return tm;
- }
-
- @Override
protected void populateTable(TableModel tm, ObjectNode payload) {
ComponentConfigService ccs = get(ComponentConfigService.class);
for (String component : ccs.getComponentNames()) {
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
index b6098bb..609b775 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
@@ -67,7 +67,6 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
@@ -159,7 +158,7 @@
private static final long SUMMARY_PERIOD = 30000;
private static final Comparator<? super ControllerNode> NODE_COMPARATOR =
- (o1, o2) -> o1.id().toString().compareTo(o2.id().toString());
+ Comparator.comparing(o -> o.id().toString());
private final Timer timer = new Timer("onos-topology-view");
@@ -255,7 +254,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
addListeners();
sendAllInstances(null);
sendAllDevices();
@@ -271,7 +270,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
String deact = string(payload, DEACTIVATE);
String act = string(payload, ACTIVATE);
overlayCache.switchOverlay(deact, act);
@@ -284,7 +283,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
removeListeners();
stopSummaryMonitoring();
traffic.stopMonitoring();
@@ -297,8 +296,8 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
- requestSummary(sid);
+ public void process(ObjectNode payload) {
+ requestSummary();
startSummaryMonitoring();
}
}
@@ -309,7 +308,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
stopSummaryMonitoring();
}
}
@@ -320,12 +319,12 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
ObjectNode root = objectNode();
ArrayNode names = arrayNode();
get(SpriteService.class).getNames().forEach(names::add);
root.set(NAMES, names);
- sendMessage(SPRITE_LIST_RESPONSE, sid, root);
+ sendMessage(SPRITE_LIST_RESPONSE, root);
}
}
@@ -335,11 +334,11 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
String name = string(payload, NAME);
ObjectNode root = objectNode();
root.set(DATA, get(SpriteService.class).get(name));
- sendMessage(SPRITE_DATA_RESPONSE, sid, root);
+ sendMessage(SPRITE_DATA_RESPONSE, root);
}
}
@@ -349,22 +348,22 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
String type = string(payload, CLASS, UNKNOWN);
String id = string(payload, ID);
PropertyPanel pp = null;
if (type.equals(DEVICE)) {
DeviceId did = deviceId(id);
- pp = deviceDetails(did, sid);
+ pp = deviceDetails(did);
overlayCache.currentOverlay().modifyDeviceDetails(pp, did);
} else if (type.equals(HOST)) {
HostId hid = hostId(id);
- pp = hostDetails(hid, sid);
+ pp = hostDetails(hid);
overlayCache.currentOverlay().modifyHostDetails(pp, hid);
}
- sendMessage(envelope(SHOW_DETAILS, sid, json(pp)));
+ sendMessage(envelope(SHOW_DETAILS, json(pp)));
}
}
@@ -374,7 +373,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
updateMetaUi(payload);
}
}
@@ -385,7 +384,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
directory.get(MastershipAdminService.class).balanceRoles();
}
}
@@ -401,7 +400,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
// TODO: add protection against device ids and non-existent hosts.
HostId one = hostId(string(payload, ONE));
HostId two = hostId(string(payload, TWO));
@@ -441,7 +440,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
Intent intent = findIntentByPayload(payload);
if (intent == null) {
log.warn("Unable to find intent from payload {}", payload);
@@ -462,7 +461,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
Intent intent = findIntentByPayload(payload);
if (intent == null) {
log.warn("Unable to find intent from payload {}", payload);
@@ -479,7 +478,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
// TODO: add protection against device ids and non-existent hosts.
Set<HostId> src = getHostIds((ArrayNode) payload.path(SRC));
HostId dst = hostId(string(payload, DST));
@@ -516,7 +515,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
traffic.monitor(Mode.ALL_FLOW_TRAFFIC);
}
}
@@ -527,7 +526,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
traffic.monitor(Mode.ALL_PORT_TRAFFIC);
}
}
@@ -538,7 +537,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
NodeSelection nodeSelection =
new NodeSelection(payload, deviceService, hostService, linkService);
traffic.monitor(Mode.DEV_LINK_FLOWS, nodeSelection);
@@ -551,7 +550,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
NodeSelection nodeSelection =
new NodeSelection(payload, deviceService, hostService, linkService);
traffic.monitor(Mode.RELATED_INTENTS, nodeSelection);
@@ -564,7 +563,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
traffic.selectNextIntent();
}
}
@@ -575,7 +574,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
traffic.selectPreviousIntent();
}
}
@@ -586,7 +585,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
traffic.monitor(Mode.SELECTED_INTENT);
}
}
@@ -597,7 +596,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
Intent intent = findIntentByPayload(payload);
if (intent == null) {
log.warn("Unable to find intent from payload {}", payload);
@@ -614,7 +613,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
traffic.stopMonitoring();
}
}
@@ -622,15 +621,15 @@
//=======================================================================
// Converts highlights to JSON format and sends the message to the client
- protected void sendHighlights(Highlights highlights) {
+ void sendHighlights(Highlights highlights) {
sendMessage(highlightsMessage(highlights));
}
// Subscribes for summary messages.
- private synchronized void requestSummary(long sid) {
- PropertyPanel pp = summmaryMessage(sid);
+ private synchronized void requestSummary() {
+ PropertyPanel pp = summmaryMessage();
overlayCache.currentOverlay().modifySummary(pp);
- sendMessage(envelope(SHOW_SUMMARY, sid, json(pp)));
+ sendMessage(envelope(SHOW_SUMMARY, json(pp)));
}
@@ -642,7 +641,7 @@
// Sends all controller nodes to the client as node-added messages.
private void sendAllInstances(String messageType) {
List<ControllerNode> nodes = new ArrayList<>(clusterService.getNodes());
- Collections.sort(nodes, NODE_COMPARATOR);
+ nodes.sort(NODE_COMPARATOR);
for (ControllerNode node : nodes) {
sendMessage(instanceMessage(new ClusterEvent(INSTANCE_ADDED, node),
messageType));
@@ -873,7 +872,7 @@
public void run() {
try {
if (summaryRunning) {
- msgSender.execute(() -> requestSummary(0));
+ msgSender.execute(() -> requestSummary());
}
} catch (Exception e) {
log.warn("Unable to handle summary request due to {}", e.getMessage());
@@ -900,7 +899,7 @@
try {
if (summaryRunning) {
- msgSender.execute(() -> requestSummary(0));
+ msgSender.execute(() -> requestSummary());
}
} catch (Exception e) {
log.warn("Unable to handle summary request due to {}", e.getMessage());
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
index c2c14f2..95c0cf4 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
@@ -395,7 +395,7 @@
// Create models of the data to return, that overlays can adjust / augment
// Returns property panel model for summary response.
- protected PropertyPanel summmaryMessage(long sid) {
+ protected PropertyPanel summmaryMessage() {
Topology topology = topologyService.currentTopology();
return new PropertyPanel("ONOS Summary", "node")
@@ -412,7 +412,7 @@
}
// Returns property panel model for device details response.
- protected PropertyPanel deviceDetails(DeviceId deviceId, long sid) {
+ protected PropertyPanel deviceDetails(DeviceId deviceId) {
Device device = deviceService.getDevice(deviceId);
Annotations annot = device.annotations();
String name = annot.value(AnnotationKeys.NAME);
@@ -525,7 +525,7 @@
}
// Returns host details response.
- protected PropertyPanel hostDetails(HostId hostId, long sid) {
+ protected PropertyPanel hostDetails(HostId hostId) {
Host host = hostService.getHost(hostId);
Annotations annot = host.annotations();
String type = annot.value(AnnotationKeys.TYPE);
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/UserPreferencesMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/UserPreferencesMessageHandler.java
index 3bd3744..44a8ef0 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/UserPreferencesMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/UserPreferencesMessageHandler.java
@@ -46,12 +46,12 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
if (!isNullOrEmpty(connection().userName())) {
UiPreferencesService service = get(UiPreferencesService.class);
service.setPreference(connection().userName(),
- payload.get(KEY).asText(),
- (ObjectNode) payload.get(VALUE));
+ payload.get(KEY).asText(),
+ (ObjectNode) payload.get(VALUE));
}
}
}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2ViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2ViewMessageHandler.java
index 4aa6fc9..ea774d9 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2ViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2ViewMessageHandler.java
@@ -67,7 +67,6 @@
private static final String CURRENT_LAYOUT = "topo2CurrentLayout";
private static final String CURRENT_REGION = "topo2CurrentRegion";
private static final String PEER_REGIONS = "topo2PeerRegions";
- private static final String TOPO_START_DONE = "topo2StartDone";
private UiTopoSession topoSession;
@@ -122,7 +121,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
// client view is ready to receive data to display; so start up
// server-side processing, and send over initial state
@@ -162,7 +161,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
String rid = string(payload, "rid");
log.debug("topo2navRegion: rid={}", rid);
@@ -185,7 +184,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
// client view has gone away; so shut down server-side processing
// TODO: implement...
@@ -204,7 +203,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
t2json.updateMeta(payload);
}
}