From 63cdb68b3a99bd74abecece017ebfef3a846684f Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Wed, 16 Oct 2024 16:49:37 +0200
Subject: [PATCH] GH-1189 Fix regression with ObjectMapper configurationb

Resolves #1189
---
 ...ntextFunctionCatalogAutoConfiguration.java |  3 +-
 .../cloud/function/utils/JsonMapperTests.java | 61 +++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

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 b9ea096a8..789f1dcd4 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
@@ -223,8 +223,9 @@ public class ContextFunctionCatalogAutoConfiguration {
 			}
 			catch (Exception e) {
 				mapper = new ObjectMapper();
+				mapper.registerModule(new JavaTimeModule());
 			}
-			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);
diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/utils/JsonMapperTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/utils/JsonMapperTests.java
index 30207d367..eb80f5101 100644
--- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/utils/JsonMapperTests.java
+++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/utils/JsonMapperTests.java
@@ -16,6 +16,9 @@
 
 package org.springframework.cloud.function.utils;
 
+import java.nio.charset.StandardCharsets;
+import java.time.ZonedDateTime;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -27,9 +30,13 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.cloud.function.json.GsonMapper;
 import org.springframework.cloud.function.json.JacksonMapper;
 import org.springframework.cloud.function.json.JsonMapper;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.ResolvableType;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -67,6 +74,16 @@ public class JsonMapperTests {
 		assertThat(JsonMapper.isJsonStringRepresentsCollection(nodeAsString)).isFalse();
 	}
 
+	// see https://github.com/spring-cloud/spring-cloud-function/issues/1189
+	@Test
+	public void testJsonDateTimeConversion() {
+		ApplicationContext context = SpringApplication.run(EmptyConfiguration.class);
+		JsonMapper jsonMapper = context.getBean(JsonMapper.class);
+		StringVsTimestamp dom = new StringVsTimestamp("2024-10-16T16:13:29.964361+02:00");
+		String convertedJson = new String(jsonMapper.toJson(dom), StandardCharsets.UTF_8);
+		assertThat(convertedJson).contains("\"zonedDateTime\":\"2024-10-16T16:13:29.964361+02:00\"");
+	}
+
 	@ParameterizedTest
 	@MethodSource("params")
 	public void vanillaArray(JsonMapper mapper) {
@@ -140,4 +157,48 @@ public class JsonMapperTests {
 
 	}
 
+	@EnableAutoConfiguration
+	@Configuration
+	static class EmptyConfiguration {
+
+	}
+
+	static class StringVsTimestamp {
+
+		private String type;
+
+		private Date date;
+
+		private ZonedDateTime zonedDateTime;
+
+		StringVsTimestamp(String zonedDate) {
+			type = "StringVsTimestamp";
+			date = new Date();
+			zonedDateTime = ZonedDateTime.parse(zonedDate);
+		}
+
+		public String getType() {
+			return type;
+		}
+
+		public void setType(String type) {
+			this.type = type;
+		}
+
+		public Date getDate() {
+			return date;
+		}
+
+		public void setDate(Date date) {
+			this.date = date;
+		}
+
+		public ZonedDateTime getZonedDateTime() {
+			return zonedDateTime;
+		}
+
+		public void setZonedDateTime(ZonedDateTime zonedDateTime) {
+			this.zonedDateTime = zonedDateTime;
+		}
+	}
 }