[3.25] Account for Formula properties when detecting JSON/XML columns

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/formatmapper/FormatMapperBehaviorTest.java

@@ -0,0 +1,33 @@
+package io.quarkus.hibernate.orm.formatmapper;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import jakarta.inject.Inject;
+
+import org.hibernate.SessionFactory;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.SchemaUtil;
+import io.quarkus.hibernate.orm.SmokeTestUtils;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class FormatMapperBehaviorTest {
+    @RegisterExtension
+    static QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(MyJsonEntity.class, MyXmlEntity.class)
+                    .addClasses(SchemaUtil.class, SmokeTestUtils.class))
+            .withConfigurationResource("application.properties");
+
+    @Inject
+    SessionFactory sessionFactory;
+
+    @Test
+    void smoke() {
+        // We really just care ot see if the SF is built successfully here or not;
+        assertThat(SchemaUtil.getColumnNames(sessionFactory, MyJsonEntity.class))
+                .contains("properties", "amount1", "amount2")
+                .doesNotContain("amountDifference");
+    }
+}

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/formatmapper/MyJsonEntity.java

@@ -0,0 +1,27 @@
+package io.quarkus.hibernate.orm.formatmapper;
+
+import java.util.Map;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+import org.hibernate.annotations.Formula;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
+
+@Entity
+public class MyJsonEntity {
+
+    @Id
+    public Long id;
+
+    @JdbcTypeCode(SqlTypes.JSON)
+    public Map<String, String> properties;
+
+    public int amount1;
+    public int amount2;
+
+    @Formula("amount2 - amount1")
+    public int amountDifference;
+
+}

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/formatmapper/MyXmlEntity.java

@@ -0,0 +1,27 @@
+package io.quarkus.hibernate.orm.formatmapper;
+
+import java.util.Map;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+import org.hibernate.annotations.Formula;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
+
+@Entity
+public class MyXmlEntity {
+
+    @Id
+    public Long id;
+
+    @JdbcTypeCode(SqlTypes.SQLXML)
+    public Map<String, String> properties;
+
+    public int amount1;
+    public int amount2;
+
+    @Formula("amount2 - amount1")
+    public int amountDifference;
+
+}

extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/BuiltinFormatMapperBehaviour.java

@@ -4,6 +4,8 @@
 import java.util.Locale;
 import java.util.Set;
 
+import org.hibernate.AssertionFailure;
+import org.hibernate.HibernateException;
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.Column;
@@ -76,19 +78,28 @@ public static boolean hasXmlProperties(MetadataImplementor metadata) {
     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();
+                try {
+                    if (property.getValue().hasFormula()) {
+                        // formulas do not have columns
+                        continue;
                     }
-                }
-                for (Column column : columns) {
-                    if (sqlTypeCodes.contains(column.getSqlTypeCode(metadata))) {
-                        return true;
+                    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;
+                        }
                     }
+                } catch (HibernateException | AssertionFailure e) {
+                    // skip the failing property and see if any remaining ones are matching the required predicate
                 }
             }
         }
+
         return false;
     }