add support for xmlXPathExpression for tenant id detection

Author: tijsrademakers

modules/flowable-event-registry-model/src/main/java/org/flowable/eventregistry/model/ChannelEventTenantIdDetection.java

@@ -24,6 +24,7 @@ public class ChannelEventTenantIdDetection {
     protected String fixedValue;
     protected String jsonPointerExpression;
     protected String xPathExpression;
+    protected String xmlXPathExpression;
     protected String delegateExpression;
 
     public String getFixedValue() {
@@ -44,11 +45,15 @@ public String getxPathExpression() {
     public void setxPathExpression(String xPathExpression) {
         this.xPathExpression = xPathExpression;
     }
-
+    public String getXmlXPathExpression() {
+        return xmlXPathExpression;
+    }
+    public void setXmlXPathExpression(String xmlXPathExpression) {
+        this.xmlXPathExpression = xmlXPathExpression;
+    }
     public String getDelegateExpression() {
         return delegateExpression;
     }
-
     public void setDelegateExpression(String delegateExpression) {
         this.delegateExpression = delegateExpression;
     }

modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/pipeline/InboundChannelModelProcessor.java

@@ -238,6 +238,8 @@ protected InboundEventProcessingPipeline createXmlEventProcessingPipeline(Inboun
         if (channelEventTenantIdDetection != null) {
             if (StringUtils.isNotEmpty(channelEventTenantIdDetection.getFixedValue())) {
                 eventTenantDetector = new InboundEventStaticTenantDetector<>(channelEventTenantIdDetection.getFixedValue());
+            } else if (StringUtils.isNotEmpty(channelEventTenantIdDetection.getXmlXPathExpression())) {
+                eventTenantDetector = new XpathBasedInboundEventTenantDetector(channelEventTenantIdDetection.getXmlXPathExpression());
             } else if (StringUtils.isNotEmpty(channelEventTenantIdDetection.getxPathExpression())) {
                 eventTenantDetector = new XpathBasedInboundEventTenantDetector(channelEventTenantIdDetection.getxPathExpression());
             } else if (StringUtils.isNotEmpty(channelEventTenantIdDetection.getDelegateExpression())) {
@@ -246,7 +248,7 @@ protected InboundEventProcessingPipeline createXmlEventProcessingPipeline(Inboun
             } else {
                 throw new FlowableException(
                     "The channel xml tenant detection value was not found for the channel model with key " + channelModel.getKey()
-                        + ". One of fixedValue, xPathExpression, delegateExpression should be set.");
+                        + ". One of fixedValue, xmlPathExpression (or xPathExpression), delegateExpression should be set.");
             }
         }
 

modules/flowable-event-registry/src/test/java/org/flowable/eventregistry/test/deployment/DeploymentTest.java

@@ -96,6 +96,31 @@ public void deployChannelsWithTenantDetection() {
         assertThat(((XpathBasedInboundEventTenantDetector) inboundEventProcessingPipeline.getInboundEventTenantDetector()).getXpathExpression())
                 .isEqualTo("/data/tenantId");
     }
+    
+    @Test
+    @ChannelDeploymentAnnotation(resources = {
+            "org/flowable/eventregistry/test/deployment/simpleChannelWithFixedTenant.channel",
+            "org/flowable/eventregistry/test/deployment/simpleChannelWithJsonPointerTenant.channel",
+            "org/flowable/eventregistry/test/deployment/simpleChannelWithXmlXPathTenant.channel"
+    })
+    public void deployChannelsWithXmlXpathTenantDetection() {
+        InboundChannelModel channel1 = (InboundChannelModel) eventRegistryEngine.getEventRepositoryService().getChannelModelByKey("channel1");
+        assertThat(((DefaultInboundEventProcessingPipeline) channel1.getInboundEventProcessingPipeline()).getInboundEventTenantDetector())
+                .isInstanceOf(InboundEventStaticTenantDetector.class);
+
+        InboundChannelModel channel2 = (InboundChannelModel) eventRegistryEngine.getEventRepositoryService().getChannelModelByKey("channel2");
+        DefaultInboundEventProcessingPipeline inboundEventProcessingPipeline = (DefaultInboundEventProcessingPipeline) channel2
+                .getInboundEventProcessingPipeline();
+        assertThat(inboundEventProcessingPipeline.getInboundEventTenantDetector()).isInstanceOf(JsonPointerBasedInboundEventTenantDetector.class);
+        assertThat(((JsonPointerBasedInboundEventTenantDetector) inboundEventProcessingPipeline.getInboundEventTenantDetector()).getJsonPointerExpression())
+                .isEqualTo("/tenantId");
+
+        InboundChannelModel channel3 = (InboundChannelModel) eventRegistryEngine.getEventRepositoryService().getChannelModelByKey("channel3");
+        inboundEventProcessingPipeline = (DefaultInboundEventProcessingPipeline) channel3.getInboundEventProcessingPipeline();
+        assertThat(inboundEventProcessingPipeline.getInboundEventTenantDetector()).isInstanceOf(XpathBasedInboundEventTenantDetector.class);
+        assertThat(((XpathBasedInboundEventTenantDetector) inboundEventProcessingPipeline.getInboundEventTenantDetector()).getXpathExpression())
+                .isEqualTo("/data/tenantId");
+    }
 
     @Test
     @EventDeploymentAnnotation(resources = "org/flowable/eventregistry/test/deployment/simpleEvent.event")

modules/flowable-event-registry/src/test/resources/org/flowable/eventregistry/test/deployment/simpleChannelWithXmlXPathTenant.channel

@@ -0,0 +1,16 @@
+{
+    "key": "channel3",
+    "category": "channel",
+    "name": "My channel",
+    "description": "My channel description",
+    "channelType": "inbound",
+    "type": "jms",
+    "destination": "testQueue",
+    "deserializerType": "xml",
+    "channelEventKeyDetection": {
+        "fixedValue": "myEvent"
+    },
+    "channelEventTenantIdDetection": {
+        "xmlXPathExpression": "/data/tenantId"
+    }
+}