chore: adapt the codebase for camunda client 8.8.0-SNAPSHOT

camunda · Feb 10, 2025 · d60245a · d60245a
1 parent aeb9aa5
commit d60245a
Show file tree

Hide file tree

Showing 25 changed files with 259 additions and 232 deletions.
diff --git a/.../main/java/io/camunda/connector/runtime/inbound/InboundConnectorRuntimeConfiguration.java b/.../main/java/io/camunda/connector/runtime/inbound/InboundConnectorRuntimeConfiguration.java
@@ -42,7 +42,7 @@
 import io.camunda.connector.runtime.inbound.state.TenantAwareProcessStateStoreImpl;
 import io.camunda.connector.runtime.inbound.webhook.WebhookConnectorRegistry;
 import io.camunda.document.factory.DocumentFactory;
-import io.camunda.zeebe.spring.client.metrics.MetricsRecorder;
+import io.camunda.spring.client.metrics.MetricsRecorder;
 import java.time.Duration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

diff --git a/.../src/main/java/io/camunda/connector/runtime/inbound/MeteredInboundCorrelationHandler.java b/.../src/main/java/io/camunda/connector/runtime/inbound/MeteredInboundCorrelationHandler.java
@@ -23,7 +23,7 @@
 import io.camunda.connector.runtime.core.inbound.ProcessElementContextFactory;
 import io.camunda.connector.runtime.core.inbound.correlation.InboundCorrelationHandler;
 import io.camunda.connector.runtime.metrics.ConnectorMetrics.Inbound;
-import io.camunda.zeebe.spring.client.metrics.MetricsRecorder;
+import io.camunda.spring.client.metrics.MetricsRecorder;
 import java.time.Duration;
 import java.util.List;
 

diff --git a/...c/main/java/io/camunda/connector/runtime/inbound/executable/BatchExecutableProcessor.java b/...c/main/java/io/camunda/connector/runtime/inbound/executable/BatchExecutableProcessor.java
@@ -36,7 +36,7 @@
 import io.camunda.connector.runtime.inbound.executable.RegisteredExecutable.InvalidDefinition;
 import io.camunda.connector.runtime.inbound.webhook.WebhookConnectorRegistry;
 import io.camunda.connector.runtime.metrics.ConnectorMetrics.Inbound;
-import io.camunda.zeebe.spring.client.metrics.MetricsRecorder;
+import io.camunda.spring.client.metrics.MetricsRecorder;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.Consumer;

diff --git a/...a/io/camunda/connector/runtime/inbound/importer/ProcessDefinitionImportConfiguration.java b/...a/io/camunda/connector/runtime/inbound/importer/ProcessDefinitionImportConfiguration.java
@@ -18,7 +18,7 @@
 
 import io.camunda.connector.runtime.inbound.search.SearchQueryClient;
 import io.camunda.connector.runtime.inbound.state.ProcessStateStore;
-import io.camunda.zeebe.spring.client.metrics.MetricsRecorder;
+import io.camunda.spring.client.metrics.MetricsRecorder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

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
@@ -22,7 +22,7 @@
 import io.camunda.connector.runtime.inbound.state.ProcessImportResult.ProcessDefinitionVersion;
 import io.camunda.connector.runtime.inbound.state.ProcessStateStore;
 import io.camunda.connector.runtime.metrics.ConnectorMetrics.Inbound;
-import io.camunda.zeebe.spring.client.metrics.MetricsRecorder;
+import io.camunda.spring.client.metrics.MetricsRecorder;
 import java.util.*;
 import java.util.stream.Collectors;
 import org.slf4j.Logger;

diff --git a/...r-runtime-spring/src/main/java/io/camunda/connector/runtime/metrics/ConnectorMetrics.java b/...r-runtime-spring/src/main/java/io/camunda/connector/runtime/metrics/ConnectorMetrics.java
@@ -16,7 +16,7 @@
  */
 package io.camunda.connector.runtime.metrics;
 
