fix some class loading issues

apache · Nov 18, 2024 · 67e2159 · 67e2159
1 parent 72ae836
commit 67e2159
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...usertask-storage-jpa/src/main/java/org/jbpm/usertask/jpa/mapper/json/utils/JSONUtils.java b/...usertask-storage-jpa/src/main/java/org/jbpm/usertask/jpa/mapper/json/utils/JSONUtils.java
@@ -26,6 +26,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
+import static java.lang.Thread.currentThread;
+
 public class JSONUtils {
 
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
@@ -51,7 +53,7 @@ public static Object stringTreeToValue(String value, String javaType) {
             if (Objects.isNull(value) || Objects.isNull(javaType)) {
                 return null;
             }
-            return OBJECT_MAPPER.readValue(value, Class.forName(javaType));
+            return OBJECT_MAPPER.readValue(value, currentThread().getContextClassLoader().loadClass(javaType));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

diff --git a/.../jbpm-usertask-storage-jpa/src/main/java/org/jbpm/usertask/jpa/model/TaskInputEntity.java b/.../jbpm-usertask-storage-jpa/src/main/java/org/jbpm/usertask/jpa/model/TaskInputEntity.java
@@ -25,7 +25,6 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.ForeignKey;
-import jakarta.persistence.IdClass;
 import jakarta.persistence.Table;
 
 @Entity
@@ -35,7 +34,6 @@
         @AttributeOverride(name = "value", column = @Column(name = "input_value"))
 })
 @AssociationOverride(name = "taskInstance", foreignKey = @ForeignKey(name = "jbpm_user_tasks_inputs_tid"))
-@IdClass(TaskNamedDataEntityPK.class)
 public class TaskInputEntity extends TaskNamedDataEntity<byte[]> {
 
 }
diff --git a/.../src/main/resources/kie-flyway/db/user-tasks/postgresql/V1.0.1__jBPM_user_task_timers.sql b/.../src/main/resources/kie-flyway/db/user-tasks/postgresql/V1.0.1__jBPM_user_task_timers.sql
@@ -48,11 +48,11 @@ create table jbpm_user_tasks_deadline_timer (
 
 
 create table jbpm_user_tasks_reassignment_timer (
-    task_id              varchar(50) not null,
+    task_id             varchar(50) not null,
     reassignment_job_id varchar(255) not null,
     reassignment_type   varchar(255) not null,
     reassignment_value  bytea,
-    java_type            varchar(255),
+    java_type           varchar(255),
     primary key (task_id, reassignment_job_id)
 );