Spring 3 upgrade & JSON Logging Support

app/pom.xml

@@ -13,6 +13,12 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>6.6</version>
+        </dependency>
+
         <dependency>
             <groupId>io.zeebe.zeeqs</groupId>
             <artifactId>graphql-api</artifactId>

app/src/main/kotlin/io/zeebe/zeeqs/ZeeqsApplication.kt

@@ -2,12 +2,12 @@ package io.zeebe.zeeqs
 
 import io.zeebe.zeeqs.importer.hazelcast.HazelcastImporter
 import io.zeebe.zeeqs.importer.hazelcast.HazelcastProperties
+import jakarta.annotation.PostConstruct
 import org.slf4j.LoggerFactory
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.boot.runApplication
 import org.springframework.cache.annotation.EnableCaching
-import javax.annotation.PostConstruct
 
 @SpringBootApplication
 @EnableCaching

app/src/main/resources/logback-spring.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
+        </encoder>
+    </appender>
+    <appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
+    </appender>
+    <root level="INFO">
+        <appender-ref ref="consoleAppender"/>
+    </root>
+</configuration>

data/pom.xml

@@ -14,6 +14,12 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>6.6</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>

data/src/main/kotlin/io/zeebe/zeeqs/data/entity/Decision.kt

@@ -1,15 +1,17 @@
 package io.zeebe.zeeqs.data.entity
 
-import javax.persistence.Column
-import javax.persistence.Entity
-import javax.persistence.Id
+import jakarta.persistence.Column
+import jakarta.persistence.Entity
+import jakarta.persistence.Id
 
 @Entity
 data class Decision(
-        @Id @Column(name = "key_") val key: Long,
-        val decisionId: String,
-        val decisionName: String,
-        val version: Int,
-        val decisionRequirementsKey: Long,
-        val decisionRequirementsId: String
-)
+    @Id @Column(name = "key_") val key: Long,
+    val decisionId: String,
+    val decisionName: String,
+    val version: Int,
+    val decisionRequirementsKey: Long,
+    val decisionRequirementsId: String
+) {
+    constructor() : this(0, "", "", 0, 0, "")
+}

data/src/main/kotlin/io/zeebe/zeeqs/data/entity/DecisionEvaluation.kt

@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.entity
 
-import javax.persistence.*
+import jakarta.persistence.*
 
 @Entity
 data class DecisionEvaluation(
@@ -14,4 +14,6 @@ data class DecisionEvaluation(
     @Lob val evaluationFailureMessage: String? = null,
     val processInstanceKey: Long? = null,
     val elementInstanceKey: Long? = null
-)
+) {
+    constructor() : this(0, 0, 0, "", DecisionEvaluationState.EVALUATED, 0, null, null, null, null)
+}

data/src/main/kotlin/io/zeebe/zeeqs/data/entity/DecisionEvaluationInput.kt

@@ -1,9 +1,9 @@
 package io.zeebe.zeeqs.data.entity
 
-import javax.persistence.Column
-import javax.persistence.Entity
-import javax.persistence.Id
-import javax.persistence.Lob
+import jakarta.persistence.Column
+import jakarta.persistence.Entity
+import jakarta.persistence.Id
+import jakarta.persistence.Lob
 
 @Entity
 data class DecisionEvaluationInput(
@@ -12,4 +12,6 @@ data class DecisionEvaluationInput(
     val inputName: String,
     @Lob @Column(name = "value_") val value: String,
     val evaluatedDecisionId: String
-)
+) {
+    constructor() : this("", "", "", "", "")
+}

data/src/main/kotlin/io/zeebe/zeeqs/data/entity/DecisionEvaluationOutput.kt

@@ -1,9 +1,9 @@
 package io.zeebe.zeeqs.data.entity
 
-import javax.persistence.Column
-import javax.persistence.Entity
-import javax.persistence.Id
-import javax.persistence.Lob
+import jakarta.persistence.Column
+import jakarta.persistence.Entity
+import jakarta.persistence.Id
+import jakarta.persistence.Lob
 
 @Entity
 data class DecisionEvaluationOutput(
@@ -14,4 +14,6 @@ data class DecisionEvaluationOutput(
     val evaluatedDecisionId: String,
     val ruleId: String,
     val ruleIndex: Int
-)
+) {
+    constructor() : this("", "", "", "", "", "", 0)
+}

