Merge pull request #18 from openremote/rework/mqtt-handler-rewrite

Rework/mqtt handler rewrite

manager/src/main/java/org/openremote/manager/custom/telematics/TelematicsDeviceProcessor.java

@@ -0,0 +1,9 @@
+package org.openremote.manager.custom.telematics;
+
+/*
+* Interface to be implemented by all handlers for device-specific payload parsing of Telematics equipment.
+*
+*
+* */
+public interface TelematicsDeviceProcessor {
+}

manager/src/main/java/org/openremote/manager/custom/teltonika/TeltonikaMQTTHandler.java → manager/src/main/java/org/openremote/manager/custom/telematics/processors/teltonika/TeltonikaMQTTHandler.java

@@ -1,4 +1,4 @@
-package org.openremote.manager.custom.teltonika;
+package org.openremote.manager.custom.telematics.processors.teltonika;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -10,7 +10,7 @@
 import org.openremote.container.util.UniqueIdentifierGenerator;
 import org.openremote.manager.asset.AssetProcessingService;
 import org.openremote.manager.asset.AssetStorageService;
-import org.openremote.manager.custom.teltonika.helpers.TeltonikaAttributeProcessingHelper;
+import org.openremote.manager.custom.telematics.processors.teltonika.helpers.TeltonikaAttributeProcessingHelper;
 import org.openremote.manager.datapoint.AssetDatapointService;
 import org.openremote.manager.mqtt.MQTTHandler;
 import org.openremote.manager.mqtt.Topic;
@@ -35,7 +35,6 @@
 import java.nio.file.Paths;
 import java.sql.Timestamp;
 import java.text.MessageFormat;
-import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -509,6 +508,7 @@ private void createNewAsset(String newDeviceId, String newDeviceImei, String rea
 
         TeltonikaConfiguration config = getConfig();
 
+        // This is where you would specify the Asset type that is inherited from the CarAsset class.
         CarAsset testAsset = new CarAsset("Teltonika Asset "+newDeviceImei)
             .setRealm(realm)
             .setModelNumber(getConfig().getDefaultModelNumber())
@@ -537,8 +537,6 @@ private void createNewAsset(String newDeviceId, String newDeviceImei, String rea
             attributes.forEach(attribute -> attribute.setTimestamp(dateVal.getTime()));
         });
 
-
-
         updateAsset(testAsset, attributes);
     }
 

manager/src/main/java/org/openremote/manager/custom/teltonika/helpers/TeltonikaAttributeProcessingHelper.java → manager/src/main/java/org/openremote/manager/custom/telematics/processors/teltonika/helpers/TeltonikaAttributeProcessingHelper.java

@@ -1,4 +1,4 @@
-package org.openremote.manager.custom.teltonika.helpers;
+package org.openremote.manager.custom.telematics.processors.teltonika.helpers;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -172,6 +172,7 @@ public static AttributeMap getAttributes(Map<Map.Entry<String, TeltonikaParamete
                 try{
                     long unixTimestampMillis = Long.parseLong(entry.getValue().toString());
                     Timestamp deviceTimestamp = Timestamp.from(Instant.ofEpochMilli(unixTimestampMillis));
+                    //Maybe this attribute should have the value set as server time and the device time as a timestamp?
                     attributes.add(new Attribute<>(CarAsset.LAST_CONTACT, deviceTimestamp, deviceTimestamp.getTime()));
 
                     //Update all affected attribute timestamps

manager/src/main/java/org/openremote/manager/custom/telematics/processors/teltonika/helpers/TeltonikaParameterData.java

@@ -0,0 +1,23 @@
+package org.openremote.manager.custom.telematics.processors.teltonika.helpers;
+
+import org.openremote.model.teltonika.TeltonikaParameter;
+
+import java.util.Map;
+
+public class TeltonikaParameterData {
+    String key;
+    TeltonikaParameter value;
+
+    public TeltonikaParameterData(String key, TeltonikaParameter value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public String getParameterId() {
+        return key;
+    }
+
+    public TeltonikaParameter getParameter() {
+        return value;
+    }
+}

manager/src/main/resources/META-INF/services/org.openremote.manager.mqtt.MQTTHandler

@@ -1 +1 @@
-org.openremote.manager.custom.teltonika.TeltonikaMQTTHandler
+org.openremote.manager.custom.telematics.processors.teltonika.TeltonikaMQTTHandler

model/src/main/java/org/openremote/model/teltonika/TeltonikaParameter.java

@@ -27,6 +27,7 @@
         "hwSupport",
         "parameterGroup"
 })
+//TODO: Create interface for this class called TelematicsDeviceParameter
 public class TeltonikaParameter implements Serializable {
 
     @JsonProperty("propertyIdInAvlPacket")

test/src/test/groovy/org/openremote/test/custom/TeltonikaMQTTProtocolTest.groovy

@@ -10,7 +10,7 @@ import org.openremote.manager.asset.AssetProcessingService
 import org.openremote.manager.asset.AssetStorageService
 import org.openremote.manager.event.ClientEventService
 import org.openremote.manager.mqtt.MQTTBrokerService
-import org.openremote.manager.custom.teltonika.TeltonikaMQTTHandler
+import org.openremote.manager.custom.telematics.processors.teltonika.TeltonikaMQTTHandler
 import org.openremote.manager.setup.SetupService
 import org.openremote.manager.setup.custom.CustomKeycloakSetup
 import org.openremote.model.Constants