fix(document-handling): refactor the Objectmapper supplier and make i…

…t private so only copy can be created

connector-runtime/connector-runtime-core/src/main/java/io/camunda/connector/runtime/core/ConnectorHelper.java

@@ -38,7 +38,7 @@ public class ConnectorHelper {
 
   private static final String ERROR_CANNOT_PARSE_VARIABLES = "Cannot parse '%s' as '%s'.";
   public static FeelEngineWrapper FEEL_ENGINE_WRAPPER = new FeelEngineWrapper();
-  public static ObjectMapper OBJECT_MAPPER = ConnectorsObjectMapperSupplier.DEFAULT_MAPPER;
+  public static ObjectMapper OBJECT_MAPPER = ConnectorsObjectMapperSupplier.getCopy();
 
   /**
    * @return a map with output process variables for a given response from an {@link

connector-runtime/connector-runtime-core/src/test/java/io/camunda/connector/runtime/core/inbound/InboundConnectorContextImplTest.java

@@ -38,7 +38,7 @@
 
 class InboundConnectorContextImplTest {
   private final SecretProvider secretProvider = new FooBarSecretProvider();
-  private final ObjectMapper mapper = ConnectorsObjectMapperSupplier.DEFAULT_MAPPER;
+  private final ObjectMapper mapper = ConnectorsObjectMapperSupplier.getCopy();
 
   @Test
   void bindProperties_shouldThrowExceptionWhenWrongFormat() {

connector-runtime/connector-runtime-core/src/test/java/io/camunda/connector/runtime/core/inbound/InboundConnectorElementTest.java

@@ -43,7 +43,7 @@ void rawProperties_notSerializedAsJson() throws JsonProcessingException {
             new ProcessElement("myProcess", 0, 0, "element1", "<default>"));
 
     // when
-    var result = ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.writeValueAsString(testObj);
+    var result = ConnectorsObjectMapperSupplier.getCopy().writeValueAsString(testObj);
 
     // then
     assertThat(result).doesNotContain("auth", "abc");

connector-runtime/connector-runtime-spring/src/main/java/io/camunda/connector/runtime/secret/console/ConsoleSecretApiClient.java

@@ -37,14 +37,14 @@ public class ConsoleSecretApiClient {
 
   private final Authentication authentication;
 
-  private final ObjectMapper objectMapper = ConnectorsObjectMapperSupplier.DEFAULT_MAPPER;
+  private final ObjectMapper objectMapper = ConnectorsObjectMapperSupplier.getCopy();
 
   private static final TypeReference<Map<String, String>> mapTypeReference =
       new TypeReference<>() {};
 
   public ConsoleSecretApiClient(String secretsEndpoint, JwtCredential jwt) {
     TokenResponseMapper tokenResponseMapper =
-        new JacksonTokenResponseMapper(ConnectorsObjectMapperSupplier.DEFAULT_MAPPER);
+        new JacksonTokenResponseMapper(ConnectorsObjectMapperSupplier.getCopy());
     this.authentication = new JwtAuthentication(jwt, tokenResponseMapper);
     this.secretsEndpoint = secretsEndpoint;
   }

connector-runtime/spring-boot-starter-camunda-connectors/src/main/java/io/camunda/connector/runtime/OutboundConnectorsAutoConfiguration.java

@@ -59,22 +59,18 @@
 @EnableConfigurationProperties(ConnectorProperties.class)
 public class OutboundConnectorsAutoConfiguration {
 
+  private static final Logger LOG =
+      LoggerFactory.getLogger(OutboundConnectorsAutoConfiguration.class);
   @Value("${camunda.connector.secretprovider.discovery.enabled:true}")
   Boolean secretProviderLookupEnabled;
-
   @Value("${camunda.connector.secretprovider.environment.prefix:}")
   String environmentSecretProviderPrefix;
-
   @Value(
       "${camunda.connector.secretprovider.console.endpoint:https://cluster-api.cloud.camunda.io/secrets}")
   String consoleSecretsApiEndpoint;
-
   @Value("${camunda.connector.secretprovider.console.audience:secrets.camunda.io}")
   String consoleSecretsApiAudience;
 
-  private static final Logger LOG =
-      LoggerFactory.getLogger(OutboundConnectorsAutoConfiguration.class);
-
   /** Provides a {@link FeelEngineWrapper} unless already present in the Spring Context */
   @Bean
   @ConditionalOnMissingBean(FeelEngineWrapper.class)
@@ -99,7 +95,7 @@ public SecretProviderAggregator springSecretProviderAggregator(
   @Bean(name = "zeebeJsonMapper")
   @ConditionalOnMissingBean
   public JsonMapper jsonMapper() {
-    return new ZeebeObjectMapper(ConnectorsObjectMapperSupplier.DEFAULT_MAPPER);
+    return new ZeebeObjectMapper(ConnectorsObjectMapperSupplier.getCopy());
   }
 
   @Bean(name = "commonJsonMapper")
@@ -163,7 +159,7 @@ public ConsoleSecretApiClient consoleSecretApiClient(CamundaClientProperties cli
   @Bean
   @ConditionalOnMissingBean
   public ObjectMapper objectMapper(DocumentFactory documentFactory) {
-    ConnectorsObjectMapperSupplier.registerDocumentModule(
+    ConnectorsObjectMapperSupplier.getCopy(
         documentFactory, DocumentModuleSettings.create());
     return ConnectorsObjectMapperSupplier.getCopy();
   }

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

@@ -55,7 +55,7 @@
 @MockitoSettings(strictness = Strictness.LENIENT)
 public class WebhookControllerPlainJavaTests {
 
-  private static final ObjectMapper mapper = ConnectorsObjectMapperSupplier.DEFAULT_MAPPER;
+  private static final ObjectMapper mapper = ConnectorsObjectMapperSupplier.getCopy();
 
   @Test
   public void multipleWebhooksOnSameContextPathAreNotSupported() {

connector-sdk/core/src/main/java/io/camunda/connector/api/json/ConnectorsObjectMapperSupplier.java

@@ -27,11 +27,13 @@
 import io.camunda.connector.document.annotation.jackson.JacksonModuleDocument.DocumentModuleSettings;
 import io.camunda.connector.feel.jackson.JacksonModuleFeelFunction;
 import io.camunda.document.factory.DocumentFactory;
+import io.camunda.document.factory.DocumentFactoryImpl;
+import io.camunda.document.store.InMemoryDocumentStore;
 
 /** Default ObjectMapper supplier to be used by the connector runtime. */
 public class ConnectorsObjectMapperSupplier {
 
-  public static final ObjectMapper DEFAULT_MAPPER =
+  private static final ObjectMapper DEFAULT_MAPPER =
       JsonMapper.builder()
           .addModules(new JacksonModuleFeelFunction(), new Jdk8Module(), new JavaTimeModule())
           .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
@@ -44,11 +46,11 @@ public class ConnectorsObjectMapperSupplier {
   private ConnectorsObjectMapperSupplier() {}
 
   public static ObjectMapper getCopy() {
-    return DEFAULT_MAPPER.copy();
+    return DEFAULT_MAPPER
+        .copy();
   }
 
-  public static void registerDocumentModule(
-      DocumentFactory factory, DocumentModuleSettings settings) {
-    DEFAULT_MAPPER.registerModule(new JacksonModuleDocument(factory, null, settings));
+  public static ObjectMapper getCopy(DocumentFactory factory, DocumentModuleSettings settings) {
+    return DEFAULT_MAPPER.copy().registerModule(new JacksonModuleDocument(factory, null, settings));
   }
 }

connector-sdk/test/src/main/java/io/camunda/connector/test/inbound/InboundConnectorContextBuilder.java

@@ -51,7 +51,7 @@ public class InboundConnectorContextBuilder {
   protected InboundConnectorDefinition definition;
   protected ValidationProvider validationProvider;
 
-  protected ObjectMapper objectMapper = ConnectorsObjectMapperSupplier.DEFAULT_MAPPER;
+  protected ObjectMapper objectMapper = ConnectorsObjectMapperSupplier.getCopy();
 
   protected CorrelationResult result;
 

connector-sdk/test/src/main/java/io/camunda/connector/test/outbound/OutboundConnectorContextBuilder.java

@@ -24,6 +24,7 @@
 import io.camunda.connector.api.outbound.OutboundConnectorContext;
 import io.camunda.connector.api.secret.SecretProvider;
 import io.camunda.connector.api.validation.ValidationProvider;
+import io.camunda.connector.document.annotation.jackson.JacksonModuleDocument;
 import io.camunda.connector.runtime.core.AbstractConnectorContext;
 import io.camunda.connector.test.ConnectorContextTestUtil;
 import io.camunda.document.Document;
@@ -44,7 +45,13 @@ public class OutboundConnectorContextBuilder {
   protected Map<String, Object> variables;
   protected DocumentFactory documentFactory =
       new DocumentFactoryImpl(InMemoryDocumentStore.INSTANCE);
-  private ObjectMapper objectMapper = ConnectorsObjectMapperSupplier.getCopy();
+  private ObjectMapper objectMapper =
+      ConnectorsObjectMapperSupplier.getCopy()
+          .registerModule(
+              new JacksonModuleDocument(
+                  this.documentFactory,
+                  null,
+                  JacksonModuleDocument.DocumentModuleSettings.create()));
 
   /**
    * @return a new instance of the {@link OutboundConnectorContextBuilder}
@@ -168,6 +175,13 @@ public OutboundConnectorContextBuilder objectMapper(ObjectMapper objectMapper) {
     return this;
   }
 
+  public OutboundConnectorContextBuilder documentFactory(DocumentFactory documentFactory) {
+    this.objectMapper =
+        ConnectorsObjectMapperSupplier.getCopy(
+            documentFactory, JacksonModuleDocument.DocumentModuleSettings.create());
+    return this;
+  }
+
   /**
    * @return the {@link OutboundConnectorContext} including all previously defined properties
    */

connectors-e2e-test/connectors-e2e-test-base/src/main/java/io/camunda/connector/e2e/app/TestConnectorRuntimeApplication.java

@@ -16,15 +16,16 @@
  */
 package io.camunda.connector.e2e.app;
 
-import io.camunda.connector.api.json.ConnectorsObjectMapperSupplier;
-import io.camunda.connector.document.annotation.jackson.JacksonModuleDocument.DocumentModuleSettings;
 import io.camunda.connector.runtime.inbound.search.SearchQueryClient;
+import io.camunda.document.factory.DocumentFactory;
 import io.camunda.document.factory.DocumentFactoryImpl;
 import io.camunda.document.store.InMemoryDocumentStore;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
 
 @SpringBootApplication
 @ImportAutoConfiguration({
@@ -36,9 +37,12 @@
 public class TestConnectorRuntimeApplication {
 
   public static void main(String[] args) {
-    ConnectorsObjectMapperSupplier.registerDocumentModule(
-        new DocumentFactoryImpl(InMemoryDocumentStore.INSTANCE), DocumentModuleSettings.create());
-
     SpringApplication.run(TestConnectorRuntimeApplication.class, args);
   }
+
+  @Bean
+  @Primary
+  public DocumentFactory documentFactory() {
+    return new DocumentFactoryImpl(InMemoryDocumentStore.INSTANCE);
+  }
 }

connectors-e2e-test/connectors-e2e-test-rabbitmq/src/test/java/io/camunda/connector/e2e/RabbitMqInboundStartEventTests.java

@@ -131,7 +131,7 @@ public void uriAuthenticationReceiveMessageTest() throws Exception {
 
   private void assertIntermediateCatchEventUsingModel(BpmnModelInstance model) throws Exception {
     Object expectedJsonResponse =
-        ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.readValue(
+        ConnectorsObjectMapperSupplier.getCopy().readValue(
             "{\"message\":{\"consumerTag\":\"myConsumerTag\",\"body\":{\"foo\": {\"bar\": \"barValue\"}},\"properties\":{}}}",
             Object.class);
 

connectors/http/graphql/src/test/java/io/camunda/connector/http/graphql/GraphQLFunctionTest.java

@@ -101,7 +101,7 @@ void execute_shouldSetConnectTime(final String input) throws Exception {
                 GraphQLRequest.GraphQL.class)
             .connectionTimeoutInSeconds();
     var graphQLRequestMapper =
-        new GraphQLRequestMapper(ConnectorsObjectMapperSupplier.DEFAULT_MAPPER);
+        new GraphQLRequestMapper(ConnectorsObjectMapperSupplier.getCopy());
 
     // when
     var request =

connectors/http/http-base/src/main/java/io/camunda/connector/http/base/client/apache/HttpCommonResultResponseHandler.java

@@ -78,11 +78,11 @@ private HttpCommonResult getResultForCloudFunction(
     if (HttpStatusHelper.isError(code)) {
       // unwrap as ErrorResponse
       var errorResponse =
-          ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.readValue(content, ErrorResponse.class);
+          ConnectorsObjectMapperSupplier.getCopy().readValue(content, ErrorResponse.class);
       return new HttpCommonResult(code, headers, errorResponse, reason);
     }
     // Unwrap the response as a HttpCommonResult directly
-    return ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.readValue(content, HttpCommonResult.class);
+    return ConnectorsObjectMapperSupplier.getCopy().readValue(content, HttpCommonResult.class);
   }
 
   /**
@@ -97,7 +97,7 @@ private Object extractBody(InputStream content) throws IOException {
 
     if (StringUtils.isNotBlank(bodyString)) {
       return isJsonStringValid(bodyString)
-          ? ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.readValue(bodyString, Object.class)
+          ? ConnectorsObjectMapperSupplier.getCopy().readValue(bodyString, Object.class)
           : bodyString;
     }
     return null;

connectors/http/http-base/src/main/java/io/camunda/connector/http/base/client/apache/builder/parts/ApacheRequestBodyBuilder.java

@@ -102,7 +102,7 @@ private HttpEntity createStringEntity(HttpCommonRequest request) {
           ? new StringEntity(
               s, contentType.orElse(ContentType.TEXT_PLAIN.withCharset(StandardCharsets.UTF_8)))
           : new StringEntity(
-              ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.writeValueAsString(body),
+              ConnectorsObjectMapperSupplier.getCopy().writeValueAsString(body),
               contentType.orElse(ContentType.APPLICATION_JSON.withCharset(StandardCharsets.UTF_8)));
     } catch (JsonProcessingException e) {
       throw new ConnectorException("Failed to serialize request body:" + body, e);

connectors/http/http-base/src/main/java/io/camunda/connector/http/base/cloudfunction/CloudFunctionService.java

@@ -58,7 +58,7 @@ public HttpCommonRequest toCloudFunctionRequest(final HttpCommonRequest request)
       // Using the JsonHttpContent cannot work with an element on the root content,
       // hence write it ourselves:
       String contentAsJson =
-          ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.writeValueAsString(request);
+          ConnectorsObjectMapperSupplier.getCopy().writeValueAsString(request);
       String token = credentials.getOAuthToken(getProxyFunctionUrl());
       return createCloudFunctionRequest(contentAsJson, token);
     } catch (IOException e) {

connectors/http/http-base/src/main/java/io/camunda/connector/http/base/utils/JsonHelper.java

@@ -27,7 +27,7 @@
 
 public class JsonHelper {
 
-  private static final ObjectMapper objectMapper = ConnectorsObjectMapperSupplier.DEFAULT_MAPPER;
+  private static final ObjectMapper objectMapper = ConnectorsObjectMapperSupplier.getCopy();
 
   public static JsonNode getAsJsonElement(Object body) {
     if (body instanceof String stringBody) {

connectors/http/http-base/src/test/java/io/camunda/connector/http/base/HttpServiceTest.java

@@ -66,7 +66,7 @@ public class HttpServiceTest {
   private final HttpService httpService = new HttpService(cloudFunctionService);
   private final HttpService httpServiceWithoutCloudFunction =
       new HttpService(disabledCloudFunctionService);
-  private final ObjectMapper objectMapper = ConnectorsObjectMapperSupplier.DEFAULT_MAPPER;
+  private final ObjectMapper objectMapper = ConnectorsObjectMapperSupplier.getCopy();
 
   @BeforeAll
   public static void setUp() {

connectors/http/http-base/src/test/java/io/camunda/connector/http/base/client/apache/ApacheRequestFactoryTest.java

@@ -348,7 +348,7 @@ public void shouldSetJsonBody_whenBodySupportedAndContentTypeNotProvided() throw
       assertThat(httpRequest.getEntity().getContentType())
           .isEqualTo(ContentType.APPLICATION_JSON.withCharset(StandardCharsets.UTF_8).toString());
       var jsonNode =
-          ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.readTree(
+          ConnectorsObjectMapperSupplier.getCopy().readTree(
               httpRequest.getEntity().getContent());
       assertThat(jsonNode.get("key").asText()).isEqualTo("value");
     }
@@ -374,7 +374,7 @@ public void shouldNotSetJsonBody_whenBodySupportedAndContentTypeProvided() throw
       assertThat(httpRequest.getEntity().getContentType())
           .isEqualTo(ContentType.TEXT_PLAIN.withCharset(StandardCharsets.UTF_8).toString());
       var jsonNode =
-          ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.readTree(
+          ConnectorsObjectMapperSupplier.getCopy().readTree(
               httpRequest.getEntity().getContent());
       assertThat(jsonNode.get("key").asText()).isEqualTo("value");
     }
@@ -400,7 +400,7 @@ public void shouldSetJsonBody_whenBodySupportedAndContentTypeProvided() throws E
       assertThat(httpRequest.getEntity().getContentType())
           .isEqualTo(ContentType.APPLICATION_JSON.withCharset(StandardCharsets.UTF_8).toString());
       var jsonNode =
-          ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.readTree(
+          ConnectorsObjectMapperSupplier.getCopy().readTree(
               httpRequest.getEntity().getContent());
       assertThat(jsonNode.get("key").asText()).isEqualTo("value");
     }
@@ -427,7 +427,7 @@ public void shouldSetJsonBody_whenBodySupportedAndContentTypeProvidedAndBodyIsMa
       assertThat(httpRequest.getEntity().getContentType())
           .isEqualTo(ContentType.APPLICATION_JSON.withCharset(StandardCharsets.UTF_8).toString());
       var jsonNode =
-          ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.readTree(
+          ConnectorsObjectMapperSupplier.getCopy().readTree(
               httpRequest.getEntity().getContent());
       assertThat(jsonNode.get("key").asText()).isEqualTo("value");
     }

connectors/http/http-base/src/test/java/io/camunda/connector/http/base/client/apache/CustomApacheHttpClientTest.java

@@ -91,7 +91,7 @@
 public class CustomApacheHttpClientTest {
 
   private final CustomApacheHttpClient customApacheHttpClient = CustomApacheHttpClient.getDefault();
-  private final ObjectMapper objectMapper = ConnectorsObjectMapperSupplier.DEFAULT_MAPPER;
+  private final ObjectMapper objectMapper = ConnectorsObjectMapperSupplier.getCopy();
   private final CamundaDocumentStore store = InMemoryDocumentStore.INSTANCE;
 
   @Nested

connectors/http/http-base/src/test/java/io/camunda/connector/http/base/client/apache/HttpCommonResultResponseHandlerTest.java

@@ -82,7 +82,7 @@ public void shouldHandleJsonResponse_whenCloudFunctionEnabled() throws Exception
         new HttpCommonResult(200, Map.of("X-Header", "value"), Map.of("key", "value"));
     response.setEntity(
         new StringEntity(
-            ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.writeValueAsString(cloudFunctionResult)));
+            ConnectorsObjectMapperSupplier.getCopy().writeValueAsString(cloudFunctionResult)));
 
     // when
     HttpCommonResult result = handler.handleResponse(response);
@@ -107,7 +107,7 @@ public void shouldHandleError_whenCloudFunctionEnabled() throws Exception {
     response.setHeaders(headers);
     response.setEntity(
         new StringEntity(
-            ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.writeValueAsString(
+            ConnectorsObjectMapperSupplier.getCopy().writeValueAsString(
                 new ErrorResponse("500", "Custom message", null))));
 
     // when
@@ -134,7 +134,7 @@ public void shouldHandleJsonAsTextResponse_whenCloudFunctionEnabled() throws Exc
         new HttpCommonResult(200, Map.of("X-Header", "value"), "{\"key\":\"value\"}");
     response.setEntity(
         new StringEntity(
-            ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.writeValueAsString(cloudFunctionResult)));
+            ConnectorsObjectMapperSupplier.getCopy().writeValueAsString(cloudFunctionResult)));
 
     // when
     HttpCommonResult result = handler.handleResponse(response);

connectors/http/http-base/src/test/java/io/camunda/connector/http/base/cloudfunction/CloudFunctionResponseTransformer.java

@@ -40,12 +40,12 @@ public Response transform(Response response, ServeEvent serveEvent) {
     String body = serveEvent.getRequest().getBodyAsString();
     try {
       HttpCommonRequest request =
-          ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.readValue(body, HttpCommonRequest.class);
+          ConnectorsObjectMapperSupplier.getCopy().readValue(body, HttpCommonRequest.class);
       return Response.Builder.like(response)
           .but()
           .status(200)
           .body(
-              ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.writeValueAsString(
+              ConnectorsObjectMapperSupplier.getCopy().writeValueAsString(
                   httpService.executeConnectorRequest(request)))
           .build();
     } catch (ConnectorException e) {
@@ -54,7 +54,7 @@ public Response transform(Response response, ServeEvent serveEvent) {
             .status(500)
             .headers(new HttpHeaders(new HttpHeader("Content-Type", "application/json")))
             .body(
-                ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.writeValueAsString(
+                ConnectorsObjectMapperSupplier.getCopy().writeValueAsString(
                     new ErrorResponse(e.getErrorCode(), e.getMessage(), e.getErrorVariables())))
             .build();
       } catch (JsonProcessingException ex) {

connectors/http/http-base/src/test/java/io/camunda/connector/http/base/cloudfunction/CloudFunctionServiceTest.java

@@ -75,7 +75,7 @@ public void shouldConvertToCloudFunctionRequest() throws IOException {
     assertThat(cloudFunctionRequest.getHeaders().orElse(Map.of()))
         .containsEntry("Content-Type", "application/json");
     Map<String, Object> body =
-        ConnectorsObjectMapperSupplier.DEFAULT_MAPPER.readValue(
+        ConnectorsObjectMapperSupplier.getCopy().readValue(
             (String) cloudFunctionRequest.getBody(), Map.class);
     assertThat(body).containsEntry("url", "theUrl");
     assertThat(body).containsEntry("method", "POST");

connectors/jdbc/src/test/java/io/camunda/connector/jdbc/BaseTest.java

@@ -26,7 +26,7 @@ public abstract class BaseTest {
       "src/test/resources/requests/success-test-cases.json";
   private static final String SUCCESS_CASES_WITH_SECRETS_PATH =
       "src/test/resources/requests/success-test-cases-with-secrets.json";
-  protected ObjectMapper objectMapper = ConnectorsObjectMapperSupplier.DEFAULT_MAPPER;
+  protected ObjectMapper objectMapper = ConnectorsObjectMapperSupplier.getCopy();
 
   protected static Stream<String> failRequestValidationTestCases() throws IOException {
     return loadTestCasesFromResourceFile(FAIL_REQUEST_VALIDATION_CASES_PATH);