Missing json-schema header

Author: codepitbull

modules/hivemq-edge-module-opcua/src/main/java/com/hivemq/edge/adapters/opcua/mqtt2opcua/BuiltinJsonSchema.java

@@ -116,10 +116,6 @@ public BuiltinJsonSchema() {
         return classToJsonSchema.get(builtinDataType);
     }
 
-    public @NotNull JsonNode getJsonSchemaForArray(final @NotNull BuiltinDataType builtinDataType) {
-        return classToJsonSchema.get(builtinDataType);
-    }
-
     private @NotNull JsonNode createJsonSchemaForBuiltinType(
             final @NotNull String title, final @NotNull BuiltinDataType builtinDataType) {
         final ObjectNode rootNode = OBJECT_MAPPER.createObjectNode();
@@ -139,6 +135,25 @@ public BuiltinJsonSchema() {
         return rootNode;
     }
 
+    public @NotNull JsonNode getJsonSchema(final @NotNull BuiltinDataType builtinDataType,
+                                           final @NotNull UInteger[] dimensions) {
+
+        final ObjectNode rootNode = OBJECT_MAPPER.createObjectNode();
+        final ObjectNode propertiesNode = OBJECT_MAPPER.createObjectNode();
+        final ObjectNode valueNode = OBJECT_MAPPER.createObjectNode();
+        rootNode.set("$schema", new TextNode("https://json-schema.org/draft/2019-09/schema"));
+        rootNode.set("title", new TextNode("Array of " + builtinDataType.name() + " JsonSchema"));
+        rootNode.set("type", new TextNode("object"));
+        rootNode.set("properties", propertiesNode);
+        propertiesNode.set("value", valueNode);
+        populatePropertiesForArray(valueNode, builtinDataType, OBJECT_MAPPER, dimensions);
+
+        final ArrayNode requiredAttributes = OBJECT_MAPPER.createArrayNode();
+        requiredAttributes.add("value");
+        rootNode.set("required", requiredAttributes);
+        return rootNode;
+    }
+
     public static void populatePropertiesForArray(final @NotNull ObjectNode propertiesNode,
                                                   final @NotNull BuiltinDataType builtinDataType,
                                                   final @NotNull ObjectMapper objectMapper,

modules/hivemq-edge-module-opcua/src/main/java/com/hivemq/edge/adapters/opcua/mqtt2opcua/JsonSchemaGenerator.java

@@ -79,15 +79,8 @@ public void createJsonSchema(
             final BuiltinDataType builtinType = tree.getBuiltinType(dataType.getNodeId());
             if (builtinType != BuiltinDataType.ExtensionObject) {
                 if(dimensions != null && dimensions.length > 0) {
-                    final ObjectNode node = objectMapper.createObjectNode();
-                    BuiltinJsonSchema.populatePropertiesForArray(
-                            node,
-                            builtinType,
-                            objectMapper,
-                            dimensions);
-
-                    System.out.println("HMM " + node);
-                    output.finish(node);
+                    System.out.println("HMM " + builtinJsonSchema.getJsonSchema(builtinType, dimensions));
+                    output.finish(builtinJsonSchema.getJsonSchema(builtinType, dimensions));
                 } else {
                     output.finish(builtinJsonSchema.getJsonSchema(builtinType));
                 }