FBP-193. Basic tests for timer events

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

@@ -4,24 +4,25 @@ 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.TimerEventDefinition
 import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.boundary.BpmnBoundaryEvent
 import org.mapstruct.Mapper
 import org.mapstruct.factory.Mappers
 
 data class BoundaryEvent(
-  @JacksonXmlProperty(isAttribute = true) val id: String,
-  @JacksonXmlProperty(isAttribute = true) val name: String?,
-  @JacksonXmlProperty(isAttribute = true) val attachedToRef: String?,
-  @JacksonXmlProperty(isAttribute = true) val cancelActivity: Boolean?,
-  val documentation: String?,
-  @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 errorEventDefinition: ErrorEventDefinition?,
-  @JsonSetter(nulls = Nulls.AS_EMPTY) val cancelEventDefinition: CancelEventDefinition?,
-  @JsonSetter(nulls = Nulls.AS_EMPTY) val compensateEventDefinition: CompensateEventDefinition?,
-  @JsonSetter(nulls = Nulls.AS_EMPTY) val conditionalEventDefinition: ConditionalEventDefinition?,
-  @JsonSetter(nulls = Nulls.AS_EMPTY) val escalationEventDefinition: EscalationEventDefinition?
+ @JacksonXmlProperty(isAttribute = true) val id: String,
+ @JacksonXmlProperty(isAttribute = true) val name: String?,
+ @JacksonXmlProperty(isAttribute = true) val attachedToRef: String?,
+ @JacksonXmlProperty(isAttribute = true) val cancelActivity: Boolean?,
+ val documentation: String?,
+ @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 errorEventDefinition: ErrorEventDefinition?,
+ @JsonSetter(nulls = Nulls.AS_EMPTY) val cancelEventDefinition: CancelEventDefinition?,
+ @JsonSetter(nulls = Nulls.AS_EMPTY) val compensateEventDefinition: CompensateEventDefinition?,
+ @JsonSetter(nulls = Nulls.AS_EMPTY) val conditionalEventDefinition: ConditionalEventDefinition?,
+ @JsonSetter(nulls = Nulls.AS_EMPTY) val escalationEventDefinition: EscalationEventDefinition?
 ): BpmnMappable<BpmnBoundaryEvent> {
 
  override fun toElement(): BpmnBoundaryEvent {
@@ -33,10 +34,6 @@ data class BoundaryEvent(
  fun convertToDto(input: BoundaryEvent) : BpmnBoundaryEvent
  }
 
- data class TimerEventDefinition(
- val timeDate: String? = null
- )
-
  data class SignalEventDefinition(
  val signalRef: String? = null
  )

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

@@ -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.TimerEventDefinition
 import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.catching.BpmnIntermediateCatchingEvent
 import org.mapstruct.Mapper
 import org.mapstruct.factory.Mappers
 
 data class IntermediateCatchEvent(
-  @JacksonXmlProperty(isAttribute = true) val id: String,
-  @JacksonXmlProperty(isAttribute = true) val name: String?,
-  @JacksonXmlProperty(isAttribute = true) val documentation: String?,
-  @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?
+ @JacksonXmlProperty(isAttribute = true) val id: String,
+ @JacksonXmlProperty(isAttribute = true) val name: String?,
+ @JacksonXmlProperty(isAttribute = true) val documentation: String?,
+ @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?
 
 ): BpmnMappable<BpmnIntermediateCatchingEvent> {
 
@@ -28,10 +29,6 @@ data class IntermediateCatchEvent(
  fun convertToDto(input: IntermediateCatchEvent) : BpmnIntermediateCatchingEvent
  }
 
- data class TimerEventDefinition(
- val timeDate: String? = null
- )
-
  data class SignalEventDefinition(
  @JacksonXmlProperty(isAttribute = true) val signalRef: String? = null
  )

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

@@ -1,57 +1,36 @@
 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.annotation.JsonSetter
 import com.fasterxml.jackson.annotation.Nulls
-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.nodes.BpmnMappable
+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.activiti.parser.nodes.process.nested.formprop.FormProperty
 import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.ExtensionFormProperty
 import com.valb3r.bpmn.intellij.plugin.bpmn.api.bpmn.elements.events.begin.BpmnStartEvent
-import com.valb3r.bpmn.intellij.plugin.bpmn.parser.core.CDATA_FIELD
 import org.mapstruct.Mapper
 import org.mapstruct.factory.Mappers
 
 data class StartEventNode(
-  @JacksonXmlProperty(isAttribute = true) val id: String,
-  @JacksonXmlProperty(isAttribute = true) val name: String?,
-  val documentation: String?,
-  @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 errorEventDefinition: ErrorEventDefinition?,
-  @JsonSetter(nulls = Nulls.AS_EMPTY) val escalationEventDefinition: EscalationEventDefinition?,
-  @JsonSetter(nulls = Nulls.AS_EMPTY) val conditionalEventDefinition: ConditionalEventDefinition?,
-  @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List<ExtensionElement>? = null
+ @JacksonXmlProperty(isAttribute = true) val id: String,
+ @JacksonXmlProperty(isAttribute = true) val name: String?,
+ val documentation: String?,
+ @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 errorEventDefinition: ErrorEventDefinition?,
+ @JsonSetter(nulls = Nulls.AS_EMPTY) val escalationEventDefinition: EscalationEventDefinition?,
+ @JsonSetter(nulls = Nulls.AS_EMPTY) val conditionalEventDefinition: ConditionalEventDefinition?,
+ @JsonMerge @JacksonXmlElementWrapper(useWrapping = true) val extensionElements: List<ExtensionElement>? = null
 ): BpmnMappable<BpmnStartEvent> {
 
  override fun toElement(): BpmnStartEvent {
  return Mappers.getMapper(StartEventNodeMapping::class.java).convertToDto(this)
  }
 
- data class TimerEventDefinition(
- val timeDate: TimeDate? = null,
- val timeDuration: TimeDuration? = null,
- val timeCycle: TimeCycle? = null
- ) {
- data class TimeDate(
- @JacksonXmlProperty(isAttribute = true) val type: String? = null,
- @JsonProperty(CDATA_FIELD) @JacksonXmlText @JacksonXmlCData val timeDate: String? = null
- )
- data class TimeDuration(
- @JacksonXmlProperty(isAttribute = true) val type: String? = null,
- @JsonProperty(CDATA_FIELD) @JacksonXmlText @JacksonXmlCData val timeDuration: String? = null)
- data class TimeCycle(
- @JacksonXmlProperty(isAttribute = true) val type: String? = null,
- @JsonProperty(CDATA_FIELD) @JacksonXmlText @JacksonXmlCData val timeCycle: String? = null
- )
- }
-
  data class SignalEventDefinition(
  val signalRef: String? = null
  )

activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/nodes/process/nested/definitions/TimerEventDefinition.kt

@@ -0,0 +1,25 @@
+package com.valb3r.bpmn.intellij.plugin.activiti.parser.nodes.process.nested.definitions
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlCData
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText
+import com.valb3r.bpmn.intellij.plugin.bpmn.parser.core.CDATA_FIELD
+
+data class TimerEventDefinition(
+ val timeDate: TimeDate? = null,
+ val timeDuration: TimeDuration? = null,
+ val timeCycle: TimeCycle? = null
+) {
+ data class TimeDate(
+ @JacksonXmlProperty(isAttribute = true) val type: String? = null,
+ @JsonProperty(CDATA_FIELD) @JacksonXmlText @JacksonXmlCData val timeDate: String? = null
+ )
+ data class TimeDuration(
+ @JacksonXmlProperty(isAttribute = true) val type: String? = null,
+ @JsonProperty(CDATA_FIELD) @JacksonXmlText @JacksonXmlCData val timeDuration: String? = null)
+ data class TimeCycle(
+ @JacksonXmlProperty(isAttribute = true) val type: String? = null,
+ @JsonProperty(CDATA_FIELD) @JacksonXmlText @JacksonXmlCData val timeCycle: String? = null
+ )
+}

camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/BoundaryEvent.kt

@@ -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.boundary.BpmnBoundaryEvent
 import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.BpmnMappable
+import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.definitions.TimerEventDefinition
 import org.mapstruct.Mapper
 import org.mapstruct.factory.Mappers
 
@@ -37,10 +38,6 @@ data class BoundaryEvent(
  fun convertToDto(input: BoundaryEvent) : BpmnBoundaryEvent
  }
 
- data class TimerEventDefinition(
- val timeDate: String? = null
- )
-
  data class SignalEventDefinition(
  val signalRef: String? = null
  )

camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/IntermediateCatchEvent.kt

@@ -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.catching.BpmnIntermediateCatchingEvent
 import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.BpmnMappable
+import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.definitions.TimerEventDefinition
 import org.mapstruct.Mapper
 import org.mapstruct.factory.Mappers
 
@@ -37,10 +38,6 @@ data class IntermediateCatchEvent(
  fun convertToDto(input: LinkEventDefinition) : BpmnIntermediateCatchingEvent.LinkEventDefinition
  }
 
- data class TimerEventDefinition(
- val timeDate: String? = null
- )
-
  data class SignalEventDefinition(
  @JacksonXmlProperty(isAttribute = true) val signalRef: String? = null
  )

camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/StartEventNode.kt

@@ -1,18 +1,15 @@
 package com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process
 
 import com.fasterxml.jackson.annotation.JsonMerge
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.annotation.JsonSetter
 import com.fasterxml.jackson.annotation.Nulls
-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.ExeсutionListener
 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.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.definitions.TimerEventDefinition
 import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.formprop.ExecutionListener
 import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.formprop.ExtensionElement
 import com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.formprop.FormDataExtensionElement
@@ -41,24 +38,6 @@ data class StartEventNode(
  return Mappers.getMapper(StartEventNodeMapping::class.java).convertToDto(this)
  }
 
- data class TimerEventDefinition(
- val timeDate: TimeDate? = null,
- val timeDuration: TimeDuration? = null,
- val timeCycle: TimeCycle? = null
- ) {
- data class TimeDate(
- @JacksonXmlProperty(isAttribute = true) val type: String? = null,
- @JsonProperty(CDATA_FIELD) @JacksonXmlText @JacksonXmlCData val timeDate: String? = null
- )
- data class TimeDuration(
- @JacksonXmlProperty(isAttribute = true) val type: String? = null,
- @JsonProperty(CDATA_FIELD) @JacksonXmlText @JacksonXmlCData val timeDuration: String? = null)
- data class TimeCycle(
- @JacksonXmlProperty(isAttribute = true) val type: String? = null,
- @JsonProperty(CDATA_FIELD) @JacksonXmlText @JacksonXmlCData val timeCycle: String? = null
- )
- }
-
  data class SignalEventDefinition(
  val signalRef: String? = null
  )

camunda-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/parser/nodes/process/nested/definitions/TimerEventDefinition.kt

@@ -0,0 +1,25 @@
+package com.valb3r.bpmn.intellij.plugin.camunda.parser.nodes.process.nested.definitions
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlCData
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText
+import com.valb3r.bpmn.intellij.plugin.bpmn.parser.core.CDATA_FIELD
+
+data class TimerEventDefinition(
+ val timeDate: TimeDate? = null,
+ val timeDuration: TimeDuration? = null,
+ val timeCycle: TimeCycle? = null
+) {
+ data class TimeDate(
+ @JacksonXmlProperty(isAttribute = true) val type: String? = null,
+ @JsonProperty(CDATA_FIELD) @JacksonXmlText @JacksonXmlCData val timeDate: String? = null
+ )
+ data class TimeDuration(
+ @JacksonXmlProperty(isAttribute = true) val type: String? = null,
+ @JsonProperty(CDATA_FIELD) @JacksonXmlText @JacksonXmlCData val timeDuration: String? = null)
+ data class TimeCycle(
+ @JacksonXmlProperty(isAttribute = true) val type: String? = null,
+ @JsonProperty(CDATA_FIELD) @JacksonXmlText @JacksonXmlCData val timeCycle: String? = null
+ )
+}