From 8e9f0cfd76848056de012e01af2707d52c07ed51 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Fri, 30 Nov 2018 11:19:07 +0100
Subject: [PATCH] PluggableDiscovery: added a 'port' field in json messages

The new format of 'add' and 'remove' actions is changed from:

{
  "eventType": "add",
  "address": "/dev/ttyACM0",
  "label": "/dev/ttyACM0",
  "prefs": {
    "vendorId": "0x2341"
    "productId": "0x0043",
    "serialNumber": "85235353137351018160",
  },
  "identificationPrefs": {
    "vid": "0x2341"
    "pid": "0x0043",
  },
  "protocol": "serial",
  "protocolLabel": "Serial Port"
}

to:

{
  "eventType": "add",
  "port": {
    "address": "/dev/ttyACM0",
    "label": "/dev/ttyACM0",
    "prefs": {
      "vendorId": "0x2341"
      "productId": "0x0043",
      "serialNumber": "85235353137351018160",
    },
    "identificationPrefs": {
      "vid": "0x2341"
      "pid": "0x0043",
    },
    "protocol": "serial",
    "protocolLabel": "Serial Port"
  }
}
---
 .../cc/arduino/packages/discoverers/PluggableDiscovery.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arduino-core/src/cc/arduino/packages/discoverers/PluggableDiscovery.java b/arduino-core/src/cc/arduino/packages/discoverers/PluggableDiscovery.java
index beb66f028..7123b6d40 100644
--- a/arduino-core/src/cc/arduino/packages/discoverers/PluggableDiscovery.java
+++ b/arduino-core/src/cc/arduino/packages/discoverers/PluggableDiscovery.java
@@ -156,7 +156,7 @@ public class PluggableDiscovery implements Discovery {
 
     case "add":
       try {
-        BoardPort port = mapper.treeToValue(node, BoardPort.class);
+        BoardPort port = mapper.treeToValue(node.get("port"), BoardPort.class);
         port.searchMatchingBoard();
         addOrUpdate(port);
       } catch (JsonProcessingException e) {
@@ -167,7 +167,7 @@ public class PluggableDiscovery implements Discovery {
 
     case "remove":
       try {
-        BoardPort port = mapper.treeToValue(node, BoardPort.class);
+        BoardPort port = mapper.treeToValue(node.get("port"), BoardPort.class);
         remove(port);
       } catch (JsonProcessingException e) {
         System.err.println(format("{0}: Invalid BoardPort message", discoveryName));