Skip to content

Add UUID support to JsonKeysetCursorStrategy #1328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −0
Open

Add UUID support to JsonKeysetCursorStrategy #1328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...raphql/src/main/java/org/springframework/graphql/data/query/JsonKeysetCursorStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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();
Expand Down
13 changes: 13 additions & 0 deletions ...l/src/test/java/org/springframework/graphql/data/query/JsonKeysetCursorStrategyTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
}
}