Skip to content

Better check for JSON/XML properties in ORM's metadata #49271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Better check for JSON/XML properties in ORM's metadata #49271

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
964df12
Better check for JSON/XML properties in ORM's metadata
mbellade Aug 1, 2025
59c810e
Account for `JSON_ARRAY`/`XML_ARRAY` by checking jdbc types
mbellade Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions ...c/main/java/io/quarkus/hibernate/orm/runtime/customized/BuiltinFormatMapperBehaviour.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
package io.quarkus.hibernate.orm.runtime.customized;

import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;

import org.hibernate.boot.spi.MetadataImplementor;
import org.hibernate.mapping.Collection;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
import org.hibernate.type.SqlTypes;
import org.hibernate.type.descriptor.java.spi.JsonJavaType;
import org.hibernate.type.descriptor.java.spi.XmlJavaType;
import org.jboss.logging.Logger;

import io.quarkus.arc.ArcContainer;
Expand Down Expand Up @@ -66,30 +63,33 @@ private static String message(String puName, String type) {
}

public static boolean hasJsonProperties(MetadataImplementor metadata) {
return hasXxxProperties(metadata, Set.of(SqlTypes.JSON, SqlTypes.JSON_ARRAY));
AtomicBoolean hasJsonProperties = new AtomicBoolean(false);
metadata.getTypeConfiguration().getJavaTypeRegistry().forEachDescriptor(javaType -> {
if (javaType instanceof JsonJavaType<?>) {
hasJsonProperties.set(true);
}
});
if (hasJsonProperties.get()) {
return true;
} else {
// for JSON_ARRAY we need to check the jdbc type registry instead
return metadata.getTypeConfiguration().getJdbcTypeRegistry().hasRegisteredDescriptor(SqlTypes.JSON_ARRAY);
}
}

public static boolean hasXmlProperties(MetadataImplementor metadata) {
return hasXxxProperties(metadata, Set.of(SqlTypes.SQLXML, SqlTypes.XML_ARRAY));
}

private static boolean hasXxxProperties(MetadataImplementor metadata, Set<Integer> sqlTypeCodes) {
for (PersistentClass persistentClass : metadata.getEntityBindings()) {
for (Property property : persistentClass.getProperties()) {
List<Column> columns = property.getColumns();
if (columns.isEmpty()) {
if (property.getValue() instanceof Collection c) {
columns = c.getElement().getColumns();
}
}
for (Column column : columns) {
if (sqlTypeCodes.contains(column.getSqlTypeCode(metadata))) {
return true;
}
}
AtomicBoolean hasXmlProperties = new AtomicBoolean(false);
metadata.getTypeConfiguration().getJavaTypeRegistry().forEachDescriptor(javaType -> {
if (javaType instanceof XmlJavaType<?>) {
hasXmlProperties.set(true);
}
});
if (hasXmlProperties.get()) {
return true;
} else {
// for XML_ARRAY we need to check the jdbc type registry instead
return metadata.getTypeConfiguration().getJdbcTypeRegistry().hasRegisteredDescriptor(SqlTypes.XML_ARRAY);
}
return false;
}

public void jsonApply(MetadataImplementor metadata, String puName, ArcContainer container,
Expand Down
Loading