diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 5f4d0d70c00..4a67d9e30d6 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -7,7 +7,7 @@ javaPlatform { } dependencies { - api(platform("com.fasterxml.jackson:jackson-bom:2.14.3")) + api(platform("com.fasterxml.jackson:jackson-bom:2.15.2")) api(platform("io.micrometer:micrometer-bom:1.10.8")) api(platform("io.netty:netty-bom:4.1.93.Final")) api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java index 3ad2305b324..3a01bb20a43 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,8 +30,6 @@ import com.fasterxml.jackson.databind.util.TokenBuffer; import org.json.JSONException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; import org.skyscreamer.jsonassert.JSONAssert; import reactor.core.publisher.Flux; import reactor.test.StepVerifier; @@ -317,12 +315,11 @@ public class Jackson2TokenizerTests extends AbstractLeakCheckingTests { .verify(); } - @ParameterizedTest - @ValueSource(booleans = {false, true}) - public void useBigDecimalForFloats(boolean useBigDecimalForFloats) { + @Test + public void useBigDecimalForFloats() { Flux source = Flux.just(stringBuffer("1E+2")); Flux tokens = Jackson2Tokenizer.tokenize( - source, this.jsonFactory, this.objectMapper, false, useBigDecimalForFloats, -1); + source, this.jsonFactory, this.objectMapper, false, true, -1); StepVerifier.create(tokens) .assertNext(tokenBuffer -> { @@ -331,12 +328,7 @@ public class Jackson2TokenizerTests extends AbstractLeakCheckingTests { JsonToken token = parser.nextToken(); assertThat(token).isEqualTo(JsonToken.VALUE_NUMBER_FLOAT); JsonParser.NumberType numberType = parser.getNumberType(); - if (useBigDecimalForFloats) { - assertThat(numberType).isEqualTo(JsonParser.NumberType.BIG_DECIMAL); - } - else { - assertThat(numberType).isEqualTo(JsonParser.NumberType.DOUBLE); - } + assertThat(numberType).isEqualTo(JsonParser.NumberType.BIG_DECIMAL); } catch (IOException ex) { fail(ex);