data/src/main/kotlin/io/zeebe/zeeqs/data/entity/DecisionRequirements.kt

@@ -1,9 +1,9 @@
 package io.zeebe.zeeqs.data.entity
 
-import javax.persistence.Column
-import javax.persistence.Entity
-import javax.persistence.Id
-import javax.persistence.Lob
+import jakarta.persistence.Column
+import jakarta.persistence.Entity
+import jakarta.persistence.Id
+import jakarta.persistence.Lob
 
 @Entity
 data class DecisionRequirements(
@@ -16,4 +16,6 @@ data class DecisionRequirements(
     val deployTime: Long,
     val resourceName: String,
     @Lob val checksum: String
-)
+) {
+    constructor() : this(0, "", "", 0, "", "", 0, "", "")
+}

data/src/main/kotlin/io/zeebe/zeeqs/data/entity/ElementInstance.kt

@@ -1,18 +1,20 @@
 package io.zeebe.zeeqs.data.entity
 
-import javax.persistence.*
+import jakarta.persistence.*
+
 
 @Entity
 class ElementInstance(
-        @Id @Column(name = "key_") val key: Long,
-        val position: Long,
-        val elementId: String,
-        @Enumerated(EnumType.STRING)
-        val bpmnElementType: BpmnElementType,
-        val processInstanceKey: Long,
-        val processDefinitionKey: Long,
-        val scopeKey: Long?
+    @Id @Column(name = "key_") val key: Long,
+    val position: Long,
+    val elementId: String,
+    @Enumerated(EnumType.STRING)
+    val bpmnElementType: BpmnElementType,
+    val processInstanceKey: Long,
+    val processDefinitionKey: Long,
+    val scopeKey: Long?
 ) {
+    constructor() : this(0, 0, "", BpmnElementType.UNKNOWN, 0, 0, null)
 
 
     var state: ElementInstanceState = ElementInstanceState.ACTIVATING

data/src/main/kotlin/io/zeebe/zeeqs/data/entity/ElementInstanceStateTransition.kt

@@ -1,15 +1,18 @@
 package io.zeebe.zeeqs.data.entity
 
-import javax.persistence.Entity
-import javax.persistence.Id
-import javax.persistence.Enumerated
-import javax.persistence.EnumType
+import jakarta.persistence.Entity
+import jakarta.persistence.EnumType
+import jakarta.persistence.Enumerated
+import jakarta.persistence.Id
+
 
 @Entity
 class ElementInstanceStateTransition(
-        @Id val partitionIdWithPosition: String,
-        val elementInstanceKey: Long,
-        @Enumerated(EnumType.STRING)
-        val state: ElementInstanceState,
-        val timestamp: Long
-)
+    @Id val partitionIdWithPosition: String,
+    val elementInstanceKey: Long,
+    @Enumerated(EnumType.STRING)
+    val state: ElementInstanceState,
+    val timestamp: Long
+) {
+    constructor() : this("", 0, ElementInstanceState.ACTIVATING, 0)
+}

data/src/main/kotlin/io/zeebe/zeeqs/data/entity/Error.kt

@@ -1,13 +1,17 @@
 package io.zeebe.zeeqs.data.entity
 
-import javax.persistence.Entity
-import javax.persistence.Id
-import javax.persistence.Lob
+import jakarta.persistence.Entity
+import jakarta.persistence.Id
+import jakarta.persistence.Lob
+
 
 @Entity
-class Error(@Id val position: Long,
-            val errorEventPosition: Long,
-            @Lob val exceptionMessage: String,
-            @Lob val stacktrace:String,
-            val processInstanceKey: Long?
-            )
+class Error(
+    @Id val position: Long,
+    val errorEventPosition: Long,
+    @Lob val exceptionMessage: String,
+    @Lob val stacktrace: String,
+    val processInstanceKey: Long?
+) {
+    constructor() : this(0, 0, "", "", null)
+}

data/src/main/kotlin/io/zeebe/zeeqs/data/entity/EvaluatedDecision.kt

@@ -1,13 +1,15 @@
 package io.zeebe.zeeqs.data.entity
 
