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

…t private so only copy can be created

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

@@ -61,13 +61,17 @@ 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;
 
@@ -159,8 +163,7 @@ public ConsoleSecretApiClient consoleSecretApiClient(CamundaClientProperties cli
   @Bean
   @ConditionalOnMissingBean
   public ObjectMapper objectMapper(DocumentFactory documentFactory) {
-    ConnectorsObjectMapperSupplier.getCopy(
-        documentFactory, DocumentModuleSettings.create());
+    ConnectorsObjectMapperSupplier.getCopy(documentFactory, DocumentModuleSettings.create());
     return ConnectorsObjectMapperSupplier.getCopy();
   }
 }

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

@@ -27,8 +27,6 @@
 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 {
@@ -46,8 +44,7 @@ public class ConnectorsObjectMapperSupplier {
   private ConnectorsObjectMapperSupplier() {}
 
   public static ObjectMapper getCopy() {
-    return DEFAULT_MAPPER
-        .copy();
+    return DEFAULT_MAPPER.copy();
   }
 
   public static ObjectMapper getCopy(DocumentFactory factory, DocumentModuleSettings settings) {

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

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

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

@@ -100,8 +100,7 @@ void execute_shouldSetConnectTime(final String input) throws Exception {
                 objectMapper.readValue(input, ObjectNode.class).get("graphql").toString(),
                 GraphQLRequest.GraphQL.class)
             .connectionTimeoutInSeconds();
-    var graphQLRequestMapper =
-        new GraphQLRequestMapper(ConnectorsObjectMapperSupplier.getCopy());
+    var graphQLRequestMapper = new GraphQLRequestMapper(ConnectorsObjectMapperSupplier.getCopy());
 
     // when
     var request =

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

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

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

@@ -348,8 +348,7 @@ public void shouldSetJsonBody_whenBodySupportedAndContentTypeNotProvided() throw
       assertThat(httpRequest.getEntity().getContentType())
           .isEqualTo(ContentType.APPLICATION_JSON.withCharset(StandardCharsets.UTF_8).toString());
       var jsonNode =
-          ConnectorsObjectMapperSupplier.getCopy().readTree(
-              httpRequest.getEntity().getContent());
+          ConnectorsObjectMapperSupplier.getCopy().readTree(httpRequest.getEntity().getContent());
       assertThat(jsonNode.get("key").asText()).isEqualTo("value");
     }
 
@@ -374,8 +373,7 @@ public void shouldNotSetJsonBody_whenBodySupportedAndContentTypeProvided() throw
       assertThat(httpRequest.getEntity().getContentType())
           .isEqualTo(ContentType.TEXT_PLAIN.withCharset(StandardCharsets.UTF_8).toString());
       var jsonNode =
-          ConnectorsObjectMapperSupplier.getCopy().readTree(
-              httpRequest.getEntity().getContent());
+          ConnectorsObjectMapperSupplier.getCopy().readTree(httpRequest.getEntity().getContent());
       assertThat(jsonNode.get("key").asText()).isEqualTo("value");
     }
 
@@ -400,8 +398,7 @@ public void shouldSetJsonBody_whenBodySupportedAndContentTypeProvided() throws E
       assertThat(httpRequest.getEntity().getContentType())
           .isEqualTo(ContentType.APPLICATION_JSON.withCharset(StandardCharsets.UTF_8).toString());
       var jsonNode =
-          ConnectorsObjectMapperSupplier.getCopy().readTree(
-              httpRequest.getEntity().getContent());
+          ConnectorsObjectMapperSupplier.getCopy().readTree(httpRequest.getEntity().getContent());
       assertThat(jsonNode.get("key").asText()).isEqualTo("value");
     }
 
@@ -427,8 +424,7 @@ public void shouldSetJsonBody_whenBodySupportedAndContentTypeProvidedAndBodyIsMa
       assertThat(httpRequest.getEntity().getContentType())
           .isEqualTo(ContentType.APPLICATION_JSON.withCharset(StandardCharsets.UTF_8).toString());
       var jsonNode =
-          ConnectorsObjectMapperSupplier.getCopy().readTree(
-              httpRequest.getEntity().getContent());
+          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/HttpCommonResultResponseHandlerTest.java

@@ -107,8 +107,8 @@ public void shouldHandleError_whenCloudFunctionEnabled() throws Exception {
     response.setHeaders(headers);
     response.setEntity(
         new StringEntity(
-            ConnectorsObjectMapperSupplier.getCopy().writeValueAsString(
-                new ErrorResponse("500", "Custom message", null))));
+            ConnectorsObjectMapperSupplier.getCopy()
+                .writeValueAsString(new ErrorResponse("500", "Custom message", null))));
 
     // when
     HttpCommonResult result = handler.handleResponse(response);

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

@@ -45,17 +45,18 @@ public Response transform(Response response, ServeEvent serveEvent) {
           .but()
           .status(200)
           .body(
-              ConnectorsObjectMapperSupplier.getCopy().writeValueAsString(
-                  httpService.executeConnectorRequest(request)))
+              ConnectorsObjectMapperSupplier.getCopy()
+                  .writeValueAsString(httpService.executeConnectorRequest(request)))
           .build();
     } catch (ConnectorException e) {
       try {
         return new Response.Builder()
             .status(500)
             .headers(new HttpHeaders(new HttpHeader("Content-Type", "application/json")))
             .body(
-                ConnectorsObjectMapperSupplier.getCopy().writeValueAsString(
-                    new ErrorResponse(e.getErrorCode(), e.getMessage(), e.getErrorVariables())))
+                ConnectorsObjectMapperSupplier.getCopy()
+                    .writeValueAsString(
+                        new ErrorResponse(e.getErrorCode(), e.getMessage(), e.getErrorVariables())))
             .build();
       } catch (JsonProcessingException ex) {
         throw new RuntimeException(ex);

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

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

secret-providers/gcp-secret-provider/src/main/java/io/camunda/connector/runtime/cloud/GcpSecretManagerSecretProvider.java

@@ -42,6 +42,7 @@ public class GcpSecretManagerSecretProvider implements SecretProvider {
 
   /** Secrets used as fallback if SecretProvider is loaded via SPI */
   public static final String SECRETS_PROJECT_ENV_NAME = "SECRETS_PROJECT_ID";
+
   public static final String SECRETS_PREFIX_ENV_NAME = "SECRETS_PREFIX";
   public static final String CLUSTER_ID_ENV_NAME = "CAMUNDA_CLUSTER_ID";
   public static final String SECRETS_CACHE_MILLIS_ENV_NAME =