From 62bc253eb1fb81c260ecf00463f574639f519e79 Mon Sep 17 00:00:00 2001 From: valb3r Date: Sat, 15 Jul 2023 21:24:38 +0300 Subject: [PATCH 1/2] FBP-110. Added support of listeners for more elements --- .../plugin/flowable/parser/nodes/process/CallActivity.kt | 4 +++- .../plugin/flowable/parser/nodes/process/EndEventNode.kt | 6 +++++- .../parser/nodes/process/IntermediateCatchEvent.kt | 6 +++++- .../parser/nodes/process/IntermediateThrowEvent.kt | 7 +++++-- .../plugin/flowable/parser/nodes/process/SequenceFlow.kt | 6 +++++- .../plugin/flowable/parser/nodes/process/SubProcess.kt | 4 ++++ .../plugin/flowable/parser/nodes/process/Transaction.kt | 4 ++++ .../plugin/bpmn/api/bpmn/elements/BpmnSequenceFlow.kt | 3 ++- .../elements/events/begin/BpmnStartConditionalEvent.kt | 4 +++- .../api/bpmn/elements/events/begin/BpmnStartErrorEvent.kt | 4 +++- .../bpmn/elements/events/begin/BpmnStartEscalationEvent.kt | 2 ++ .../bpmn/elements/events/begin/BpmnStartMessageEvent.kt | 2 ++ .../api/bpmn/elements/events/begin/BpmnStartSignalEvent.kt | 2 ++ .../api/bpmn/elements/events/begin/BpmnStartTimerEvent.kt | 4 +++- .../events/catching/BpmnIntermediateCatchingEvent.kt | 2 ++ .../catching/BpmnIntermediateConditionalCatchingEvent.kt | 4 +++- .../events/catching/BpmnIntermediateLinkCatchingEvent.kt | 2 ++ .../catching/BpmnIntermediateMessageCatchingEvent.kt | 2 ++ .../events/catching/BpmnIntermediateSignalCatchingEvent.kt | 2 ++ .../events/catching/BpmnIntermediateTimerCatchingEvent.kt | 2 ++ .../api/bpmn/elements/events/end/BpmnEndCancelEvent.kt | 2 ++ .../bpmn/api/bpmn/elements/events/end/BpmnEndErrorEvent.kt | 4 +++- .../api/bpmn/elements/events/end/BpmnEndEscalationEvent.kt | 2 ++ .../bpmn/api/bpmn/elements/events/end/BpmnEndEvent.kt | 4 +++- .../api/bpmn/elements/events/end/BpmnEndTerminateEvent.kt | 2 ++ .../throwing/BpmnIntermediateEscalationThrowingEvent.kt | 2 ++ .../events/throwing/BpmnIntermediateLinkThrowingEvent.kt | 2 ++ .../events/throwing/BpmnIntermediateNoneThrowingEvent.kt | 2 ++ .../events/throwing/BpmnIntermediateSignalThrowingEvent.kt | 2 ++ .../events/throwing/BpmnIntermediateThrowingEvent.kt | 4 +++- 30 files changed, 84 insertions(+), 14 deletions(-) diff --git a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/CallActivity.kt b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/CallActivity.kt index d7fd7102b..4a41fd538 100644 --- a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/CallActivity.kt +++ b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/CallActivity.kt @@ -1,9 +1,11 @@ package com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process +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.bpmn.api.bpmn.elements.activities.BpmnCallActivity import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.BpmnMappable +import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -16,7 +18,7 @@ data class CallActivity( @JacksonXmlProperty(isAttribute = true) val calledElementType: String?, @JacksonXmlProperty(isAttribute = true) val inheritVariables: Boolean?, @JacksonXmlProperty(isAttribute = true) val fallbackToDefaultTenant: Boolean?, - val extensionElements: ExtensionElements? + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { override fun toElement(): BpmnCallActivity { diff --git a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/EndEventNode.kt b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/EndEventNode.kt index b72c6e8af..5116220af 100644 --- a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/EndEventNode.kt +++ b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/EndEventNode.kt @@ -1,12 +1,15 @@ package com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process +import com.fasterxml.jackson.annotation.JsonMerge import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.end.BpmnEndEvent import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.BpmnMappable import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.definitions.ErrorEventDefinition import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.definitions.EscalationEventDefinition +import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -17,7 +20,8 @@ data class EndEventNode( @JsonSetter(nulls = Nulls.AS_EMPTY) val errorEventDefinition: ErrorEventDefinition?, @JsonSetter(nulls = Nulls.AS_EMPTY) val escalationEventDefinition: EscalationEventDefinition?, @JsonSetter(nulls = Nulls.AS_EMPTY) val cancelEventDefinition: CancelEventDefinition?, - @JsonSetter(nulls = Nulls.AS_EMPTY) val terminateEventDefinition: TerminateEventDefinition? + @JsonSetter(nulls = Nulls.AS_EMPTY) val terminateEventDefinition: TerminateEventDefinition?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { override fun toElement(): BpmnEndEvent { diff --git a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/IntermediateCatchEvent.kt b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/IntermediateCatchEvent.kt index 0127d7c01..9ba0aee63 100644 --- a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/IntermediateCatchEvent.kt +++ b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/IntermediateCatchEvent.kt @@ -1,7 +1,9 @@ package com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process +import com.fasterxml.jackson.annotation.JsonMerge import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.catching.BpmnIntermediateCatchingEvent import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.BpmnMappable @@ -9,6 +11,7 @@ import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.defi import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.definitions.MessageEventDefinition import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.definitions.SignalEventDefinition import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.definitions.TimerEventDefinition +import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -19,7 +22,8 @@ data class IntermediateCatchEvent( @JsonSetter(nulls = Nulls.AS_EMPTY) val timerEventDefinition: TimerEventDefinition?, @JsonSetter(nulls = Nulls.AS_EMPTY) val signalEventDefinition: SignalEventDefinition?, @JsonSetter(nulls = Nulls.AS_EMPTY) val messageEventDefinition: MessageEventDefinition?, - @JsonSetter(nulls = Nulls.AS_EMPTY) val conditionalEventDefinition: ConditionalEventDefinition? + @JsonSetter(nulls = Nulls.AS_EMPTY) val conditionalEventDefinition: ConditionalEventDefinition?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { diff --git a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/IntermediateThrowEvent.kt b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/IntermediateThrowEvent.kt index cb88f9356..309b5697e 100644 --- a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/IntermediateThrowEvent.kt +++ b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/IntermediateThrowEvent.kt @@ -1,12 +1,15 @@ package com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process +import com.fasterxml.jackson.annotation.JsonMerge import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.throwing.BpmnIntermediateThrowingEvent import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.BpmnMappable import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.definitions.EscalationEventDefinition import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.definitions.SignalEventDefinition +import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -15,8 +18,8 @@ data class IntermediateThrowEvent( @JacksonXmlProperty(isAttribute = true) val name: String?, @JacksonXmlProperty(isAttribute = true) val documentation: String?, @JsonSetter(nulls = Nulls.AS_EMPTY) val signalEventDefinition: SignalEventDefinition?, - @JsonSetter(nulls = Nulls.AS_EMPTY) val escalationEventDefinition: EscalationEventDefinition? - + @JsonSetter(nulls = Nulls.AS_EMPTY) val escalationEventDefinition: EscalationEventDefinition?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { override fun toElement(): BpmnIntermediateThrowingEvent { diff --git a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/SequenceFlow.kt b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/SequenceFlow.kt index e0e44288a..c6e5ec2c9 100644 --- a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/SequenceFlow.kt +++ b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/SequenceFlow.kt @@ -1,12 +1,15 @@ package com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process +import com.fasterxml.jackson.annotation.JsonMerge import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlCData +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.BpmnSequenceFlow import com.valb3r.bpmn.intellij.plugin.bpmn.parser.core.CDATA_FIELD import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.BpmnMappable +import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -16,7 +19,8 @@ data class SequenceFlow( val documentation: String?, @JacksonXmlProperty(isAttribute = true) val sourceRef: String?, @JacksonXmlProperty(isAttribute = true) val targetRef: String?, - val conditionExpression: ConditionExpression? + val conditionExpression: ConditionExpression?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { override fun toElement(): BpmnSequenceFlow { diff --git a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/SubProcess.kt b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/SubProcess.kt index b513421a1..d1de3cf91 100644 --- a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/SubProcess.kt +++ b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/SubProcess.kt @@ -1,11 +1,14 @@ package com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process import com.fasterxml.jackson.annotation.JsonIgnore +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.bpmn.api.bpmn.elements.subprocess.BpmnCollapsedSubprocess import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess.BpmnSubProcess import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.BpmnMappable import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.ProcessBody +import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.Mapping import org.mapstruct.factory.Mappers @@ -19,6 +22,7 @@ class SubProcess: BpmnMappable, ProcessBody() { @JacksonXmlProperty(isAttribute = true) var exclusive: Boolean? = null @JacksonXmlProperty(isAttribute = true) var triggeredByEvent: Boolean? = null @JsonIgnore var hasExternalDiagram: Boolean = false + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) var extensionElements: List? = null override fun toElement(): BpmnSubProcess { return Mappers.getMapper(SubProcessMapping::class.java).convertToDto(this) diff --git a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/Transaction.kt b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/Transaction.kt index d5ddd535d..5cfcaa605 100644 --- a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/Transaction.kt +++ b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/Transaction.kt @@ -1,11 +1,14 @@ package com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process import com.fasterxml.jackson.annotation.JsonIgnore +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.bpmn.api.bpmn.elements.subprocess.BpmnTransactionCollapsedSubprocess import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess.BpmnTransactionalSubProcess import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.BpmnMappable import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.ProcessBody +import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.Mapping import org.mapstruct.factory.Mappers @@ -18,6 +21,7 @@ class Transaction: BpmnMappable, ProcessBody() { @JacksonXmlProperty(isAttribute = true) var async: Boolean? = null @JacksonXmlProperty(isAttribute = true) var exclusive: Boolean? = null @JsonIgnore var hasExternalDiagram: Boolean = false + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null override fun toElement(): BpmnTransactionalSubProcess { return Mappers.getMapper(TransactionMapping::class.java).convertToDto(this) diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/BpmnSequenceFlow.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/BpmnSequenceFlow.kt index c379c335f..245c62d2a 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/BpmnSequenceFlow.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/BpmnSequenceFlow.kt @@ -8,7 +8,8 @@ data class BpmnSequenceFlow( val documentation: String? = null, val sourceRef: String? = null, // can't be null in reality, but malformed XMLs should be editable too val targetRef: String? = null, // can't be null in reality, but malformed XMLs should be editable too - val conditionExpression: ConditionExpression? = null + val conditionExpression: ConditionExpression? = null, + val executionListener: List? = null ): WithBpmnId { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartConditionalEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartConditionalEvent.kt index 5b32d7e6b..b931eed5c 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartConditionalEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartConditionalEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.begin import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnConditionalEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnTimerEventDefinition @@ -14,7 +15,8 @@ data class BpmnStartConditionalEvent( val asyncAfter: Boolean? = null, val incoming: List? = null, val outgoing: List? = null, - val conditionalEventDefinition: BpmnConditionalEventDefinition? = null + val conditionalEventDefinition: BpmnConditionalEventDefinition? = null, + val executionListener: List? = null ) : WithBpmnId, BpmnStartEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartErrorEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartErrorEvent.kt index 2ec397cf7..6a7846ee7 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartErrorEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartErrorEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.begin import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnErrorEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.BpmnStartEventAlike @@ -13,7 +14,8 @@ data class BpmnStartErrorEvent( val asyncAfter: Boolean? = null, val incoming: List? = null, val outgoing: List? = null, - val errorEventDefinition: BpmnErrorEventDefinition? = null + val errorEventDefinition: BpmnErrorEventDefinition? = null, + val executionListener: List? = null ) : WithBpmnId, BpmnStartEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartEscalationEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartEscalationEvent.kt index 562879cb4..dacf939a4 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartEscalationEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartEscalationEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.begin import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnEscalationEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.BpmnStartEventAlike @@ -14,6 +15,7 @@ data class BpmnStartEscalationEvent( val incoming: List? = null, val outgoing: List? = null, val escalationEventDefinition: BpmnEscalationEventDefinition? = null, + val executionListener: List? = null ) : WithBpmnId, BpmnStartEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartMessageEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartMessageEvent.kt index 72bc5ce51..333c1d285 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartMessageEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartMessageEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.begin import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnMessageEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.BpmnStartEventAlike @@ -14,6 +15,7 @@ data class BpmnStartMessageEvent( val incoming: List? = null, val outgoing: List? = null, val messageEventDefinition: BpmnMessageEventDefinition? = null, + val executionListener: List? = null ) : WithBpmnId, BpmnStartEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartSignalEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartSignalEvent.kt index 7be5892ac..697d1b6b7 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartSignalEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartSignalEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.begin import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnSignalEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.BpmnStartEventAlike @@ -14,6 +15,7 @@ data class BpmnStartSignalEvent( val incoming: List? = null, val outgoing: List? = null, val signalEventDefinition: BpmnSignalEventDefinition? = null, + val executionListener: List? = null ) : WithBpmnId, BpmnStartEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartTimerEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartTimerEvent.kt index 668d38f50..4b1a08d03 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartTimerEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/begin/BpmnStartTimerEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.begin import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnTimerEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.BpmnStartEventAlike @@ -13,7 +14,8 @@ data class BpmnStartTimerEvent( val asyncAfter: Boolean? = null, val incoming: List? = null, val outgoing: List? = null, - val timerEventDefinition: BpmnTimerEventDefinition? = null + val timerEventDefinition: BpmnTimerEventDefinition? = null, + val executionListener: List? = null ) : WithBpmnId, BpmnStartEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateCatchingEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateCatchingEvent.kt index 2b262232a..d70476845 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateCatchingEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateCatchingEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.catching import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.* @@ -15,6 +16,7 @@ data class BpmnIntermediateCatchingEvent( val linkEventDefinition: BpmnLinkEventDefinition? = null, val incoming: List? = null, val outgoing: List? = null, + val executionListener: List? = null ) : WithBpmnId { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateConditionalCatchingEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateConditionalCatchingEvent.kt index e1dd95a51..1bf293ea6 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateConditionalCatchingEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateConditionalCatchingEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.catching import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnConditionalEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.IntermediateCatchingEventAlike @@ -11,7 +12,8 @@ data class BpmnIntermediateConditionalCatchingEvent( val documentation: String? = null, val incoming: List? = null, val outgoing: List? = null, - val conditionalEventDefinition: BpmnConditionalEventDefinition? = null + val conditionalEventDefinition: BpmnConditionalEventDefinition? = null, + val executionListener: List? = null ) : WithBpmnId, IntermediateCatchingEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateLinkCatchingEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateLinkCatchingEvent.kt index 00d7ee881..7e82efcfd 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateLinkCatchingEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateLinkCatchingEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.catching import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnLinkEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.IntermediateCatchingEventAlike @@ -12,6 +13,7 @@ data class BpmnIntermediateLinkCatchingEvent( val incoming: List? = null, val outgoing: List? = null, val linkEventDefinition: BpmnLinkEventDefinition? = null, + val executionListener: List? = null ) : WithBpmnId, IntermediateCatchingEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateMessageCatchingEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateMessageCatchingEvent.kt index 464ac3f1d..fc188837b 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateMessageCatchingEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateMessageCatchingEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.catching import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnMessageEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.IntermediateCatchingEventAlike @@ -12,6 +13,7 @@ data class BpmnIntermediateMessageCatchingEvent( val incoming: List? = null, val outgoing: List? = null, val messageEventDefinition: BpmnMessageEventDefinition? = null, + val executionListener: List? = null ) : WithBpmnId, IntermediateCatchingEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateSignalCatchingEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateSignalCatchingEvent.kt index 745928b4a..6ebd45a8f 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateSignalCatchingEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateSignalCatchingEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.catching import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnSignalEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.IntermediateCatchingEventAlike @@ -12,6 +13,7 @@ data class BpmnIntermediateSignalCatchingEvent( val incoming: List? = null, val outgoing: List? = null, val signalEventDefinition: BpmnSignalEventDefinition? = null, + val executionListener: List? = null ) : WithBpmnId, IntermediateCatchingEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateTimerCatchingEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateTimerCatchingEvent.kt index ced2cfffa..b2f0563d5 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateTimerCatchingEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/catching/BpmnIntermediateTimerCatchingEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.catching import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnTimerEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.IntermediateCatchingEventAlike @@ -12,6 +13,7 @@ data class BpmnIntermediateTimerCatchingEvent( val incoming: List? = null, val outgoing: List? = null, val timerEventDefinition: BpmnTimerEventDefinition? = null, + val executionListener: List? = null ) : WithBpmnId, IntermediateCatchingEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndCancelEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndCancelEvent.kt index 5d9273b70..013367b56 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndCancelEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndCancelEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.end import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.EndEventAlike @@ -12,6 +13,7 @@ data class BpmnEndCancelEvent( val asyncAfter: Boolean? = null, val incoming: List? = null, val outgoing: List? = null, + val executionListener: List? = null ): WithBpmnId, EndEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndErrorEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndErrorEvent.kt index dd1a4280f..7ad43108d 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndErrorEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndErrorEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.end import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnErrorEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.EndEventAlike @@ -13,7 +14,8 @@ data class BpmnEndErrorEvent( val asyncAfter: Boolean? = null, val incoming: List? = null, val outgoing: List? = null, - val errorEventDefinition: BpmnErrorEventDefinition? = null + val errorEventDefinition: BpmnErrorEventDefinition? = null, + val executionListener: List? = null ): WithBpmnId, EndEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndEscalationEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndEscalationEvent.kt index 187fbf569..63e303704 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndEscalationEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndEscalationEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.end import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnEscalationEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.BpmnBoundaryEventAlike @@ -15,6 +16,7 @@ data class BpmnEndEscalationEvent( val incoming: List? = null, val outgoing: List? = null, val escalationEventDefinition: BpmnEscalationEventDefinition? = null, + val executionListener: List? = null ): WithBpmnId, EndEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndEvent.kt index 52598c60b..ed22aa9d5 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.end import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnErrorEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnEscalationEventDefinition @@ -17,7 +18,8 @@ data class BpmnEndEvent( val errorEventDefinition: BpmnErrorEventDefinition? = null, val escalationEventDefinition: BpmnEscalationEventDefinition? = null, val cancelEventDefinition: CancelEventDefinition? = null, - val terminateEventDefinition: TerminateEventDefinition? = null + val terminateEventDefinition: TerminateEventDefinition? = null, + val executionListener: List? = null ): WithBpmnId, EndEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndTerminateEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndTerminateEvent.kt index 583c2b963..d48c67bea 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndTerminateEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/end/BpmnEndTerminateEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.end import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.EndEventAlike @@ -12,6 +13,7 @@ data class BpmnEndTerminateEvent( val asyncAfter: Boolean? = null, val incoming: List? = null, val outgoing: List? = null, + val executionListener: List? = null ): WithBpmnId, EndEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateEscalationThrowingEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateEscalationThrowingEvent.kt index 4f10285db..fa3ba16c2 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateEscalationThrowingEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateEscalationThrowingEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.throwing import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnEscalationEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.IntermediateThrowingEventAlike @@ -12,6 +13,7 @@ data class BpmnIntermediateEscalationThrowingEvent( val incoming: List? = null, val outgoing: List? = null, val escalationEventDefinition: BpmnEscalationEventDefinition? = null, + val executionListener: List? = null ) : WithBpmnId, IntermediateThrowingEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateLinkThrowingEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateLinkThrowingEvent.kt index 657eaeb7d..4f6473ba3 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateLinkThrowingEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateLinkThrowingEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.throwing import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnLinkEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.IntermediateCatchingEventAlike @@ -13,6 +14,7 @@ data class BpmnIntermediateLinkThrowingEvent( val incoming: List? = null, val outgoing: List? = null, val linkEventDefinition: BpmnLinkEventDefinition? = null, + val executionListener: List? = null ) : WithBpmnId, IntermediateThrowingEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateNoneThrowingEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateNoneThrowingEvent.kt index 9d8479b1b..a428f9c51 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateNoneThrowingEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateNoneThrowingEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.throwing import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.IntermediateThrowingEventAlike @@ -10,6 +11,7 @@ data class BpmnIntermediateNoneThrowingEvent( val documentation: String? = null, val incoming: List? = null, val outgoing: List? = null, + val executionListener: List? = null ) : WithBpmnId, IntermediateThrowingEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateSignalThrowingEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateSignalThrowingEvent.kt index f8bd37f14..307939189 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateSignalThrowingEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateSignalThrowingEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.throwing import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnSignalEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.IntermediateThrowingEventAlike @@ -12,6 +13,7 @@ data class BpmnIntermediateSignalThrowingEvent( val incoming: List? = null, val outgoing: List? = null, val signalEventDefinition: BpmnSignalEventDefinition? = null, + val executionListener: List? = null ) : WithBpmnId, IntermediateThrowingEventAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateThrowingEvent.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateThrowingEvent.kt index 6a0e2bdc5..075f81bf4 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateThrowingEvent.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/events/throwing/BpmnIntermediateThrowingEvent.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.throwing import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnEscalationEventDefinition import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnLinkEventDefinition @@ -14,7 +15,8 @@ data class BpmnIntermediateThrowingEvent( val outgoing: List? = null, val signalEventDefinition: BpmnSignalEventDefinition? = null, val escalationEventDefinition: BpmnEscalationEventDefinition? = null, - val linkEventDefinition: BpmnLinkEventDefinition? = null + val linkEventDefinition: BpmnLinkEventDefinition? = null, + val executionListener: List? = null ) : WithBpmnId { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { From 0769fb9317c0190231c00f4436d82bd32583da17 Mon Sep 17 00:00:00 2001 From: valb3r Date: Sat, 15 Jul 2023 21:45:21 +0300 Subject: [PATCH 2/2] FBP-110. Added support of listeners for more elements --- .../activiti/parser/nodes/process/AdHocSubProcess.kt | 4 ++++ .../activiti/parser/nodes/process/CallActivity.kt | 12 ++++-------- .../activiti/parser/nodes/process/EndEventNode.kt | 6 +++++- .../parser/nodes/process/EventBasedGateway.kt | 6 +++++- .../parser/nodes/process/ExclusiveGateway.kt | 6 +++++- .../parser/nodes/process/InclusiveGateway.kt | 6 +++++- .../parser/nodes/process/IntermediateCatchEvent.kt | 6 +++++- .../parser/nodes/process/IntermediateThrowEvent.kt | 6 +++++- .../activiti/parser/nodes/process/ParallelGateway.kt | 6 +++++- .../activiti/parser/nodes/process/SequenceFlow.kt | 6 +++++- .../activiti/parser/nodes/process/SubProcess.kt | 4 ++++ .../activiti/parser/nodes/process/Transaction.kt | 4 ++++ .../camunda/parser/nodes/process/AdHocSubProcess.kt | 2 ++ .../camunda/parser/nodes/process/CallActivity.kt | 3 ++- .../camunda/parser/nodes/process/EndEventNode.kt | 4 +++- .../parser/nodes/process/IntermediateCatchEvent.kt | 4 +++- .../parser/nodes/process/IntermediateThrowEvent.kt | 4 +++- .../camunda/parser/nodes/process/ParallelGateway.kt | 4 +++- .../camunda/parser/nodes/process/SequenceFlow.kt | 2 ++ .../camunda/parser/nodes/process/SubProcess.kt | 2 ++ .../camunda/parser/nodes/process/Transaction.kt | 2 ++ .../flowable/parser/nodes/process/AdHocSubProcess.kt | 4 ++++ .../flowable/parser/nodes/process/ParallelGateway.kt | 6 +++++- .../api/bpmn/elements/activities/BpmnCallActivity.kt | 11 +++-------- .../bpmn/elements/subprocess/BpmnAdHocSubProcess.kt | 4 +++- .../elements/subprocess/BpmnCollapsedSubprocess.kt | 2 ++ .../bpmn/elements/subprocess/BpmnEventSubprocess.kt | 2 ++ .../api/bpmn/elements/subprocess/BpmnSubProcess.kt | 2 ++ .../subprocess/BpmnTransactionCollapsedSubprocess.kt | 2 ++ .../subprocess/BpmnTransactionalSubprocess.kt | 2 ++ .../intellij/plugin/bpmn/api/info/PropertyType.kt | 2 +- 31 files changed, 104 insertions(+), 32 deletions(-) diff --git a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/AdHocSubProcess.kt b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/AdHocSubProcess.kt index 32ba600e3..2e799b9d3 100644 --- a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/AdHocSubProcess.kt +++ b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/AdHocSubProcess.kt @@ -1,12 +1,15 @@ package com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process +import com.fasterxml.jackson.annotation.JsonMerge import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlCData +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText import com.valb3r.bpmn.intellij.plugin.activiti.parser.CDATA_FIELD import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.BpmnMappable import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.ProcessBody +import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process.nested.formprop.ExtensionElement import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess.BpmnAdHocSubProcess import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -18,6 +21,7 @@ class AdHocSubProcess: BpmnMappable, ProcessBody() { @JacksonXmlProperty(isAttribute = true) var ordering: String? = null var documentation: String? = null var completionCondition: CompletionCondition? = null + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null override fun toElement(): BpmnAdHocSubProcess { return Mappers.getMapper(Mapping::class.java).convertToDto(this) diff --git a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/CallActivity.kt b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/CallActivity.kt index 58152e522..ce15c466c 100644 --- a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/CallActivity.kt +++ b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/CallActivity.kt @@ -1,8 +1,10 @@ package com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process +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.nested.formprop.ExtensionElement import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.activities.BpmnCallActivity import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -16,7 +18,7 @@ data class CallActivity( @JacksonXmlProperty(isAttribute = true) val calledElementType: String?, @JacksonXmlProperty(isAttribute = true) val inheritVariables: Boolean?, @JacksonXmlProperty(isAttribute = true) val fallbackToDefaultTenant: Boolean?, - val extensionElements: ExtensionElements? + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { override fun toElement(): BpmnCallActivity { @@ -27,10 +29,4 @@ data class CallActivity( interface Mapping { fun convertToDto(input: CallActivity) : BpmnCallActivity } -} - -data class ExtensionElements( - @JacksonXmlElementWrapper(useWrapping = false) val out: List? -) - -data class OutExtensionElement(val source: String?, val target: String?) \ No newline at end of file +} \ No newline at end of file diff --git a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/EndEventNode.kt b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/EndEventNode.kt index 856d89b6e..50443f564 100644 --- a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/EndEventNode.kt +++ b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/EndEventNode.kt @@ -1,11 +1,14 @@ package com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process +import com.fasterxml.jackson.annotation.JsonMerge import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls +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.nested.definitions.ErrorEventDefinition import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process.nested.definitions.EscalationEventDefinition +import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process.nested.formprop.ExtensionElement import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.end.BpmnEndEvent import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -17,7 +20,8 @@ data class EndEventNode( @JsonSetter(nulls = Nulls.AS_EMPTY) val errorEventDefinition: ErrorEventDefinition?, @JsonSetter(nulls = Nulls.AS_EMPTY) val escalationEventDefinition: EscalationEventDefinition?, @JsonSetter(nulls = Nulls.AS_EMPTY) val cancelEventDefinition: CancelEventDefinition?, - @JsonSetter(nulls = Nulls.AS_EMPTY) val terminateEventDefinition: TerminateEventDefinition? + @JsonSetter(nulls = Nulls.AS_EMPTY) val terminateEventDefinition: TerminateEventDefinition?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { override fun toElement(): BpmnEndEvent { diff --git a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/EventBasedGateway.kt b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/EventBasedGateway.kt index 4ba172682..9bbf221b6 100644 --- a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/EventBasedGateway.kt +++ b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/EventBasedGateway.kt @@ -1,7 +1,10 @@ package com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process +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.nested.formprop.ExtensionElement import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.gateways.BpmnEventGateway import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -10,7 +13,8 @@ data class EventBasedGateway( @JacksonXmlProperty(isAttribute = true) val id: String, @JacksonXmlProperty(isAttribute = true) val name: String?, @JacksonXmlProperty(isAttribute = true, localName = "default") val defaultElement: String?, - val documentation: String? + val documentation: String?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { override fun toElement(): BpmnEventGateway { diff --git a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/ExclusiveGateway.kt b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/ExclusiveGateway.kt index b7e25bee5..1fb803e78 100644 --- a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/ExclusiveGateway.kt +++ b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/ExclusiveGateway.kt @@ -1,7 +1,10 @@ package com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process +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.nested.formprop.ExtensionElement import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.gateways.BpmnExclusiveGateway import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -10,7 +13,8 @@ data class ExclusiveGateway( @JacksonXmlProperty(isAttribute = true) val id: String, @JacksonXmlProperty(isAttribute = true) val name: String?, @JacksonXmlProperty(isAttribute = true, localName = "default") val defaultElement: String?, - val documentation: String? + val documentation: String?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { override fun toElement(): BpmnExclusiveGateway { diff --git a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/InclusiveGateway.kt b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/InclusiveGateway.kt index 736a280b2..52da4ac9d 100644 --- a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/InclusiveGateway.kt +++ b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/InclusiveGateway.kt @@ -1,7 +1,10 @@ package com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process +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.nested.formprop.ExtensionElement import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.gateways.BpmnInclusiveGateway import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -10,7 +13,8 @@ data class InclusiveGateway( @JacksonXmlProperty(isAttribute = true) val id: String, @JacksonXmlProperty(isAttribute = true) val name: String?, @JacksonXmlProperty(isAttribute = true, localName = "default") val defaultElement: String?, - val documentation: String? + val documentation: String?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { override fun toElement(): BpmnInclusiveGateway { diff --git a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/IntermediateCatchEvent.kt b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/IntermediateCatchEvent.kt index 5238a9474..6bb8739fd 100644 --- a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/IntermediateCatchEvent.kt +++ b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/IntermediateCatchEvent.kt @@ -1,13 +1,16 @@ package com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process +import com.fasterxml.jackson.annotation.JsonMerge import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls +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.nested.definitions.ConditionalEventDefinition import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process.nested.definitions.MessageEventDefinition import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process.nested.definitions.SignalEventDefinition import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process.nested.definitions.TimerEventDefinition +import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process.nested.formprop.ExtensionElement import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.catching.BpmnIntermediateCatchingEvent import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -19,7 +22,8 @@ data class IntermediateCatchEvent( @JsonSetter(nulls = Nulls.AS_EMPTY) val timerEventDefinition: TimerEventDefinition?, @JsonSetter(nulls = Nulls.AS_EMPTY) val signalEventDefinition: SignalEventDefinition?, @JsonSetter(nulls = Nulls.AS_EMPTY) val messageEventDefinition: MessageEventDefinition?, - @JsonSetter(nulls = Nulls.AS_EMPTY) val conditionalEventDefinition: ConditionalEventDefinition? + @JsonSetter(nulls = Nulls.AS_EMPTY) val conditionalEventDefinition: ConditionalEventDefinition?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { diff --git a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/IntermediateThrowEvent.kt b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/IntermediateThrowEvent.kt index 869e374d3..dfa50c4b5 100644 --- a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/IntermediateThrowEvent.kt +++ b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/IntermediateThrowEvent.kt @@ -1,11 +1,14 @@ package com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process +import com.fasterxml.jackson.annotation.JsonMerge import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls +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.nested.definitions.EscalationEventDefinition import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process.nested.definitions.SignalEventDefinition +import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process.nested.formprop.ExtensionElement import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.throwing.BpmnIntermediateThrowingEvent import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -15,7 +18,8 @@ data class IntermediateThrowEvent( @JacksonXmlProperty(isAttribute = true) val name: String?, @JacksonXmlProperty(isAttribute = true) val documentation: String?, @JsonSetter(nulls = Nulls.AS_EMPTY) val signalEventDefinition: SignalEventDefinition?, - @JsonSetter(nulls = Nulls.AS_EMPTY) val escalationEventDefinition: EscalationEventDefinition? + @JsonSetter(nulls = Nulls.AS_EMPTY) val escalationEventDefinition: EscalationEventDefinition?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { diff --git a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/ParallelGateway.kt b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/ParallelGateway.kt index 05f4741d8..90d819413 100644 --- a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/ParallelGateway.kt +++ b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/ParallelGateway.kt @@ -1,7 +1,10 @@ package com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process +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.nested.formprop.ExtensionElement import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.gateways.BpmnParallelGateway import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -10,7 +13,8 @@ data class ParallelGateway( @JacksonXmlProperty(isAttribute = true) val id: String, @JacksonXmlProperty(isAttribute = true) val name: String?, @JacksonXmlProperty(isAttribute = true, localName = "default") val defaultElement: String?, - val documentation: String? + val documentation: String?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { override fun toElement(): BpmnParallelGateway { diff --git a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/SequenceFlow.kt b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/SequenceFlow.kt index 393ddb879..848b74dcb 100644 --- a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/SequenceFlow.kt +++ b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/SequenceFlow.kt @@ -1,11 +1,14 @@ package com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process +import com.fasterxml.jackson.annotation.JsonMerge import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlCData +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText import com.valb3r.bpmn.intellij.plugin.activiti.parser.CDATA_FIELD import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.BpmnMappable +import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process.nested.formprop.ExtensionElement import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.BpmnSequenceFlow import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -16,7 +19,8 @@ data class SequenceFlow( val documentation: String?, @JacksonXmlProperty(isAttribute = true) val sourceRef: String?, @JacksonXmlProperty(isAttribute = true) val targetRef: String?, - val conditionExpression: ConditionExpression? + val conditionExpression: ConditionExpression?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { override fun toElement(): BpmnSequenceFlow { diff --git a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/SubProcess.kt b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/SubProcess.kt index 8b96e8754..6eaed0e8a 100644 --- a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/SubProcess.kt +++ b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/SubProcess.kt @@ -1,9 +1,12 @@ package com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process import com.fasterxml.jackson.annotation.JsonIgnore +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.ProcessBody +import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process.nested.formprop.ExtensionElement import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess.BpmnCollapsedSubprocess import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess.BpmnSubProcess import org.mapstruct.Mapper @@ -19,6 +22,7 @@ class SubProcess: BpmnMappable, ProcessBody() { @JacksonXmlProperty(isAttribute = true) var exclusive: Boolean? = null @JacksonXmlProperty(isAttribute = true) var triggeredByEvent: Boolean? = null @JsonIgnore var hasExternalDiagram: Boolean = false + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null override fun toElement(): BpmnSubProcess { return Mappers.getMapper(SubProcessMapping::class.java).convertToDto(this) diff --git a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/Transaction.kt b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/Transaction.kt index 5e5e23c06..23c4486d0 100644 --- a/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/Transaction.kt +++ b/activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/Transaction.kt @@ -1,9 +1,12 @@ package com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process import com.fasterxml.jackson.annotation.JsonIgnore +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.ProcessBody +import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process.nested.formprop.ExtensionElement import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess.BpmnTransactionCollapsedSubprocess import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess.BpmnTransactionalSubProcess import org.mapstruct.Mapper @@ -18,6 +21,7 @@ class Transaction: BpmnMappable, ProcessBody() { @JacksonXmlProperty(isAttribute = true) var async: Boolean? = null @JacksonXmlProperty(isAttribute = true) var exclusive: Boolean? = null @JsonIgnore var hasExternalDiagram: Boolean = false + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null override fun toElement(): BpmnTransactionalSubProcess { return Mappers.getMapper(TransactionMapping::class.java).convertToDto(this) diff --git a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/AdHocSubProcess.kt b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/AdHocSubProcess.kt index 715a086e1..0f1edac45 100644 --- a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/AdHocSubProcess.kt +++ b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/AdHocSubProcess.kt @@ -10,6 +10,7 @@ import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess.BpmnAdH import com.valb3r.bpmn.intellij.plugin.bpmn.parser.core.CDATA_FIELD import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.BpmnMappable import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.ProcessBody +import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -24,6 +25,7 @@ class AdHocSubProcess: BpmnMappable, ProcessBody() { @JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val incoming: List? = null @JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val outgoing: List? = null var completionCondition: CompletionCondition? = null + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null override fun toElement(): BpmnAdHocSubProcess { return Mappers.getMapper(Mapping::class.java).convertToDto(this) diff --git a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/CallActivity.kt b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/CallActivity.kt index 52a98d667..3810ad28f 100644 --- a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/CallActivity.kt +++ b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/CallActivity.kt @@ -5,6 +5,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.activities.BpmnCallActivity import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.BpmnMappable +import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -20,7 +21,7 @@ data class CallActivity( @JacksonXmlProperty(isAttribute = true) val fallbackToDefaultTenant: Boolean?, @JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val incoming: List?, @JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val outgoing: List?, - val extensionElements: ExtensionElements? + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { override fun toElement(): BpmnCallActivity { diff --git a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/EndEventNode.kt b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/EndEventNode.kt index 5fc85d2bc..7810cd813 100644 --- a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/EndEventNode.kt +++ b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/EndEventNode.kt @@ -9,6 +9,7 @@ import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.end.BpmnEnd import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.BpmnMappable import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.definitions.ErrorEventDefinition import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.definitions.EscalationEventDefinition +import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -23,7 +24,8 @@ data class EndEventNode( @JsonSetter(nulls = Nulls.AS_EMPTY) val errorEventDefinition: ErrorEventDefinition?, @JsonSetter(nulls = Nulls.AS_EMPTY) val escalationEventDefinition: EscalationEventDefinition?, @JsonSetter(nulls = Nulls.AS_EMPTY) val cancelEventDefinition: CancelEventDefinition?, - @JsonSetter(nulls = Nulls.AS_EMPTY) val terminateEventDefinition: TerminateEventDefinition? + @JsonSetter(nulls = Nulls.AS_EMPTY) val terminateEventDefinition: TerminateEventDefinition?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { override fun toElement(): BpmnEndEvent { diff --git a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/IntermediateCatchEvent.kt b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/IntermediateCatchEvent.kt index 2375bf273..9f60153c1 100644 --- a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/IntermediateCatchEvent.kt +++ b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/IntermediateCatchEvent.kt @@ -9,6 +9,7 @@ import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.catching.Bp import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.props.BpmnLinkEventDefinition import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.BpmnMappable import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.definitions.* +import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -22,7 +23,8 @@ data class IntermediateCatchEvent( @JsonSetter(nulls = Nulls.AS_EMPTY) val signalEventDefinition: SignalEventDefinition?, @JsonSetter(nulls = Nulls.AS_EMPTY) val messageEventDefinition: MessageEventDefinition?, @JsonSetter(nulls = Nulls.AS_EMPTY) val conditionalEventDefinition: ConditionalEventDefinition?, - @JsonSetter(nulls = Nulls.AS_EMPTY) val linkEventDefinition: LinkEventDefinition? + @JsonSetter(nulls = Nulls.AS_EMPTY) val linkEventDefinition: LinkEventDefinition?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { override fun toElement(): BpmnIntermediateCatchingEvent { diff --git a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/IntermediateThrowEvent.kt b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/IntermediateThrowEvent.kt index 63ca799ac..9350e374e 100644 --- a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/IntermediateThrowEvent.kt +++ b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/IntermediateThrowEvent.kt @@ -10,6 +10,7 @@ import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.BpmnMappable import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.definitions.EscalationEventDefinition import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.definitions.LinkEventDefinition import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.definitions.SignalEventDefinition +import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -21,7 +22,8 @@ data class IntermediateThrowEvent( @JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val outgoing: List?, @JsonSetter(nulls = Nulls.AS_EMPTY) val signalEventDefinition: SignalEventDefinition?, @JsonSetter(nulls = Nulls.AS_EMPTY) val escalationEventDefinition: EscalationEventDefinition?, - @JsonSetter(nulls = Nulls.AS_EMPTY) val linkEventDefinition: LinkEventDefinition? + @JsonSetter(nulls = Nulls.AS_EMPTY) val linkEventDefinition: LinkEventDefinition?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { diff --git a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/ParallelGateway.kt b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/ParallelGateway.kt index 0675b64c7..8275a4100 100644 --- a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/ParallelGateway.kt +++ b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/ParallelGateway.kt @@ -5,6 +5,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.gateways.BpmnParallelGateway import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.BpmnMappable +import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -14,7 +15,8 @@ data class ParallelGateway( @JacksonXmlProperty(isAttribute = true, localName = "default") val defaultElement: String?, @JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val incoming: List?, @JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val outgoing: List?, - val documentation: String? + val documentation: String?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { override fun toElement(): BpmnParallelGateway { diff --git a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/SequenceFlow.kt b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/SequenceFlow.kt index 84d23b18e..88b8c9887 100644 --- a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/SequenceFlow.kt +++ b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/SequenceFlow.kt @@ -9,6 +9,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.BpmnSequenceFlow import com.valb3r.bpmn.intellij.plugin.bpmn.parser.core.CDATA_FIELD import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.BpmnMappable +import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -21,6 +22,7 @@ data class SequenceFlow( val conditionExpression: ConditionExpression?, @JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val incoming: List?, @JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val outgoing: List?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { override fun toElement(): BpmnSequenceFlow { diff --git a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/SubProcess.kt b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/SubProcess.kt index 0f85e3ae6..7656557bc 100644 --- a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/SubProcess.kt +++ b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/SubProcess.kt @@ -8,6 +8,7 @@ import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess.BpmnCol import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess.BpmnSubProcess import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.BpmnMappable import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.ProcessBody +import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.Mapping import org.mapstruct.factory.Mappers @@ -24,6 +25,7 @@ class SubProcess: BpmnMappable, ProcessBody() { @JsonIgnore var hasExternalDiagram: Boolean = false @JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val incoming: List? = null @JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val outgoing: List? = null + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null override fun toElement(): BpmnSubProcess { return Mappers.getMapper(SubProcessMapping::class.java).convertToDto(this) diff --git a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/Transaction.kt b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/Transaction.kt index a2982565f..48d3e6143 100644 --- a/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/Transaction.kt +++ b/camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/Transaction.kt @@ -8,6 +8,7 @@ import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess.BpmnTra import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess.BpmnTransactionalSubProcess import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.BpmnMappable import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.ProcessBody +import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.Mapping import org.mapstruct.factory.Mappers @@ -23,6 +24,7 @@ class Transaction: BpmnMappable, ProcessBody() { @JsonIgnore var hasExternalDiagram: Boolean = false @JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val incoming: List? = null @JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val outgoing: List? = null + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null override fun toElement(): BpmnTransactionalSubProcess { return Mappers.getMapper(TransactionMapping::class.java).convertToDto(this) diff --git a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/AdHocSubProcess.kt b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/AdHocSubProcess.kt index 526d70827..5cf1e1fc1 100644 --- a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/AdHocSubProcess.kt +++ b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/AdHocSubProcess.kt @@ -1,13 +1,16 @@ package com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process +import com.fasterxml.jackson.annotation.JsonMerge import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlCData +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess.BpmnAdHocSubProcess import com.valb3r.bpmn.intellij.plugin.bpmn.parser.core.CDATA_FIELD import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.BpmnMappable import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.ProcessBody +import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -18,6 +21,7 @@ class AdHocSubProcess: BpmnMappable, ProcessBody() { @JacksonXmlProperty(isAttribute = true) var ordering: String? = null var documentation: String? = null var completionCondition: CompletionCondition? = null + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null override fun toElement(): BpmnAdHocSubProcess { return Mappers.getMapper(Mapping::class.java).convertToDto(this) diff --git a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/ParallelGateway.kt b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/ParallelGateway.kt index e9e5ce449..8d2344fef 100644 --- a/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/ParallelGateway.kt +++ b/flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/ParallelGateway.kt @@ -1,8 +1,11 @@ package com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process +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.bpmn.api.bpmn.elements.gateways.BpmnParallelGateway import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.BpmnMappable +import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.formprop.ExtensionElement import org.mapstruct.Mapper import org.mapstruct.factory.Mappers @@ -10,7 +13,8 @@ data class ParallelGateway( @JacksonXmlProperty(isAttribute = true) val id: String, @JacksonXmlProperty(isAttribute = true) val name: String?, @JacksonXmlProperty(isAttribute = true, localName = "default") val defaultElement: String?, - val documentation: String? + val documentation: String?, + @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List? = null ): BpmnMappable { override fun toElement(): BpmnParallelGateway { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/activities/BpmnCallActivity.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/activities/BpmnCallActivity.kt index f1a8c8eeb..7d68bef9c 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/activities/BpmnCallActivity.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/activities/BpmnCallActivity.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.activities import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.BpmnStructuralElementAlike @@ -13,18 +14,12 @@ data class BpmnCallActivity( val calledElementType: String? = null, val inheritVariables: Boolean? = null, val fallbackToDefaultTenant: Boolean? = null, - val extensionElements: ExtensionElements? = null, val incoming: List? = null, val outgoing: List? = null, + val executionListener: List? = null ) : WithBpmnId, BpmnStructuralElementAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { return copy(id = newId) } -} - -data class ExtensionElements( - val out: List? = null -) - -data class OutExtensionElement(val source: String? = null, val target: String?) \ No newline at end of file +} \ No newline at end of file diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnAdHocSubProcess.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnAdHocSubProcess.kt index 8cc4c828d..52cd3b1d6 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnAdHocSubProcess.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnAdHocSubProcess.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.BpmnStructuralElementAlike @@ -13,7 +14,8 @@ data class BpmnAdHocSubProcess( val asyncAfter: Boolean? = null, val incoming: List? = null, val outgoing: List? = null, - val completionCondition: CompletionCondition? = null + val completionCondition: CompletionCondition? = null, + val executionListener: List? = null ): WithBpmnId, BpmnStructuralElementAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnCollapsedSubprocess.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnCollapsedSubprocess.kt index 10f9386da..abf37983f 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnCollapsedSubprocess.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnCollapsedSubprocess.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.BpmnStructuralElementAlike @@ -15,6 +16,7 @@ data class BpmnCollapsedSubprocess( val triggeredByEvent: Boolean? = null, val incoming: List? = null, val outgoing: List? = null, + val executionListener: List? = null, val transactionalSubprocess: Boolean // can't set default for @KotlinBuilder ): WithBpmnId, BpmnStructuralElementAlike { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnEventSubprocess.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnEventSubprocess.kt index adf23b654..1fd7ff1e8 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnEventSubprocess.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnEventSubprocess.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.BpmnStructuralElementAlike @@ -15,6 +16,7 @@ data class BpmnEventSubprocess( val triggeredByEvent: Boolean? = null, val incoming: List? = null, val outgoing: List? = null, + val executionListener: List? = null ): WithBpmnId, BpmnStructuralElementAlike { override fun updateBpmnElemId(newId: BpmnElementId): WithBpmnId { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnSubProcess.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnSubProcess.kt index 34a31852b..e558f9c67 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnSubProcess.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnSubProcess.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.BpmnStructuralElementAlike @@ -15,6 +16,7 @@ data class BpmnSubProcess( val triggeredByEvent: Boolean? = null, val incoming: List? = null, val outgoing: List? = null, + val executionListener: List? = null, val transactionalSubprocess: Boolean // can't set default for @KotlinBuilder ): WithBpmnId, BpmnStructuralElementAlike { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnTransactionCollapsedSubprocess.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnTransactionCollapsedSubprocess.kt index 139333e19..47e904ef7 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnTransactionCollapsedSubprocess.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnTransactionCollapsedSubprocess.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.BpmnStructuralElementAlike @@ -15,6 +16,7 @@ data class BpmnTransactionCollapsedSubprocess( val triggeredByEvent: Boolean? = null, val incoming: List? = null, val outgoing: List? = null, + val executionListener: List? = null, val transactionalSubprocess: Boolean // can't set default for @KotlinBuilder ): WithBpmnId, BpmnStructuralElementAlike { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnTransactionalSubprocess.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnTransactionalSubprocess.kt index c11035084..0bbd175d3 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnTransactionalSubprocess.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/bpmn/elements/subprocess/BpmnTransactionalSubprocess.kt @@ -1,6 +1,7 @@ package com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.subprocess import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.BpmnElementId +import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExeсutionListener import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.WithBpmnId import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.types.BpmnStructuralElementAlike @@ -14,6 +15,7 @@ data class BpmnTransactionalSubProcess( val exclusive: Boolean? = null, val incoming: List? = null, val outgoing: List? = null, + val executionListener: List? = null, val transactionalSubprocess: Boolean // can't set default for @KotlinBuilder ): WithBpmnId, BpmnStructuralElementAlike { diff --git a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/info/PropertyType.kt b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/info/PropertyType.kt index cef5ff88b..cca2fddd3 100644 --- a/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/info/PropertyType.kt +++ b/xml-parser-api/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/bpmn/api/info/PropertyType.kt @@ -175,7 +175,7 @@ enum class PropertyType( MAPPING_PAYLOAD_FROM_EVENT_VARIABLE_NAME("extensionElementsMappingPayloadFromEvent.@source", "Variable name", STRING, group = listOf(FunctionalGroupType.MAPPING_PAYLOAD_FROM), isUsedOnlyBy = setOf(BpmnSendEventTask::class), indexInGroupArrayName = "source", listenerOrder = 100, indexCascades = CascadeGroup.PARENTS_CASCADE, removeEnclosingNodeIfNullOrEmpty = true, hideIfNullOrEmpty = true, positionInGroup = 1), MAPPING_PAYLOAD_FROM_EVENT_PROPERTY_NAME("extensionElementsMappingPayloadFromEvent.@target", "Event property name", STRING, group = listOf(FunctionalGroupType.MAPPING_PAYLOAD_FROM), isUsedOnlyBy = setOf(BpmnSendEventTask::class), indexInGroupArrayName = "source"), MAPPING_PAYLOAD_FROM_EVENT_TYPE("extensionElementsMappingPayloadFromEvent.@type", "Type", LIST_SELECT, setForSelect = setOf("","string", "integer", "double", "boolean"), isUsedOnlyBy = setOf(BpmnSendEventTask::class), group = listOf(FunctionalGroupType.MAPPING_PAYLOAD_FROM), indexInGroupArrayName = "source"), - EXECUTION_LISTENER_CLASS("executionListener.@clazz", "Class", STRING, group = listOf(FunctionalGroupType.EXECUTION_LISTENER), indexInGroupArrayName = "clazz", listenerOrder = 100, indexCascades = CascadeGroup.PARENTS_CASCADE, removeEnclosingNodeIfNullOrEmpty = true, hideIfNullOrEmpty = true), + EXECUTION_LISTENER_CLASS("executionListener.@clazz", "Class", PropertyValueType.CLASS, group = listOf(FunctionalGroupType.EXECUTION_LISTENER), indexInGroupArrayName = "clazz", listenerOrder = 100, indexCascades = CascadeGroup.PARENTS_CASCADE, removeEnclosingNodeIfNullOrEmpty = true, hideIfNullOrEmpty = true), EXECUTION_LISTENER_EVENT("executionListener.@event", "Event", LIST_SELECT, setForSelect = setOf("","start", "end", "take"), group = listOf(FunctionalGroupType.EXECUTION_LISTENER), indexInGroupArrayName = "clazz"), EXECUTION_LISTENER_FIELD_NAME("executionListener.@fields.@name", "Name", STRING, group = listOf(FunctionalGroupType.EXECUTION_LISTENER, FunctionalGroupType.EXECUTION_LISTENER_FILED), indexInGroupArrayName = "clazz.name", indexCascades = CascadeGroup.PARENTS_CASCADE, removeEnclosingNodeIfNullOrEmpty = true, listenerOrder = 95), EXECUTION_LISTENER_FIELD_STRING("executionListener.@fields.@string", "String", STRING, group = listOf(FunctionalGroupType.EXECUTION_LISTENER, FunctionalGroupType.EXECUTION_LISTENER_FILED), indexInGroupArrayName = "clazz.name", listenerOrder = 90);