Skip to content

Commit

Permalink
Merge pull request #361 from valb3r/feature/FBP-110-more-listeners
Browse files Browse the repository at this point in the history
Feature/fbp 110 more listeners
  • Loading branch information
valb3r authored Jul 15, 2023
2 parents 96e6611 + 0769fb9 commit a7afb8a
Show file tree
Hide file tree
Showing 61 changed files with 188 additions and 46 deletions.
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -18,6 +21,7 @@ class AdHocSubProcess: BpmnMappable<BpmnAdHocSubProcess>, ProcessBody() {
@JacksonXmlProperty(isAttribute = true) var ordering: String? = null
var documentation: String? = null
var completionCondition: CompletionCondition? = null
@JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List<ExtensionElement>? = null

override fun toElement(): BpmnAdHocSubProcess {
return Mappers.getMapper(Mapping::class.java).convertToDto(this)
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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<ExtensionElement>? = null
): BpmnMappable<BpmnCallActivity> {

override fun toElement(): BpmnCallActivity {
Expand All @@ -27,10 +29,4 @@ data class CallActivity(
interface Mapping {
fun convertToDto(input: CallActivity) : BpmnCallActivity
}
}

data class ExtensionElements(
@JacksonXmlElementWrapper(useWrapping = false) val out: List<OutExtensionElement>?
)

data class OutExtensionElement(val source: String?, val target: String?)
}
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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<ExtensionElement>? = null
): BpmnMappable<BpmnEndEvent> {

override fun toElement(): BpmnEndEvent {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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<ExtensionElement>? = null
): BpmnMappable<BpmnEventGateway> {

override fun toElement(): BpmnEventGateway {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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<ExtensionElement>? = null
): BpmnMappable<BpmnExclusiveGateway> {

override fun toElement(): BpmnExclusiveGateway {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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<ExtensionElement>? = null
): BpmnMappable<BpmnInclusiveGateway> {

override fun toElement(): BpmnInclusiveGateway {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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<ExtensionElement>? = null

): BpmnMappable<BpmnIntermediateCatchingEvent> {

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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<ExtensionElement>? = null

): BpmnMappable<BpmnIntermediateThrowingEvent> {

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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<ExtensionElement>? = null
): BpmnMappable<BpmnParallelGateway> {

override fun toElement(): BpmnParallelGateway {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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<ExtensionElement>? = null
): BpmnMappable<BpmnSequenceFlow> {

override fun toElement(): BpmnSequenceFlow {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -19,6 +22,7 @@ class SubProcess: BpmnMappable<BpmnSubProcess>, 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<ExtensionElement>? = null

override fun toElement(): BpmnSubProcess {
return Mappers.getMapper(SubProcessMapping::class.java).convertToDto(this)
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -18,6 +21,7 @@ class Transaction: BpmnMappable<BpmnTransactionalSubProcess>, 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<ExtensionElement>? = null

override fun toElement(): BpmnTransactionalSubProcess {
return Mappers.getMapper(TransactionMapping::class.java).convertToDto(this)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -24,6 +25,7 @@ class AdHocSubProcess: BpmnMappable<BpmnAdHocSubProcess>, ProcessBody() {
@JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val incoming: List<String>? = null
@JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val outgoing: List<String>? = null
var completionCondition: CompletionCondition? = null
@JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List<ExtensionElement>? = null

override fun toElement(): BpmnAdHocSubProcess {
return Mappers.getMapper(Mapping::class.java).convertToDto(this)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -20,7 +21,7 @@ data class CallActivity(
@JacksonXmlProperty(isAttribute = true) val fallbackToDefaultTenant: Boolean?,
@JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val incoming: List<String>?,
@JsonMerge @JacksonXmlElementWrapper(useWrapping = false) val outgoing: List<String>?,
val extensionElements: ExtensionElements?
@JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List<ExtensionElement>? = null
): BpmnMappable<BpmnCallActivity> {

override fun toElement(): BpmnCallActivity {
Expand Down
Loading

0 comments on commit a7afb8a

Please sign in to comment.