-import io.camunda.zeebe.spring.client.metrics.MetricsRecorder;
+import io.camunda.spring.client.metrics.MetricsRecorder;
 
 public class ConnectorMetrics {
 

diff --git a/...ain/java/io/camunda/connector/runtime/outbound/OutboundConnectorRuntimeConfiguration.java b/...ain/java/io/camunda/connector/runtime/outbound/OutboundConnectorRuntimeConfiguration.java
@@ -29,9 +29,9 @@
 import io.camunda.document.factory.DocumentFactoryImpl;
 import io.camunda.document.store.CamundaDocumentStore;
 import io.camunda.document.store.CamundaDocumentStoreImpl;
-import io.camunda.zeebe.spring.client.jobhandling.CommandExceptionHandlingStrategy;
-import io.camunda.zeebe.spring.client.jobhandling.JobWorkerManager;
-import io.camunda.zeebe.spring.client.metrics.MetricsRecorder;
+import io.camunda.spring.client.jobhandling.CommandExceptionHandlingStrategy;
+import io.camunda.spring.client.jobhandling.JobWorkerManager;
+import io.camunda.spring.client.metrics.MetricsRecorder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

diff --git a/...ain/java/io/camunda/connector/runtime/outbound/jobhandling/SpringConnectorJobHandler.java b/...ain/java/io/camunda/connector/runtime/outbound/jobhandling/SpringConnectorJobHandler.java
@@ -30,9 +30,9 @@
 import io.camunda.connector.runtime.metrics.ConnectorMetrics;
 import io.camunda.connector.runtime.metrics.ConnectorMetrics.Outbound;
 import io.camunda.document.factory.DocumentFactory;
-import io.camunda.zeebe.spring.client.jobhandling.CommandExceptionHandlingStrategy;
-import io.camunda.zeebe.spring.client.jobhandling.CommandWrapper;
-import io.camunda.zeebe.spring.client.metrics.MetricsRecorder;
+import io.camunda.spring.client.jobhandling.CommandExceptionHandlingStrategy;
+import io.camunda.spring.client.jobhandling.CommandWrapper;
+import io.camunda.spring.client.metrics.MetricsRecorder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...io/camunda/connector/runtime/outbound/lifecycle/OutboundConnectorAnnotationProcessor.java b/...io/camunda/connector/runtime/outbound/lifecycle/OutboundConnectorAnnotationProcessor.java
@@ -21,15 +21,15 @@
 import io.camunda.connector.api.outbound.OutboundConnectorFunction;
 import io.camunda.connector.runtime.core.config.OutboundConnectorConfiguration;
 import io.camunda.connector.runtime.core.outbound.OutboundConnectorFactory;
-import io.camunda.zeebe.spring.client.annotation.processor.AbstractZeebeAnnotationProcessor;
-import io.camunda.zeebe.spring.client.bean.BeanInfo;
-import io.camunda.zeebe.spring.client.bean.ClassInfo;
+import io.camunda.spring.client.annotation.processor.AbstractCamundaAnnotationProcessor;
+import io.camunda.spring.client.bean.BeanInfo;
+import io.camunda.spring.client.bean.ClassInfo;
 import java.lang.invoke.MethodHandles;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /** */
-public class OutboundConnectorAnnotationProcessor extends AbstractZeebeAnnotationProcessor {
+public class OutboundConnectorAnnotationProcessor extends AbstractCamundaAnnotationProcessor {
 
   private static final Logger LOGGER =
       LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());

diff --git a/...c/main/java/io/camunda/connector/runtime/outbound/lifecycle/OutboundConnectorManager.java b/...c/main/java/io/camunda/connector/runtime/outbound/lifecycle/OutboundConnectorManager.java
@@ -26,10 +26,10 @@
 import io.camunda.connector.runtime.core.secret.SecretProviderAggregator;
 import io.camunda.connector.runtime.outbound.jobhandling.SpringConnectorJobHandler;
 import io.camunda.document.factory.DocumentFactory;
-import io.camunda.zeebe.spring.client.annotation.value.ZeebeWorkerValue;
-import io.camunda.zeebe.spring.client.jobhandling.CommandExceptionHandlingStrategy;
-import io.camunda.zeebe.spring.client.jobhandling.JobWorkerManager;
-import io.camunda.zeebe.spring.client.metrics.MetricsRecorder;
+import io.camunda.spring.client.annotation.value.JobWorkerValue;
+import io.camunda.spring.client.jobhandling.CommandExceptionHandlingStrategy;
+import io.camunda.spring.client.jobhandling.JobWorkerManager;
+import io.camunda.spring.client.metrics.MetricsRecorder;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Set;
@@ -85,7 +85,7 @@ public void stop() {
 
   private void openWorkerForOutboundConnector(
       CamundaClient client, OutboundConnectorConfiguration connector) {
-    ZeebeWorkerValue zeebeWorkerValue = new ZeebeWorkerValue();
+    JobWorkerValue zeebeWorkerValue = new JobWorkerValue();
     zeebeWorkerValue.setName(connector.name());
     zeebeWorkerValue.setType(connector.type());
     zeebeWorkerValue.setFetchVariables(Arrays.asList(connector.inputVariables()));

diff --git a/...est/java/io/camunda/connector/runtime/inbound/importer/ProcessDefinitionImporterTest.java b/...est/java/io/camunda/connector/runtime/inbound/importer/ProcessDefinitionImporterTest.java
@@ -24,10 +24,10 @@
 
 import io.camunda.client.api.search.response.ProcessDefinition;
 import io.camunda.client.impl.search.response.ProcessDefinitionImpl;
-import io.camunda.client.protocol.rest.ProcessDefinitionItem;
+import io.camunda.client.protocol.rest.ProcessDefinitionResult;
 import io.camunda.connector.runtime.inbound.state.ProcessImportResult;
 import io.camunda.connector.runtime.inbound.state.ProcessStateStore;
-import io.camunda.zeebe.spring.client.metrics.DefaultNoopMetricsRecorder;
+import io.camunda.spring.client.metrics.DefaultNoopMetricsRecorder;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -71,7 +71,7 @@ void shouldUpdateStateStore() {
 
   private ProcessDefinition getProcessDefinition(
       String bpmnProcessId, int version, String key, String tenantId) {
-    var pdi = new ProcessDefinitionItem();
+    var pdi = new ProcessDefinitionResult();
     pdi.setProcessDefinitionId(bpmnProcessId);
     pdi.setVersion(version);
     pdi.setProcessDefinitionKey(key);

diff --git a/.../test/java/io/camunda/connector/runtime/inbound/search/ProcessInstanceClientImplTest.java b/.../test/java/io/camunda/connector/runtime/inbound/search/ProcessInstanceClientImplTest.java
@@ -29,8 +29,8 @@
 import io.camunda.client.impl.search.response.SearchQueryResponseImpl;
 import io.camunda.client.impl.search.response.SearchResponsePageImpl;
 import io.camunda.client.impl.search.response.VariableImpl;
-import io.camunda.client.protocol.rest.FlowNodeInstanceItem;
-import io.camunda.client.protocol.rest.VariableItem;
+import io.camunda.client.protocol.rest.FlowNodeInstanceResult;
+import io.camunda.client.protocol.rest.VariableResult;
 import io.camunda.connector.runtime.core.inbound.ProcessInstanceClient;
 import java.util.Arrays;
 import java.util.Collections;
@@ -82,7 +82,7 @@ public void testFetchFlowNodeInstanceByDefinitionKeyAndElementId() {
 
     // Then
     assertThat(result.size()).isEqualTo(2);
-    FlowNodeInstance actualFlowNodeInstance1 = result.get(0);
+    FlowNodeInstance actualFlowNodeInstance1 = result.getFirst();
     assertThat(actualFlowNodeInstance1.getFlowNodeId())
         .isEqualTo(flownodeInstance1.getFlowNodeId());
     assertThat(actualFlowNodeInstance1.getProcessDefinitionKey())
@@ -95,12 +95,12 @@ public void testFetchFlowNodeInstanceByDefinitionKeyAndElementId() {
   }
 
   private FlowNodeInstance createFlownodeInstance(
-      String key,
-      String processInstanceKey,
+      final String key,
+      final String processInstanceKey,
       final String definitionKey,
       final String flowNodeId,
       final String tenantId) {
-    final var item = new FlowNodeInstanceItem();
+    final var item = new FlowNodeInstanceResult();
     item.setFlowNodeInstanceKey(key);
     item.setProcessInstanceKey(processInstanceKey);
     item.setProcessDefinitionKey(definitionKey);
@@ -110,7 +110,7 @@ private FlowNodeInstance createFlownodeInstance(
   }
 
   @Test
-  public void testFetchVariablesByProcessInstanceKey() throws Exception {
+  public void testFetchVariablesByProcessInstanceKey() {
     ProcessInstanceClient processInstanceClient =
         new ProcessInstanceClientImpl(searchQueryClient, objectMapper);
 
@@ -139,7 +139,7 @@ public void testFetchVariablesByProcessInstanceKey() throws Exception {
   }
 
   private Variable createVariable(String key, String name, String value) {
-    final var item = new VariableItem();
+    final var item = new VariableResult();
     item.setVariableKey(key);
     item.setScopeKey(key);
     item.setName(name);
@@ -155,8 +155,6 @@ private <T> SearchQueryResponse<T> createSearchResult(T... items) {
 
   private <T> SearchQueryResponse<T> createEmptySearchResult() {
     final var page = new SearchResponsePageImpl(0, null, null);
-    SearchQueryResponse<T> searchResult =
-        new SearchQueryResponseImpl<>(Collections.emptyList(), page);
-    return searchResult;
+    return new SearchQueryResponseImpl<>(Collections.emptyList(), page);
   }
 }
diff --git a/...ectors/src/main/java/io/camunda/connector/runtime/InboundConnectorsAutoConfiguration.java b/...ectors/src/main/java/io/camunda/connector/runtime/InboundConnectorsAutoConfiguration.java
@@ -17,7 +17,7 @@
 package io.camunda.connector.runtime;
 
 import io.camunda.connector.runtime.inbound.InboundConnectorRuntimeConfiguration;
-import io.camunda.zeebe.spring.client.configuration.CamundaAutoConfiguration;
+import io.camunda.spring.client.configuration.CamundaAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

diff --git a/...ctors/src/main/java/io/camunda/connector/runtime/OutboundConnectorsAutoConfiguration.java b/...ctors/src/main/java/io/camunda/connector/runtime/OutboundConnectorsAutoConfiguration.java
@@ -17,6 +17,7 @@
 package io.camunda.connector.runtime;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.camunda.client.api.JsonMapper;
 import io.camunda.client.impl.CamundaObjectMapper;
 import io.camunda.connector.api.json.ConnectorsObjectMapperSupplier;
 import io.camunda.connector.api.secret.SecretProvider;
@@ -30,10 +31,8 @@
 import io.camunda.connector.runtime.secret.console.ConsoleSecretApiClient;
 import io.camunda.connector.runtime.secret.console.JwtCredential;
 import io.camunda.document.factory.DocumentFactory;
-import io.camunda.zeebe.spring.client.properties.CamundaClientProperties;
-import io.camunda.zeebe.spring.client.properties.CamundaClientProperties.ClientMode;
-import io.camunda.zeebe.spring.common.json.SdkObjectMapper;
-import java.net.URI;
+import io.camunda.spring.client.properties.CamundaClientProperties;
+import io.camunda.spring.client.properties.CamundaClientProperties.ClientMode;
 import java.net.URL;
 import java.time.Duration;
 import java.util.LinkedList;
@@ -103,12 +102,11 @@ public CamundaObjectMapper jsonMapper() {
 
   @Bean(name = "commonJsonMapper")
   @ConditionalOnMissingBean
-  public io.camunda.zeebe.spring.common.json.JsonMapper commonJsonMapper(
-      ObjectMapper objectMapper) {
+  public JsonMapper commonJsonMapper(ObjectMapper objectMapper) {
     if (objectMapper == null) {
-      return new SdkObjectMapper();
+      return new CamundaObjectMapper();
     }
-    return new SdkObjectMapper(objectMapper.copy());
+    return new CamundaObjectMapper(objectMapper.copy());
   }
 
   @Bean
@@ -144,7 +142,7 @@ public ConsoleSecretApiClient consoleSecretApiClient(CamundaClientProperties cli
     var authProperties = clientProperties.getAuth();
     URL issuerUrl;
     try {
-      issuerUrl = new URI(authProperties.getIssuer()).toURL();
+      issuerUrl = authProperties.getIssuer().toURL();
     } catch (Exception e) {
       throw new RuntimeException("Invalid issuer URL: " + authProperties.getIssuer(), e);
     }

diff --git a/...src/test/java/io/camunda/connector/runtime/inbound/InboundConnectorTestConfiguration.java b/...src/test/java/io/camunda/connector/runtime/inbound/InboundConnectorTestConfiguration.java
@@ -16,8 +16,8 @@
  */
 package io.camunda.connector.runtime.inbound;
 
-import io.camunda.zeebe.spring.client.metrics.MetricsRecorder;
-import io.camunda.zeebe.spring.client.metrics.SimpleMetricsRecorder;
+import io.camunda.spring.client.metrics.MetricsRecorder;
+import io.camunda.spring.client.metrics.SimpleMetricsRecorder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;

diff --git a/...a/io/camunda/connector/runtime/outbound/RuntimeStartupWithConnectorsFromEnvVarsTests.java b/...a/io/camunda/connector/runtime/outbound/RuntimeStartupWithConnectorsFromEnvVarsTests.java
@@ -23,8 +23,8 @@
 import io.camunda.connector.runtime.app.TestConnectorRuntimeApplication;
 import io.camunda.connector.runtime.core.discovery.EnvVarsConnectorDiscovery;
 import io.camunda.process.test.api.CamundaSpringProcessTest;
-import io.camunda.zeebe.spring.client.annotation.value.ZeebeWorkerValue;
-import io.camunda.zeebe.spring.client.jobhandling.JobWorkerManager;
+import io.camunda.spring.client.annotation.value.JobWorkerValue;
+import io.camunda.spring.client.jobhandling.JobWorkerManager;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,12 +50,12 @@ class RuntimeStartupWithConnectorsFromEnvVarsTests {
   @Autowired private JobWorkerManager jobWorkerManager;
 
   @AfterTestClass
-  public static void cleanup() throws Exception {
+  public void cleanup() {
     EnvVarsConnectorDiscovery.clearHardwiredEnvironmentVariable();
   }
 
   @BeforeTestClass
-  public void prepare() throws Exception {
+  public void prepare() {
     EnvVarsConnectorDiscovery.addHardwiredEnvironmentVariable(
         "CONNECTOR_TEST2_FUNCTION", "io.camunda.connector.http.HttpJsonFunction");
     EnvVarsConnectorDiscovery.addHardwiredEnvironmentVariable(
@@ -74,7 +74,7 @@ public void httpConnectorLoadedViaEnvVar() {
     // Make sure the environment variables are used INSTEAD of SPI (which would load TEST)
     assertFalse(jobWorkerManager.findJobWorkerConfigByName("TEST").isPresent());
 
-    Optional<ZeebeWorkerValue> testConnector = jobWorkerManager.findJobWorkerConfigByName("TEST2");
+    Optional<JobWorkerValue> testConnector = jobWorkerManager.findJobWorkerConfigByName("TEST2");
     assertTrue(testConnector.isPresent());
     assertEquals("non-default-TEST-task-type", testConnector.get().getType());
   }

diff --git a/.../java/io/camunda/connector/runtime/outbound/RuntimeStartupWithConnectorsFromSpiTests.java b/.../java/io/camunda/connector/runtime/outbound/RuntimeStartupWithConnectorsFromSpiTests.java
@@ -20,8 +20,8 @@
 
 import io.camunda.connector.runtime.app.TestConnectorRuntimeApplication;
 import io.camunda.process.test.api.CamundaSpringProcessTest;
-import io.camunda.zeebe.spring.client.annotation.value.ZeebeWorkerValue;
-import io.camunda.zeebe.spring.client.jobhandling.JobWorkerManager;
+import io.camunda.spring.client.annotation.value.JobWorkerValue;
+import io.camunda.spring.client.jobhandling.JobWorkerManager;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +40,7 @@ class RuntimeStartupWithConnectorsFromSpiTests {
 
   @Test
   public void httpConnectorLoadedViaSpi() {
-    Optional<ZeebeWorkerValue> httpjson = jobWorkerManager.findJobWorkerConfigByName("TEST");
+    Optional<JobWorkerValue> httpjson = jobWorkerManager.findJobWorkerConfigByName("TEST");
     assertTrue(httpjson.isPresent());
   }
 }
diff --git a/...rc/main/java/io/camunda/connector/document/annotation/jackson/DocumentReferenceModel.java b/...rc/main/java/io/camunda/connector/document/annotation/jackson/DocumentReferenceModel.java
@@ -62,9 +62,7 @@ record CamundaDocumentMetadataModel(
       String fileName,
       String processDefinitionId,
       Long processInstanceKey,
-      Map<String, Object> customProperties,
-      String processDefinitionId,
-      Long processInstanceKey)
+      Map<String, Object> customProperties)
       implements DocumentMetadata {
 
     public CamundaDocumentMetadataModel(DocumentMetadata documentMetadata) {
@@ -75,9 +73,7 @@ public CamundaDocumentMetadataModel(DocumentMetadata documentMetadata) {
           documentMetadata.getFileName(),
           documentMetadata.getProcessDefinitionId(),
           documentMetadata.getProcessInstanceKey(),
-          documentMetadata.getCustomProperties(),
-          documentMetadata.getProcessDefinitionId(),
-          documentMetadata.getProcessInstanceKey());
+          documentMetadata.getCustomProperties());
     }
 
     @Override