This is an automated email from the ASF dual-hosted git repository.
egonzalez 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 f07e259e2b [Incubator-kie-issues-1932] Fix for node name being null
for throw and catch link (#3904)
f07e259e2b is described below
commit f07e259e2b51c7d18b1850875961e24866b09178
Author: Deepak Joseph <[email protected]>
AuthorDate: Wed Apr 30 19:33:51 2025 +0530
[Incubator-kie-issues-1932] Fix for node name being null for throw and
catch link (#3904)
---
.../src/main/java/org/jbpm/compiler/canonical/AbstractVisitor.java | 2 +-
.../main/java/org/jbpm/compiler/canonical/CatchLinkNodeVisitor.java | 1 +
.../main/java/org/jbpm/compiler/canonical/ThrowLinkNodeVisitor.java | 1 +
.../test/java/org/kie/kogito/codegen/process/ProcessGenerationIT.java | 3 ++-
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git
a/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/AbstractVisitor.java
b/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/AbstractVisitor.java
index 65932b1d76..4e5d5226f8 100644
---
a/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/AbstractVisitor.java
+++
b/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/AbstractVisitor.java
@@ -74,7 +74,7 @@ public abstract class AbstractVisitor {
}
protected String getOrDefault(String value, String defaultValue) {
- if (value == null) {
+ if (value == null || value.trim().isEmpty()) {
return sanitizeString(defaultValue);
}
return sanitizeString(value);
diff --git
a/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/CatchLinkNodeVisitor.java
b/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/CatchLinkNodeVisitor.java
index aa0d406e35..8536b41236 100644
---
a/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/CatchLinkNodeVisitor.java
+++
b/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/CatchLinkNodeVisitor.java
@@ -45,6 +45,7 @@ public class CatchLinkNodeVisitor extends
AbstractNodeVisitor<CatchLinkNode> {
body.addStatement(getAssignedFactoryMethod(factoryField,
CatchLinkNodeFactory.class, nodeId,
getNodeKey(), getWorkflowElementConstructor(node.getId())));
body.addStatement(getDoneMethod(nodeId));
+ body.addStatement(getNameMethod(node, "CatchLink"));
}
}
diff --git
a/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/ThrowLinkNodeVisitor.java
b/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/ThrowLinkNodeVisitor.java
index 3505d46d70..7b5a47ce8c 100644
---
a/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/ThrowLinkNodeVisitor.java
+++
b/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/ThrowLinkNodeVisitor.java
@@ -45,6 +45,7 @@ public class ThrowLinkNodeVisitor extends
AbstractNodeVisitor<ThrowLinkNode> {
body.addStatement(getAssignedFactoryMethod(factoryField,
ThrowLinkNodeFactory.class, nodeId,
getNodeKey(), getWorkflowElementConstructor(node.getId())));
body.addStatement(getDoneMethod(nodeId));
+ body.addStatement(getNameMethod(node, "ThrowLink"));
}
}
diff --git
a/kogito-codegen-modules/kogito-codegen-processes-integration-tests/src/test/java/org/kie/kogito/codegen/process/ProcessGenerationIT.java
b/kogito-codegen-modules/kogito-codegen-processes-integration-tests/src/test/java/org/kie/kogito/codegen/process/ProcessGenerationIT.java
index 7737a67aca..983b8039ae 100644
---
a/kogito-codegen-modules/kogito-codegen-processes-integration-tests/src/test/java/org/kie/kogito/codegen/process/ProcessGenerationIT.java
+++
b/kogito-codegen-modules/kogito-codegen-processes-integration-tests/src/test/java/org/kie/kogito/codegen/process/ProcessGenerationIT.java
@@ -38,6 +38,7 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.commons.lang3.StringUtils;
import org.assertj.core.api.Assertions;
import org.drools.io.FileSystemResource;
import org.jbpm.process.core.timer.Timer;
@@ -204,7 +205,7 @@ public class ProcessGenerationIT extends AbstractCodegenIT {
private static final BiConsumer<Node, Node> nodeAsserter = (expected,
current) -> {
assertThat(current.getId()).isEqualTo(expected.getId());
- if (expected.getName() != null) {
+ if (!StringUtils.isBlank(expected.getName())) {
assertThat(current.getName()).isEqualTo(expected.getName());
} else {
assertThat(current.getName()).as(current.getClass().getName()).isNotNull();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