-import javax.persistence.Entity
-import javax.persistence.Id
-import javax.persistence.Lob
+import jakarta.persistence.Entity
+import jakarta.persistence.Id
+import jakarta.persistence.Lob
 
 @Entity
 data class EvaluatedDecision(
     @Id val id: String,
     val decisionKey: Long,
     @Lob val decisionOutput: String,
     val decisionEvaluationKey: Long
-)
+) {
+    constructor() : this("", 0, "", 0)
+}

data/src/main/kotlin/io/zeebe/zeeqs/data/entity/Incident.kt

@@ -1,18 +1,20 @@
 package io.zeebe.zeeqs.data.entity
 
-import javax.persistence.*
+import jakarta.persistence.*
+
 
 @Entity
 class Incident(
-        @Id @Column(name = "key_") val key: Long,
-        val position: Long,
-        val errorType: String,
-        @Lob val errorMessage: String,
-        val processInstanceKey: Long,
-        val elementInstanceKey: Long,
-        val processDefinitionKey: Long,
-        val jobKey: Long?
+    @Id @Column(name = "key_") val key: Long,
+    val position: Long,
+    val errorType: String,
+    @Lob val errorMessage: String,
+    val processInstanceKey: Long,
+    val elementInstanceKey: Long,
+    val processDefinitionKey: Long,
+    val jobKey: Long?
 ) {
+    constructor() : this(0, 0, "", "", 0, 0, 0, null)
 
     @Enumerated(EnumType.STRING)
     var state: IncidentState = IncidentState.CREATED

data/src/main/kotlin/io/zeebe/zeeqs/data/entity/Job.kt

@@ -1,16 +1,17 @@
 package io.zeebe.zeeqs.data.entity
 
-import javax.persistence.*
+import jakarta.persistence.*
 
 @Entity
 data class Job(
-        @Id @Column(name = "key_") val key: Long,
-        val position: Long,
-        val jobType: String,
-        val processInstanceKey: Long,
-        val elementInstanceKey: Long,
-        val processDefinitionKey: Long
+    @Id @Column(name = "key_") val key: Long,
+    val position: Long,
+    val jobType: String,
+    val processInstanceKey: Long,
+    val elementInstanceKey: Long,
+    val processDefinitionKey: Long
 ) {
+    constructor() : this(0, 0, "", 0, 0, 0)
 
     @Enumerated(EnumType.STRING)
     var state: JobState = JobState.ACTIVATABLE

data/src/main/kotlin/io/zeebe/zeeqs/data/entity/Message.kt

@@ -1,16 +1,17 @@
 package io.zeebe.zeeqs.data.entity
 
-import javax.persistence.*
+import jakarta.persistence.*
 
 @Entity
 class Message(
-        @Id @Column(name = "key_") val key: Long,
-        val position: Long,
-        val name: String,
-        val correlationKey: String?,
-        val messageId: String?,
-        val timeToLive: Long
+    @Id @Column(name = "key_") val key: Long,
+    val position: Long,
+    val name: String,
+    val correlationKey: String?,
+    val messageId: String?,
+    val timeToLive: Long
 ) {
+    constructor() : this(0, 0, "", null, null, 0)
 
     @Enumerated(EnumType.STRING)
     var state: MessageState = MessageState.PUBLISHED

data/src/main/kotlin/io/zeebe/zeeqs/data/entity/MessageCorrelation.kt

@@ -1,16 +1,19 @@
 package io.zeebe.zeeqs.data.entity
 
-import javax.persistence.Entity
-import javax.persistence.Id
+import jakarta.persistence.Entity
+import jakarta.persistence.Id
+
 
 @Entity
 class MessageCorrelation(
-        @Id val partitionIdWithPosition: String,
-        val messageKey: Long,
-        val messageName: String,
-        val timestamp: Long,
-        val processInstanceKey: Long,
-        val elementInstanceKey: Long?,
-        val elementId: String?,
-        val processDefinitionKey: Long?
-)
+    @Id val partitionIdWithPosition: String,
+    val messageKey: Long,
+    val messageName: String,
+    val timestamp: Long,
+    val processInstanceKey: Long,
+    val elementInstanceKey: Long?,
+    val elementId: String?,
+    val processDefinitionKey: Long?
+) {
+    constructor() : this("", 0, "", 0, 0, null, null, null)
+}