From 9c8c167267da57985ee7707b4413e7d54a4ef061 Mon Sep 17 00:00:00 2001
From: luxbe <luxbe@mailbox.org>
Date: Wed, 20 Nov 2024 14:50:32 +0100
Subject: [PATCH] [Enhancement #283] Add handling for Object properties

---
 .../jopa/model/metamodel/ClassFieldMetamodelProcessor.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/jopa-impl/src/main/java/cz/cvut/kbss/jopa/model/metamodel/ClassFieldMetamodelProcessor.java b/jopa-impl/src/main/java/cz/cvut/kbss/jopa/model/metamodel/ClassFieldMetamodelProcessor.java
index 2a3b22b1b..d19036d6e 100644
--- a/jopa-impl/src/main/java/cz/cvut/kbss/jopa/model/metamodel/ClassFieldMetamodelProcessor.java
+++ b/jopa-impl/src/main/java/cz/cvut/kbss/jopa/model/metamodel/ClassFieldMetamodelProcessor.java
@@ -318,6 +318,11 @@ private void createQueryAttribute(Field field, Class<?> fieldValueCls) {
         final AbstractAttribute<X, ?> a;
         if (property.getAnnotation(RDFContainer.class) != null) {
             a = createRdfContainerAttribute(property, inference, propertyAttributes);
+        } else if (property.getType().isAssignableFrom(Object.class)) {
+            final SingularAttributeImpl.SingularAttributeBuilder builder = setCommonBuildParameters(SingularAttributeImpl.builder(propertyAttributes),
+                    property, inference);
+            context.getConverterResolver().resolveConverter(property, propertyAttributes).ifPresent(builder::converter);
+            a = builder.build();
         } else if (property.getType().isAssignableFrom(Collection.class)) {
             final AbstractPluralAttribute.PluralAttributeBuilder builder = setCommonBuildParameters(CollectionAttributeImpl.builder(propertyAttributes),
                     property, inference);