Skip to content

Commit 1dd8018

Browse files
committed
GH-2354 - Upgrade to Jackson 2.20 RC1.
1 parent 2b249ef commit 1dd8018

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<logback.version>1.5.18</logback.version>
7878
<jacoco>0.8.12</jacoco>
7979
<jacoco.destfile>${project.build.directory}/jacoco.exec</jacoco.destfile>
80-
<jackson-bom.version>2.19.2</jackson-bom.version>
80+
<jackson-bom.version>2.20.0-rc1</jackson-bom.version>
8181
<java-module-name>spring.hateoas</java-module-name>
8282
<jsonpath.version>2.9.0</jsonpath.version>
8383
<junit.version>5.13.4</junit.version>

src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
import com.fasterxml.jackson.core.Version;
5555
import com.fasterxml.jackson.databind.*;
5656
import com.fasterxml.jackson.databind.PropertyNamingStrategies.NamingBase;
57-
import com.fasterxml.jackson.databind.PropertyNamingStrategy.PropertyNamingStrategyBase;
5857
import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
5958
import com.fasterxml.jackson.databind.deser.std.ContainerDeserializerBase;
6059
import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
@@ -848,9 +847,9 @@ private EmbeddedMapper(LinkRelationProvider relProvider, CurieProvider curieProv
848847
*/
849848
public EmbeddedMapper with(@Nullable PropertyNamingStrategy strategy) {
850849

851-
Function<String, String> mapper = strategy instanceof PropertyNamingStrategyBase
852-
? ((PropertyNamingStrategyBase) strategy)::translate
853-
: strategy instanceof NamingBase ? ((NamingBase) strategy)::translate : null;
850+
Function<String, String> mapper = strategy instanceof NamingBase
851+
? ((NamingBase) strategy)::translate
852+
: null;
854853

855854
return mapper == null
856855
? this

src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import net.minidev.json.JSONArray;
2121
import net.minidev.json.JSONObject;
22-
import org.jspecify.annotations.Nullable;
2322

2423
import java.io.IOException;
2524
import java.util.ArrayList;
@@ -32,6 +31,7 @@
3231
import java.util.Map;
3332
import java.util.stream.Stream;
3433

34+
import org.jspecify.annotations.Nullable;
3535
import org.junit.jupiter.api.BeforeEach;
3636
import org.junit.jupiter.api.Test;
3737
import org.springframework.context.MessageSource;
@@ -60,7 +60,7 @@
6060
import com.fasterxml.jackson.databind.JavaType;
6161
import com.fasterxml.jackson.databind.ObjectMapper;
6262
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
63-
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
63+
import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;
6464
import com.fasterxml.jackson.databind.SerializationFeature;
6565
import com.fasterxml.jackson.databind.type.TypeFactory;
6666
import com.jayway.jsonpath.Configuration;
@@ -538,7 +538,7 @@ void forwardsPropertyNamingStrategyToNonIanaLinkRelations() throws JsonProcessin
538538
model.add(Link.of("/foo/form", IanaLinkRelations.EDIT_FORM));
539539

540540
ObjectMapper objectMapper = mapper.copy() //
541-
.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE) //
541+
.setPropertyNamingStrategy(SnakeCaseStrategy.INSTANCE) //
542542
.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
543543

544544
String result = objectMapper.writeValueAsString(model);
@@ -560,7 +560,7 @@ void doesNotApplyPropertyNamingStrategyToLinkRelationsIfConfigurationOptsOut() t
560560

561561
ObjectMapper mapper = HalTestUtils.halObjectMapper(new HalConfiguration() //
562562
.withApplyPropertyNamingStrategy(false)) //
563-
.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE) //
563+
.setPropertyNamingStrategy(SnakeCaseStrategy.INSTANCE) //
564564
.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
565565

566566
String result = mapper.writeValueAsString(model);

0 commit comments

Comments
 (0)