fix(inbound): fix saving already processed process definition keys (#…

…1883) * fix(inbound): fix saving already processed process definition keys * fix(inbound): fix code formatting (cherry picked from commit fb09ab5)
camunda · Feb 5, 2024 · c442a16 · c442a16
1 parent 4ac7d60
commit c442a16
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/...rc/main/java/io/camunda/connector/runtime/inbound/importer/ProcessDefinitionImporter.java b/...rc/main/java/io/camunda/connector/runtime/inbound/importer/ProcessDefinitionImporter.java
@@ -86,11 +86,6 @@ public void handleImportedDefinitions(List<ProcessDefinition> unprocessedDefinit
     logResult(brandNew, upgraded, deleted);
     meter(brandNew.size());
 
-    registeredProcessDefinitionKeys.addAll(
-        notYetRegistered.stream().map(ProcessDefinition::getKey).toList());
-    registeredProcessDefinitionKeys.removeAll(deleted);
-    registeredProcessDefinitionKeys.removeAll(oldProcessDefinitionKeys);
-
     notYetRegistered.forEach(
         definition -> versionByBpmnProcessId.put(definition.getBpmnProcessId(), definition));
 
@@ -103,6 +98,11 @@ public void handleImportedDefinitions(List<ProcessDefinition> unprocessedDefinit
     if (!notYetRegistered.isEmpty()) {
       connectorManager.handleNewProcessDefinitions(notYetRegistered);
     }
+
+    registeredProcessDefinitionKeys.addAll(
+        notYetRegistered.stream().map(ProcessDefinition::getKey).toList());
+    registeredProcessDefinitionKeys.removeAll(deleted);
+    registeredProcessDefinitionKeys.removeAll(oldProcessDefinitionKeys);
   }
 
   private List<ProcessDefinition> keepOnlyLatestVersions(List<ProcessDefinition> unprocessed) {

diff --git a/...src/main/java/io/camunda/connector/runtime/inbound/lifecycle/InboundConnectorManager.java b/...src/main/java/io/camunda/connector/runtime/inbound/lifecycle/InboundConnectorManager.java
@@ -26,7 +26,6 @@
 import io.camunda.connector.runtime.inbound.importer.ProcessDefinitionInspector;
 import io.camunda.connector.runtime.inbound.webhook.WebhookConnectorRegistry;
 import io.camunda.connector.runtime.metrics.ConnectorMetrics.Inbound;
-import io.camunda.operate.exception.OperateException;
 import io.camunda.operate.model.ProcessDefinition;
 import io.camunda.zeebe.spring.client.metrics.MetricsRecorder;
 import java.util.Collection;
@@ -39,7 +38,6 @@
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,9 +78,9 @@ public void handleNewProcessDefinitions(Set<ProcessDefinition> newProcessDefinit
                 d -> {
                   try {
                     return processDefinitionInspector.findInboundConnectors(d).stream();
-                  } catch (OperateException e) {
+                  } catch (Exception e) {
                     LOG.error("Failed to inspect process definition {}", d.getKey(), e);
-                    return Stream.empty();
+                    throw new RuntimeException(e);
                   }
                 })
             .toList();