TH2-3857

README.md

@@ -1,5 +1,5 @@
 # Codec Xml via Xsd
-![version](https://img.shields.io/badge/version-0.0.3-blue.svg)
+![version](https://img.shields.io/badge/version-0.0.4-blue.svg)
 
 # How it works:
 
@@ -142,6 +142,12 @@ spec:
 
 ## Changelog
 
+### v0.0.4
+
+#### Feature:
+
+* Self-closing tags are ignored by the codec
+
 ### v0.0.3
 
 #### Feature:
@@ -159,4 +165,4 @@ spec:
 
 #### Feature:
 
-* First realization using underscore library as parser for json
+* First realization using underscore library as parser for json

build.gradle

@@ -69,7 +69,7 @@ jar {
 dependencies {
     api platform('com.exactpro.th2:bom:3.1.0')
     implementation 'com.exactpro.th2:common:3.31.5'
-    implementation 'com.exactpro.th2:codec:4.2.0'
+    implementation 'com.exactpro.th2:codec:4.7.2'
     implementation 'com.exactpro.th2:sailfish-utils:3.12.3'
 
     implementation "com.exactpro.sf:sailfish-core:${sailfishVersion}"
@@ -82,7 +82,9 @@ dependencies {
 
     implementation 'com.fasterxml.jackson.core:jackson-core:2.13.1'
     implementation 'com.github.javadev:underscore:1.69'
-
+
+    implementation group: 'org.apache.ws.xmlschema', name: 'xmlschema-core', version: '2.3.0'
+
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit5:${kotlin_version}"
     testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
     testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"

gradle.properties

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 
-release_version=0.0.3
+release_version=0.0.5
 kotlin_version=1.5.31
 description = 'th2 codec xml via xsd'
 

src/main/kotlin/com/exactpro/th2/codec/xml/NodeContent.kt

@@ -0,0 +1,118 @@
+package com.exactpro.th2.codec.xml
+
+import com.exactpro.th2.common.grpc.ListValue
+import com.exactpro.th2.common.grpc.Message
+import com.exactpro.th2.common.grpc.Value
+import com.exactpro.th2.common.grpc.Value.KindCase.SIMPLE_VALUE
+import com.exactpro.th2.common.grpc.Value.KindCase.MESSAGE_VALUE
+import com.exactpro.th2.common.grpc.Value.KindCase.LIST_VALUE
+import com.exactpro.th2.common.message.addField
+import com.exactpro.th2.common.message.message
+import com.exactpro.th2.common.value.add
+import com.exactpro.th2.common.value.listValue
+import javax.xml.namespace.QName
+
+class NodeContent(val nodeName: QName) {
+    val attributes: MutableMap<String, String> = mutableMapOf()
+    val childNodes: MutableMap<QName, MutableList<NodeContent>> = mutableMapOf()
+
+    var text: String? = null
+    var type: Value.KindCase = SIMPLE_VALUE
+
+    fun StreamReaderDelegateDecorator.addAttributes() {
+        if (attributeCount > 0) {
+            for (i in 0 until attributeCount) {
+                attributes[getAttributeName(i).localPart] = getAttributeValue(i)
+            }
+        }
+    }
+
+    fun setMessageType() {
+        if (this.type == SIMPLE_VALUE) {
+            this.type = MESSAGE_VALUE
+        }
+    }
+
+    fun release(messageBuilder: Message.Builder) {
+
+        // TODO: don't forget about attributes
+
+        childNodes.forEach {
+            messageBuilder.addNode(it.key, it.value)
+        }
+
+        messageBuilder.addField(nodeName.localPart, this)
+    }
+
+    private fun Message.Builder.addNode(nodeName: QName, nodeList: MutableList<NodeContent>) {
+        println("Message addNode $nodeName")
+        nodeList.forEach { node ->
+            when (node.type) {
+                MESSAGE_VALUE -> {
+                    val count = nodeList.count()
+                    if (count > 1) {
+                        val list = listValue()
+
+                        nodeList.forEach { nodeContent ->
+                            nodeContent.childNodes.forEach {
+                                list.addNode(it.key, it.value)
+                            }
+                        }
+
+                        addField(nodeName.localPart, list)
+                    } else if (count == 1) {
+                        val message = message()
+
+                        node.childNodes.forEach {
+                            message.addNode(it.key, it.value)
+                        }
+
+                        addField(nodeName.localPart, message)
+                    }
+                }
+
+                // TODO: mb I it's possible to have a list of simple values too
+                SIMPLE_VALUE -> addField(node.nodeName.localPart, node.text)
+
+                else -> throw IllegalArgumentException("Node $node can be either MESSAGE_VALUE or SIMPLE_VALUE")
+            }
+        }
+    }
+
+    private fun ListValue.Builder.addNode(nodeName: QName, nodeList: MutableList<NodeContent>) {
+        println("List addNode $nodeName, nodeList $nodeList")
+        nodeList.forEach { node ->
+            when (node.type) {
+                MESSAGE_VALUE -> {
+                    val count = nodeList.count()
+                    if (count > 1) {
+                        val list = listValue()
+
+                        node.childNodes.forEach {
+                            list.addNode(it.key, it.value)
+                        }
+
+                        add(list)
+                    } else if (count == 1) {
+                        val message = message()
+
+                        node.childNodes.forEach {
+                            message.addNode(it.key, it.value)
+                        }
+
+                        add(message)
+                    }
+                }
+
+                // TODO: mb I it's possible to have a list of simple values too
+                SIMPLE_VALUE -> add(node.text)
+
+                else -> throw IllegalArgumentException("Node $node can be either MESSAGE_VALUE or SIMPLE_VALUE")
+            }
+        }
+    }
+
+    override fun toString(): String {
+        return "NodeContent(attributes=$attributes, childNodes=$childNodes, text=$text, type=$type)"
+    }
+}