Fix schema generation to be backwards compatible

Author: codepitbull

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

@@ -257,18 +257,12 @@ private void verifyDataTypeForField(final @NotNull FieldInformation fieldType) {
                                 fieldInformation.customDataType().getNodeId().toParseableString())));
         rootNode.set(TYPE, new TextNode(OBJECT_DATA_TYPE));
 
-        // Create the root properties node that contains "value" and metadata
-        final ObjectNode rootPropertiesNode = MAPPER.createObjectNode();
-        rootNode.set("properties", rootPropertiesNode);
-
         final ObjectNode valueNode = MAPPER.createObjectNode();
-        rootPropertiesNode.set("value", valueNode);
         valueNode.set(TYPE, new TextNode(OBJECT_DATA_TYPE));
 
         final ObjectNode propertiesNode = MAPPER.createObjectNode();
         valueNode.set("properties", propertiesNode);
 
-
         final ArrayNode requiredAttributesArray = MAPPER.createArrayNode();
         fieldInformation.nestedFields().forEach(fieldInfo -> {
             if (fieldInfo.required()) {
@@ -279,9 +273,13 @@ private void verifyDataTypeForField(final @NotNull FieldInformation fieldType) {
 
         valueNode.set("required", requiredAttributesArray);
 
-        // Add metadata properties if enabled
         if (includeMetadata) {
+            final ObjectNode rootPropertiesNode = MAPPER.createObjectNode();
+            rootNode.set("properties", rootPropertiesNode);
+            rootPropertiesNode.set("value", valueNode);
             BuiltinJsonSchema.addReadOnlyMetadataProperties(rootPropertiesNode, MAPPER);
+        } else {
+            rootNode.set("value", valueNode);
         }
 
         final ArrayNode requiredProperties = MAPPER.createArrayNode();