Skip to content

fix https://github.com/spring-projects/spring-hateoas/issues/2469 #2477

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
le-zell wants to merge 1 commit into
base: 2.5.x
Choose a base branch
from
Open

fix https://github.com/spring-projects/spring-hateoas/issues/2469 #2477

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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<logback.version>1.5.32</logback.version>
<jacoco>0.8.12</jacoco>
<jacoco.destfile>${project.build.directory}/jacoco.exec</jacoco.destfile>
<jackson-bom.version>2.19.4</jackson-bom.version>
<jackson-bom.version>2.21.1</jackson-bom.version>
<java-module-name>spring.hateoas</java-module-name>
<jsonpath.version>2.9.0</jsonpath.version>
<junit.version>5.11.4</junit.version>
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -849,8 +848,8 @@ private EmbeddedMapper(LinkRelationProvider relProvider, CurieProvider curieProv
*/
public EmbeddedMapper with(@Nullable PropertyNamingStrategy strategy) {

Function<String, String> mapper = strategy instanceof PropertyNamingStrategyBase
? ((PropertyNamingStrategyBase) strategy)::translate
Function<String, String> mapper = strategy instanceof NamingBase
? ((NamingBase) strategy)::translate
: strategy instanceof NamingBase ? ((NamingBase) strategy)::translate : null;

return mapper == null
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down