[Bug kbss-cvut#285] properly resolve collectionType in LazyLoadingPro…

…xyFactory
luxbe · Nov 20, 2024 · 2e32ada · 2e32ada
1 parent 531c6d8
commit 2e32ada
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/jopa-impl/src/main/java/cz/cvut/kbss/jopa/proxy/lazy/LazyLoadingProxyFactory.java b/jopa-impl/src/main/java/cz/cvut/kbss/jopa/proxy/lazy/LazyLoadingProxyFactory.java
@@ -18,8 +18,10 @@
 package cz.cvut.kbss.jopa.proxy.lazy;
 
 import cz.cvut.kbss.jopa.exceptions.OWLPersistenceException;
+import cz.cvut.kbss.jopa.model.metamodel.CollectionType;
 import cz.cvut.kbss.jopa.model.metamodel.FieldSpecification;
 import cz.cvut.kbss.jopa.model.metamodel.PluralAttribute;
+import cz.cvut.kbss.jopa.model.metamodel.PluralQueryAttribute;
 import cz.cvut.kbss.jopa.proxy.lazy.gen.LazyLoadingEntityProxy;
 import cz.cvut.kbss.jopa.sessions.UnitOfWork;
 
@@ -59,8 +61,18 @@ public <T> Object createProxy(T entity, FieldSpecification<? super T, ?> fieldSp
         } else if (Map.class.isAssignableFrom(type)) {
             return new LazyLoadingMapProxy<>(entity, (FieldSpecification) fieldSpec, uow);
         } else if (Collection.class.isAssignableFrom(type)) {
-            final PluralAttribute<? super T, ?, ?> pa = (PluralAttribute<? super T, ?, ?>) fieldSpec;
-            return switch (pa.getCollectionType()) {
+            CollectionType collectionType;
+            assert fieldSpec instanceof PluralAttribute<?,?,?> || fieldSpec instanceof PluralQueryAttribute<?,?,?>;
+
+            if(fieldSpec instanceof PluralAttribute) {
+                final PluralAttribute<? super T, ?, ?> pa = (PluralAttribute<? super T, ?, ?>) fieldSpec;
+                collectionType = pa.getCollectionType();
+            } else {
+                final PluralQueryAttribute<? super T, ?, ?> pa = (PluralQueryAttribute<? super T, ?, ?>) fieldSpec;
+                collectionType = pa.getCollectionType();
+            }
+
+            return switch (collectionType) {
                 case LIST -> new LazyLoadingListProxy<>(entity, (FieldSpecification) fieldSpec, uow);
                 case SET, COLLECTION -> new LazyLoadingSetProxy<>(entity, (FieldSpecification) fieldSpec, uow);
                 default -> throw new IllegalArgumentException("Unsupported collection type for lazy proxying.");