commit a9c1ae8b9ab5cb7a72f6af2982e8fddc20bd0458
author Jonathan Hart <jono@onlab.us> Mon Feb 27 09:00:16 2017 -0800
committer Jonathan Hart <jono@onlab.us> Mon Feb 27 09:00:16 2017 -0800
tree db155ba7108f0a73401867db4dcf54abd3936ef3
parent 3d935f422927b156870f3eada3c39b6163f640cb

Fix patchpanel to not have snapshot dependencies

Change-Id: I66498fc1f15e635969e9e97ffe61a7d433282d5e

patchpanel/pom.xml

diff --git a/patchpanel/pom.xml b/patchpanel/pom.xml
index b92da57..8f0ae81 100644
--- a/patchpanel/pom.xml
+++ b/patchpanel/pom.xml
@@ -35,6 +35,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <onos.version>1.8.2</onos.version>
         <onos.app.name>org.onosproject.patchpanel</onos.app.name>
         <onos.app.title>Patch Panel</onos.app.title>
         <onos.app.origin>ON.Lab</onos.app.origin>
@@ -48,7 +49,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-cli</artifactId>
-            <version>${project.version}</version>
+            <version>${onos.version}</version>
         </dependency>
 
         <dependency>

patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiMessageHandler.java

diff --git a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiMessageHandler.java b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiMessageHandler.java
index d1f0cbf..d9d3086 100644
--- a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiMessageHandler.java
+++ b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiMessageHandler.java
@@ -79,7 +79,7 @@
         }
 
         @Override
-        public void process(ObjectNode payload) {
+        public void process(long sid, ObjectNode payload) {
             DeviceService service = get(DeviceService.class);
             ObjectNode result = objectNode();
             ArrayNode cps = arrayNode();
@@ -104,7 +104,7 @@
         }
 
         @Override
-        public void process(ObjectNode payload) {
+        public void process(long sid, ObjectNode payload) {
             String deviceId = payload.get(RESULT).get(0).asText();
             ConnectPoint cp1 = deviceConnectPoint(deviceId + SLASH + payload.get(RESULT).get(1).asText());
             ConnectPoint cp2 = deviceConnectPoint(deviceId + SLASH + payload.get(RESULT).get(2).asText());
@@ -134,7 +134,7 @@
         }
 
         @Override
-        public void process(ObjectNode payload) {
+        public void process(long sid, ObjectNode payload) {
             StringBuilder sb = new StringBuilder();
             for (int i = 0; i < previous.size(); i++) {
                 sb.append(previous.get(i)).append(i % 2 == 0 ? WITH : EOL);