refactor(runtime): reuse process lock key derivation

Agent-Logs-Url: https://github.com/camunda/connectors/sessions/330b3d47-05bd-41dc-a7a6-c53ce3f9a1b0

Co-authored-by: johnBgood <1797846+johnBgood@users.noreply.github.com>

connector-runtime/connector-runtime-spring/src/main/java/io/camunda/connector/runtime/inbound/controller/InboundInstancesRestController.java

@@ -80,7 +80,7 @@ public ConnectorInstances getConnectorInstance(
         .orElseThrow(() -> new DataNotFoundException(ConnectorInstances.class, type));
   }
 
-  @GetMapping("/{type}/executables/{executableId}")
+  @GetMapping({"/{type}/executables/{executableId}", "/executables/{executableId}"})
   public ActiveInboundConnectorResponse getConnectorInstanceExecutable(
       HttpServletRequest request,
       @RequestHeader(name = X_CAMUNDA_FORWARDED_FOR, required = false) String forwardedFor,
@@ -95,7 +95,7 @@ public ActiveInboundConnectorResponse getConnectorInstanceExecutable(
             () -> new DataNotFoundException(ActiveInboundConnectorResponse.class, executableId));
   }
 
-  @GetMapping("/{type}/executables/{executableId}/health")
+  @GetMapping({"/{type}/executables/{executableId}/health", "/executables/{executableId}/health"})
   public List<InstanceAwareModel.InstanceAwareHealth> getConnectorInstanceExecutableHealth(
       HttpServletRequest request,
       @RequestHeader(name = X_CAMUNDA_FORWARDED_FOR, required = false) String forwardedFor,
@@ -108,7 +108,7 @@ public List<InstanceAwareModel.InstanceAwareHealth> getConnectorInstanceExecutab
         new TypeReference<>() {});
   }
 
-  @GetMapping("/{type}/executables/{executableId}/logs")
+  @GetMapping({"/{type}/executables/{executableId}/logs", "/executables/{executableId}/logs"})
   public List<InstanceAwareModel.InstanceAwareActivity> getConnectorInstanceExecutableLogs(
       HttpServletRequest request,
       @RequestHeader(name = X_CAMUNDA_FORWARDED_FOR, required = false) String forwardedFor,
@@ -120,7 +120,7 @@ public List<InstanceAwareModel.InstanceAwareActivity> getConnectorInstanceExecut
         new TypeReference<>() {});
   }
 
-  @PostMapping("/{type}/executables/{executableId}/reset")
+  @PostMapping("/executables/{executableId}/reset")
   public ActiveInboundConnectorResponse resetConnectorInstanceExecutable(
       HttpServletRequest request,
       @RequestHeader(name = X_CAMUNDA_FORWARDED_FOR, required = false) String forwardedFor,

connector-runtime/connector-runtime-spring/src/main/java/io/camunda/connector/runtime/inbound/executable/InboundExecutableRegistryImpl.java

@@ -116,9 +116,9 @@
         event.elementsByProcessDefinitionKey().size());
     LOG.debug("Received target elements: {}", event.elementsByProcessDefinitionKey());
 
-    var processId = event.tenantId() + event.bpmnProcessId();
+    var processLockKey = processLockKey(event.tenantId(), event.bpmnProcessId());
 
-    synchronized (processId.intern()) {
+    synchronized (processLockKey.intern()) {
       try {
         List<InboundConnectorElement> allElements =
             event.elementsByProcessDefinitionKey().values().stream().flatMap(List::stream).toList();
@@ -348,7 +348,11 @@
    */
   private String extractProcessLockKey(RegisteredExecutable executable) {
     var element = extractContext(executable).connectorElements().getFirst();
-    return element.tenantId() + element.element().bpmnProcessId();
+    return processLockKey(element.tenantId(), element.element().bpmnProcessId());
+  }
+
+  private String processLockKey(String tenantId, String bpmnProcessId) {
+    return tenantId + bpmnProcessId;
   }
 
   private InboundConnectorManagementContext extractContext(RegisteredExecutable executable) {

connector-runtime/spring-boot-starter-camunda-connectors/src/test/java/io/camunda/connector/runtime/inbound/InboundInstancesRestControllerTest.java

@@ -306,13 +306,7 @@ public void shouldResetConnectorInstanceExecutable() throws Exception {
     // re-uses the existing query mock and returns the same response
     var response =
         mockMvc
-            .perform(
-                post(
-                    "/inbound-instances/"
-                        + TYPE_1
-                        + "/executables/"
-                        + RANDOM_ID_1.getId()
-                        + "/reset"))
+            .perform(post("/inbound-instances/executables/" + RANDOM_ID_1.getId() + "/reset"))
             .andExpect(status().isOk())
             .andReturn()
             .getResponse()
@@ -328,7 +322,7 @@ public void shouldResetConnectorInstanceExecutable() throws Exception {
   @Test
   public void shouldReturn404_whenResettingUnknownExecutableId() throws Exception {
     mockMvc
-        .perform(post("/inbound-instances/" + TYPE_1 + "/executables/UNKNOWN-ID/reset"))
+        .perform(post("/inbound-instances/executables/UNKNOWN-ID/reset"))
         .andExpect(status().isNotFound())
         .andExpect(
             content()
@@ -342,11 +336,54 @@ public void shouldReturn500_whenResetFails() throws Exception {
     doThrow(new RuntimeException("Reset failed")).when(executableRegistry).reset(RANDOM_ID_1);
 
     mockMvc
-        .perform(
-            post("/inbound-instances/" + TYPE_1 + "/executables/" + RANDOM_ID_1.getId() + "/reset"))
+        .perform(post("/inbound-instances/executables/" + RANDOM_ID_1.getId() + "/reset"))
         .andExpect(status().isInternalServerError());
   }
 
+  @Test
+  public void shouldReturnSingleExecutable_withoutType() throws Exception {
+    var response =
+        mockMvc
+            .perform(get("/inbound-instances/executables/" + RANDOM_ID_1.getId()))
+            .andExpect(status().isOk())
+            .andReturn()
+            .getResponse()
+            .getContentAsString();
+
+    ActiveInboundConnectorResponse executable =
+        ConnectorsObjectMapperSupplier.getCopy()
+            .readValue(response, ActiveInboundConnectorResponse.class);
+    assertEquals(RANDOM_ID_1, executable.executableId());
+    assertEquals("ProcessA", executable.elements().getFirst().bpmnProcessId());
+  }
+
+  @Test
+  public void shouldReturnActivityLogs_withoutType() throws Exception {
+    var response =
+        mockMvc
+            .perform(get("/inbound-instances/executables/" + RANDOM_ID_3.getId() + "/logs"))
+            .andExpect(status().isOk())
+            .andReturn()
+            .getResponse()
+            .getContentAsString();
+
+    List<Activity> logs =
+        ConnectorsObjectMapperSupplier.getCopy().readValue(response, new TypeReference<>() {});
+    assertEquals(2, logs.size());
+  }
+
+  @Test
+  public void shouldReturn404_whenUnknownExecutableId_withoutType() throws Exception {
+    mockMvc
+        .perform(get("/inbound-instances/executables/UNKNOWN-ID"))
+        .andExpect(status().isNotFound())
+        .andExpect(
+            content()
+                .string(
+                    containsString(
+                        "Data of type 'ActiveInboundConnectorResponse' with id 'UNKNOWN-ID' not found")));
+  }
+
   private boolean matchesQuery(ActiveExecutableResponse response, ActiveExecutableQuery query) {
     var elements = response.elements();
     if (elements.isEmpty()) {