From 01c3fb07ef00e15ab04f69758a7e0ebca3bf4561 Mon Sep 17 00:00:00 2001
From: Lars Bilger <lars.bilger@lht.dlh.de>
Date: Wed, 17 Jul 2024 09:22:51 +0200
Subject: [PATCH] Revert "GH-1148 Configure our own ObjectMapper"

This reverts commit 8b66fd29
---
 .../ContextFunctionCatalogAutoConfiguration.java       | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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);