Skip to content

Commit 166c9ab

Browse files
committed
HHH-19887 Use declaring ClassLoader for Jackson Module discovery
1 parent 1620d49 commit 166c9ab

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
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
@@ -27,7 +27,7 @@ public final class JacksonJsonFormatMapper extends AbstractJsonFormatMapper {
2727
private final ObjectMapper objectMapper;
2828

2929
public JacksonJsonFormatMapper() {
30-
this( new ObjectMapper().findAndRegisterModules() );
30+
this( new ObjectMapper().registerModules( ObjectMapper.findModules( JacksonJsonFormatMapper.class.getClassLoader() ) ) );
3131
}
3232

3333
public JacksonJsonFormatMapper(ObjectMapper objectMapper) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public final class JacksonOsonFormatMapper extends AbstractJsonFormatMapper {
3434
* Creates a new JacksonOsonFormatMapper
3535
*/
3636
public JacksonOsonFormatMapper() {
37-
this( new ObjectMapper().findAndRegisterModules() );
37+
this( new ObjectMapper().registerModules( ObjectMapper.findModules( JacksonOsonFormatMapper.class.getClassLoader() ) ) );
3838
}
3939

4040
public JacksonOsonFormatMapper(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
@@ -65,7 +65,7 @@ public JacksonXmlFormatMapper(ObjectMapper objectMapper) {
6565
private static XmlMapper createXmlMapper(boolean legacyFormat) {
6666
final XmlMapper xmlMapper = new XmlMapper();
6767
// needed to automatically find and register Jackson's jsr310 module for java.time support
68-
xmlMapper.findAndRegisterModules();
68+
xmlMapper.registerModules( XmlMapper.findModules( JacksonXmlFormatMapper.class.getClassLoader() ) );
6969
xmlMapper.configure( SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false );
7070
xmlMapper.enable( ToXmlGenerator.Feature.WRITE_NULLS_AS_XSI_NIL );
7171
// Workaround for null vs empty string handling inside arrays,

0 commit comments

Comments
 (0)