Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-15415 Jackson integration to not break GraalVM native image compilation

This commit is contained in:
Sanne Grinovero 2022-07-21 18:42:36 +01:00 committed by Sanne Grinovero
parent 68dc79a87a
commit ca2088ad39
5 changed files with 51 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java
View File

@ -72,9 +72,9 @@ import org.hibernate.service.spi.ServiceRegistryImplementor;
import org.hibernate.stat.Statistics;
import org.hibernate.type.FormatMapper;
import org.hibernate.type.JacksonJsonFormatMapper;
import org.hibernate.type.JacksonXmlFormatMapper;
import org.hibernate.type.JaxbXmlFormatMapper;
import org.hibernate.type.JsonBJsonFormatMapper;
import org.hibernate.type.jackson.JacksonIntegration;
import static org.hibernate.cfg.AvailableSettings.ALLOW_JTA_TRANSACTION_ACCESS;
import static org.hibernate.cfg.AvailableSettings.ALLOW_REFRESH_DETACHED_ENTITY;
@ -797,13 +797,9 @@ public class SessionFactoryOptionsBuilder implements SessionFactoryOptions {
FormatMapper.class,
setting,
(Callable<FormatMapper>) () -> {
try {
// Force initialization of the instance
JacksonJsonFormatMapper.INSTANCE.hashCode();
return JacksonJsonFormatMapper.INSTANCE;
}
catch (NoClassDefFoundError ex) {
// Ignore
final FormatMapper jsonJacksonFormatMapper = JacksonIntegration.getJsonJacksonFormatMapperOrNull();
if (jsonJacksonFormatMapper != null) {
return jsonJacksonFormatMapper;
}
try {
// Force initialization of the instance
@ -823,18 +819,13 @@ public class SessionFactoryOptionsBuilder implements SessionFactoryOptions {
FormatMapper.class,
setting,
(Callable<FormatMapper>) () -> {
try {
// Force initialization of the instance
JacksonXmlFormatMapper.INSTANCE.hashCode();
return JacksonXmlFormatMapper.INSTANCE;
}
catch (NoClassDefFoundError ex) {
// Ignore
final FormatMapper jacksonFormatMapper = JacksonIntegration.getXMLJacksonFormatMapperOrNull();
if (jacksonFormatMapper != null) {
return jacksonFormatMapper;
}
try {
// Force initialization of the instance
JaxbXmlFormatMapper.INSTANCE.hashCode();
return JaxbXmlFormatMapper.INSTANCE;
return new JaxbXmlFormatMapper();
}
catch (NoClassDefFoundError ex) {
// Ignore

1
hibernate-core/src/main/java/org/hibernate/type/JacksonJsonFormatMapper.java
View File

@ -18,7 +18,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
public class JacksonJsonFormatMapper implements FormatMapper {
public static final String SHORT_NAME = "jackson";
public static final JacksonJsonFormatMapper INSTANCE = new JacksonJsonFormatMapper();
private final ObjectMapper objectMapper;

1
hibernate-core/src/main/java/org/hibernate/type/JacksonXmlFormatMapper.java
View File

@ -19,7 +19,6 @@ import com.fasterxml.jackson.dataformat.xml.XmlMapper;
public class JacksonXmlFormatMapper implements FormatMapper {
public static final String SHORT_NAME = "jackson-xml";
public static final JacksonXmlFormatMapper INSTANCE = new JacksonXmlFormatMapper();
private final ObjectMapper objectMapper;

1
hibernate-core/src/main/java/org/hibernate/type/JaxbXmlFormatMapper.java
View File

@ -44,7 +44,6 @@ import org.w3c.dom.Node;
public class JaxbXmlFormatMapper implements FormatMapper {
public static final String SHORT_NAME = "jaxb";
public static final JaxbXmlFormatMapper INSTANCE = new JaxbXmlFormatMapper();
public JaxbXmlFormatMapper() {
}

42
hibernate-core/src/main/java/org/hibernate/type/jackson/JacksonIntegration.java Normal file
View File

@ -0,0 +1,42 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.type.jackson;
import org.hibernate.type.FormatMapper;
import org.hibernate.type.JacksonJsonFormatMapper;
import org.hibernate.type.JacksonXmlFormatMapper;
public final class JacksonIntegration {
// Implementation note: we rely on the following two fields to be folded as constants
// when GraalVM native image is initializing them.
private static final boolean JACKSON_AVAILABLE = ableToLoadJackson();
private static final JacksonXmlFormatMapper XML_FORMAT_MAPPER = JACKSON_AVAILABLE ? new JacksonXmlFormatMapper() : null;
private static final JacksonJsonFormatMapper JSON_FORMAT_MAPPER = JACKSON_AVAILABLE ? new JacksonJsonFormatMapper() : null;
private JacksonIntegration() {
//To not be instantiated: static helpers only
}
private static boolean ableToLoadJackson() {
try {
JacksonIntegration.class.getClassLoader().loadClass( "com.fasterxml.jackson.dataformat.xml.XmlMapper" );
return true;
}
catch (ClassNotFoundException | LinkageError e) {
return false;
}
}
public static FormatMapper getXMLJacksonFormatMapperOrNull() {
return XML_FORMAT_MAPPER;
}
public static FormatMapper getJsonJacksonFormatMapperOrNull() {
return JSON_FORMAT_MAPPER;
}
}