Update to Thinbsgoard 1.3.1

NullPointerException when deviceAttributes was missing In 1.3.1 device needs a type
a1664670118 · Oct 2, 2017 · b0fccc3 · b0fccc3
1 parent 79edaad
commit b0fccc3
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 30 deletions.
diff --git a/demo-data/src/main/resources/demos/basic-demos/demo_devices.json b/demo-data/src/main/resources/demos/basic-demos/demo_devices.json
@@ -2,52 +2,52 @@
   "devices":[
     {
       "name":"DHT11 Demo Device",
-      "additionalInfo":{
-        "description":"Demo device that is used in sample applications that upload data from DHT11 temperature and humidity sensor"
-      }
+      "type":"HVAC",
+      "additionalInfo":"Demo device that is used in sample applications that upload data from DHT11 temperature and humidity sensor"
     },
     {
       "name":"Raspberry Pi Demo Device",
-      "additionalInfo":{
-        "description":"Demo device that is used in Raspberry Pi GPIO control sample application"
-      }
+      "type":"HVAC",
+      "additionalInfo":"Demo device that is used in Raspberry Pi GPIO control sample application"
     },
     {
       "name":"LinkIt One Demo Device",
-      "additionalInfo":{
-        "description":"Demo device that is used in sample applications for LinkIt One"
-      }
+      "type":"HVAC",
+      "additionalInfo":"Demo device that is used in sample applications for LinkIt One"
     },
     {
       "name":"Arduino UNO Demo Device",
-      "additionalInfo":{
-        "description":"Demo device that is used in sample applications for Arduino UNO"
-      }
+      "type":"HVAC",
+      "additionalInfo":"Demo device that is used in sample applications for Arduino UNO"
     },
     {
       "name":"ESP8266 Demo Device",
-      "additionalInfo":{
-        "description":"Demo device that is used in sample applications for ESP8266"
-      }
+      "type":"HVAC",
+      "additionalInfo":"Demo device that is used in sample applications for ESP8266"
     },
     {
       "name":"Test Device A1",
+      "type":"HVAC",
       "additionalInfo":null
     },
     {
       "name":"Test Device A2",
+      "type":"HVAC",
       "additionalInfo":null
     },
     {
       "name":"Test Device A3",
+      "type":"HVAC",
       "additionalInfo":null
     },
     {
       "name":"Test Device B1",
+      "type":"HVAC",
       "additionalInfo":null
     },
     {
       "name":"Test Device C1",
+      "type":"HVAC",
       "additionalInfo":null
     }
   ],

diff --git a/demo-loader/src/main/java/org/thingsboard/demo/loader/DemoLoader.java b/demo-loader/src/main/java/org/thingsboard/demo/loader/DemoLoader.java
@@ -92,6 +92,7 @@ public boolean loadDemoFromArchive(String demoDataArchive) {
             } catch (Exception e) {
                 System.err.println(String.format("Invalid demo archive: %s", demoDataArchive));
                 System.err.println(e.getMessage());
+                e.printStackTrace();
                 System.exit(-1);
             }
             demoData.uploadData(restTemplate, baseUrl);

diff --git a/demo-loader/src/main/java/org/thingsboard/demo/loader/data/DemoData.java b/demo-loader/src/main/java/org/thingsboard/demo/loader/data/DemoData.java
@@ -306,21 +306,23 @@ private void readData(String email,
             );
 
             JsonNode deviceAttributesJson = devicesJson.get("deviceAttributes");
-            deviceAttributesJson.forEach(
-                    jsonNode -> {
-                        String deviceName = jsonNode.get("deviceName").asText();
-                        Map<String, JsonNode> attributesMap = new HashMap<>();
-                        if (jsonNode.has("server")) {
-                            JsonNode serverAttributes = jsonNode.get("server");
-                            attributesMap.put(DataConstants.SERVER_SCOPE, serverAttributes);
-                        }
-                        if (jsonNode.has("shared")) {
-                            JsonNode sharedAttributes = jsonNode.get("shared");
-                            attributesMap.put(DataConstants.SHARED_SCOPE, sharedAttributes);
+            if (deviceAttributesJson != null) {
+                deviceAttributesJson.forEach(
+                        jsonNode -> {
+                            String deviceName = jsonNode.get("deviceName").asText();
+                            Map<String, JsonNode> attributesMap = new HashMap<>();
+                            if (jsonNode.has("server")) {
+                                JsonNode serverAttributes = jsonNode.get("server");
+                                attributesMap.put(DataConstants.SERVER_SCOPE, serverAttributes);
+                            }
+                            if (jsonNode.has("shared")) {
+                                JsonNode sharedAttributes = jsonNode.get("shared");
+                                attributesMap.put(DataConstants.SHARED_SCOPE, sharedAttributes);
+                            }
+                            devicesAttributes.put(deviceName, attributesMap);
                         }
-                        devicesAttributes.put(deviceName, attributesMap);
-                    }
-            );
+                );
+            }
 
         }
         dashboardsContent.forEach(

diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
     <inceptionYear>2016</inceptionYear>
 
     <properties>
-        <thingsboard.version>1.1.0-SNAPSHOT</thingsboard.version>
+        <thingsboard.version>1.3.1-SNAPSHOT</thingsboard.version>
         <main.dir>${basedir}</main.dir>
         <lombok.version>1.16.10</lombok.version>
         <slf4j.version>1.7.7</slf4j.version>