Skip to content

Commit 5443986

Browse files
committed
HHH-19887 Use declaring ClassLoader for Jackson Module discovery
1 parent c2adaaf commit 5443986

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonJsonFormatMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public final class JacksonJsonFormatMapper extends AbstractJsonFormatMapper {
2424
private final ObjectMapper objectMapper;
2525

2626
public JacksonJsonFormatMapper() {
27-
this(new ObjectMapper().findAndRegisterModules());
27+
this( new ObjectMapper().registerModules( ObjectMapper.findModules( JacksonXmlFormatMapper.class.getClassLoader() ) ) );
2828
}
2929

3030
public JacksonJsonFormatMapper(ObjectMapper objectMapper) {

hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonXmlFormatMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public JacksonXmlFormatMapper(ObjectMapper objectMapper) {
4545
private static XmlMapper createXmlMapper() {
4646
final XmlMapper xmlMapper = new XmlMapper();
4747
// needed to automatically find and register Jackson's jsr310 module for java.time support
48-
xmlMapper.findAndRegisterModules();
48+
xmlMapper.registerModules( XmlMapper.findModules( JacksonXmlFormatMapper.class.getClassLoader() ) );
4949
xmlMapper.configure( SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false );
5050
xmlMapper.enable( ToXmlGenerator.Feature.WRITE_NULLS_AS_XSI_NIL );
5151
// Workaround for null vs empty string handling inside arrays,

0 commit comments

Comments
 (0)