Feature/fbp 224 swimlane support

activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/ActivitiParser.kt

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.module.kotlin.readValue
 import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.BpmnFile
 import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.DiagramNode
 import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.ProcessNode
-import com.valb3r.bpmn.intellij.plugin.bpmn.api.BpmnProcessObject
+import com.valb3r.bpmn.intellij.plugin.bpmn.api.BpmnFileObject
 import com.valb3r.bpmn.intellij.plugin.bpmn.api.info.PropertyType
 import com.valb3r.bpmn.intellij.plugin.bpmn.parser.core.BaseBpmnParser
 import com.valb3r.bpmn.intellij.plugin.bpmn.parser.core.NS
@@ -116,18 +116,18 @@ open class ActivitiParser : BaseBpmnParser() {
 
     private val mapper: XmlMapper = mapper()
 
-    override fun parse(input: String): BpmnProcessObject {
+    override fun parse(input: String): BpmnFileObject {
         val dto = mapper.readValue<BpmnFile>(input)
         return toProcessObject(dto)
     }
 
-    private fun toProcessObject(dto: BpmnFile): BpmnProcessObject {
-        // TODO - Multi process support?
+    private fun toProcessObject(dto: BpmnFile): BpmnFileObject {
         markSubprocessesAndTransactionsThatHaveExternalDiagramAsCollapsed(dto.processes[0], dto.diagrams!!)
-        val process = dto.processes[0].toElement()
+        val processes = dto.processes.map { it.toElement() }
+        val collaborations = dto.collaborations?.map { it.toElement() } ?: emptyList()
         val diagrams = dto.diagrams!!.map { it.toElement() }
 
-        return BpmnProcessObject(process, diagrams)
+        return BpmnFileObject(processes, collaborations, diagrams)
     }
 
     override fun modelNs(): NS {

activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/ActivitiXml.kt

@@ -21,12 +21,12 @@ import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess.BpmnEve
 import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess.BpmnSubProcess
 import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.tasks.*
 import com.valb3r.bpmn.intellij.plugin.bpmn.api.diagram.DiagramElement
+import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.collaboration.Collaboration
 import org.mapstruct.Mapper
 import org.mapstruct.Mapping
 import org.mapstruct.Mappings
 import org.mapstruct.factory.Mappers
 import java.util.concurrent.ConcurrentHashMap
-import kotlin.reflect.KClass
 
 
 const val EXTENSION_ELEM_STREAM = "java(null == input.getExtensionElements() ? null : input.getExtensionElements().stream()"
@@ -38,20 +38,25 @@ const val EXTENSION_BOOLEAN_EXTRACTOR = ".map(it -> Boolean.valueOf(it.getString
 // https://github.com/FasterXML/jackson-dataformat-xml/issues/363
 // unfortunately this has failed with Kotlin 'data' classes
 class BpmnFile(
-        @JacksonXmlProperty(localName = "message")
-        @JsonMerge
-        @JacksonXmlElementWrapper(useWrapping = false)
-        var messages: List<MessageNode>? = null,
-
-        @JacksonXmlProperty(localName = "process")
-        @JsonMerge
-        @JacksonXmlElementWrapper(useWrapping = false)
-        var processes: List<ProcessNode>,
-
-        @JacksonXmlProperty(localName = "BPMNDiagram")
-        @JsonMerge
-        @JacksonXmlElementWrapper(useWrapping = false)
-        var diagrams: List<DiagramNode>? = null
+    @JacksonXmlProperty(localName = "message")
+    @JsonMerge
+    @JacksonXmlElementWrapper(useWrapping = false)
+    var messages: List<MessageNode>? = null,
+
+    @JacksonXmlProperty(localName = "collaboration")
+    @JsonMerge
+    @JacksonXmlElementWrapper(useWrapping = false)
+    var collaborations: List<Collaboration>? = null,
+
+    @JacksonXmlProperty(localName = "process")
+    @JsonMerge
+    @JacksonXmlElementWrapper(useWrapping = false)
+    var processes: List<ProcessNode>,
+
+    @JacksonXmlProperty(localName = "BPMNDiagram")
+    @JsonMerge
+    @JacksonXmlElementWrapper(useWrapping = false)
+    var diagrams: List<DiagramNode>? = null
 )
 
 data class MessageNode(val id: String, var name: String?)

activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/collaboration/Collaboration.kt

@@ -0,0 +1,43 @@
+package com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.collaboration
+
+import com.fasterxml.jackson.annotation.JsonMerge
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty
+import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.BpmnMappable
+import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process.BpmnElementIdMapper
+import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnCollaboration
+import org.mapstruct.Mapper
+import org.mapstruct.factory.Mappers
+
+data class Collaboration(
+    @JacksonXmlProperty(isAttribute = true) val id: String,
+    @JacksonXmlProperty(isAttribute = true) val name: String?,
+    @JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val participant: List<Participant>?,
+    @JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val messageFlow: List<MessageFlow>?,
+) : BpmnMappable<BpmnCollaboration> {
+
+    override fun toElement(): BpmnCollaboration {
+        return Mappers.getMapper(Mapping::class.java).convertToDto(this)
+    }
+
+    @Mapper(uses = [BpmnElementIdMapper::class])
+    interface Mapping {
+        fun convertToDto(input: Collaboration): BpmnCollaboration
+    }
+}
+
+data class Participant(
+    @JacksonXmlProperty(isAttribute = true) val id: String,
+    @JacksonXmlProperty(isAttribute = true) val name: String?,
+    @JacksonXmlProperty(isAttribute = true) val processRef: String?,
+    val documentation: String?
+)
+
+data class MessageFlow(
+    @JacksonXmlProperty(isAttribute = true) val id: String,
+    @JacksonXmlProperty(isAttribute = true) val name: String?,
+    val documentation: String?,
+    @JacksonXmlProperty(isAttribute = true) val sourceRef: String?,
+    @JacksonXmlProperty(isAttribute = true) val targetRef: String?,
+)
+

activiti-xml-parser/src/test/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/ActivityParserDumbTest.kt

@@ -1,7 +1,7 @@
 package com.valb3r.bpmn.intellij.plugin.activiti.parser
 
 import com.valb3r.bpmn.intellij.plugin.activiti.parser.testevents.*
-import com.valb3r.bpmn.intellij.plugin.bpmn.api.BpmnProcessObject
+import com.valb3r.bpmn.intellij.plugin.bpmn.api.BpmnFileObject
 import com.valb3r.bpmn.intellij.plugin.bpmn.api.PropertyTable
 import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId
 import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.BpmnSequenceFlow
@@ -25,7 +25,7 @@ internal class ActivityParserDumbTest {
 
     @Test
     fun `XML process with all Activiti elements is parseable without error`() {
-        val processObject: BpmnProcessObject?
+        val processObject: BpmnFileObject?
 
         processObject = ActivitiParser().parse("popurri.bpmn20.xml".asResource()!!)
 
@@ -34,7 +34,7 @@ internal class ActivityParserDumbTest {
 
     @Test
     fun `XML process without name should be parseable without error`() {
-        val processObject: BpmnProcessObject?
+        val processObject: BpmnFileObject?
 
         processObject = ActivitiParser().parse("empty-process-name.bpmn20.xml".asResource()!!)
 
@@ -44,7 +44,7 @@ internal class ActivityParserDumbTest {
 
     @Test
     fun `XML process with interlaced elements of same type should be parseable without error`() {
-        val processObject: BpmnProcessObject?
+        val processObject: BpmnFileObject?
 
         processObject = ActivitiParser().parse("duplicates.bpmn20.xml".asResource()!!)
 
@@ -53,7 +53,7 @@ internal class ActivityParserDumbTest {
 
     @Test
     fun `XML process with nested subprocess elements of same type should be parseable without error`() {
-        val processObject: BpmnProcessObject?
+        val processObject: BpmnFileObject?
 
         processObject = ActivitiParser().parse("nested.bpmn20.xml".asResource()!!)
 
@@ -62,38 +62,38 @@ internal class ActivityParserDumbTest {
 
     @Test
     fun `XML process with nested subprocess elements that have interlaced subelems of same type should be parseable without error`() {
-        val processObject: BpmnProcessObject?
+        val processObject: BpmnFileObject?
 
         processObject = ActivitiParser().parse("nested-interlaced.bpmn20.xml".asResource()!!)
 
         processObject.shouldNotBeNull()
-        processObject.process.body!!.serviceTask!!.map { it.id.id }.shouldContainAll(arrayOf("parentInterlaceBeginServiceTask", "parentInterlaceEndServiceTask"))
-        processObject.process.children!![BpmnElementId("sid-9E62AF47-D4DF-4492-BA2F-E531CEB29A03")]!!.serviceTask!!.shouldHaveSize(2)
-        processObject.process.children!![BpmnElementId("sid-9E62AF47-D4DF-4492-BA2F-E531CEB29A03")]!!.serviceTask!!.map { it.id.id }.shouldContain("nestedServiceTaskInterlaced")
+        processObject.processes[0].body!!.serviceTask!!.map { it.id.id }.shouldContainAll(arrayOf("parentInterlaceBeginServiceTask", "parentInterlaceEndServiceTask"))
+        processObject.processes[0].children!![BpmnElementId("sid-9E62AF47-D4DF-4492-BA2F-E531CEB29A03")]!!.serviceTask!!.shouldHaveSize(2)
+        processObject.processes[0].children!![BpmnElementId("sid-9E62AF47-D4DF-4492-BA2F-E531CEB29A03")]!!.serviceTask!!.map { it.id.id }.shouldContain("nestedServiceTaskInterlaced")
     }
 
     @Test
     fun `XML process with nested other subprocess elements that have interlaced subelems of same type should be parseable without error`() {
-        val processObject: BpmnProcessObject?
+        val processObject: BpmnFileObject?
 
         processObject = ActivitiParser().parse("nested-interlaced.bpmn20.xml".asResource()!!)
 
         processObject.shouldNotBeNull()
-        processObject.process.body!!.serviceTask!!.map { it.id.id }.shouldContainAll(arrayOf("parentInterlaceBeginServiceTask", "parentInterlaceEndServiceTask"))
-        processObject.process.children!![BpmnElementId("sid-0B5D0923-5542-44DA-B86D-C3E4B2883DC2")]!!.serviceTask!!.shouldHaveSize(2)
-        processObject.process.children!![BpmnElementId("sid-0B5D0923-5542-44DA-B86D-C3E4B2883DC2")]!!.serviceTask!!.map { it.id.id }.shouldContain("nestedServiceTaskInterlacedOther")
+        processObject.processes[0].body!!.serviceTask!!.map { it.id.id }.shouldContainAll(arrayOf("parentInterlaceBeginServiceTask", "parentInterlaceEndServiceTask"))
+        processObject.processes[0].children!![BpmnElementId("sid-0B5D0923-5542-44DA-B86D-C3E4B2883DC2")]!!.serviceTask!!.shouldHaveSize(2)
+        processObject.processes[0].children!![BpmnElementId("sid-0B5D0923-5542-44DA-B86D-C3E4B2883DC2")]!!.serviceTask!!.map { it.id.id }.shouldContain("nestedServiceTaskInterlacedOther")
     }
 
     @Test
     fun `XML process with nested transactional subprocess elements that have interlaced subelems of same type should be parseable without error`() {
-        val processObject: BpmnProcessObject?
+        val processObject: BpmnFileObject?
 
         processObject = ActivitiParser().parse("nested-interlaced.bpmn20.xml".asResource()!!)
 
         processObject.shouldNotBeNull()
-        processObject.process.body!!.serviceTask!!.map { it.id.id }.shouldContainAll(arrayOf("parentInterlaceBeginServiceTask", "parentInterlaceEndServiceTask"))
-        processObject.process.children!![BpmnElementId("sid-77F95F37-ADC3-4EBB-8F21-AEF1C015D5EB")]!!.serviceTask!!.shouldHaveSize(2)
-        processObject.process.children!![BpmnElementId("sid-77F95F37-ADC3-4EBB-8F21-AEF1C015D5EB")]!!.serviceTask!!.map { it.id.id }.shouldContain("nestedServiceTaskInterlacedYetOther")
+        processObject.processes[0].body!!.serviceTask!!.map { it.id.id }.shouldContainAll(arrayOf("parentInterlaceBeginServiceTask", "parentInterlaceEndServiceTask"))
+        processObject.processes[0].children!![BpmnElementId("sid-77F95F37-ADC3-4EBB-8F21-AEF1C015D5EB")]!!.serviceTask!!.shouldHaveSize(2)
+        processObject.processes[0].children!![BpmnElementId("sid-77F95F37-ADC3-4EBB-8F21-AEF1C015D5EB")]!!.serviceTask!!.map { it.id.id }.shouldContain("nestedServiceTaskInterlacedYetOther")
     }
 
     @Test
@@ -223,7 +223,7 @@ internal class ActivityParserDumbTest {
 
         updated.shouldNotBeNull()
         val updatedProcess = ActivitiParser().parse(updated)
-        updatedProcess.process.children!![BpmnElementId("sid-1334170C-BA4D-4387-99BD-44229D18942C")]!!.sequenceFlow!!.map { it.id }.shouldContain(newId)
+        updatedProcess.processes[0].children!![BpmnElementId("sid-1334170C-BA4D-4387-99BD-44229D18942C")]!!.sequenceFlow!!.map { it.id }.shouldContain(newId)
     }
 
     @Test
@@ -258,7 +258,7 @@ internal class ActivityParserDumbTest {
 
         updated.shouldNotBeNull()
         val processObject = ActivitiParser().parse(updated)
-        processObject.process.body!!.transaction!!.map { it.id.id }.shouldContain("sid-9DBEBCA6-7BE8-4170-ACC3-4548A2244C40")
+        processObject.processes[0].body!!.transaction!!.map { it.id.id }.shouldContain("sid-9DBEBCA6-7BE8-4170-ACC3-4548A2244C40")
     }
 
     @Test
@@ -280,7 +280,7 @@ internal class ActivityParserDumbTest {
 
         updated.shouldNotBeNull()
         val updatedProcess = ActivitiParser().parse(updated)
-        val sequenceFlow = updatedProcess.process.body!!.sequenceFlow!!.filter { it.id.id == "sid-2CF229A2-6399-4510-AED6-45B5C553458C"}.shouldHaveSingleItem()
+        val sequenceFlow = updatedProcess.processes[0].body!!.sequenceFlow!!.filter { it.id.id == "sid-2CF229A2-6399-4510-AED6-45B5C553458C"}.shouldHaveSingleItem()
         sequenceFlow.conditionExpression!!.text.shouldBeNull()
     }
 
@@ -293,7 +293,7 @@ internal class ActivityParserDumbTest {
 
         updated.shouldNotBeNull()
         val updatedProcess = ActivitiParser().parse(updated)
-        val sequenceFlow = updatedProcess.process.body!!.sequenceFlow!!.filter { it.id.id == "sid-BFF510EA-1AD5-4353-AB11-DF8B2090A9FD"}.shouldHaveSingleItem()
+        val sequenceFlow = updatedProcess.processes[0].body!!.sequenceFlow!!.filter { it.id.id == "sid-BFF510EA-1AD5-4353-AB11-DF8B2090A9FD"}.shouldHaveSingleItem()
         sequenceFlow.conditionExpression!!.text.shouldBeNull()
     }
 }

activiti-xml-parser/src/test/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/CommonUtils.kt

@@ -1,21 +1,21 @@
 package com.valb3r.bpmn.intellij.plugin.activiti.parser
 
-import com.valb3r.bpmn.intellij.plugin.bpmn.api.BpmnProcessObject
+import com.valb3r.bpmn.intellij.plugin.bpmn.api.BpmnFileObject
 import com.valb3r.bpmn.intellij.plugin.bpmn.api.events.EventPropagatableToXml
 import org.amshove.kluent.shouldNotBeNull
 import java.nio.charset.StandardCharsets
 
 fun String.asResource(): String? = object {}::class.java.classLoader.getResource(this)?.readText(StandardCharsets.UTF_8)
 
-fun readAndUpdateProcess(parser: ActivitiParser, event: EventPropagatableToXml): BpmnProcessObject {
+fun readAndUpdateProcess(parser: ActivitiParser, event: EventPropagatableToXml): BpmnFileObject {
     return readAndUpdateProcess(parser, "simple-nested.bpmn20.xml", event)
 }
 
-fun readAndUpdateProcess(parser: ActivitiParser, processName: String, event: EventPropagatableToXml): BpmnProcessObject {
+fun readAndUpdateProcess(parser: ActivitiParser, processName: String, event: EventPropagatableToXml): BpmnFileObject {
     return readAndUpdateProcess(parser, processName, listOf(event))
 }
 
-fun readAndUpdateProcess(parser: ActivitiParser, processName: String, events: List<EventPropagatableToXml>): BpmnProcessObject {
+fun readAndUpdateProcess(parser: ActivitiParser, processName: String, events: List<EventPropagatableToXml>): BpmnFileObject {
     val updated = updateBpmnFile(parser, processName, events)
     return parser.parse(updated)
 }

activiti-xml-parser/src/test/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/WindowsEncodingAndCrLfTest.kt

@@ -19,7 +19,7 @@ class WindowsEncodingAndCrLfTest {
         val updateNameTo = "提交请假"
         val ActivityParser = ActivitiParser()
         val updated = ActivityParser.update(initial, listOf(StringValueUpdatedEvent(BpmnElementId("empty-process-name"), PropertyType.NAME, updateNameTo)))
-        ActivityParser.parse(updated).process.name.shouldBeEqualTo(updateNameTo)
+        ActivityParser.parse(updated).processes[0].name.shouldBeEqualTo(updateNameTo)
     }
 
     private fun setKoi8DefaultEncoding() {