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

HHH-17086 Make JSON/XML format mappers modifiable in SessionFactoryOptionsBuilder

This commit is contained in:
marko-bekhta 2023-08-16 10:45:30 +02:00 committed by Christian Beikov
parent 7c697f7e37
commit 90dd4e6d77
5 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java
View File

@ -10,6 +10,7 @@ import java.util.function.Supplier;
import org.hibernate.CustomEntityDirtinessStrategy;
import org.hibernate.EntityNameResolver;
import org.hibernate.Incubating;
import org.hibernate.Interceptor;
import org.hibernate.SessionFactory;
import org.hibernate.SessionFactoryObserver;
@ -22,6 +23,7 @@ import org.hibernate.query.NullPrecedence;
import org.hibernate.query.sqm.function.SqmFunctionDescriptor;
import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
import org.hibernate.resource.jdbc.spi.StatementInspector;
import org.hibernate.type.format.FormatMapper;
/**
* The contract for building a {@link SessionFactory} given a number of options.
@ -707,6 +709,30 @@ public interface SessionFactoryBuilder {
*/
SessionFactoryBuilder enableJpaClosedCompliance(boolean enabled);
/**
* Specifies a {@link FormatMapper format mapper} to use for serialization/deserialization of JSON properties.
*
* @param jsonFormatMapper The {@link FormatMapper} to use.
*
* @return {@code this}, for method chaining
*
* @see org.hibernate.cfg.AvailableSettings#JSON_FORMAT_MAPPER
*/
@Incubating
SessionFactoryBuilder applyJsonFormatMapper(FormatMapper jsonFormatMapper);
/**
* Specifies a {@link FormatMapper format mapper} to use for serialization/deserialization of XML properties.
*
* @param xmlFormatMapper The {@link FormatMapper} to use.
*
* @return {@code this}, for method chaining
*
* @see org.hibernate.cfg.AvailableSettings#XML_FORMAT_MAPPER
*/
@Incubating
SessionFactoryBuilder applyXmlFormatMapper(FormatMapper xmlFormatMapper);
/**
* After all options have been set, build the SessionFactory.
*

13
hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java
View File

@ -31,6 +31,7 @@ import org.hibernate.query.NullPrecedence;
import org.hibernate.query.sqm.function.SqmFunctionDescriptor;
import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
import org.hibernate.resource.jdbc.spi.StatementInspector;
import org.hibernate.type.format.FormatMapper;
/**
* @author Gail Badner
@ -422,6 +423,18 @@ public class SessionFactoryBuilderImpl implements SessionFactoryBuilderImplement
return this;
}
@Override
public SessionFactoryBuilder applyJsonFormatMapper(FormatMapper jsonFormatMapper) {
this.optionsBuilder.applyJsonFormatMapper( jsonFormatMapper );
return this;
}
@Override
public SessionFactoryBuilder applyXmlFormatMapper(FormatMapper xmlFormatMapper) {
this.optionsBuilder.applyXmlFormatMapper( xmlFormatMapper );
return this;
}
@Override
public void disableRefreshDetachedEntity() {
this.optionsBuilder.disableRefreshDetachedEntity();

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

@ -155,8 +155,8 @@ public class SessionFactoryOptionsBuilder implements SessionFactoryOptions {
// integration
private Object beanManagerReference;
private Object validatorFactoryReference;
private final FormatMapper jsonFormatMapper;
private final FormatMapper xmlFormatMapper;
private FormatMapper jsonFormatMapper;
private FormatMapper xmlFormatMapper;
// SessionFactory behavior
private final boolean jpaBootstrap;
@ -1241,6 +1241,14 @@ public class SessionFactoryOptionsBuilder implements SessionFactoryOptions {
this.validatorFactoryReference = validatorFactory;
}
public void applyJsonFormatMapper(FormatMapper jsonFormatMapper) {
this.jsonFormatMapper = jsonFormatMapper;
}
public void applyXmlFormatMapper(FormatMapper xmlFormatMapper) {
this.xmlFormatMapper = xmlFormatMapper;
}
public void applySessionFactoryName(String sessionFactoryName) {
this.sessionFactoryName = sessionFactoryName;
}

13
hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java
View File

@ -23,6 +23,7 @@ import org.hibernate.query.NullPrecedence;
import org.hibernate.query.sqm.function.SqmFunctionDescriptor;
import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
import org.hibernate.resource.jdbc.spi.StatementInspector;
import org.hibernate.type.format.FormatMapper;
/**
* Convenience base class for custom implementors of SessionFactoryBuilder, using delegation
@ -396,6 +397,18 @@ public abstract class AbstractDelegatingSessionFactoryBuilder<T extends SessionF
return getThis();
}
@Override
public SessionFactoryBuilder applyJsonFormatMapper(FormatMapper jsonFormatMapper) {
delegate.applyJsonFormatMapper( jsonFormatMapper );
return getThis();
}
@Override
public SessionFactoryBuilder applyXmlFormatMapper(FormatMapper xmlFormatMapper) {
delegate.applyXmlFormatMapper( xmlFormatMapper );
return getThis();
}
@Override
public SessionFactory build() {
return delegate.build();

3
hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
View File

@ -31,6 +31,7 @@ import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
import org.hibernate.resource.jdbc.spi.StatementInspector;
import org.hibernate.sql.ast.spi.ParameterMarkerStrategy;
import org.hibernate.type.WrapperArrayHandling;
import org.hibernate.type.format.FormatMapper;
import jakarta.persistence.criteria.CriteriaDelete;
import jakarta.persistence.criteria.CriteriaQuery;
@ -2814,6 +2815,7 @@ public interface AvailableSettings {
* used, according to the listing order.
*
* @since 6.0
* @see org.hibernate.boot.SessionFactoryBuilder#applyJsonFormatMapper(FormatMapper)
*/
@Incubating
String JSON_FORMAT_MAPPER = "hibernate.type.json_format_mapper";
@ -2832,6 +2834,7 @@ public interface AvailableSettings {
* used, according to the listing order.
*
* @since 6.0.1
* @see org.hibernate.boot.SessionFactoryBuilder#applyXmlFormatMapper(FormatMapper)
*/
@Incubating
String XML_FORMAT_MAPPER = "hibernate.type.xml_format_mapper";