change datetime from long to string

hivemq · Dec 11, 2024 · 6a87cb5 · 6a87cb5
1 parent 5e6ae88
commit 6a87cb5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/...dule-opcua/src/main/java/com/hivemq/edge/adapters/opcua/mqtt2opcua/BuiltinJsonSchema.java b/...dule-opcua/src/main/java/com/hivemq/edge/adapters/opcua/mqtt2opcua/BuiltinJsonSchema.java
@@ -52,8 +52,10 @@ public BuiltinJsonSchema() {
             classToJsonSchema.put(BuiltinDataType.Boolean,
                     createJsonSchemaForBuiltinType("Boolean JsonSchema", BuiltinDataType.Boolean));
 
-            classToJsonSchema.put(BuiltinDataType.SByte, createJsonSchemaForBuiltinType(" SByte JsonSchema", BuiltinDataType.SByte));
-            classToJsonSchema.put(BuiltinDataType.Byte, createJsonSchemaForBuiltinType(" Byte JsonSchema", BuiltinDataType.Byte));
+            classToJsonSchema.put(BuiltinDataType.SByte,
+                    createJsonSchemaForBuiltinType(" SByte JsonSchema", BuiltinDataType.SByte));
+            classToJsonSchema.put(BuiltinDataType.Byte,
+                    createJsonSchemaForBuiltinType(" Byte JsonSchema", BuiltinDataType.Byte));
 
             classToJsonSchema.put(BuiltinDataType.UInt64,
                     createJsonSchemaForBuiltinType("UInt64 JsonSchema", BuiltinDataType.UInt64));
@@ -110,8 +112,7 @@ public BuiltinJsonSchema() {
     }
 
     private @NotNull JsonNode createJsonSchemaForBuiltinType(
-            final @NotNull String title,
-            final @NotNull BuiltinDataType builtinDataType) {
+            final @NotNull String title, final @NotNull BuiltinDataType builtinDataType) {
         final ObjectNode rootNode = OBJECT_MAPPER.createObjectNode();
         final ObjectNode propertiesNode = OBJECT_MAPPER.createObjectNode();
         final ObjectNode valueNode = OBJECT_MAPPER.createObjectNode();
@@ -156,6 +157,10 @@ public static void populatePropertiesForBuiltinType(
             case LocalizedText:
                 nestedPropertiesNode.set("type", new TextNode("string"));
                 return;
+            case DateTime:
+                nestedPropertiesNode.set("type", new TextNode("string"));
+                nestedPropertiesNode.set("format", new TextNode("date-time"));
+                return;
             case Int16:
                 nestedPropertiesNode.set("type", new TextNode(INTEGER_DATA_TYPE));
                 nestedPropertiesNode.set(MINIMUM_KEY_WORD, new ShortNode(Short.MIN_VALUE));
@@ -177,7 +182,6 @@ public static void populatePropertiesForBuiltinType(
                 nestedPropertiesNode.set(MINIMUM_KEY_WORD, new LongNode(UInteger.MIN_VALUE));
                 nestedPropertiesNode.set(MAXIMUM_KEY_WORD, new LongNode(UInteger.MAX_VALUE));
                 return;
-            case DateTime:
             case Int64:
                 nestedPropertiesNode.set("type", new TextNode(INTEGER_DATA_TYPE));
                 nestedPropertiesNode.set(MINIMUM_KEY_WORD, new LongNode(Long.MIN_VALUE));

diff --git a/...e-opcua/src/main/java/com/hivemq/edge/adapters/opcua/mqtt2opcua/JsonToOpcUAConverter.java b/...e-opcua/src/main/java/com/hivemq/edge/adapters/opcua/mqtt2opcua/JsonToOpcUAConverter.java
@@ -47,6 +47,8 @@
 import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Field;
+import java.time.Instant;
+import java.util.Date;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
@@ -359,8 +361,8 @@ private static UUID extractGuid(final JsonNode jsonNode) {
     }
 
     private static DateTime extractDateTime(final JsonNode jsonNode) {
-        if (jsonNode.isLong()) {
-            return new DateTime(jsonNode.asLong());
+        if (jsonNode.isTextual()) {
+            return new DateTime(Date.from(Instant.parse(jsonNode.asText())));
         }
         throw createException(jsonNode, BuiltinDataType.DateTime.name());
     }
@@ -372,6 +374,7 @@ private static DateTime extractDateTime(final JsonNode jsonNode) {
         throw createException(jsonNode, BuiltinDataType.String.name());
     }
 
+
     static double extractDouble(final JsonNode jsonNode) {
         if (jsonNode.isDouble()) {
             return jsonNode.asDouble();