Skip to content

Commit

Permalink
FBP-193. Add support for escalation event props
Browse files Browse the repository at this point in the history
  • Loading branch information
@valb3r
valb3r committed Jul 15, 2023
1 parent a57104b commit b7fcd9b
Show file tree
Hide file tree
Showing 32 changed files with 120 additions and 110 deletions.
1 change: 1 addition & 0 deletions ...parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/Activiti7Parser.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ enum class Activiti7PropertyTypeDetails(val details: PropertyTypeDetails) {
// EVENT_CONDITION_TYPE(PropertyTypeDetails(PropertyType.EVENT_CONDITION_TYPE, "bpmn:conditionalEventDefinition.condition.xsi:type", XmlType.ATTRIBUTE)), // Camunda-only specific
// EVENT_CONDITION_LANGUAGE(PropertyTypeDetails(PropertyType.EVENT_CONDITION_LANGUAGE, "bpmn:conditionalEventDefinition.condition.language", XmlType.ATTRIBUTE)), // Camunda-only specific
MESSAGE_REF(PropertyTypeDetails(PropertyType.MESSAGE_REF, "messageEventDefinition.messageRef", XmlType.ATTRIBUTE)),
ESCALATION_REF(PropertyTypeDetails(PropertyType.ESCALATION_REF, "escalationEventDefinition.escalationRef", XmlType.ATTRIBUTE)),
// END TODO
COMPLETION_CONDITION(PropertyTypeDetails(PropertyType.COMPLETION_CONDITION, "bpmn2:completionCondition.text", XmlType.CDATA)),
DEFAULT_FLOW(PropertyTypeDetails(PropertyType.DEFAULT_FLOW, "default", XmlType.ATTRIBUTE))
Expand Down
1 change: 1 addition & 0 deletions ...-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/ActivitiParser.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ enum class ActivitiPropertyTypeDetails(val details: PropertyTypeDetails) {
// EVENT_CONDITION_TYPE(PropertyTypeDetails(PropertyType.EVENT_CONDITION_TYPE, "bpmn:conditionalEventDefinition.condition.xsi:type", XmlType.ATTRIBUTE)), // Camunda-only specific
// EVENT_CONDITION_LANGUAGE(PropertyTypeDetails(PropertyType.EVENT_CONDITION_LANGUAGE, "bpmn:conditionalEventDefinition.condition.language", XmlType.ATTRIBUTE)), // Camunda-only specific
MESSAGE_REF(PropertyTypeDetails(PropertyType.MESSAGE_REF, "messageEventDefinition.messageRef", XmlType.ATTRIBUTE)),
ESCALATION_REF(PropertyTypeDetails(PropertyType.ESCALATION_REF, "escalationEventDefinition.escalationRef", XmlType.ATTRIBUTE)),
COMPLETION_CONDITION(PropertyTypeDetails(PropertyType.COMPLETION_CONDITION, "completionCondition.text", XmlType.CDATA)),
DEFAULT_FLOW(PropertyTypeDetails(PropertyType.DEFAULT_FLOW, "default", XmlType.ATTRIBUTE)),
IS_TRANSACTIONAL_SUBPROCESS(PropertyTypeDetails(PropertyType.IS_TRANSACTIONAL_SUBPROCESS, "transactionalSubprocess", XmlType.ELEMENT)),
Expand Down
5 changes: 1 addition & 4 deletions ...ain/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/BoundaryEvent.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.Nulls
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.EscalationEventDefinition
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.TimerEventDefinition
import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.boundary.BpmnBoundaryEvent
Expand Down Expand Up @@ -51,8 +52,4 @@ data class BoundaryEvent(
data class CompensateEventDefinition(
val activityRef: String? = null
)

data class EscalationEventDefinition(
val escalationRef: String? = null
)
}
19 changes: 8 additions & 11 deletions ...main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/EndEventNode.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,19 @@ import com.fasterxml.jackson.annotation.JsonSetter
import com.fasterxml.jackson.annotation.Nulls
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.bpmn.api.bpmn.elements.events.end.BpmnEndEvent
import org.mapstruct.Mapper
import org.mapstruct.factory.Mappers

data class EndEventNode(
@JacksonXmlProperty(isAttribute = true) val id: String,
@JacksonXmlProperty(isAttribute = true) val name: String?,
@JacksonXmlProperty(isAttribute = true) val documentation: String?,
@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?
@JacksonXmlProperty(isAttribute = true) val id: String,
@JacksonXmlProperty(isAttribute = true) val name: String?,
@JacksonXmlProperty(isAttribute = true) val documentation: String?,
@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?
): BpmnMappable<BpmnEndEvent> {

override fun toElement(): BpmnEndEvent {
Expand All @@ -31,10 +32,6 @@ data class EndEventNode(
val errorRef: String? = null
)

data class EscalationEventDefinition(
val escalationRef: String? = null
)

data class CancelEventDefinition(
val cancelRef: String? = null
)
Expand Down
5 changes: 1 addition & 4 deletions ...n/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/IntermediateThrowEvent.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonSetter
import com.fasterxml.jackson.annotation.Nulls
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.bpmn.api.bpmn.elements.events.throwing.BpmnIntermediateThrowingEvent
import org.mapstruct.Mapper
import org.mapstruct.factory.Mappers
Expand All @@ -29,9 +30,5 @@ data class IntermediateThrowEvent(
data class SignalEventDefinition(
val signalRef: String? = null
)

data class EscalationEventDefinition(
val escalationRef: String? = null
)
}

5 changes: 1 addition & 4 deletions ...in/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/StartEventNode.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ 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.EscalationEventDefinition
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.TimerEventDefinition
import com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process.nested.formprop.ExtensionElement
Expand Down Expand Up @@ -41,10 +42,6 @@ data class StartEventNode(
val errorRef: String? = null
)

data class EscalationEventDefinition(
val escalationRef: String? = null
)


@Mapper(uses = [BpmnElementIdMapper::class])
abstract class StartEventNodeMapping {
Expand Down
7 changes: 7 additions & 0 deletions ...llij/plugin/activiti/parser/nodes/process/nested/definitions/EscalationEventDefinition.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process.nested.definitions

import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty

data class EscalationEventDefinition(
@JacksonXmlProperty(isAttribute = true) val escalationRef: String? = null
)
1 change: 1 addition & 0 deletions ...ml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/CamundaParser.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ enum class CamundaPropertyTypeDetails(val details: PropertyTypeDetails) {
EVENT_CONDITION_TYPE(PropertyTypeDetails(PropertyType.EVENT_CONDITION_TYPE, "bpmn:conditionalEventDefinition.bpmn:condition.xsi:type", XmlType.ATTRIBUTE)),
EVENT_CONDITION_LANGUAGE(PropertyTypeDetails(PropertyType.EVENT_CONDITION_LANGUAGE, "bpmn:conditionalEventDefinition.bpmn:condition.language", XmlType.ATTRIBUTE)),
MESSAGE_REF(PropertyTypeDetails(PropertyType.MESSAGE_REF, "bpmn:messageEventDefinition.messageRef", XmlType.ATTRIBUTE)),
ESCALATION_REF(PropertyTypeDetails(PropertyType.ESCALATION_REF, "bpmn:escalationEventDefinition.escalationRef", XmlType.ATTRIBUTE)),
COMPLETION_CONDITION(PropertyTypeDetails(PropertyType.COMPLETION_CONDITION, "completionCondition.text", XmlType.CDATA)),
DEFAULT_FLOW(PropertyTypeDetails(PropertyType.DEFAULT_FLOW, "default", XmlType.ATTRIBUTE)),
// Unsupported? IS_TRANSACTIONAL_SUBPROCESS(PropertyTypeDetails(PropertyType.IS_TRANSACTIONAL_SUBPROCESS, "transactionalSubprocess", XmlType.ELEMENT)),
Expand Down
5 changes: 1 addition & 4 deletions ...main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/BoundaryEvent.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty
import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.boundary.BpmnBoundaryEvent
import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.BpmnMappable
import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.definitions.ConditionalEventDefinition
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.MessageEventDefinition
import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.definitions.TimerEventDefinition
import org.mapstruct.Mapper
Expand Down Expand Up @@ -55,8 +56,4 @@ data class BoundaryEvent(
data class CompensateEventDefinition(
val activityRef: String? = null
)

data class EscalationEventDefinition(
val escalationRef: String? = null
)
}
5 changes: 1 addition & 4 deletions .../main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/EndEventNode.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,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.events.end.BpmnEndEvent
import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.BpmnMappable
import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.definitions.EscalationEventDefinition
import org.mapstruct.Mapper
import org.mapstruct.factory.Mappers

Expand Down Expand Up @@ -37,10 +38,6 @@ data class EndEventNode(
val errorRef: String? = null
)

data class EscalationEventDefinition(
val escalationRef: String? = null
)

data class CancelEventDefinition(
val cancelRef: String? = null
)
Expand Down
5 changes: 1 addition & 4 deletions ...in/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/IntermediateThrowEvent.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,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.events.throwing.BpmnIntermediateThrowingEvent
import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.BpmnMappable
import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.definitions.EscalationEventDefinition
import org.mapstruct.Mapper
import org.mapstruct.factory.Mappers

Expand All @@ -33,9 +34,5 @@ data class IntermediateThrowEvent(
data class SignalEventDefinition(
val signalRef: String? = null
)

data class EscalationEventDefinition(
val escalationRef: String? = null
)
}

5 changes: 1 addition & 4 deletions ...ain/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/StartEventNode.kt
View file
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.ListenerField
import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.begin.BpmnStartEvent
import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.BpmnMappable
import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.definitions.ConditionalEventDefinition
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.MessageEventDefinition
import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.definitions.TimerEventDefinition
import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.formprop.ExecutionListener
Expand Down Expand Up @@ -48,10 +49,6 @@ data class StartEventNode(
val errorRef: String? = null
)

data class EscalationEventDefinition(
val escalationRef: String? = null
)

@Mapper(uses = [BpmnElementIdMapper::class])
abstract class StartEventNodeMapping {

Expand Down
7 changes: 7 additions & 0 deletions ...ellij/plugin/camunda/parser/nodes/process/nested/definitions/EscalationEventDefinition.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.definitions

import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty

data class EscalationEventDefinition(
@JacksonXmlProperty(isAttribute = true) val escalationRef: String? = null
)
16 changes: 14 additions & 2 deletions ...lb3r/bpmn/intellij/plugin/camunda/parser/fullelements/ExtraBoundaryEventPropertiesTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,21 @@ internal class ExtraBoundaryEventPropertiesTest {
readAndUpdate(id, prop, "TEST").propsOf(id)[prop]!!.shouldBeEqualTo(Property("TEST"))
}

@Test
fun `EscalationBoundaryEvent extra essential properties`() {
@ParameterizedTest
@CsvSource(
"process.body.boundaryEscalationEvent[?(@.id.id == 'EscalationBoundaryEvent')].escalationEventDefinition.escalationRef,EscalationBoundaryEvent,ESCALATION_REF,Escalation_1e2ddfb",
"process.body.intermediateEscalationThrowingEvent[?(@.id.id == 'EscalationIntermediateThrowEvent')].escalationEventDefinition.escalationRef,EscalationIntermediateThrowEvent,ESCALATION_REF,Escalation_1e2ddfb",
"process.body.escalationEndEvent[?(@.id.id == 'EscalationEndEvent')].escalationEventDefinition.escalationRef,EscalationEndEvent,ESCALATION_REF,Escalation_1e2ddfb",
)
fun `EscalationStartEvent,EscalationBoundaryEvent,EscalationIntermediateCatchingEvent with date extra essential properties are parseable and updatable`(jsonPath: String, id: String, prop: PropertyType, expectedValue: String) {
val processObject = parser.parse(FILE.asResource()!!)

val valueFromBpmn: List<String> = JsonPath.read(jacksonObjectMapper().writeValueAsString(processObject), jsonPath)
valueFromBpmn.shouldHaveSingleItem().shouldBeEqualTo(expectedValue)
val props = processObject.propsOf(id)

props[prop]!!.shouldBeEqualTo(Property(expectedValue))
readAndUpdate(id, prop, "TEST").propsOf(id)[prop]!!.shouldBeEqualTo(Property("TEST"))
}

@Test
Expand Down
6 changes: 6 additions & 0 deletions camunda-xml-parser/src/test/resources/fullelements/full-boundary-events-and-timer.bpmn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@
<bpmn:intermediateCatchEvent id="LinkIntermediateCatchEvent">
<bpmn:linkEventDefinition id="LinkEventDefinition_167um4f" name="Link1" />
</bpmn:intermediateCatchEvent>
<bpmn:endEvent id="EscalationEndEvent">
<bpmn:escalationEventDefinition id="EscalationEventDefinition_1r5i994" escalationRef="Escalation_1e2ddfb" />
</bpmn:endEvent>
</bpmn:process>
<bpmn:message id="Message_1q041lj" name="Message" />
<bpmn:escalation id="Escalation_1e2ddfb" name="Escalation_1e2ddfb" escalationCode="CodeValue" />
Expand Down Expand Up @@ -203,6 +206,9 @@
<bpmndi:BPMNShape id="Event_1nht52n_di" bpmnElement="LinkIntermediateCatchEvent">
<dc:Bounds x="422" y="232" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0jakyag_di" bpmnElement="EscalationEndEvent">
<dc:Bounds x="362" y="292" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_0voebt1" bpmnElement="TimerBoundaryCycleEvent">
<dc:Bounds x="652" y="122" width="36" height="36" />
</bpmndi:BPMNShape>
Expand Down
1 change: 1 addition & 0 deletions ...-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/FlowableParser.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ enum class FlowablePropertyTypeDetails(val details: PropertyTypeDetails) {
// EVENT_CONDITION_TYPE(PropertyTypeDetails(PropertyType.EVENT_CONDITION_TYPE, "bpmn:conditionalEventDefinition.condition.xsi:type", XmlType.ATTRIBUTE)), // Camunda-only specific
// EVENT_CONDITION_LANGUAGE(PropertyTypeDetails(PropertyType.EVENT_CONDITION_LANGUAGE, "bpmn:conditionalEventDefinition.condition.language", XmlType.ATTRIBUTE)), // Camunda-only specific
MESSAGE_REF(PropertyTypeDetails(PropertyType.MESSAGE_REF, "messageEventDefinition.messageRef", XmlType.ATTRIBUTE)),
ESCALATION_REF(PropertyTypeDetails(PropertyType.ESCALATION_REF, "escalationEventDefinition.escalationRef", XmlType.ATTRIBUTE)),
COMPLETION_CONDITION(PropertyTypeDetails(PropertyType.COMPLETION_CONDITION, "completionCondition.text", XmlType.CDATA)),
DEFAULT_FLOW(PropertyTypeDetails(PropertyType.DEFAULT_FLOW, "default", XmlType.ATTRIBUTE)),
IS_TRANSACTIONAL_SUBPROCESS(PropertyTypeDetails(PropertyType.IS_TRANSACTIONAL_SUBPROCESS, "transactionalSubprocess", XmlType.ELEMENT)),
Expand Down
5 changes: 1 addition & 4 deletions ...ain/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/BoundaryEvent.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty
import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.boundary.BpmnBoundaryEvent
import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.BpmnMappable
import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.definitions.ConditionalEventDefinition
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.MessageEventDefinition
import com.valb3r.bpmn.intellij.plugin.flowable.parser.nodes.process.nested.definitions.TimerEventDefinition
import org.mapstruct.Mapper
Expand Down Expand Up @@ -51,8 +52,4 @@ data class BoundaryEvent(
data class CompensateEventDefinition(
val activityRef: String? = null
)

data class EscalationEventDefinition(
val escalationRef: String? = null
)
}
19 changes: 8 additions & 11 deletions ...main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/EndEventNode.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,18 @@ import com.fasterxml.jackson.annotation.Nulls
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.EscalationEventDefinition
import org.mapstruct.Mapper
import org.mapstruct.factory.Mappers

data class EndEventNode(
@JacksonXmlProperty(isAttribute = true) val id: String,
@JacksonXmlProperty(isAttribute = true) val name: String?,
@JacksonXmlProperty(isAttribute = true) val documentation: String?,
@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?
@JacksonXmlProperty(isAttribute = true) val id: String,
@JacksonXmlProperty(isAttribute = true) val name: String?,
@JacksonXmlProperty(isAttribute = true) val documentation: String?,
@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?
): BpmnMappable<BpmnEndEvent> {

override fun toElement(): BpmnEndEvent {
Expand All @@ -31,10 +32,6 @@ data class EndEventNode(
val errorRef: String? = null
)

data class EscalationEventDefinition(
val escalationRef: String? = null
)

data class CancelEventDefinition(
val cancelRef: String? = null
)
Expand Down
5 changes: 1 addition & 4 deletions ...n/com/valb3r/bpmn/intellij/plugin/flowable/parser/nodes/process/IntermediateThrowEvent.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.Nulls
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 org.mapstruct.Mapper
import org.mapstruct.factory.Mappers

Expand All @@ -29,9 +30,5 @@ data class IntermediateThrowEvent(
data class SignalEventDefinition(
val signalRef: String? = null
)

data class EscalationEventDefinition(
val escalationRef: String? = null
)
}

Loading

0 comments on commit b7fcd9b

Please sign in to comment.