Skip to content

HHH-19887 Use declaring ClassLoader for Jackson Module discovery #11145

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −3
Open

HHH-19887 Use declaring ClassLoader for Jackson Module discovery #11145

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 hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonJsonFormatMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public final class JacksonJsonFormatMapper extends AbstractJsonFormatMapper {
private final ObjectMapper objectMapper;

public JacksonJsonFormatMapper() {
this( new ObjectMapper().findAndRegisterModules() );
this( new ObjectMapper().registerModules( ObjectMapper.findModules( JacksonJsonFormatMapper.class.getClassLoader() ) ) );
}

public JacksonJsonFormatMapper(ObjectMapper objectMapper) {
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonOsonFormatMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public final class JacksonOsonFormatMapper extends AbstractJsonFormatMapper {
* Creates a new JacksonOsonFormatMapper
*/
public JacksonOsonFormatMapper() {
this( new ObjectMapper().findAndRegisterModules() );
this( new ObjectMapper().registerModules( ObjectMapper.findModules( JacksonOsonFormatMapper.class.getClassLoader() ) ) );
}

public JacksonOsonFormatMapper(ObjectMapper objectMapper) {
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonXmlFormatMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public JacksonXmlFormatMapper(ObjectMapper objectMapper) {
private static XmlMapper createXmlMapper(boolean legacyFormat) {
final XmlMapper xmlMapper = new XmlMapper();
// needed to automatically find and register Jackson's jsr310 module for java.time support
xmlMapper.findAndRegisterModules();
xmlMapper.registerModules( XmlMapper.findModules( JacksonXmlFormatMapper.class.getClassLoader() ) );
xmlMapper.configure( SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false );
xmlMapper.enable( ToXmlGenerator.Feature.WRITE_NULLS_AS_XSI_NIL );
// Workaround for null vs empty string handling inside arrays,
Expand Down