Handle missing parameters

2 files changed, 20 insertions, 13 deletions

diff --git a/src/main/java/org/traccar/protocol/DmtHttpProtocolDecoder.java b/src/main/java/org/traccar/protocol/DmtHttpProtocolDecoder.java
index 15cf84a5f..815cce987 100644
--- a/src/main/java/org/traccar/protocol/DmtHttpProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/DmtHttpProtocolDecoder.java
@@ -174,21 +174,25 @@ public class DmtHttpProtocolDecoder extends BaseHttpProtocolDecoder {
         position.set(Position.KEY_INDEX, root.getInt("sqn"));
         position.set(Position.KEY_EVENT, root.getInt("reason"));
 
-        JsonArray analogues = root.getJsonArray("analogues");
-        for (int i = 0; i < analogues.size(); i++) {
-            JsonObject adc = analogues.getJsonObject(i);
-            position.set(Position.PREFIX_ADC + adc.getInt("id"), adc.getInt("val"));
+        if (root.containsKey("analogues")) {
+            JsonArray analogues = root.getJsonArray("analogues");
+            for (int i = 0; i < analogues.size(); i++) {
+                JsonObject adc = analogues.getJsonObject(i);
+                position.set(Position.PREFIX_ADC + adc.getInt("id"), adc.getInt("val"));
+            }
         }
 
-        int input = root.getInt("inputs");
-        int output = root.getInt("outputs");
-        int status = root.getInt("status");
-
-        position.set(Position.KEY_IGNITION, BitUtil.check(input, 0));
-
-        position.set(Position.KEY_INPUT, input);
-        position.set(Position.KEY_OUTPUT, output);
-        position.set(Position.KEY_STATUS, status);
+        if (root.containsKey("inputs")) {
+            int input = root.getInt("inputs");
+            position.set(Position.KEY_IGNITION, BitUtil.check(input, 0));
+            position.set(Position.KEY_INPUT, input);
+        }
+        if (root.containsKey("outputs")) {
+            position.set(Position.KEY_OUTPUT, root.getInt("outputs"));
+        }
+        if (root.containsKey("status")) {
+            position.set(Position.KEY_STATUS, root.getInt("status"));
+        }
 
         if (root.containsKey("counters")) {
             JsonArray counters = root.getJsonArray("counters");
diff --git a/src/test/java/org/traccar/protocol/DmtHttpProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/DmtHttpProtocolDecoderTest.java
index bed56ba30..31d0efa12 100644
--- a/src/test/java/org/traccar/protocol/DmtHttpProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/DmtHttpProtocolDecoderTest.java
@@ -12,6 +12,9 @@ public class DmtHttpProtocolDecoderTest extends ProtocolTest {
         var decoder = new DmtHttpProtocolDecoder(null);
 
         verifyAttributes(decoder, request(HttpMethod.POST, "/",
+                buffer("{\"date\":\"2021-12-12T16:04:52Z\",\"device\":{\"sn\":\"416581\",\"prod\":85,\"rev\":1,\"fw\":\"1.12\",\"iccid\":\"89011702278612797427\",\"imei\":\"351358810439486\"},\"sqn\":1549,\"reason\":42,\"counters\":[{\"id\":0,\"val\":5304},{\"id\":3,\"val\":3200},{\"id\":4,\"val\":5066},{\"id\":128,\"val\":1},{\"id\":129,\"val\":8},{\"id\":130,\"val\":0},{\"id\":131,\"val\":0},{\"id\":132,\"val\":0},{\"id\":134,\"val\":1},{\"id\":138,\"val\":0},{\"id\":139,\"val\":36},{\"id\":142,\"val\":1629023},{\"id\":145,\"val\":0},{\"id\":146,\"val\":1}]}")));
+
+        verifyAttributes(decoder, request(HttpMethod.POST, "/",
                 buffer("{\"date\":\"2021-10-04T18:15:47Z\",\"device\":{\"sn\":\"403809\",\"prod\":85,\"rev\":1,\"fw\":\"1.12\",\"iccid\":\"89011702278483601922\",\"imei\":\"352656106127312\"},\"sqn\":40927,\"reason\":11,\"analogues\":[{\"id\":1,\"val\":4265},{\"id\":3,\"val\":3800},{\"id\":4,\"val\":12},{\"id\":5,\"val\":4251}],\"inputs\":1,\"outputs\":0,\"status\":137}")));
 
         verifyPosition(decoder, request(HttpMethod.POST, "/",