diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java index 7641957c8..c02077c0c 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java @@ -214,8 +214,14 @@ public class ContextFunctionCatalogAutoConfiguration { } private JsonMapper jackson(ApplicationContext context) { - ObjectMapper mapper = new ObjectMapper(); - mapper.registerModule(new JavaTimeModule()); + ObjectMapper mapper; + try { + mapper = context.getBean(ObjectMapper.class); + } + catch (Exception e) { + mapper = new ObjectMapper(); + } + mapper.registerModule(new JavaTimeModule()); mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); mapper.configure(DeserializationFeature.FAIL_ON_TRAILING_TOKENS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);