Skip to content

Commit c8abf73

Browse files
committed
Start building against Framework 7.0.0-SNAPSHOT
See gh-1292
1 parent e3c5083 commit c8abf73

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description = "Spring for GraphQL"
66

77
ext {
88
moduleProjects = [project(":spring-graphql"), project(":spring-graphql-test")]
9-
springFrameworkVersion = "7.0.0-M8"
9+
springFrameworkVersion = "7.0.0-SNAPSHOT"
1010
graphQlJavaVersion = "25.0.beta-5"
1111
}
1212

spring-graphql/src/main/java/org/springframework/graphql/client/AbstractGraphQlClientBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.function.Consumer;
2525

2626
import org.jspecify.annotations.Nullable;
27-
import tools.jackson.databind.ObjectMapper;
2827
import tools.jackson.databind.json.JsonMapper;
2928

3029
import org.springframework.core.codec.Decoder;
@@ -248,7 +247,7 @@ private Decoder<?> getDecoder() {
248247

249248
protected static class DefaultJacksonCodecs {
250249

251-
private static final ObjectMapper JSON_MAPPER = JsonMapper.builder()
250+
private static final JsonMapper JSON_MAPPER = JsonMapper.builder()
252251
.addModule(new GraphQlJacksonModule()).build();
253252

254253
static Encoder<?> encoder() {

spring-graphql/src/test/java/org/springframework/graphql/server/webflux/GraphQlHttpHandlerTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import reactor.core.publisher.Flux;
2828
import reactor.test.StepVerifier;
2929
import tools.jackson.databind.ObjectMapper;
30+
import tools.jackson.databind.json.JsonMapper;
3031

3132
import org.springframework.core.codec.DataBufferEncoder;
3233
import org.springframework.core.io.buffer.DefaultDataBuffer;
@@ -182,7 +183,7 @@ void shouldUseCustomCodec() {
182183
.queryFetcher("showId", (env) -> env.getExecutionId().toString())
183184
.toWebGraphQlHandler();
184185

185-
ObjectMapper mapper = new ObjectMapper();
186+
JsonMapper mapper = JsonMapper.builder().build();
186187
CodecConfigurer configurer = ServerCodecConfigurer.create();
187188
configurer.defaultCodecs().jacksonJsonDecoder(new JacksonJsonDecoder(mapper));
188189
configurer.defaultCodecs().jacksonJsonEncoder(new JacksonJsonEncoder(mapper));

0 commit comments

Comments
 (0)