This is an automated email from the ASF dual-hosted git repository.
martinweiler pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-apps.git
The following commit(s) were added to refs/heads/main by this push:
new 384193e26 [incubator-kie-issues-2364]Add @Column mappings to all
unmapped JPA entity fields (#2349)
384193e26 is described below
commit 384193e269eb42f75d1c2652e82f403e2c454dc2
Author: Soniya Abraham <[email protected]>
AuthorDate: Fri Jul 17 19:52:14 2026 +0530
[incubator-kie-issues-2364]Add @Column mappings to all unmapped JPA entity
fields (#2349)
* Add explicit @Column mappings to all unmapped JPA entity fields
* Adding back the missed columnDefinitions
---
.../app/audit/jpa/model/JobExecutionLog.java | 4 ++
.../audit/jpa/model/ProcessInstanceErrorLog.java | 1 +
.../audit/jpa/model/ProcessInstanceNodeLog.java | 1 +
.../audit/jpa/model/ProcessInstanceStateLog.java | 5 ++-
.../jpa/model/ProcessInstanceVariableLog.java | 1 +
.../jpa/model/UserTaskInstanceAssignmentLog.java | 1 +
.../jpa/model/UserTaskInstanceAttachmentLog.java | 1 +
.../jpa/model/UserTaskInstanceCommentLog.java | 1 +
.../jpa/model/UserTaskInstanceDeadlineLog.java | 1 +
.../audit/jpa/model/UserTaskInstanceStateLog.java | 5 ++-
.../jpa/model/UserTaskInstanceVariableLog.java | 1 +
.../kogito/index/jpa/model/AttachmentEntity.java | 13 +++++-
.../kie/kogito/index/jpa/model/CommentEntity.java | 10 ++++-
.../org/kie/kogito/index/jpa/model/JobEntity.java | 42 +++++++++++++++++
.../kogito/index/jpa/model/MilestoneEntity.java | 8 +++-
.../org/kie/kogito/index/jpa/model/NodeEntity.java | 7 +++
.../kogito/index/jpa/model/NodeInstanceEntity.java | 27 +++++++++--
.../index/jpa/model/ProcessDefinitionEntity.java | 13 +++++-
.../index/jpa/model/ProcessInstanceEntity.java | 47 ++++++++++++++++---
.../jpa/model/ProcessInstanceErrorEntity.java | 6 +++
.../index/jpa/model/UserTaskInstanceEntity.java | 52 +++++++++++++++++++++-
.../app/jobs/jpa/model/JobDetailsEntity.java | 7 +++
.../repository/jpa/model/JobDetailsEntity.java | 8 ++++
.../jpa/model/JobServiceManagementEntity.java | 2 +
24 files changed, 247 insertions(+), 17 deletions(-)
diff --git
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/JobExecutionLog.java
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/JobExecutionLog.java
index 10f3a56b4..b78ab1ecd 100644
---
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/JobExecutionLog.java
+++
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/JobExecutionLog.java
@@ -44,6 +44,7 @@ public class JobExecutionLog {
@Id
@GeneratedValue(strategy = GenerationType.AUTO, generator =
"jobExecutionHistoryIdSeq")
+ @Column(name = "id")
private Long id;
@Column(name = "job_id")
@@ -53,6 +54,7 @@ public class JobExecutionLog {
@Temporal(TemporalType.TIMESTAMP)
private Date expirationTime;
+ @Column(name = "priority")
private Integer priority;
@Column(name = "process_instance_id")
@@ -70,8 +72,10 @@ public class JobExecutionLog {
@Column(name = "scheduled_id")
private String scheduledId;
+ @Column(name = "retries")
private Integer retries;
+ @Column(name = "status")
private String status;
@Column(name = "execution_counter")
diff --git
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceErrorLog.java
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceErrorLog.java
index 7f24acae3..c0b9d27f3 100644
---
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceErrorLog.java
+++
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceErrorLog.java
@@ -49,6 +49,7 @@ public class ProcessInstanceErrorLog extends
AbstractProcessInstanceLog {
@Id
@GeneratedValue(strategy = GenerationType.AUTO, generator =
"processInstanceErrorHistorySeq")
+ @Column(name = "id")
private Long id;
@Column(name = "error_message")
diff --git
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceNodeLog.java
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceNodeLog.java
index 07f84938f..b54877c72 100644
---
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceNodeLog.java
+++
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceNodeLog.java
@@ -58,6 +58,7 @@ public class ProcessInstanceNodeLog extends
AbstractProcessInstanceLog {
@Id
@GeneratedValue(strategy = GenerationType.AUTO, generator =
"processInstanceNodeLogIdSeq")
+ @Column(name = "id")
private long id;
@Column(name = "event_type")
diff --git
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceStateLog.java
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceStateLog.java
index b18a7d656..6f84a8853 100644
---
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceStateLog.java
+++
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceStateLog.java
@@ -61,16 +61,17 @@ public class ProcessInstanceStateLog extends
AbstractProcessInstanceLog {
@Id
@GeneratedValue(strategy = GenerationType.AUTO, generator =
"processInstanceStateLogIdSeq")
+ @Column(name = "id")
private long id;
@Column(name = "event_type", nullable = false)
@Enumerated(EnumType.STRING)
private ProcessStateLogType eventType;
- @Column
+ @Column(name = "outcome")
private String outcome;
- @Column
+ @Column(name = "state")
private String state;
@Temporal(TemporalType.TIMESTAMP)
diff --git
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceVariableLog.java
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceVariableLog.java
index b04905a62..9b36146e2 100644
---
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceVariableLog.java
+++
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceVariableLog.java
@@ -48,6 +48,7 @@ public class ProcessInstanceVariableLog extends
AbstractProcessInstanceLog {
@Id
@GeneratedValue(strategy = GenerationType.AUTO, generator =
"processInstanceVariableLogIdSeq")
+ @Column(name = "id")
private long id;
@Column(name = "variable_id")
diff --git
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceAssignmentLog.java
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceAssignmentLog.java
index 078a348d7..a3528f964 100644
---
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceAssignmentLog.java
+++
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceAssignmentLog.java
@@ -47,6 +47,7 @@ public class UserTaskInstanceAssignmentLog extends
AbstractUserTaskInstanceLog {
@Id
@GeneratedValue(strategy = GenerationType.AUTO, generator =
"taskInstanceAssignmentLogIdSeq")
+ @Column(name = "id")
private Long id;
@Column(name = "task_name")
diff --git
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceAttachmentLog.java
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceAttachmentLog.java
index c60c56103..9bad5b0ef 100644
---
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceAttachmentLog.java
+++
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceAttachmentLog.java
@@ -43,6 +43,7 @@ public class UserTaskInstanceAttachmentLog extends
AbstractUserTaskInstanceLog {
@Id
@GeneratedValue(strategy = GenerationType.AUTO, generator =
"taskInstanceAttachmentLogIdSeq")
+ @Column(name = "id")
private Long id;
@Column(name = "attachment_id")
diff --git
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceCommentLog.java
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceCommentLog.java
index 82a43a651..527f7d908 100644
---
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceCommentLog.java
+++
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceCommentLog.java
@@ -41,6 +41,7 @@ public class UserTaskInstanceCommentLog extends
AbstractUserTaskInstanceLog {
@Id
@GeneratedValue(strategy = GenerationType.AUTO, generator =
"taskInstanceCommentLogIdSeq")
+ @Column(name = "id")
private Long id;
// custom data fields
diff --git
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceDeadlineLog.java
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceDeadlineLog.java
index ff39b8510..830c56698 100644
---
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceDeadlineLog.java
+++
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceDeadlineLog.java
@@ -48,6 +48,7 @@ public class UserTaskInstanceDeadlineLog extends
AbstractUserTaskInstanceLog {
@Id
@GeneratedValue(strategy = GenerationType.AUTO, generator =
"taskInstanceDeadlineLogIdSeq")
+ @Column(name = "id")
private Long id;
@ElementCollection
diff --git
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceStateLog.java
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceStateLog.java
index 59697fdd5..dcaacf311 100644
---
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceStateLog.java
+++
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceStateLog.java
@@ -42,15 +42,18 @@ public class UserTaskInstanceStateLog extends
AbstractUserTaskInstanceLog {
@Id
@GeneratedValue(strategy = GenerationType.AUTO, generator =
"taskInstanceStateLogIdSeq")
+ @Column(name = "id")
private Long id;
-
+ @Column(name = "name")
private String name;
+ @Column(name = "description")
private String description;
@Column(name = "actual_user")
private String actualUser;
+ @Column(name = "state")
private String state;
@Column(name = "event_type")
diff --git
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceVariableLog.java
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceVariableLog.java
index 24bdccfc1..be4d0170b 100644
---
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceVariableLog.java
+++
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceVariableLog.java
@@ -48,6 +48,7 @@ public class UserTaskInstanceVariableLog extends
AbstractUserTaskInstanceLog {
@Id
@GeneratedValue(strategy = GenerationType.AUTO, generator =
"taskInstanceVariableLogIdSeq")
+ @Column(name = "id")
private Long id;
@Column(name = "variable_id")
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/AttachmentEntity.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/AttachmentEntity.java
index 529f9709f..45996e13c 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/AttachmentEntity.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/AttachmentEntity.java
@@ -21,6 +21,7 @@ package org.kie.kogito.index.jpa.model;
import java.time.ZonedDateTime;
import java.util.Objects;
+import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.ForeignKey;
import jakarta.persistence.Id;
@@ -33,13 +34,23 @@ import jakarta.persistence.Table;
public class AttachmentEntity extends AbstractEntity {
@Id
+ @Column(name = "id")
private String id;
+
+ @Column(name = "name")
private String name;
+
+ @Column(name = "content")
private String content;
+
+ @Column(name = "updated_by")
private String updatedBy;
+
+ @Column(name = "updated_at")
private ZonedDateTime updatedAt;
+
@ManyToOne(optional = false)
- @JoinColumn(name = "taskId", foreignKey = @ForeignKey(name =
"fk_attachments_tasks"))
+ @JoinColumn(name = "task_id", foreignKey = @ForeignKey(name =
"fk_attachments_tasks"))
private UserTaskInstanceEntity userTask;
@Override
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/CommentEntity.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/CommentEntity.java
index 9d870a43b..f826e9fb4 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/CommentEntity.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/CommentEntity.java
@@ -21,6 +21,7 @@ package org.kie.kogito.index.jpa.model;
import java.time.ZonedDateTime;
import java.util.Objects;
+import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.ForeignKey;
import jakarta.persistence.Id;
@@ -33,12 +34,19 @@ import jakarta.persistence.Table;
public class CommentEntity extends AbstractEntity {
@Id
+ @Column(name = "id")
private String id;
+
+ @Column(name = "content")
private String content;
+
+ @Column(name = "updated_by")
private String updatedBy;
+
+ @Column(name = "updated_at")
private ZonedDateTime updatedAt;
@ManyToOne(optional = false)
- @JoinColumn(name = "taskId", foreignKey = @ForeignKey(name =
"fk_comments_tasks"))
+ @JoinColumn(name = "task_id", foreignKey = @ForeignKey(name =
"fk_comments_tasks"))
private UserTaskInstanceEntity userTask;
@Override
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/JobEntity.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/JobEntity.java
index 1a89163c9..15d1efbf0 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/JobEntity.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/JobEntity.java
@@ -21,6 +21,7 @@ package org.kie.kogito.index.jpa.model;
import java.time.ZonedDateTime;
import java.util.Objects;
+import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@@ -30,26 +31,67 @@ import jakarta.persistence.Table;
public class JobEntity extends AbstractEntity {
@Id
+ @Column(name = "id")
private String id;
+
+ @Column(name = "process_id")
private String processId;
+
+ @Column(name = "process_version")
private String processVersion;
+
+ @Column(name = "process_instance_id")
private String processInstanceId;
+
+ @Column(name = "node_instance_id")
private String nodeInstanceId;
+
+ @Column(name = "root_process_id")
private String rootProcessId;
+
+ @Column(name = "root_process_version")
private String rootProcessVersion;
+
+ @Column(name = "root_process_instance_id")
private String rootProcessInstanceId;
+
+ @Column(name = "expiration_time")
private ZonedDateTime expirationTime;
+
+ @Column(name = "priority")
private Integer priority;
+
+ @Column(name = "callback_endpoint")
private String callbackEndpoint;
+
+ @Column(name = "repeat_interval")
private Long repeatInterval;
+
+ @Column(name = "repeat_limit")
private Integer repeatLimit;
+
+ @Column(name = "scheduled_id")
private String scheduledId;
+
+ @Column(name = "retries")
private Integer retries;
+
+ @Column(name = "status")
private String status;
+
+ @Column(name = "last_update")
private ZonedDateTime lastUpdate;
+
+ @Column(name = "execution_counter")
private Integer executionCounter;
+
+ @Column(name = "endpoint")
private String endpoint;
+
+ @Column(name = "exception_message")
private String exceptionMessage;
+
+ @Column(name = "exception_details")
private String exceptionDetails;
@Override
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/MilestoneEntity.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/MilestoneEntity.java
index 5f95c7969..4aab32e48 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/MilestoneEntity.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/MilestoneEntity.java
@@ -24,6 +24,7 @@ import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.ForeignKey;
import jakarta.persistence.Id;
@@ -38,14 +39,19 @@ import jakarta.persistence.Table;
public class MilestoneEntity extends AbstractEntity {
@Id
+ @Column(name = "id")
private String id;
@Id
@ManyToOne(cascade = CascadeType.ALL, optional = false)
@OnDelete(action = OnDeleteAction.CASCADE)
- @JoinColumn(name = "processInstanceId", foreignKey = @ForeignKey(name =
"fk_milestones_process"))
+ @JoinColumn(name = "process_instance_id", foreignKey = @ForeignKey(name =
"fk_milestones_process"))
private ProcessInstanceEntity processInstance;
+
+ @Column(name = "name")
private String name;
+
+ @Column(name = "status")
private String status;
@Override
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java
index f11c3d2b4..7b04a5dd5 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java
@@ -44,9 +44,16 @@ import jakarta.persistence.Table;
public class NodeEntity extends AbstractEntity {
@Id
+ @Column(name = "id")
private String id;
+
+ @Column(name = "name")
private String name;
+
+ @Column(name = "unique_id")
private String uniqueId;
+
+ @Column(name = "type")
private String type;
@ElementCollection
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeInstanceEntity.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeInstanceEntity.java
index f19011fc2..9a487e0ed 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeInstanceEntity.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeInstanceEntity.java
@@ -45,30 +45,51 @@ import jakarta.persistence.Table;
public class NodeInstanceEntity extends AbstractEntity {
@Id
+ @Column(name = "id")
private String id;
+
+ @Column(name = "name")
private String name;
+
+ @Column(name = "node_id")
private String nodeId;
+
+ @Column(name = "type")
private String type;
+
+ @Column(name = "enter")
private ZonedDateTime enter;
+
+ @Column(name = "exit")
private ZonedDateTime exit;
+
+ @Column(name = "sla_due_date")
private ZonedDateTime slaDueDate;
+
+ @Column(name = "definition_id")
private String definitionId;
+
+ @Column(name = "retrigger")
private Boolean retrigger;
+
+ @Column(name = "error_message")
private String errorMessage;
+
+ @Column(name = "cancel_type")
@Enumerated(EnumType.STRING)
private CancelType cancelType;
@ManyToOne(cascade = CascadeType.ALL, optional = false)
@OnDelete(action = OnDeleteAction.CASCADE)
- @JoinColumn(name = "processInstanceId", foreignKey = @ForeignKey(name =
"fk_nodes_process"))
+ @JoinColumn(name = "process_instance_id", foreignKey = @ForeignKey(name =
"fk_nodes_process"))
private ProcessInstanceEntity processInstance;
@Convert(converter = JsonBinaryConverter.class)
- @Column(columnDefinition = "jsonb")
+ @Column(name = "input_args", columnDefinition = "jsonb")
private JsonNode inputArgs;
@Convert(converter = JsonBinaryConverter.class)
- @Column(columnDefinition = "jsonb")
+ @Column(name = "output_args", columnDefinition = "jsonb")
private JsonNode outputArgs;
public Boolean isRetrigger() {
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java
index 6dda01443..b4228c94e 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java
@@ -46,13 +46,23 @@ import jakarta.persistence.Table;
public class ProcessDefinitionEntity extends AbstractEntity {
@Id
+ @Column(name = "id")
private String id;
@Id
+ @Column(name = "version")
private String version;
+
+ @Column(name = "name")
private String name;
+
+ @Column(name = "description")
private String description;
+
+ @Column(name = "type")
private String type;
+
+ @Column(name = "source")
private byte[] source;
@ElementCollection
@@ -67,6 +77,7 @@ public class ProcessDefinitionEntity extends AbstractEntity {
@Column(name = "addon", nullable = false)
private Set<String> addons;
+ @Column(name = "endpoint")
private String endpoint;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "processDefinition")
@@ -77,7 +88,7 @@ public class ProcessDefinitionEntity extends AbstractEntity {
@Column(name = "annotation")
private Set<String> annotations;
@Convert(converter = JsonBinaryConverter.class)
- @Column(columnDefinition = "jsonb")
+ @Column(name = "metadata", columnDefinition = "jsonb")
private JsonNode metadata;
@Override
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntity.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntity.java
index 052f4bd05..ce7db594f 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntity.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntity.java
@@ -48,55 +48,92 @@ import jakarta.persistence.Table;
public class ProcessInstanceEntity extends AbstractEntity {
@Id
+ @Column(name = "id")
private String id;
+
+ @Column(name = "process_id")
private String processId;
+
+ @Column(name = "version")
private String version;
+
@Column(name = "version", insertable = false, updatable = false)
private String processVersion;
+
+ @Column(name = "process_name")
private String processName;
+
+ @Column(name = "state")
private Integer state;
+
+ @Column(name = "business_key")
private String businessKey;
+
+ @Column(name = "endpoint")
private String endpoint;
+
@ElementCollection
@CollectionTable(name = "processes_roles", joinColumns = @JoinColumn(name
= "process_id", foreignKey = @ForeignKey(name =
"fk_processes_roles_processes")))
@Column(name = "role", nullable = false)
private Set<String> roles;
- @Column(name = "startTime")
+
+ @Column(name = "start_time")
private ZonedDateTime start;
- @Column(name = "endTime")
+
+ @Column(name = "end_time")
private ZonedDateTime end;
+
+ @Column(name = "root_process_instance_id")
private String rootProcessInstanceId;
+
+ @Column(name = "root_process_id")
private String rootProcessId;
+
+ @Column(name = "root_process_version")
private String rootProcessVersion;
+
+ @Column(name = "parent_process_instance_id")
private String parentProcessInstanceId;
- @Column(name = "lastUpdateTime")
+
+ @Column(name = "last_update_time")
private ZonedDateTime lastUpdate;
+
+ @Column(name = "created_by")
private String createdBy;
+ @Column(name = "updated_by")
private String updatedBy;
+ @Column(name = "sla_due_date")
private ZonedDateTime slaDueDate;
@Convert(converter = JsonBinaryConverter.class)
- @Column(columnDefinition = "jsonb")
+ @Column(name = "variables", columnDefinition = "jsonb")
private JsonNode variables;
+
@OneToMany(cascade = CascadeType.ALL, mappedBy = "processInstance")
private List<NodeInstanceEntity> nodes;
+
@OneToMany(cascade = CascadeType.ALL, mappedBy = "processInstance")
private List<MilestoneEntity> milestones;
+
@ElementCollection
@CollectionTable(name = "processes_addons", joinColumns = @JoinColumn(name
= "process_id", foreignKey = @ForeignKey(name =
"fk_processes_addons_processes")))
@Column(name = "addon", nullable = false)
private Set<String> addons;
+
@Embedded
private ProcessInstanceErrorEntity error;
@ManyToOne(targetEntity = ProcessDefinitionEntity.class, fetch =
FetchType.LAZY)
- @JoinColumns({ @JoinColumn(name = "processId", referencedColumnName =
"id", insertable = false, updatable = false),
+ @JoinColumns({ @JoinColumn(name = "process_id", referencedColumnName =
"id", insertable = false, updatable = false),
@JoinColumn(name = "version", referencedColumnName = "version",
insertable = false, updatable = false) })
private ProcessDefinitionEntity definition;
+ @Column(name = "cloud_event_id")
private String cloudEventId;
+
+ @Column(name = "cloud_event_source")
private String cloudEventSource;
@Override
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceErrorEntity.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceErrorEntity.java
index 04b8f6775..815417a43 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceErrorEntity.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceErrorEntity.java
@@ -20,13 +20,19 @@ package org.kie.kogito.index.jpa.model;
import java.util.Objects;
+import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
@Embeddable
public class ProcessInstanceErrorEntity {
+ @Column(name = "node_definition_id")
private String nodeDefinitionId;
+
+ @Column(name = "node_instance_id")
private String nodeInstanceId;
+
+ @Column(name = "message")
private String message;
public String getNodeDefinitionId() {
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java
index c7fd04b46..236fce1cf 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java
@@ -45,55 +45,103 @@ import jakarta.persistence.Table;
public class UserTaskInstanceEntity extends AbstractEntity {
@Id
+ @Column(name = "id")
private String id;
+
+ @Column(name = "description")
private String description;
+
+ @Column(name = "user_task_id")
private String userTaskId;
+
+ @Column(name = "name")
private String name;
+
+ @Column(name = "priority")
private String priority;
+
+ @Column(name = "process_instance_id")
private String processInstanceId;
+
+ @Column(name = "state")
private String state;
+
+ @Column(name = "actual_owner")
private String actualOwner;
+
@ElementCollection
@CollectionTable(name = "tasks_admin_groups", joinColumns =
@JoinColumn(name = "task_id", foreignKey = @ForeignKey(name =
"fk_tasks_admin_groups_tasks")))
@Column(name = "group_id", nullable = false)
private Set<String> adminGroups;
+
@ElementCollection
@CollectionTable(name = "tasks_admin_users", joinColumns =
@JoinColumn(name = "task_id", foreignKey = @ForeignKey(name =
"fk_tasks_admin_users_tasks")))
@Column(name = "user_id", nullable = false)
private Set<String> adminUsers;
+
+ @Column(name = "completed")
private ZonedDateTime completed;
+
+ @Column(name = "started")
private ZonedDateTime started;
+
@ElementCollection
@CollectionTable(name = "tasks_excluded_users", joinColumns =
@JoinColumn(name = "task_id", foreignKey = @ForeignKey(name =
"fk_tasks_excluded_users_tasks")))
@Column(name = "user_id", nullable = false)
private Set<String> excludedUsers;
+
@ElementCollection
@CollectionTable(name = "tasks_potential_groups", joinColumns =
@JoinColumn(name = "task_id", foreignKey = @ForeignKey(name =
"fk_tasks_potential_groups_tasks")))
@Column(name = "group_id", nullable = false)
private Set<String> potentialGroups;
+
@ElementCollection
@CollectionTable(name = "tasks_potential_users", joinColumns =
@JoinColumn(name = "task_id", foreignKey = @ForeignKey(name =
"fk_tasks_potential_users_tasks")))
@Column(name = "user_id", nullable = false)
private Set<String> potentialUsers;
+
+ @Column(name = "reference_name")
private String referenceName;
+
+ @Column(name = "last_update")
private ZonedDateTime lastUpdate;
+
+ @Column(name = "process_id")
private String processId;
+
+ @Column(name = "process_version")
private String processVersion;
+
+ @Column(name = "root_process_id")
private String rootProcessId;
+
+ @Column(name = "root_process_version")
private String rootProcessVersion;
+
+ @Column(name = "root_process_instance_id")
private String rootProcessInstanceId;
+
@Convert(converter = JsonBinaryConverter.class)
- @Column(columnDefinition = "jsonb")
+ @Column(name = "inputs", columnDefinition = "jsonb")
private ObjectNode inputs;
+
@Convert(converter = JsonBinaryConverter.class)
- @Column(columnDefinition = "jsonb")
+ @Column(name = "outputs", columnDefinition = "jsonb")
private ObjectNode outputs;
+
+ @Column(name = "endpoint")
private String endpoint;
+
@OneToMany(cascade = CascadeType.ALL, mappedBy = "userTask", orphanRemoval
= true, fetch = FetchType.LAZY)
private List<CommentEntity> comments;
+
@OneToMany(cascade = CascadeType.ALL, mappedBy = "userTask", orphanRemoval
= true, fetch = FetchType.LAZY)
private List<AttachmentEntity> attachments;
+
+ @Column(name = "external_reference_id")
private String externalReferenceId;
+
+ @Column(name = "sla_due_date")
private ZonedDateTime slaDueDate;
public String getExternalReferenceId() {
diff --git
a/jobs/kogito-addons-embedded-jobs-jpa/kogito-addons-common-embedded-jobs-jpa/src/main/java/org/kie/kogito/app/jobs/jpa/model/JobDetailsEntity.java
b/jobs/kogito-addons-embedded-jobs-jpa/kogito-addons-common-embedded-jobs-jpa/src/main/java/org/kie/kogito/app/jobs/jpa/model/JobDetailsEntity.java
index 4bacff93e..e5a247ad1 100644
---
a/jobs/kogito-addons-embedded-jobs-jpa/kogito-addons-common-embedded-jobs-jpa/src/main/java/org/kie/kogito/app/jobs/jpa/model/JobDetailsEntity.java
+++
b/jobs/kogito-addons-embedded-jobs-jpa/kogito-addons-common-embedded-jobs-jpa/src/main/java/org/kie/kogito/app/jobs/jpa/model/JobDetailsEntity.java
@@ -46,6 +46,7 @@ import jakarta.persistence.TemporalType;
public class JobDetailsEntity {
@Id
+ @Column(name = "id")
private String id;
@Column(name = "correlation_id")
@@ -63,12 +64,14 @@ public class JobDetailsEntity {
@Column(name = "root_process_version")
private String rootProcessVersion;
+ @Column(name = "status")
private String status;
@Column(name = "last_update")
@Temporal(TemporalType.TIMESTAMP)
private OffsetDateTime lastUpdate;
+ @Column(name = "retries")
private Integer retries;
@Column(name = "execution_counter")
@@ -77,11 +80,14 @@ public class JobDetailsEntity {
@Column(name = "scheduled_id")
private String scheduledId;
+ @Column(name = "priority")
private Integer priority;
+ @Column(name = "recipient")
@Convert(converter = JsonBinaryConverter.class)
private ObjectNode recipient;
+ @Column(name = "trigger")
@Convert(converter = JsonBinaryConverter.class)
private ObjectNode trigger;
@@ -95,6 +101,7 @@ public class JobDetailsEntity {
@Column(name = "execution_timeout_unit")
private String executionTimeoutUnit;
+ @Column(name = "created")
@Temporal(TemporalType.TIMESTAMP)
private OffsetDateTime created;
diff --git
a/kogito-apps-quarkus/jobs-service-quarkus/jobs-service-storage-jpa/src/main/java/org/kie/kogito/jobs/service/repository/jpa/model/JobDetailsEntity.java
b/kogito-apps-quarkus/jobs-service-quarkus/jobs-service-storage-jpa/src/main/java/org/kie/kogito/jobs/service/repository/jpa/model/JobDetailsEntity.java
index 9c1b317b4..642bbc663 100644
---
a/kogito-apps-quarkus/jobs-service-quarkus/jobs-service-storage-jpa/src/main/java/org/kie/kogito/jobs/service/repository/jpa/model/JobDetailsEntity.java
+++
b/kogito-apps-quarkus/jobs-service-quarkus/jobs-service-storage-jpa/src/main/java/org/kie/kogito/jobs/service/repository/jpa/model/JobDetailsEntity.java
@@ -35,17 +35,20 @@ import jakarta.persistence.*;
public class JobDetailsEntity {
@Id
+ @Column(name = "id")
private String id;
@Column(name = "correlation_id")
private String correlationId;
+ @Column(name = "status")
private String status;
@Column(name = "last_update")
@Temporal(TemporalType.TIMESTAMP)
private OffsetDateTime lastUpdate;
+ @Column(name = "retries")
private Integer retries;
@Column(name = "execution_counter")
@@ -54,12 +57,15 @@ public class JobDetailsEntity {
@Column(name = "scheduled_id")
private String scheduledId;
+ @Column(name = "priority")
private Integer priority;
@Convert(converter = JsonBinaryConverter.class)
+ @Column(name = "recipient")
private ObjectNode recipient;
@Convert(converter = JsonBinaryConverter.class)
+ @Column(name = "trigger")
private ObjectNode trigger;
@Column(name = "fire_time")
@@ -68,10 +74,12 @@ public class JobDetailsEntity {
@Column(name = "execution_timeout")
private Long executionTimeout;
+
@Column(name = "execution_timeout_unit")
private String executionTimeoutUnit;
@Temporal(TemporalType.TIMESTAMP)
+ @Column(name = "created")
private OffsetDateTime created;
public String getId() {
diff --git
a/kogito-apps-quarkus/jobs-service-quarkus/jobs-service-storage-jpa/src/main/java/org/kie/kogito/jobs/service/repository/jpa/model/JobServiceManagementEntity.java
b/kogito-apps-quarkus/jobs-service-quarkus/jobs-service-storage-jpa/src/main/java/org/kie/kogito/jobs/service/repository/jpa/model/JobServiceManagementEntity.java
index 77ac0a67a..231a12256 100644
---
a/kogito-apps-quarkus/jobs-service-quarkus/jobs-service-storage-jpa/src/main/java/org/kie/kogito/jobs/service/repository/jpa/model/JobServiceManagementEntity.java
+++
b/kogito-apps-quarkus/jobs-service-quarkus/jobs-service-storage-jpa/src/main/java/org/kie/kogito/jobs/service/repository/jpa/model/JobServiceManagementEntity.java
@@ -32,12 +32,14 @@ import jakarta.persistence.*;
public class JobServiceManagementEntity {
@Id
+ @Column(name = "id")
private String id;
@Column(name = "last_heartbeat")
@Temporal(TemporalType.TIMESTAMP)
private OffsetDateTime lastHeartBeat;
+ @Column(name = "token")
private String token;
public String getId() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
