This is an automated email from the ASF dual-hosted git repository.
fjtiradosarti pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git
The following commit(s) were added to refs/heads/main by this push:
new 7d7b406699 [Fix #3677] Removing exception type from error message
(#3679)
7d7b406699 is described below
commit 7d7b406699ec40a53278c2c2a7c319f0ca5ffbbc
Author: Francisco Javier Tirado Sarti
<[email protected]>
AuthorDate: Wed Sep 25 11:08:25 2024 +0200
[Fix #3677] Removing exception type from error message (#3679)
* [Fix #3677] Removing exception type from error message
* Update
jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java
Co-authored-by: Gonzalo Muñoz <[email protected]>
* [Fix #3677] Alternative approach
* [Fix #281] Adding specific exception handler
---------
Co-authored-by: Gonzalo Muñoz <[email protected]>
---
.../resource/exceptions/BaseExceptionsHandler.java | 6 +++--
.../internal/process/runtime/MessageException.java | 27 ++++++++++++++++++++++
.../instance/impl/WorkflowProcessInstanceImpl.java | 3 ++-
.../workflow/actions/ErrorExpressionAction.java | 7 +++---
4 files changed, 37 insertions(+), 6 deletions(-)
diff --git
a/addons/common/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionsHandler.java
b/addons/common/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionsHandler.java
index cdd3b2ad52..3da864ee7e 100644
---
a/addons/common/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionsHandler.java
+++
b/addons/common/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionsHandler.java
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
+import org.kie.kogito.internal.process.runtime.MessageException;
import org.kie.kogito.internal.process.workitem.InvalidLifeCyclePhaseException;
import org.kie.kogito.internal.process.workitem.InvalidTransitionException;
import org.kie.kogito.internal.process.workitem.NotAuthorizedException;
@@ -66,6 +67,7 @@ public abstract class BaseExceptionsHandler<T> {
}
private final FunctionHolder<T, Exception> defaultHolder = new
FunctionHolder<>(ex -> ex, ex -> BaseExceptionsHandler.this::internalError);
+ private final FunctionHolder<T, ?> messageFunctionHolder = new
FunctionHolder<>(ex -> Collections.singletonMap(MESSAGE, ex.getMessage()), ex
-> BaseExceptionsHandler.this::badRequest);
protected BaseExceptionsHandler() {
mapper = new HashMap<>();
@@ -144,8 +146,8 @@ public abstract class BaseExceptionsHandler<T> {
mapper.put(WorkItemExecutionException.class, new FunctionHolder<>(
ex -> Map.of(MESSAGE, ex.getMessage()),
ex -> fromErrorCode(((WorkItemExecutionException)
ex).getErrorCode())));
-
- mapper.put(IllegalArgumentException.class, new FunctionHolder<>(ex ->
Collections.singletonMap(MESSAGE, ex.getMessage()), ex ->
BaseExceptionsHandler.this::badRequest));
+ mapper.put(IllegalArgumentException.class, messageFunctionHolder);
+ mapper.put(MessageException.class, messageFunctionHolder);
}
private <R> Function<R, T> fromErrorCode(String errorCode) {
diff --git
a/api/kogito-api/src/main/java/org/kie/kogito/internal/process/runtime/MessageException.java
b/api/kogito-api/src/main/java/org/kie/kogito/internal/process/runtime/MessageException.java
new file mode 100644
index 0000000000..5aaccdc1ce
--- /dev/null
+++
b/api/kogito-api/src/main/java/org/kie/kogito/internal/process/runtime/MessageException.java
@@ -0,0 +1,27 @@
+/*
+ * 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.internal.process.runtime;
+
+public class MessageException extends RuntimeException {
+ private static final long serialVersionUID = 1L;
+
+ public MessageException(String message) {
+ super(message);
+ }
+}
diff --git
a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java
b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java
index 79ef9e1d07..7ae6edf3fb 100755
---
a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java
+++
b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java
@@ -85,6 +85,7 @@ import
org.kie.kogito.internal.process.runtime.KogitoNodeInstance;
import org.kie.kogito.internal.process.runtime.KogitoNodeInstanceContainer;
import org.kie.kogito.internal.process.runtime.KogitoProcessInstance;
import org.kie.kogito.internal.process.runtime.KogitoWorkflowProcess;
+import org.kie.kogito.internal.process.runtime.MessageException;
import org.kie.kogito.jobs.DurationExpirationTime;
import org.kie.kogito.jobs.JobsService;
import org.kie.kogito.jobs.ProcessInstanceJobDescription;
@@ -1164,7 +1165,7 @@ public abstract class WorkflowProcessInstanceImpl extends
ProcessInstanceImpl im
this.nodeInstanceIdInError = nodeInstanceInError.getId();
this.errorCause = Optional.of(e);
Throwable rootException = getRootException(e);
- this.errorMessage = rootException.getClass().getCanonicalName() + " -
" + rootException.getMessage();
+ this.errorMessage = rootException instanceof MessageException ?
rootException.getMessage() : rootException.getClass().getCanonicalName() + " -
" + rootException.getMessage();
setState(STATE_ERROR);
logger.error("Unexpected error while executing node {} in process
instance {}", nodeInstanceInError.getNode().getName(), this.getStringId(), e);
((InternalProcessRuntime)
getKnowledgeRuntime().getProcessRuntime()).getProcessEventSupport().fireOnError(this,
nodeInstanceInError, getKnowledgeRuntime(), e);
diff --git
a/kogito-serverless-workflow/kogito-serverless-workflow-runtime/src/main/java/org/kie/kogito/serverless/workflow/actions/ErrorExpressionAction.java
b/kogito-serverless-workflow/kogito-serverless-workflow-runtime/src/main/java/org/kie/kogito/serverless/workflow/actions/ErrorExpressionAction.java
index a4b1f1da11..04a22c1e2c 100644
---
a/kogito-serverless-workflow/kogito-serverless-workflow-runtime/src/main/java/org/kie/kogito/serverless/workflow/actions/ErrorExpressionAction.java
+++
b/kogito-serverless-workflow/kogito-serverless-workflow-runtime/src/main/java/org/kie/kogito/serverless/workflow/actions/ErrorExpressionAction.java
@@ -21,6 +21,7 @@ package org.kie.kogito.serverless.workflow.actions;
import org.jbpm.process.instance.ProcessInstance;
import org.jbpm.workflow.instance.NodeInstance;
import org.kie.kogito.internal.process.runtime.KogitoProcessContext;
+import org.kie.kogito.internal.process.runtime.MessageException;
import com.fasterxml.jackson.databind.JsonNode;
@@ -40,11 +41,11 @@ public class ErrorExpressionAction extends
BaseExpressionAction {
}
}
} else {
- setError(context, expr.toString());
+ setError(context, "The expression used for generating error
message is not a valid one: " + expr.asString());
}
}
- private void setError(KogitoProcessContext context, String error) {
- ((ProcessInstance)
context.getProcessInstance()).setErrorState((NodeInstance)
context.getNodeInstance(), new IllegalArgumentException(error));
+ private void setError(KogitoProcessContext context, String message) {
+ ((ProcessInstance)
context.getProcessInstance()).setErrorState((NodeInstance)
context.getNodeInstance(), new MessageException(message));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
