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

HHH-15415 Moving all Jackson and Jakarta Jsonb integrations into dedicated packages

This commit is contained in:
Sanne Grinovero 2022-07-21 19:49:24 +01:00 committed by Sanne Grinovero
parent d363ba6e89
commit f6580ae520
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java
View File

@ -39,10 +39,10 @@ import org.hibernate.resource.transaction.backend.jdbc.internal.JdbcResourceLoca
import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorBuilderImpl; import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorBuilderImpl;
import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder; import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder;
import org.hibernate.type.FormatMapper; import org.hibernate.type.FormatMapper;
import org.hibernate.type.JacksonJsonFormatMapper; import org.hibernate.type.jackson.JacksonJsonFormatMapper;
import org.hibernate.type.JacksonXmlFormatMapper; import org.hibernate.type.jackson.JacksonXmlFormatMapper;
import org.hibernate.type.JaxbXmlFormatMapper; import org.hibernate.type.JaxbXmlFormatMapper;
import org.hibernate.type.JsonBJsonFormatMapper; import org.hibernate.type.jakartajson.JsonBJsonFormatMapper;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;

2
hibernate-core/src/main/java/org/hibernate/type/jackson/JacksonIntegration.java
View File

@ -7,8 +7,6 @@
package org.hibernate.type.jackson; package org.hibernate.type.jackson;
import org.hibernate.type.FormatMapper; import org.hibernate.type.FormatMapper;
import org.hibernate.type.JacksonJsonFormatMapper;
import org.hibernate.type.JacksonXmlFormatMapper;
public final class JacksonIntegration { public final class JacksonIntegration {

5
hibernate-core/src/main/java/org/hibernate/type/JacksonJsonFormatMapper.java → hibernate-core/src/main/java/org/hibernate/type/jackson/JacksonJsonFormatMapper.java
View File

@ -4,8 +4,9 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later. * 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>. * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/ */
package org.hibernate.type; package org.hibernate.type.jackson;
import org.hibernate.type.FormatMapper;
import org.hibernate.type.descriptor.WrapperOptions; import org.hibernate.type.descriptor.WrapperOptions;
import org.hibernate.type.descriptor.java.JavaType; import org.hibernate.type.descriptor.java.JavaType;
@ -15,7 +16,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
/** /**
* @author Christian Beikov * @author Christian Beikov
*/ */
public class JacksonJsonFormatMapper implements FormatMapper { public final class JacksonJsonFormatMapper implements FormatMapper {
public static final String SHORT_NAME = "jackson"; public static final String SHORT_NAME = "jackson";

5
hibernate-core/src/main/java/org/hibernate/type/JacksonXmlFormatMapper.java → hibernate-core/src/main/java/org/hibernate/type/jackson/JacksonXmlFormatMapper.java
View File

@ -4,8 +4,9 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later. * 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>. * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/ */
package org.hibernate.type; package org.hibernate.type.jackson;
import org.hibernate.type.FormatMapper;
import org.hibernate.type.descriptor.WrapperOptions; import org.hibernate.type.descriptor.WrapperOptions;
import org.hibernate.type.descriptor.java.JavaType; import org.hibernate.type.descriptor.java.JavaType;
@ -16,7 +17,7 @@ import com.fasterxml.jackson.dataformat.xml.XmlMapper;
/** /**
* @author Christian Beikov * @author Christian Beikov
*/ */
public class JacksonXmlFormatMapper implements FormatMapper { public final class JacksonXmlFormatMapper implements FormatMapper {
public static final String SHORT_NAME = "jackson-xml"; public static final String SHORT_NAME = "jackson-xml";

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

@ -7,7 +7,6 @@
package org.hibernate.type.jakartajson; package org.hibernate.type.jakartajson;
import org.hibernate.type.FormatMapper; import org.hibernate.type.FormatMapper;
import org.hibernate.type.JsonBJsonFormatMapper;
public final class JakartaJsonIntegration { public final class JakartaJsonIntegration {

6
hibernate-core/src/main/java/org/hibernate/type/JsonBJsonFormatMapper.java → hibernate-core/src/main/java/org/hibernate/type/jakartajson/JsonBJsonFormatMapper.java
View File

@ -4,8 +4,9 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later. * 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>. * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/ */
package org.hibernate.type; package org.hibernate.type.jakartajson;
import org.hibernate.type.FormatMapper;
import org.hibernate.type.descriptor.WrapperOptions; import org.hibernate.type.descriptor.WrapperOptions;
import org.hibernate.type.descriptor.java.JavaType; import org.hibernate.type.descriptor.java.JavaType;
@ -16,10 +17,9 @@ import jakarta.json.bind.JsonbException;
/** /**
* @author Christian Beikov * @author Christian Beikov
*/ */
public class JsonBJsonFormatMapper implements FormatMapper { public final class JsonBJsonFormatMapper implements FormatMapper {
public static final String SHORT_NAME = "jsonb"; public static final String SHORT_NAME = "jsonb";
public static final JsonBJsonFormatMapper INSTANCE = new JsonBJsonFormatMapper();
private final Jsonb jsonb; private final Jsonb jsonb;