From 532e4e4f96dab088c372814c032089ac7f83e476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rautureau?= Date: Fri, 17 Apr 2026 13:01:24 +0200 Subject: [PATCH] fix https://github.com/spring-projects/spring-hateoas/issues/2469 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix issue https://github.com/spring-projects/spring-hateoas/issues/2469 Signed-off-by: Jérôme Rautureau Signed-off-by: Jérôme Rautureau --- pom.xml | 2 +- .../hateoas/mediatype/hal/Jackson2HalModule.java | 5 ++--- .../hateoas/mediatype/hal/Jackson2HalIntegrationTest.java | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 7a1a87843..94408af3b 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 1.5.32 0.8.12 ${project.build.directory}/jacoco.exec - 2.19.4 + 2.21.1 spring.hateoas 2.9.0 5.11.4 diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java b/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java index fc7d5840e..89cab5a3e 100644 --- a/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java +++ b/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java @@ -55,7 +55,6 @@ import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.PropertyNamingStrategies.NamingBase; -import com.fasterxml.jackson.databind.PropertyNamingStrategy.PropertyNamingStrategyBase; import com.fasterxml.jackson.databind.deser.ContextualDeserializer; import com.fasterxml.jackson.databind.deser.std.ContainerDeserializerBase; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper; @@ -849,8 +848,8 @@ private EmbeddedMapper(LinkRelationProvider relProvider, CurieProvider curieProv */ public EmbeddedMapper with(@Nullable PropertyNamingStrategy strategy) { - Function mapper = strategy instanceof PropertyNamingStrategyBase - ? ((PropertyNamingStrategyBase) strategy)::translate + Function mapper = strategy instanceof NamingBase + ? ((NamingBase) strategy)::translate : strategy instanceof NamingBase ? ((NamingBase) strategy)::translate : null; return mapper == null diff --git a/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java b/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java index 8cf9edfd3..01fc727b1 100755 --- a/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java @@ -538,7 +538,7 @@ void forwardsPropertyNamingStrategyToNonIanaLinkRelations() throws JsonProcessin model.add(Link.of("/foo/form", IanaLinkRelations.EDIT_FORM)); ObjectMapper objectMapper = mapper.copy() // - .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE) // + .setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE) // .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); String result = objectMapper.writeValueAsString(model); @@ -560,7 +560,7 @@ void doesNotApplyPropertyNamingStrategyToLinkRelationsIfConfigurationOptsOut() t ObjectMapper mapper = HalTestUtils.halObjectMapper(new HalConfiguration() // .withApplyPropertyNamingStrategy(false)) // - .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE) // + .setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE) // .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); String result = mapper.writeValueAsString(model);