Add UUID support to JsonKeysetCursorStrategy

Closes gh-1328

Signed-off-by: Giovanni Lovato <giovanni@lova.to>
[brian.clozel@broadcom.com: add documentation]
Signed-off-by: Brian Clozel <brian.clozel@broadcom.com>

Author: heruan

spring-graphql-docs/modules/ROOT/pages/data.adoc

@@ -441,8 +441,10 @@ allowed types. For example:
 			.allowIfSubType(ZonedDateTime.class)
 			.build();
 
-	ObjectMapper mapper = new ObjectMapper();
-	mapper.activateDefaultTyping(validator, ObjectMapper.DefaultTyping.NON_FINAL);
+	JsonMapper mapper = JsonMapper.builder()
+	    .activateDefaultTyping(validator, DefaultTyping.NON_FINAL)
+        .enable(DateTimeFeature.WRITE_DATES_AS_TIMESTAMPS)
+        .build();
 ----
 
 You can then create `JsonKeysetCursorStrategy`:
@@ -460,7 +462,7 @@ You can then create `JsonKeysetCursorStrategy`:
 
 By default, if `JsonKeysetCursorStrategy` is created without a `CodecConfigurer` and the
 Jackson library is on the classpath, customizations like the above are applied for
-`Date`, `Calendar`, and any type from `java.time`.
+`Date`, `Calendar`, `UUID` and any type from `java.time`.
 
 
 

spring-graphql/src/main/java/org/springframework/graphql/data/query/JsonKeysetCursorStrategy.java

@@ -21,6 +21,7 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.Map;
+import java.util.UUID;
 
 import tools.jackson.databind.DefaultTyping;
 import tools.jackson.databind.ObjectMapper;
@@ -146,7 +147,7 @@ public Map<String, Object> fromCursor(String cursor) {
 
 	/**
 	 * Customizes the {@link ObjectMapper} to use default typing that supports
-	 * {@link Date}, {@link Calendar}, and classes in {@code java.time}.
+	 * {@link Date}, {@link Calendar}, {@link UUID} and classes in {@code java.time}.
 	 */
 	private static final class JacksonObjectMapperCustomizer {
 
@@ -157,6 +158,7 @@ static void customize(CodecConfigurer configurer) {
 					.allowIfSubType("java.time.")
 					.allowIfSubType(Calendar.class)
 					.allowIfSubType(Date.class)
+					.allowIfSubType(UUID.class)
 					.build();
 
 			JsonMapper mapper = JsonMapper.builder()
@@ -172,7 +174,7 @@ static void customize(CodecConfigurer configurer) {
 
 	/**
 	 * Customizes the {@link ObjectMapper} to use default typing that supports
-	 * {@link Date}, {@link Calendar}, and classes in {@code java.time}.
+	 * {@link Date}, {@link Calendar}, {@link UUID} and classes in {@code java.time}.
 	 */
 	@SuppressWarnings("removal")
 	private static final class Jackson2ObjectMapperCustomizer {
@@ -185,6 +187,7 @@ static void customize(CodecConfigurer configurer) {
 					.allowIfSubType("java.time.")
 					.allowIfSubType(Calendar.class)
 					.allowIfSubType(Date.class)
+					.allowIfSubType(UUID.class)
 					.build();
 
 			com.fasterxml.jackson.databind.ObjectMapper mapper = Jackson2ObjectMapperBuilder.json().build();

spring-graphql/src/test/java/org/springframework/graphql/data/query/JsonKeysetCursorStrategyTests.java

@@ -23,6 +23,7 @@
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.UUID;
 
 import org.junit.jupiter.api.Test;
 
@@ -78,4 +79,16 @@ void toAndFromCursorWithZonedDateTime() {
 		assertThat(this.cursorStrategy.fromCursor(json)).isEqualTo(keys);
 	}
 
+	@Test
+	void toAndFromCursorWithUUID() {
+
+		UUID uuid = UUID.randomUUID();
+
+		Map<String, Object> keys = new LinkedHashMap<>();
+		keys.put("uuid", uuid);
+		String json = "[\"java.util.LinkedHashMap\",{\"uuid\":[\"java.util.UUID\",\"" + uuid + "\"]}]";
+
+		assertThat(this.cursorStrategy.toCursor(keys)).isEqualTo(json);
+		assertThat(this.cursorStrategy.fromCursor(json)).isEqualTo(keys);
+	}
 }