attachments) {
this.attachments = attachments;
}
+ public void setExternalReferenceId(String externalReferenceId) {
+ this.externalReferenceId = externalReferenceId;
+ }
+
+ public String getExternalReferenceId() {
+ return externalReferenceId;
+ }
+
@Override
public boolean equals(Object o) {
if (this == o) {
@@ -435,4 +445,5 @@ public int hashCode() {
return Objects.hash(id);
}
}
+
}
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapper.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapper.java
index b7479af604..1a8b9add5d 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapper.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapper.java
@@ -79,6 +79,7 @@ public UserTaskInstanceEntity mapToEntity(String key, UserTaskInstance instance)
entity.setEndpoint(instance.getEndpoint());
entity.setComments(Optional.ofNullable(instance.getComments()).map(comments -> comments.stream().map(this::fromComment).collect(toList())).orElse(null));
entity.setAttachments(Optional.ofNullable(instance.getAttachments()).map(attachments -> attachments.stream().map(this::fromAttachment).collect(toList())).orElse(null));
+ entity.setExternalReferenceId(instance.getExternalReferenceId());
return entity;
}
@@ -113,6 +114,7 @@ public UserTaskInstance mapToModel(UserTaskInstanceEntity entity) {
instance.setEndpoint(entity.getEndpoint());
instance.setComments(Optional.ofNullable(entity.getComments()).map(comments -> comments.stream().map(this::toComment).collect(toList())).orElse(null));
instance.setAttachments(Optional.ofNullable(entity.getAttachments()).map(attachments -> attachments.stream().map(this::toAttachment).collect(toList())).orElse(null));
+ instance.setExternalReferenceId(entity.getExternalReferenceId());
return instance;
}
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapperTest.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapperTest.java
index 9340704383..013ba7a041 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapperTest.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapperTest.java
@@ -64,6 +64,7 @@ static void setup() {
String processId = "testProcessId";
String rootProcessId = "testRootProcessId";
String rootProcessInstanceId = "testRootProcessInstanceId";
+ String externalReferenceId = "testExternalReferenceId";
ObjectNode object = MAPPER.createObjectNode();
object.put("test", "testValue");
ObjectNode inputs = object;
@@ -114,6 +115,7 @@ static void setup() {
userTaskInstance.setOutputs(outputs);
userTaskInstance.setComments(List.of(comment));
userTaskInstance.setAttachments(List.of(attachment));
+ userTaskInstance.setExternalReferenceId(externalReferenceId);
userTaskInstanceEntity = new UserTaskInstanceEntity();
userTaskInstanceEntity.setId(testId);
@@ -139,6 +141,7 @@ static void setup() {
userTaskInstanceEntity.setOutputs(jsonNodeToDocument(outputs));
userTaskInstanceEntity.setComments(List.of(commentEntity));
userTaskInstanceEntity.setAttachments(List.of(attachmentEntity));
+ userTaskInstanceEntity.setExternalReferenceId(externalReferenceId);
}
@Test
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/META-INF/kie-flyway.properties b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/META-INF/kie-flyway.properties
index 383546a8fe..4adfed0d42 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/META-INF/kie-flyway.properties
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/META-INF/kie-flyway.properties
@@ -19,4 +19,4 @@
module.name=data-index
-module.locations.postgresql=classpath:kie-flyway/db/data-index/postgresql,classpath:kie-flyway/db/persistence-commons/postgresql
\ No newline at end of file
+module.locations.postgresql=classpath:kie-flyway/db/data-index/postgresql
\ No newline at end of file
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.45.0.5__add_external_reference_id.sql b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.45.0.5__add_external_reference_id.sql
new file mode 100644
index 0000000000..908ee2b249
--- /dev/null
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.45.0.5__add_external_reference_id.sql
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+alter table tasks add external_reference_id varchar(4000);
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceStorageIT.java
index 0ad8baf9b6..0ac176627c 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceStorageIT.java
@@ -21,10 +21,12 @@
import org.kie.kogito.index.jpa.storage.AbstractProcessInstanceStorageIT;
import org.kie.kogito.testcontainers.quarkus.PostgreSqlQuarkusTestResource;
+import io.quarkus.test.TestTransaction;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
@QuarkusTest
+@TestTransaction
@QuarkusTestResource(PostgreSqlQuarkusTestResource.class)
public class ProcessInstanceStorageIT extends AbstractProcessInstanceStorageIT {
}
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/resources/application.properties b/data-index/data-index-storage/data-index-storage-postgresql/src/test/resources/application.properties
index b5637dfd64..a91fc1a378 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/resources/application.properties
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/resources/application.properties
@@ -25,8 +25,7 @@ quarkus.datasource.username=kogito
quarkus.datasource.password=kogito
quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/kogito
# Hibernate
-quarkus.hibernate-orm.database.generation=drop-and-create
-quarkus.hibernate-orm.database.generation.halt-on-error=true
+
quarkus.hibernate-orm.physical-naming-strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy
quarkus.hibernate-orm.jdbc.timezone=UTC
quarkus.hibernate-orm.log.sql=true
diff --git a/data-index/data-index-storage/data-index-storage-protobuf/src/main/resources/META-INF/kogito-index.proto b/data-index/data-index-storage/data-index-storage-protobuf/src/main/resources/META-INF/kogito-index.proto
index 18f01a6014..5c23eecefa 100644
--- a/data-index/data-index-storage/data-index-storage-protobuf/src/main/resources/META-INF/kogito-index.proto
+++ b/data-index/data-index-storage/data-index-storage-protobuf/src/main/resources/META-INF/kogito-index.proto
@@ -237,6 +237,7 @@ message UserTaskInstance {
repeated Comment comments = 23;
/* @Field(store = Store.YES) */
repeated Attachment attachments = 24;
+ optional string externalReferenceId = 25;
}
/* @Indexed */
@@ -275,6 +276,7 @@ message UserTaskInstanceMeta {
repeated Comment comments = 17;
/* @Field(store = Store.YES) */
repeated Attachment attachments = 18;
+ optional string externalReferenceId = 25;
}
/* @Indexed */
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/TestUtils.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/TestUtils.java
index 68946a056c..600d52824e 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/TestUtils.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/TestUtils.java
@@ -286,6 +286,7 @@ public static UserTaskInstanceStateDataEvent getUserTaskCloudEvent(String taskId
.actualOwner(actualOwner)
.eventDate(new Date())
.processInstanceId(processInstanceId)
+ .externalReferenceId("testExternalReferenceId")
.build();
UserTaskInstanceStateDataEvent event = new UserTaskInstanceStateDataEvent(URI.create("http://localhost:8080/" + processId).toString(), null, null, body.metaData(), body);
event.setKogitoProcessId(processId);
@@ -422,6 +423,7 @@ public static UserTaskInstance getUserTaskInstance(String taskId, String process
task.setPotentialGroups(singleton("potentialGroup"));
task.setComments(List.of(Comment.builder().id("commentId" + taskId).content("Comment 1").updatedBy("kogito").build()));
task.setAttachments(List.of(Attachment.builder().id("attachmentId" + taskId).content("http://linltodoc.com/1").name("doc1").updatedBy("kogito").build()));
+ task.setExternalReferenceId("testExternalReferenceId");
return task;
}
}
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/application.properties
index 17182933f0..36c137123b 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/application.properties
@@ -32,7 +32,7 @@ quarkus.hibernate-orm.datasource=data_index
quarkus.hibernate-orm.physical-naming-strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy
#Flyway
-quarkus.flyway."data_index".locations=classpath:/kie-flyway/db/data-index/postgresql
+quarkus.flyway."data_index".locations=classpath:/kie-flyway/db/data-index/postgresql,classpath:kie-flyway/db/persistence-commons/postgresql
quarkus.flyway."data_index".migrate-at-start=true
kie.flyway.modules."data-index".enabled=false
\ No newline at end of file
diff --git a/jitexecutor/jitexecutor-common/src/main/java/org/kie/kogito/jitexecutor/common/Constants.java b/jitexecutor/jitexecutor-common/src/main/java/org/kie/kogito/jitexecutor/common/Constants.java
index ed8079006b..17999225e6 100644
--- a/jitexecutor/jitexecutor-common/src/main/java/org/kie/kogito/jitexecutor/common/Constants.java
+++ b/jitexecutor/jitexecutor-common/src/main/java/org/kie/kogito/jitexecutor/common/Constants.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/DMNEvaluator.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/DMNEvaluator.java
index 3a7bafe229..86e68c4729 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/DMNEvaluator.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/DMNEvaluator.java
@@ -32,6 +32,7 @@
import org.kie.internal.io.ResourceFactory;
import org.kie.kogito.jitexecutor.common.requests.MultipleResourcesPayload;
import org.kie.kogito.jitexecutor.common.requests.ResourceWithURI;
+import org.kie.kogito.jitexecutor.dmn.responses.JITDMNResult;
import org.kie.kogito.jitexecutor.dmn.utils.ResolveByKey;
public class DMNEvaluator {
@@ -43,6 +44,7 @@ public static DMNEvaluator fromXML(String modelXML) {
Resource modelResource = ResourceFactory.newReaderResource(new StringReader(modelXML), "UTF-8");
DMNRuntime dmnRuntime = DMNRuntimeBuilder.fromDefaults().buildConfiguration()
.fromResources(Collections.singletonList(modelResource)).getOrElseThrow(RuntimeException::new);
+ dmnRuntime.addListener(new JITDMNListener());
DMNModel dmnModel = dmnRuntime.getModels().get(0);
if (dmnModel.hasErrors()) {
List messages = dmnModel.getMessages(DMNMessage.Severity.ERROR);
@@ -75,9 +77,16 @@ public Collection getAllDMNModels() {
return dmnRuntime.getModels();
}
- public DMNResult evaluate(Map context) {
- DMNContext dmnContext = new DynamicDMNContextBuilder(dmnRuntime.newContext(), dmnModel).populateContextWith(context);
- return dmnRuntime.evaluateAll(dmnModel, dmnContext);
+ public JITDMNResult evaluate(Map context) {
+ DMNContext dmnContext =
+ new DynamicDMNContextBuilder(dmnRuntime.newContext(), dmnModel).populateContextWith(context);
+ DMNResult dmnResult = dmnRuntime.evaluateAll(dmnModel, dmnContext);
+ Optional> evaluationHitIds = dmnRuntime.getListeners().stream()
+ .filter(JITDMNListener.class::isInstance)
+ .findFirst()
+ .map(JITDMNListener.class::cast)
+ .map(JITDMNListener::getEvaluationHitIds);
+ return new JITDMNResult(getNamespace(), getName(), dmnResult, evaluationHitIds.orElse(Collections.emptyMap()));
}
public static DMNEvaluator fromMultiple(MultipleResourcesPayload payload) {
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNListener.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNListener.java
new file mode 100644
index 0000000000..2da2e74e4c
--- /dev/null
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNListener.java
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.jitexecutor.dmn;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.kie.dmn.api.core.event.AfterConditionalEvaluationEvent;
+import org.kie.dmn.api.core.event.AfterEvaluateAllEvent;
+import org.kie.dmn.api.core.event.AfterEvaluateBKMEvent;
+import org.kie.dmn.api.core.event.AfterEvaluateContextEntryEvent;
+import org.kie.dmn.api.core.event.AfterEvaluateDecisionEvent;
+import org.kie.dmn.api.core.event.AfterEvaluateDecisionServiceEvent;
+import org.kie.dmn.api.core.event.AfterEvaluateDecisionTableEvent;
+import org.kie.dmn.api.core.event.AfterInvokeBKMEvent;
+import org.kie.dmn.api.core.event.DMNEvent;
+import org.kie.dmn.api.core.event.DMNRuntimeEventListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class JITDMNListener implements DMNRuntimeEventListener {
+
+ private final Map evaluationHitIds = new HashMap<>();
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(JITDMNListener.class);
+
+ @Override
+ public void afterEvaluateDecisionTable(AfterEvaluateDecisionTableEvent event) {
+ logEvent(event);
+ event.getSelectedIds().forEach(s -> evaluationHitIds.compute(s, (k, v) -> v == null ? 1 : v + 1));
+ }
+
+ @Override
+ public void afterEvaluateDecision(AfterEvaluateDecisionEvent event) {
+ logEvent(event);
+ }
+
+ @Override
+ public void afterEvaluateBKM(AfterEvaluateBKMEvent event) {
+ logEvent(event);
+ }
+
+ @Override
+ public void afterEvaluateContextEntry(AfterEvaluateContextEntryEvent event) {
+ logEvent(event);
+ }
+
+ @Override
+ public void afterEvaluateDecisionService(AfterEvaluateDecisionServiceEvent event) {
+ logEvent(event);
+ }
+
+ @Override
+ public void afterInvokeBKM(AfterInvokeBKMEvent event) {
+ logEvent(event);
+ }
+
+ @Override
+ public void afterEvaluateAll(AfterEvaluateAllEvent event) {
+ logEvent(event);
+ }
+
+ @Override
+ public void afterConditionalEvaluation(AfterConditionalEvaluationEvent event) {
+ logEvent(event);
+ evaluationHitIds.compute(event.getExecutedId(), (k, v) -> v == null ? 1 : v + 1);
+ }
+
+ public Map getEvaluationHitIds() {
+ return evaluationHitIds;
+ }
+
+ private void logEvent(DMNEvent toLog) {
+ LOGGER.info("{} event {}", toLog.getClass().getSimpleName(), toLog);
+ }
+
+ private void logEvent(AfterConditionalEvaluationEvent toLog) {
+ LOGGER.info("{} event {}", toLog.getClass().getSimpleName(), toLog);
+ }
+
+}
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImpl.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImpl.java
index 320f1a9609..bb0b6513c8 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImpl.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImpl.java
@@ -76,8 +76,7 @@ public JITDMNServiceImpl(int explainabilityLimeSampleSize, int explainabilityLim
@Override
public JITDMNResult evaluateModel(String modelXML, Map context) {
DMNEvaluator dmnEvaluator = DMNEvaluator.fromXML(modelXML);
- DMNResult dmnResult = dmnEvaluator.evaluate(context);
- return new JITDMNResult(dmnEvaluator.getNamespace(), dmnEvaluator.getName(), dmnResult);
+ return dmnEvaluator.evaluate(context);
}
@Override
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/JITDMNResult.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/JITDMNResult.java
index bfaea16420..c444dd0148 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/JITDMNResult.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/JITDMNResult.java
@@ -21,6 +21,7 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -49,16 +50,23 @@ public class JITDMNResult implements Serializable,
private Map decisionResults = new HashMap<>();
+ private Map evaluationHitIds;
+
public JITDMNResult() {
// Intentionally blank.
}
public JITDMNResult(String namespace, String modelName, org.kie.dmn.api.core.DMNResult dmnResult) {
+ this(namespace, modelName, dmnResult, Collections.emptyMap());
+ }
+
+ public JITDMNResult(String namespace, String modelName, org.kie.dmn.api.core.DMNResult dmnResult, Map evaluationHitIds) {
this.namespace = namespace;
this.modelName = modelName;
this.setDmnContext(dmnResult.getContext().getAll());
this.setMessages(dmnResult.getMessages());
this.setDecisionResults(dmnResult.getDecisionResults());
+ this.evaluationHitIds = evaluationHitIds;
}
public String getNamespace() {
@@ -102,6 +110,14 @@ public void setDecisionResults(List decisionResults
}
}
+ public Map getEvaluationHitIds() {
+ return evaluationHitIds;
+ }
+
+ public void setEvaluationHitIds(Map evaluationHitIds) {
+ this.evaluationHitIds = evaluationHitIds;
+ }
+
@JsonIgnore
@Override
public DMNContext getContext() {
@@ -151,6 +167,7 @@ public String toString() {
.append(", dmnContext=").append(dmnContext)
.append(", messages=").append(messages)
.append(", decisionResults=").append(decisionResults)
+ .append(", evaluationHitIds=").append(evaluationHitIds)
.append("]").toString();
}
}
diff --git a/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImplTest.java b/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImplTest.java
index 3169dce379..0e627f7a33 100644
--- a/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImplTest.java
+++ b/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImplTest.java
@@ -19,8 +19,11 @@
package org.kie.kogito.jitexecutor.dmn;
import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.Assertions;
@@ -43,7 +46,7 @@ public static void setup() throws IOException {
}
@Test
- public void testModelEvaluation() {
+ void testModelEvaluation() {
Map context = new HashMap<>();
context.put("FICO Score", 800);
context.put("DTI Ratio", .1);
@@ -57,7 +60,142 @@ public void testModelEvaluation() {
}
@Test
- public void testExplainability() throws IOException {
+ void testDecisionTableModelEvaluation() throws IOException {
+ String decisionTableModel = getModelFromIoUtils("valid_models/DMNv1_x/LoanEligibility.dmn");
+ Map client = new HashMap<>();
+ client.put("age", 43);
+ client.put("salary", 1950);
+ client.put("existing payments", 100);
+
+ Map loan = new HashMap<>();
+ loan.put("duration", 15);
+ loan.put("installment", 180);
+ Map context = new HashMap<>();
+
+ context.put("Client", client);
+ context.put("Loan", loan);
+ context.put("SupremeDirector", "No");
+ context.put("Bribe", 10);
+ JITDMNResult dmnResult = jitdmnService.evaluateModel(decisionTableModel, context);
+
+ Assertions.assertEquals("LoanEligibility", dmnResult.getModelName());
+ Assertions.assertEquals("https://github.com/kiegroup/kogito-examples/dmn-quarkus-listener-example",
+ dmnResult.getNamespace());
+ Assertions.assertTrue(dmnResult.getMessages().isEmpty());
+ Assertions.assertEquals("Yes", dmnResult.getDecisionResultByName("Eligibility").getResult());
+ }
+
+ @Test
+ void testEvaluationHitIds() throws IOException {
+ final String thenElementId = "_6481FF12-61B5-451C-B775-4143D9B6CD6B";
+ final String elseElementId = "_2CD02CB2-6B56-45C4-B461-405E89D45633";
+ final String ruleId0 = "_1578BD9E-2BF9-4BFC-8956-1A736959C937";
+ final String ruleId1 = "_31CD7AA3-A806-4E7E-B512-821F82043620";
+ final String ruleId3 = "_2545E1A8-93D3-4C8A-A0ED-8AD8B10A58F9";
+ final String ruleId4 = "_510A50DA-D5A4-4F06-B0BE-7F8F2AA83740";
+ String decisionTableModel = getModelFromIoUtils("valid_models/DMNv1_5/RiskScore_Simple.dmn");
+ Map context = new HashMap<>();
+ context.put("Credit Score", "Poor");
+ context.put("DTI", 33);
+ JITDMNResult dmnResult = jitdmnService.evaluateModel(decisionTableModel, context);
+
+ Assertions.assertEquals("DMN_A77074C1-21FE-4F7E-9753-F84661569AFC", dmnResult.getModelName());
+ Assertions.assertTrue(dmnResult.getMessages().isEmpty());
+ Assertions.assertEquals(BigDecimal.valueOf(50), dmnResult.getDecisionResultByName("Risk Score").getResult());
+ Map evaluationHitIds = dmnResult.getEvaluationHitIds();
+ Assertions.assertNotNull(evaluationHitIds);
+ Assertions.assertEquals(3, evaluationHitIds.size());
+ Assertions.assertTrue(evaluationHitIds.containsKey(elseElementId));
+ Assertions.assertTrue(evaluationHitIds.containsKey(ruleId0));
+ Assertions.assertTrue(evaluationHitIds.containsKey(ruleId3));
+
+ context = new HashMap<>();
+ context.put("Credit Score", "Excellent");
+ context.put("DTI", 10);
+ dmnResult = jitdmnService.evaluateModel(decisionTableModel, context);
+
+ Assertions.assertTrue(dmnResult.getMessages().isEmpty());
+ Assertions.assertEquals(BigDecimal.valueOf(20), dmnResult.getDecisionResultByName("Risk Score").getResult());
+ evaluationHitIds = dmnResult.getEvaluationHitIds();
+ Assertions.assertNotNull(evaluationHitIds);
+ Assertions.assertEquals(3, evaluationHitIds.size());
+ Assertions.assertTrue(evaluationHitIds.containsKey(thenElementId));
+ Assertions.assertTrue(evaluationHitIds.containsKey(ruleId1));
+ Assertions.assertTrue(evaluationHitIds.containsKey(ruleId4));
+ }
+
+ @Test
+ void testConditionalWithNestedDecisionTableFromRiskScoreEvaluation() throws IOException {
+ final String thenElementId = "_6481FF12-61B5-451C-B775-4143D9B6CD6B";
+ final String thenRuleId0 = "_D1753442-03F0-414B-94F8-6A86182DF6EB";
+ final String thenRuleId4 = "_E787BA51-E31D-449B-A432-50BE7466A15E";
+ final String elseElementId = "_2CD02CB2-6B56-45C4-B461-405E89D45633";
+ final String elseRuleId2 = "_945A5471-9F91-4751-9D96-74978F6FB12B";
+ final String elseRuleId5 = "_654BBFBC-9B84-4BD8-9D0B-13E8DD1B9F5D";
+ String decisionTableModel = getModelFromIoUtils("valid_models/DMNv1_5/RiskScore_Conditional.dmn");
+
+ Map context = new HashMap<>();
+ context.put("Credit Score", "Poor");
+ context.put("DTI", 33);
+ context.put("World Region", "Asia");
+ JITDMNResult dmnResult = jitdmnService.evaluateModel(decisionTableModel, context);
+
+ Assertions.assertTrue(dmnResult.getMessages().isEmpty());
+ Assertions.assertEquals(BigDecimal.valueOf(50), dmnResult.getDecisionResultByName("Risk Score").getResult());
+ Map evaluationHitIds = dmnResult.getEvaluationHitIds();
+ Assertions.assertNotNull(evaluationHitIds);
+ Assertions.assertEquals(3, evaluationHitIds.size());
+ Assertions.assertTrue(evaluationHitIds.containsKey(thenElementId));
+ Assertions.assertTrue(evaluationHitIds.containsKey(thenRuleId0));
+ Assertions.assertTrue(evaluationHitIds.containsKey(thenRuleId4));
+
+ context = new HashMap<>();
+ context.put("Credit Score", "Excellent");
+ context.put("DTI", 10);
+ context.put("World Region", "Europe");
+ dmnResult = jitdmnService.evaluateModel(decisionTableModel, context);
+
+ Assertions.assertTrue(dmnResult.getMessages().isEmpty());
+ Assertions.assertEquals(BigDecimal.valueOf(30), dmnResult.getDecisionResultByName("Risk Score").getResult());
+ evaluationHitIds = dmnResult.getEvaluationHitIds();
+ Assertions.assertNotNull(evaluationHitIds);
+ Assertions.assertEquals(3, evaluationHitIds.size());
+ Assertions.assertTrue(evaluationHitIds.containsKey(elseElementId));
+ Assertions.assertTrue(evaluationHitIds.containsKey(elseRuleId2));
+ Assertions.assertTrue(evaluationHitIds.containsKey(elseRuleId5));
+ }
+
+ @Test
+ void testMultipleHitRulesEvaluation() throws IOException {
+ final String rule0 = "_E5C380DA-AF7B-4401-9804-C58296EC09DD";
+ final String rule1 = "_DFD65E8B-5648-4BFD-840F-8C76B8DDBD1A";
+ final String rule2 = "_E80EE7F7-1C0C-4050-B560-F33611F16B05";
+ String decisionTableModel = getModelFromIoUtils("valid_models/DMNv1_5/MultipleHitRules.dmn");
+
+ final List numbers = new ArrayList<>();
+ numbers.add(BigDecimal.valueOf(10));
+ numbers.add(BigDecimal.valueOf(2));
+ numbers.add(BigDecimal.valueOf(1));
+ final Map context = new HashMap<>();
+ context.put("Numbers", numbers);
+ final JITDMNResult dmnResult = jitdmnService.evaluateModel(decisionTableModel, context);
+
+ final List expectedStatistcs = new ArrayList<>();
+ expectedStatistcs.add(BigDecimal.valueOf(6));
+ expectedStatistcs.add(BigDecimal.valueOf(3));
+ expectedStatistcs.add(BigDecimal.valueOf(1));
+ Assertions.assertTrue(dmnResult.getMessages().isEmpty());
+ Assertions.assertEquals(expectedStatistcs, dmnResult.getDecisionResultByName("Statistics").getResult());
+ final Map evaluationHitIds = dmnResult.getEvaluationHitIds();
+ Assertions.assertNotNull(evaluationHitIds);
+ Assertions.assertEquals(3, evaluationHitIds.size());
+ Assertions.assertEquals(3, evaluationHitIds.get(rule0));
+ Assertions.assertEquals(2, evaluationHitIds.get(rule1));
+ Assertions.assertEquals(1, evaluationHitIds.get(rule2));
+ }
+
+ @Test
+ void testExplainability() throws IOException {
String allTypesModel = getModelFromIoUtils("valid_models/DMNv1_x/allTypes.dmn");
Map context = new HashMap<>();
diff --git a/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResourceTest.java b/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResourceTest.java
index d728d112c3..cacf238916 100644
--- a/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResourceTest.java
+++ b/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResourceTest.java
@@ -19,13 +19,23 @@
package org.kie.kogito.jitexecutor.dmn.api;
import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.kie.kogito.jitexecutor.dmn.requests.JITDMNPayload;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.http.ContentType;
@@ -36,18 +46,28 @@
@QuarkusTest
public class JITDMNResourceTest {
- private static String model;
+ private static String invalidModel;
private static String modelWithExtensionElements;
+ private static String modelWithMultipleEvaluationHitIds;
+
+ private static final ObjectMapper MAPPER = new ObjectMapper();
+
+ private static final String EVALUATION_HIT_IDS_FIELD_NAME = "evaluationHitIds";
+
+ static {
+ MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+ }
@BeforeAll
public static void setup() throws IOException {
- model = getModelFromIoUtils("invalid_models/DMNv1_x/test.dmn");
+ invalidModel = getModelFromIoUtils("invalid_models/DMNv1_x/test.dmn");
modelWithExtensionElements = getModelFromIoUtils("valid_models/DMNv1_x/testWithExtensionElements.dmn");
+ modelWithMultipleEvaluationHitIds = getModelFromIoUtils("valid_models/DMNv1_5/MultipleHitRules.dmn");
}
@Test
- public void testjitEndpoint() {
- JITDMNPayload jitdmnpayload = new JITDMNPayload(model, buildContext());
+ void testjitEndpoint() {
+ JITDMNPayload jitdmnpayload = new JITDMNPayload(invalidModel, buildContext());
given()
.contentType(ContentType.JSON)
.body(jitdmnpayload)
@@ -58,31 +78,57 @@ public void testjitEndpoint() {
}
@Test
- public void testjitdmnResultEndpoint() {
- JITDMNPayload jitdmnpayload = new JITDMNPayload(model, buildContext());
+ void testjitdmnResultEndpoint() {
+ JITDMNPayload jitdmnpayload = new JITDMNPayload(modelWithMultipleEvaluationHitIds, buildMultipleHitContext());
given()
.contentType(ContentType.JSON)
.body(jitdmnpayload)
.when().post("/jitdmn/dmnresult")
.then()
.statusCode(200)
- .body(containsString("Loan Approval"), containsString("Approved"), containsString("xls2dmn"));
+ .body(containsString("Statistics"));
}
@Test
- public void testjitExplainabilityEndpoint() {
- JITDMNPayload jitdmnpayload = new JITDMNPayload(model, buildContext());
+ void testjitdmnResultEndpointWithEvaluationHitIds() throws JsonProcessingException {
+ JITDMNPayload jitdmnpayload = new JITDMNPayload(modelWithMultipleEvaluationHitIds, buildMultipleHitContext());
+ final String rule0 = "_E5C380DA-AF7B-4401-9804-C58296EC09DD";
+ final String rule1 = "_DFD65E8B-5648-4BFD-840F-8C76B8DDBD1A";
+ final String rule2 = "_E80EE7F7-1C0C-4050-B560-F33611F16B05";
+ String response = given().contentType(ContentType.JSON)
+ .body(jitdmnpayload)
+ .when().post("/jitdmn/dmnresult")
+ .then()
+ .statusCode(200)
+ .body(containsString("Statistics"),
+ containsString(EVALUATION_HIT_IDS_FIELD_NAME),
+ containsString(rule0),
+ containsString(rule1),
+ containsString(rule2))
+ .extract()
+ .asString();
+ JsonNode retrieved = MAPPER.readTree(response);
+ ObjectNode evaluationHitIdsNode = (ObjectNode) retrieved.get(EVALUATION_HIT_IDS_FIELD_NAME);
+ Assertions.assertThat(evaluationHitIdsNode).hasSize(3);
+ final Map expectedEvaluationHitIds = Map.of(rule0, 3, rule1, 2, rule2, 1);
+ evaluationHitIdsNode.fields().forEachRemaining(entry -> Assertions.assertThat(expectedEvaluationHitIds).containsEntry(entry.getKey(), entry.getValue().asInt()));
+ }
+
+ @Test
+ void testjitExplainabilityEndpoint() {
+ JITDMNPayload jitdmnpayload = new JITDMNPayload(invalidModel, buildContext());
given()
.contentType(ContentType.JSON)
.body(jitdmnpayload)
.when().post("/jitdmn/evaluateAndExplain")
.then()
.statusCode(200)
- .body(containsString("dmnResult"), containsString("saliencies"), containsString("xls2dmn"), containsString("featureName"));
+ .body(containsString("dmnResult"), containsString("saliencies"), containsString("xls2dmn"),
+ containsString("featureName"));
}
@Test
- public void testjitdmnWithExtensionElements() {
+ void testjitdmnWithExtensionElements() {
Map context = new HashMap<>();
context.put("m", 1);
context.put("n", 2);
@@ -104,4 +150,14 @@ private Map buildContext() {
context.put("PITI Ratio", .1);
return context;
}
+
+ private Map buildMultipleHitContext() {
+ final List numbers = new ArrayList<>();
+ numbers.add(BigDecimal.valueOf(10));
+ numbers.add(BigDecimal.valueOf(2));
+ numbers.add(BigDecimal.valueOf(1));
+ final Map context = new HashMap<>();
+ context.put("Numbers", numbers);
+ return context;
+ }
}
diff --git a/jitexecutor/jitexecutor-runner/src/main/resources/application.properties b/jitexecutor/jitexecutor-runner/src/main/resources/application.properties
index 47e4b5dc93..0dfac610c5 100644
--- a/jitexecutor/jitexecutor-runner/src/main/resources/application.properties
+++ b/jitexecutor/jitexecutor-runner/src/main/resources/application.properties
@@ -22,6 +22,6 @@ quarkus.http.cors=true
quarkus.swagger-ui.always-include=true
quarkus.native.additional-build-args=\
- --initialize-at-run-time=com.thoughtworks.xstream.converters.extended.DynamicProxyConverter$Reflections\\,org.kie.dmn.core.compiler.execmodelbased.AbstractModelEvaluator\\,org.kie.dmn.core.pmml.DMNKiePMMLTrustyInvocationEvaluator,\
+ --initialize-at-run-time=org.apache.hc.client5.http.impl.auth.NTLMEngineImpl\\,com.thoughtworks.xstream.converters.extended.DynamicProxyConverter$Reflections\\,org.kie.dmn.core.compiler.execmodelbased.AbstractModelEvaluator\\,org.kie.dmn.core.pmml.DMNKiePMMLTrustyInvocationEvaluator,\
-H:IncludeResourceBundles=com.sun.org.apache.xerces.internal.impl.xpath.regex.message,\
--allow-incomplete-classpath
\ No newline at end of file
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobScheduler.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobScheduler.java
index ac080cdb82..49e777ba8c 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobScheduler.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobScheduler.java
@@ -343,7 +343,8 @@ private PublisherBuilder handleRetry(CompletionStage fut
.build())
.map(jobRepository::save)
.flatMapCompletionStage(p -> p))
- .peek(job -> LOGGER.debug("Retry executed {}", job));
+ .peek(job -> LOGGER.debug("Retry executed {}", job))
+ .onError(errorHandler -> LOGGER.error("Failed to retrieve job due to {}", errorHandler.getMessage()));
}
private PointInTimeTrigger getRetryTrigger() {
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManager.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManager.java
index b0bd05feac..2211c3aeef 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManager.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManager.java
@@ -118,6 +118,9 @@ enum LoadJobErrorStrategy {
}
private void startJobsLoadingFromRepositoryTask() {
+ LOGGER.info(
+ "Starting with configuration: schedulerChunkInMinutes={}, loadJobIntervalInMinutes={}, loadJobFromCurrentTimeIntervalInMinutes={}, loadJobRetries={}, loadJobErrorStrategy={}",
+ schedulerChunkInMinutes, loadJobIntervalInMinutes, loadJobFromCurrentTimeIntervalInMinutes, loadJobRetries, loadJobErrorStrategy);
//guarantee it starts the task just in case it is not already active
initialLoading.set(true);
if (periodicTimerIdForLoadJobs.get() < 0) {
@@ -129,6 +132,13 @@ private void startJobsLoadingFromRepositoryTask() {
schedulerChunkInMinutes);
loadJobIntervalInMinutes = schedulerChunkInMinutes;
}
+ if (loadJobFromCurrentTimeIntervalInMinutes < loadJobIntervalInMinutes) {
+ LOGGER.warn("The loadJobFromCurrentTimeIntervalInMinutes value ({}) is smaller than loadJobIntervalInMinutes ({}). " +
+ "This can potentially lead to overdue timers not getting rescheduled during the periodic job loading.",
+ loadJobFromCurrentTimeIntervalInMinutes,
+ loadJobIntervalInMinutes);
+
+ }
//first execution
vertx.runOnContext(this::loadJobDetails);
//next executions to run periodically
@@ -198,6 +208,15 @@ private boolean isNotScheduled(JobDetails jobDetails) {
Date triggerFireTime = jobDetails.getTrigger().hasNextFireTime();
ZonedDateTime nextFireTime = triggerFireTime != null ? DateUtil.instantToZonedDateTime(triggerFireTime.toInstant()) : null;
boolean scheduled = scheduler.scheduled(jobDetails.getId()).isPresent();
+ // cancel an overdue timer to have it rescheduled
+ if (!initialLoading.get() && nextFireTime != null && nextFireTime.isBefore(DateUtil.now())) {
+ LOGGER.debug("Job found, id: {}, nextFireTime: {}, created: {}, status: {} is overdue and will be rescheduled", jobDetails.getId(),
+ nextFireTime,
+ jobDetails.getCreated(),
+ jobDetails.getStatus());
+ scheduler.cancel(jobDetails.getId());
+ return true;
+ }
LOGGER.debug("Job found, id: {}, nextFireTime: {}, created: {}, status: {}, already scheduled: {}", jobDetails.getId(),
nextFireTime,
jobDetails.getCreated(),
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobScheduler.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobScheduler.java
index 6b30c30b0b..b64bd87b95 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobScheduler.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobScheduler.java
@@ -62,6 +62,9 @@ public TimerDelegateJobScheduler(ReactiveJobRepository jobRepository,
@ConfigProperty(name = "kogito.jobs-service.forceExecuteExpiredJobsOnServiceStart", defaultValue = "true") boolean forceExecuteExpiredJobsOnServiceStart,
JobExecutorResolver jobExecutorResolver, VertxTimerServiceScheduler delegate) {
super(jobRepository, backoffRetryMillis, maxIntervalLimitToRetryMillis, schedulerChunkInMinutes, forceExecuteExpiredJobs, forceExecuteExpiredJobsOnServiceStart);
+ LOGGER.info(
+ "Creating JobScheduler with backoffRetryMillis={}, maxIntervalLimitToRetryMillis={}, schedulerChunkInMinutes={}, forceExecuteExpiredJobs={}, forceExecuteExpiredJobsOnServiceStart={}",
+ backoffRetryMillis, maxIntervalLimitToRetryMillis, schedulerChunkInMinutes, forceExecuteExpiredJobs, forceExecuteExpiredJobsOnServiceStart);
this.jobExecutorResolver = jobExecutorResolver;
this.delegate = delegate;
}
diff --git a/jobs-service/jobs-service-storage-jpa/src/main/java/org/kie/kogito/jobs/service/repository/jpa/converter/JsonBinaryConverter.java b/jobs-service/jobs-service-storage-jpa/src/main/java/org/kie/kogito/jobs/service/repository/jpa/converter/JsonBinaryConverter.java
index b269ab9eaf..924fae07fa 100644
--- a/jobs-service/jobs-service-storage-jpa/src/main/java/org/kie/kogito/jobs/service/repository/jpa/converter/JsonBinaryConverter.java
+++ b/jobs-service/jobs-service-storage-jpa/src/main/java/org/kie/kogito/jobs/service/repository/jpa/converter/JsonBinaryConverter.java
@@ -27,19 +27,19 @@
import jakarta.persistence.AttributeConverter;
-public class JsonBinaryConverter implements AttributeConverter {
+public class JsonBinaryConverter implements AttributeConverter {
@Override
- public byte[] convertToDatabaseColumn(ObjectNode attribute) {
+ public String convertToDatabaseColumn(ObjectNode attribute) {
try {
- return attribute == null ? null : ObjectMapperFactory.get().writeValueAsBytes(attribute);
+ return attribute == null ? null : ObjectMapperFactory.get().writeValueAsString(attribute);
} catch (IOException e) {
throw new UncheckedIOException(e);
}
}
@Override
- public ObjectNode convertToEntityAttribute(byte[] dbData) {
+ public ObjectNode convertToEntityAttribute(String dbData) {
try {
return dbData == null ? null : ObjectMapperFactory.get().readValue(dbData, ObjectNode.class);
} catch (IOException e) {
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/resources/application.properties b/jobs-service/jobs-service-storage-jpa/src/main/resources/application.properties
similarity index 100%
rename from persistence-commons/persistence-commons-postgresql/src/main/resources/application.properties
rename to jobs-service/jobs-service-storage-jpa/src/main/resources/application.properties
diff --git a/jobs-service/jobs-service-storage-jpa/src/main/resources/kie-flyway/db/jobs-service/ansi/V2.0.0__Create_Tables.sql b/jobs-service/jobs-service-storage-jpa/src/main/resources/kie-flyway/db/jobs-service/ansi/V2.0.0__Create_Tables.sql
index b48a32a95c..eaf988097c 100644
--- a/jobs-service/jobs-service-storage-jpa/src/main/resources/kie-flyway/db/jobs-service/ansi/V2.0.0__Create_Tables.sql
+++ b/jobs-service/jobs-service-storage-jpa/src/main/resources/kie-flyway/db/jobs-service/ansi/V2.0.0__Create_Tables.sql
@@ -27,8 +27,8 @@ create table job_details
execution_counter integer,
scheduled_id varchar(40),
priority integer,
- recipient varbinary(max),
- trigger varbinary(max),
+ recipient varchar(max),
+ trigger varchar(max),
fire_time timestamp,
execution_timeout bigint,
execution_timeout_unit varchar(40),
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs/src/main/java/org/kie/kogito/jobs/embedded/EmbeddedJobExecutor.java b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs/src/main/java/org/kie/kogito/jobs/embedded/EmbeddedJobExecutor.java
index 347eedcb69..ead3bbf2a2 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs/src/main/java/org/kie/kogito/jobs/embedded/EmbeddedJobExecutor.java
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs/src/main/java/org/kie/kogito/jobs/embedded/EmbeddedJobExecutor.java
@@ -56,7 +56,15 @@ public Uni execute(JobDetails jobDetails) {
InVMRecipient recipient = (InVMRecipient) recipientModel.getRecipient();
String timerId = recipient.getPayload().getData().timerId();
String processInstanceId = recipient.getPayload().getData().processInstanceId();
- Optional> process = processes.processByProcessInstanceId(processInstanceId);
+ Optional> process;
+ try {
+ process = processes.processByProcessInstanceId(processInstanceId);
+ } catch (Exception ex) {
+ return Uni.createFrom().failure(
+ new JobExecutionException(jobDetails.getId(),
+ "Unexpected error when executing Embedded request for job: " + jobDetails.getId() + ". " + ex.getMessage(),
+ ex));
+ }
if (process.isEmpty()) {
return Uni.createFrom().item(
JobExecutionResponse.builder()
diff --git a/kogito-apps-build-parent/pom.xml b/kogito-apps-build-parent/pom.xml
index c5093d2eb0..72c89cabf6 100644
--- a/kogito-apps-build-parent/pom.xml
+++ b/kogito-apps-build-parent/pom.xml
@@ -66,6 +66,7 @@
2.3.2
1.10.0
2.2.0
+ 20231013
1.5.5.Final
1.5.1
22.0
@@ -158,6 +159,17 @@
com.redislabs
jredisearch
${version.org.jredisearch}
+
+
+ org.json
+ json
+
+
+