Hibernate more strict on 3.8.1 requires adjustments.

pefernan · Mar 1, 2024 · 063a62b · 063a62b
1 parent c336955
commit 063a62b
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 12 deletions.
diff --git a/...ata-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java b/...ata-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java
@@ -50,7 +50,6 @@ public class NodeEntity extends AbstractEntity {
     private String type;
 
     @ElementCollection
-    @JoinColumn(name = "node_id")
     @CollectionTable(name = "definitions_nodes_metadata", joinColumns = { @JoinColumn(name = "node_id", referencedColumnName = "id"),
             @JoinColumn(name = "process_id", referencedColumnName = "process_id"), @JoinColumn(name = "process_version", referencedColumnName = "process_version") },
             foreignKey = @ForeignKey(name = "fk_definitions_nodes_metadata_definitions_nodes"))

diff --git a/...rage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java b/...rage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java
@@ -54,14 +54,12 @@ public class ProcessDefinitionEntity extends AbstractEntity {
     private byte[] source;
 
     @ElementCollection
-    @JoinColumn(name = "id")
     @CollectionTable(name = "definitions_roles", joinColumns = { @JoinColumn(name = "process_id"),
             @JoinColumn(name = "process_version") }, foreignKey = @ForeignKey(name = "fk_definitions_roles_definitions"))
     @Column(name = "role", nullable = false)
     private Set<String> roles;
 
     @ElementCollection
-    @JoinColumn(name = "id")
     @CollectionTable(name = "definitions_addons", joinColumns = { @JoinColumn(name = "process_id"),
             @JoinColumn(name = "process_version") }, foreignKey = @ForeignKey(name = "fk_definitions_addons_definitions"))
     @Column(name = "addon", nullable = false)
@@ -72,13 +70,11 @@ public class ProcessDefinitionEntity extends AbstractEntity {
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "processDefinition")
     private List<NodeEntity> nodes;
     @ElementCollection
-    @JoinColumn(name = "id")
     @CollectionTable(name = "definitions_annotations", joinColumns = { @JoinColumn(name = "process_id", referencedColumnName = "id"),
             @JoinColumn(name = "process_version", referencedColumnName = "version") }, foreignKey = @ForeignKey(name = "fk_definitions_annotations"))
     @Column(name = "value")
     private Set<String> annotations;
     @ElementCollection
-    @JoinColumn(name = "id")
     @CollectionTable(name = "definitions_metadata", joinColumns = {
             @JoinColumn(name = "process_id", referencedColumnName = "id"), @JoinColumn(name = "process_version", referencedColumnName = "version") },
             foreignKey = @ForeignKey(name = "fk_definitions_metadata"))

diff --git a/...torage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntity.java b/...torage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntity.java
@@ -53,7 +53,6 @@ public class ProcessInstanceEntity extends AbstractEntity {
     private String businessKey;
     private String endpoint;
     @ElementCollection
-    @JoinColumn(name = "process_id")
     @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;
@@ -77,7 +76,6 @@ public class ProcessInstanceEntity extends AbstractEntity {
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "processInstance")
     private List<MilestoneEntity> milestones;
     @ElementCollection
-    @JoinColumn(name = "process_id")
     @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;

diff --git a/...orage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java b/...orage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java
@@ -53,29 +53,24 @@ public class UserTaskInstanceEntity extends AbstractEntity {
     private String state;
     private String actualOwner;
     @ElementCollection
-    @JoinColumn(name = "task_id")
     @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
-    @JoinColumn(name = "task_id")
     @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;
     private ZonedDateTime completed;
     private ZonedDateTime started;
     @ElementCollection
-    @JoinColumn(name = "task_id")
     @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
-    @JoinColumn(name = "task_id")
     @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
-    @JoinColumn(name = "task_id")
     @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;