From f0fb52ab459b2f42e9d2e8f87f9bcd61f6c017a3 Mon Sep 17 00:00:00 2001 From: Jonathan Lukas Date: Thu, 5 Dec 2024 06:41:14 +0100 Subject: [PATCH] fix: inclusive gateway is fully supported in 8.6 (#1078) --- .../visitor/impl/gateway/InclusiveGatewayVisitor.java | 3 ++- .../community/migration/converter/BpmnConverterTest.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/backend-diagram-converter/core/src/main/java/org/camunda/community/migration/converter/visitor/impl/gateway/InclusiveGatewayVisitor.java b/backend-diagram-converter/core/src/main/java/org/camunda/community/migration/converter/visitor/impl/gateway/InclusiveGatewayVisitor.java index 8154b51f9..7344206e3 100644 --- a/backend-diagram-converter/core/src/main/java/org/camunda/community/migration/converter/visitor/impl/gateway/InclusiveGatewayVisitor.java +++ b/backend-diagram-converter/core/src/main/java/org/camunda/community/migration/converter/visitor/impl/gateway/InclusiveGatewayVisitor.java @@ -12,6 +12,7 @@ public class InclusiveGatewayVisitor extends AbstractGatewayVisitor { private static final SemanticVersion FORK_AVAILABLE_VERSION = SemanticVersion._8_1; + private static final SemanticVersion JOIN_AVAILABLE_VERSION = SemanticVersion._8_6; public static final String ELEMENT_LOCAL_NAME = "inclusiveGateway"; @Override @@ -37,7 +38,7 @@ protected SemanticVersion availableFrom(DomElementVisitorContext context) { if (isNotJoining(context.getElement())) { return FORK_AVAILABLE_VERSION; } - return null; + return JOIN_AVAILABLE_VERSION; } @Override diff --git a/backend-diagram-converter/core/src/test/java/org/camunda/community/migration/converter/BpmnConverterTest.java b/backend-diagram-converter/core/src/test/java/org/camunda/community/migration/converter/BpmnConverterTest.java index 9be140b98..0ed24fe17 100644 --- a/backend-diagram-converter/core/src/test/java/org/camunda/community/migration/converter/BpmnConverterTest.java +++ b/backend-diagram-converter/core/src/test/java/org/camunda/community/migration/converter/BpmnConverterTest.java @@ -144,7 +144,7 @@ void testOrGateways() { assertThat(joinGateway.getMessages()).hasSize(1); assertThat(joinGateway.getMessages().get(0).getMessage()) .isEqualTo( - "Element 'Inclusive Gateway' is not supported in Zeebe version '8.0.0'. Please review."); + "Element 'Inclusive Gateway' is not supported in Zeebe version '8.0.0'. It is available in version '8.6.0'."); } @Test @@ -154,7 +154,8 @@ void testOrGateways_8_1() { BpmnElementCheckResult joinGateway = result.getResult("JoinGateway"); assertThat(joinGateway.getMessages()).hasSize(1); assertThat(joinGateway.getMessages().get(0).getMessage()) - .isEqualTo("A joining inclusive gateway is not supported."); + .isEqualTo( + "Element 'Inclusive Gateway' is not supported in Zeebe version '8.1.0'. It is available in version '8.6.0'."); } @Test