Cbor update and java sdk changes

iot-onboarding · Oct 30, 2024 · 62ad79f · 62ad79f
1 parent 14e748a
commit 62ad79f
Show file tree

Hide file tree

Showing 17 changed files with 92 additions and 104 deletions.
diff --git a/gateway/data_producer.py b/gateway/data_producer.py
@@ -11,6 +11,7 @@
 """
 
 import dataclasses
+import time
 from typing import Any
 import cbor2
 from flask import Flask
@@ -129,16 +130,17 @@ def publish_notification(self,
                 # ble_sub = data_app_pb2.DataSubscription()  # pylint: disable=no-member
                 # ble_sub.data = value
                 ble_sub: dict[str, Any] = {
-                    "data": value
+                    "data": value,
+                    "timestamp": time.time()
                 }
 
                 if topic.data_format == "default":
                     ble_sub["deviceId"] = str(device.device_id)
                     # pylint: disable-next=no-member
                     ble_sub["bleSubscription"] = {}
                     ble_subscription = ble_sub["bleSubscription"]
-                    ble_subscription["serviceUuid"] = service_uuid
-                    ble_subscription["characteristicUuid"] = char_uuid
+                    ble_subscription["serviceId"] = service_uuid
+                    ble_subscription["characteristicId"] = char_uuid
 
                 data = cbor2.dumps(obj=ble_sub)
 

diff --git a/java-sdk/sample-java-app/build.gradle b/java-sdk/sample-java-app/build.gradle
@@ -29,7 +29,6 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-websocket'
-	implementation 'com.google.protobuf:protobuf-java-util:3.22.2'
 
 	compileOnly 'org.projectlombok:lombok'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'

diff --git a/...dk/sample-java-app/src/main/java/com/example/tiediesampleapp/ConnectionStatusHandler.java b/...dk/sample-java-app/src/main/java/com/example/tiediesampleapp/ConnectionStatusHandler.java
@@ -16,7 +16,6 @@
 import com.cisco.tiedie.clients.DataReceiverClient;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.protobuf.util.JsonFormat;
 
 @Component
 public class ConnectionStatusHandler extends TextWebSocketHandler {
@@ -39,7 +38,7 @@ protected void handleTextMessage(WebSocketSession session, TextMessage message)
         dataReceiverClient.connect();
         dataReceiverClient.subscribe(topics, (dataSubscription, topic) -> {
             try {
-                var payload = JsonFormat.printer().print(dataSubscription);
+                var payload = mapper.writeValueAsString(dataSubscription);
                 if (session.isOpen()) {
                     session.sendMessage(new TextMessage(payload));
                 }

diff --git a/java-sdk/sample-java-app/src/main/java/com/example/tiediesampleapp/GattHandler.java b/java-sdk/sample-java-app/src/main/java/com/example/tiediesampleapp/GattHandler.java
@@ -18,13 +18,15 @@
 import org.springframework.web.socket.server.HandshakeInterceptor;
 
 import com.cisco.tiedie.clients.DataReceiverClient;
-import com.google.protobuf.util.JsonFormat;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Component
 public class GattHandler extends TextWebSocketHandler implements HandshakeInterceptor {
     @Autowired
     DataReceiverClient dataReceiverClient;
 
+    ObjectMapper mapper = new ObjectMapper();
+
     @Override
     protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception {
         if (!session.isOpen()) {
@@ -39,7 +41,7 @@ protected void handleTextMessage(WebSocketSession session, TextMessage message)
 
         dataReceiverClient.subscribe(topic, (dataSubscription) -> {
             try {
-                var payload = JsonFormat.printer().print(dataSubscription);
+                var payload = mapper.writeValueAsString(dataSubscription);
                 if (session.isOpen()) {
                     session.sendMessage(new TextMessage(payload));
                 }

diff --git a/...e-java-app/src/test/java/com/example/tiediesampleapp/TiedieSampleAppApplicationTests.java b/...e-java-app/src/test/java/com/example/tiediesampleapp/TiedieSampleAppApplicationTests.java
diff --git a/java-sdk/sdk/build.gradle b/java-sdk/sdk/build.gradle
@@ -7,7 +7,6 @@ plugins {
     id 'java-library'
     id "io.freefair.lombok" version "8.0.0-rc4"
     id 'jacoco'
-    id 'com.google.protobuf' version '0.9.2'
 }
 
 group 'com.cisco.tiedie'
@@ -23,8 +22,8 @@ dependencies {
     implementation platform('com.squareup.okhttp3:okhttp-bom:4.10.0')
     implementation 'com.squareup.okhttp3:okhttp'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.2'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.14.2'
     implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
-    implementation 'com.google.protobuf:protobuf-java:3.22.2'
 
     testImplementation 'com.squareup.okhttp3:mockwebserver'
     testImplementation platform('org.junit:junit-bom:5.8.2')
@@ -42,18 +41,4 @@ test {
 
 jacocoTestReport {
     dependsOn test
-
-    afterEvaluate {
-        classDirectories.setFrom(files(classDirectories.files.collect {
-            fileTree(dir: it, exclude: [
-                    "com/cisco/tiedie/proto/**"
-            ])
-        }))
-    }
-}
-
-protobuf {
-    protoc {
-        artifact = 'com.google.protobuf:protoc:3.22.2'
-    }
 }
diff --git a/java-sdk/sdk/src/main/java/com/cisco/tiedie/clients/DataReceiverClient.java b/java-sdk/sdk/src/main/java/com/cisco/tiedie/clients/DataReceiverClient.java
@@ -6,7 +6,10 @@
 package com.cisco.tiedie.clients;
 
 import com.cisco.tiedie.auth.Authenticator;
-import com.cisco.tiedie.proto.DataSubscription;
+import com.cisco.tiedie.dto.telemetry.DataSubscription;
+import com.cisco.tiedie.utils.ObjectMapperSingleton;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import lombok.NonNull;
 
 import org.eclipse.paho.client.mqttv3.IMqttMessageListener;
@@ -38,6 +41,8 @@ public class DataReceiverClient {
     private final MqttClient mqttClient;
     private final MqttConnectOptions mqttConnectOptions;
 
+    private final ObjectMapper mapper = ObjectMapperSingleton.getCborInstance();
+
     /**
      * Create a {@link DataReceiverClient} object.
      *
@@ -89,7 +94,7 @@ public void subscribe(@NonNull String topic, Consumer<DataSubscription> callback
 
             byte[] payload = message.getPayload();
 
-            DataSubscription dataSubscription = DataSubscription.parseFrom(payload);
+            DataSubscription dataSubscription = mapper.readValue(payload, DataSubscription.class);
 
             callback.accept(dataSubscription);
         });
@@ -121,7 +126,7 @@ public void subscribe(@NonNull List<String> topics, BiConsumer<DataSubscription,
 
                 byte[] payload = message.getPayload();
 
-                DataSubscription dataSubscription = DataSubscription.parseFrom(payload);
+                DataSubscription dataSubscription = mapper.readValue(payload, DataSubscription.class);
 
                 callback.accept(dataSubscription, topic);
             };

diff --git a/java-sdk/sdk/src/main/java/com/cisco/tiedie/dto/scim/Device.java b/java-sdk/sdk/src/main/java/com/cisco/tiedie/dto/scim/Device.java
@@ -94,7 +94,7 @@ public List<String> getSchemas() {
         }
 
         if (endpointAppsExtension != null) {
-            schemas.add("urn:ietf:params:scim:schemas:extension:endpointApps:2.0:Device");
+            schemas.add("urn:ietf:params:scim:schemas:extension:endpointAppsExt:2.0:Device");
         }
 
         return schemas;

diff --git a/java-sdk/sdk/src/main/java/com/cisco/tiedie/dto/telemetry/BleAdvertisement.java b/java-sdk/sdk/src/main/java/com/cisco/tiedie/dto/telemetry/BleAdvertisement.java
@@ -0,0 +1,9 @@
+package com.cisco.tiedie.dto.telemetry;
+
+import lombok.Data;
+
+@Data
+public class BleAdvertisement {
+    String macAddress;
+    int rssi;
+}
diff --git a/java-sdk/sdk/src/main/java/com/cisco/tiedie/dto/telemetry/BleConnectionStatus.java b/java-sdk/sdk/src/main/java/com/cisco/tiedie/dto/telemetry/BleConnectionStatus.java
@@ -0,0 +1,10 @@
+package com.cisco.tiedie.dto.telemetry;
+
+import lombok.Data;
+
+@Data
+public class BleConnectionStatus {
+    String macAddress;
+    boolean connected;
+    int reason;
+}
diff --git a/java-sdk/sdk/src/main/java/com/cisco/tiedie/dto/telemetry/BleSubscription.java b/java-sdk/sdk/src/main/java/com/cisco/tiedie/dto/telemetry/BleSubscription.java
@@ -0,0 +1,9 @@
+package com.cisco.tiedie.dto.telemetry;
+
+import lombok.Data;
+
+@Data
+public class BleSubscription {
+    String serviceId;
+    String characteristicId;
+}
diff --git a/java-sdk/sdk/src/main/java/com/cisco/tiedie/dto/telemetry/DataSubscription.java b/java-sdk/sdk/src/main/java/com/cisco/tiedie/dto/telemetry/DataSubscription.java
@@ -0,0 +1,16 @@
+package com.cisco.tiedie.dto.telemetry;
+
+import lombok.Data;
+
+@Data
+public class DataSubscription {
+    byte[] data;
+    float timestamp;
+    String deviceId;
+    String apMacAddress;
+    BleSubscription BleSubscription;
+    BleAdvertisement bleAdvertisement;
+    BleConnectionStatus bleConnectionStatus;
+    ZigbeeSubscription zigbeeSubscription;
+    RawPayload rawPayload;
+}
diff --git a/java-sdk/sdk/src/main/java/com/cisco/tiedie/dto/telemetry/RawPayload.java b/java-sdk/sdk/src/main/java/com/cisco/tiedie/dto/telemetry/RawPayload.java
@@ -0,0 +1,8 @@
+package com.cisco.tiedie.dto.telemetry;
+
+import lombok.Data;
+
+@Data
+public class RawPayload {
+    String contextId;
+}
diff --git a/java-sdk/sdk/src/main/java/com/cisco/tiedie/dto/telemetry/ZigbeeSubscription.java b/java-sdk/sdk/src/main/java/com/cisco/tiedie/dto/telemetry/ZigbeeSubscription.java
@@ -0,0 +1,11 @@
+package com.cisco.tiedie.dto.telemetry;
+
+import lombok.Data;
+
+@Data
+public class ZigbeeSubscription {
+    int endpointId;
+    int clusterId;
+    int attributeId;
+    int attributeType;
+}
diff --git a/java-sdk/sdk/src/main/java/com/cisco/tiedie/utils/ObjectMapperSingleton.java b/java-sdk/sdk/src/main/java/com/cisco/tiedie/utils/ObjectMapperSingleton.java
@@ -7,10 +7,12 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.cbor.databind.CBORMapper;
 
 
 public class ObjectMapperSingleton {
     private static ObjectMapper objectMapper;
+    private static CBORMapper cborMapper;
 
     private ObjectMapperSingleton() {}
 
@@ -25,4 +27,10 @@ public static ObjectMapper getInstance() {
         return objectMapper;
     }
 
+    public static ObjectMapper getCborInstance() {
+        cborMapper = new CBORMapper();
+        cborMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+
+        return cborMapper;
+    }
 }
diff --git a/java-sdk/sdk/src/main/proto/data_app.proto b/java-sdk/sdk/src/main/proto/data_app.proto
diff --git a/java-sdk/sdk/src/test/java/com/cisco/tiedie/dto/scim/DeviceTest.java b/java-sdk/sdk/src/test/java/com/cisco/tiedie/dto/scim/DeviceTest.java
@@ -320,7 +320,7 @@ void testEndpointExtension() throws JsonProcessingException {
 
         var json = mapper.writeValueAsString(device);
         var expected = "{\n" +
-                "  \"schemas\" : [ \"urn:ietf:params:scim:schemas:core:2.0:Device\", \"urn:ietf:params:scim:schemas:extension:ble:2.0:Device\", \"urn:ietf:params:scim:schemas:extension:endpointApps:2.0:Device\" ],\n"
+                "  \"schemas\" : [ \"urn:ietf:params:scim:schemas:core:2.0:Device\", \"urn:ietf:params:scim:schemas:extension:ble:2.0:Device\", \"urn:ietf:params:scim:schemas:extension:endpointAppsExt:2.0:Device\" ],\n"
                 +
                 "  \"displayName\" : \"BLE Monitor\",\n" +
                 "  \"active\" : false,\n" +