Move findDefinitionKeyById only for BPMN / CMMN event registry consumer + handle fallback event subscription for Oracle

Author: filiphr

modules/flowable-event-registry-api/src/main/java/org/flowable/eventregistry/api/EventRegistryEventConsumer.java

@@ -19,7 +19,5 @@ public interface EventRegistryEventConsumer {
 
     EventRegistryProcessingInfo eventReceived(EventRegistryEvent event);
 
-    String findDefinitionKeyById(String definitionId);
-    
     String getConsumerKey();
 }

modules/flowable-event-registry-integration-test/src/test/java/org/flowable/eventregistry/spring/test/TestEventConsumer.java

@@ -34,11 +34,6 @@ public String getConsumerKey() {
         return "testEventConsumer";
     }
 
-    @Override
-    public String findDefinitionKeyById(String definitionId) {
-        return null;
-    }
-
     @Override
     public EventRegistryProcessingInfo eventReceived(EventRegistryEvent event) {
         events.add(event);

modules/flowable-event-registry-spring/src/test/java/org/flowable/eventregistry/spring/test/TestEventConsumer.java

@@ -39,11 +39,6 @@ public String getConsumerKey() {
         return "testEventConsumer";
     }
 
-    @Override
-    public String findDefinitionKeyById(String definitionId) {
-        return null;
-    }
-
     @Override
     public EventRegistryProcessingInfo eventReceived(EventRegistryEvent event) {
         events.add(event);

modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/consumer/BaseEventRegistryEventConsumer.java

@@ -206,7 +206,7 @@ protected List<EventSubscription> findEventSubscriptions(String scopeType, Event
                                 }
 
                             } else {
-                                if (AbstractEngineConfiguration.NO_TENANT_ID.equals(eventSubscription.getTenantId())) {
+                                if (StringUtils.isEmpty(eventSubscription.getTenantId())) {
                                     defaultTenantEventSubscriptions.add(eventSubscription);
 
                                 } else {
@@ -215,14 +215,14 @@ protected List<EventSubscription> findEventSubscriptions(String scopeType, Event
 
                                     } else if (StringUtils.isNotEmpty(eventSubscription.getScopeDefinitionId())) {
                                         EventRegistryEventConsumer eventRegistryEventConsumer = eventRegistryConfiguration.getEventRegistryEventConsumers().get("cmmnEventConsumer");
-                                        String caseDefinitionKey = eventRegistryEventConsumer.findDefinitionKeyById(eventSubscription.getScopeDefinitionId());
+                                        String caseDefinitionKey = findDefinitionKeyById(eventRegistryEventConsumer, eventSubscription.getScopeDefinitionId());
                                         if (StringUtils.isNotEmpty(caseDefinitionKey)) {
                                             tenantCaseDefinitionKeys.add(caseDefinitionKey);
                                         }
 
                                     } else if (StringUtils.isNotEmpty(eventSubscription.getProcessDefinitionId())) {
                                         EventRegistryEventConsumer eventRegistryEventConsumer = eventRegistryConfiguration.getEventRegistryEventConsumers().get("bpmnEventConsumer");
-                                        String processDefinitionKey = eventRegistryEventConsumer.findDefinitionKeyById(eventSubscription.getProcessDefinitionId());
+                                        String processDefinitionKey = findDefinitionKeyById(eventRegistryEventConsumer, eventSubscription.getProcessDefinitionId());
                                         if (StringUtils.isNotEmpty(processDefinitionKey)) {
                                             tenantProcessDefinitionKeys.add(processDefinitionKey);
                                         }
@@ -242,14 +242,14 @@ protected List<EventSubscription> findEventSubscriptions(String scopeType, Event
 
                                 } else if (StringUtils.isNotEmpty(eventSubscription.getScopeDefinitionId())) {
                                     EventRegistryEventConsumer eventRegistryEventConsumer = eventRegistryConfiguration.getEventRegistryEventConsumers().get("cmmnEventConsumer");
-                                    String caseDefinitionKey = eventRegistryEventConsumer.findDefinitionKeyById(eventSubscription.getScopeDefinitionId());
+                                    String caseDefinitionKey = findDefinitionKeyById(eventRegistryEventConsumer, eventSubscription.getScopeDefinitionId());
                                     if (StringUtils.isNotEmpty(caseDefinitionKey) && !tenantCaseDefinitionKeys.contains(caseDefinitionKey)) {
                                         cleanedEventSubscriptions.add(eventSubscription);
                                     }
 
                                 } else if (StringUtils.isNotEmpty(eventSubscription.getProcessDefinitionId())) {
                                     EventRegistryEventConsumer eventRegistryEventConsumer = eventRegistryConfiguration.getEventRegistryEventConsumers().get("bpmnEventConsumer");
-                                    String processDefinitionKey = eventRegistryEventConsumer.findDefinitionKeyById(eventSubscription.getProcessDefinitionId());
+                                    String processDefinitionKey = findDefinitionKeyById(eventRegistryEventConsumer, eventSubscription.getProcessDefinitionId());
                                     if (StringUtils.isNotEmpty(processDefinitionKey) && !tenantProcessDefinitionKeys.contains(processDefinitionKey)) {
                                         cleanedEventSubscriptions.add(eventSubscription);
                                     }
@@ -274,6 +274,16 @@ protected List<EventSubscription> findEventSubscriptions(String scopeType, Event
         });
     }
 
+    protected String findDefinitionKeyById(EventRegistryEventConsumer eventConsumer, String definitionId) {
+        if (eventConsumer instanceof BaseEventRegistryEventConsumer baseEventRegistryEventConsumer) {
+            return baseEventRegistryEventConsumer.findDefinitionKeyById(definitionId);
+        } else {
+            return null;
+        }
+    }
+
+    public abstract String findDefinitionKeyById(String definitionId);
+
     protected abstract EventSubscriptionQuery createEventSubscriptionQuery();
 
 }

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

@@ -408,11 +408,6 @@ public String getConsumerKey() {
             return "myTestEventConsumer";
         }
 
-        @Override
-        public String findDefinitionKeyById(String definitionId) {
-            return null;
-        }
-
         @Override
         public EventRegistryProcessingInfo eventReceived(EventRegistryEvent event) {
             eventsReceived.add(event);