[Bug #135] Improve bindable type resolution - remove instanceof.

kbss-cvut · Feb 23, 2023 · 5cee5cf · 5cee5cf
1 parent 5a3cf9c
commit 5cee5cf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/jopa-impl/src/main/java/cz/cvut/kbss/jopa/query/soql/SoqlQueryListener.java b/jopa-impl/src/main/java/cz/cvut/kbss/jopa/query/soql/SoqlQueryListener.java
@@ -542,10 +542,10 @@ private void setAllNodesIris(ManagedType<?> entityType, SoqlNode node) {
     }
 
     private static Type<?> resolveBindableType(Attribute<?, ?> att) {
-        if (att instanceof SingularAttribute) {
-            return ((SingularAttribute<?, ?>) att).getType();
-        } else {
+        if (att.isCollection()) {
             return ((PluralAttribute<?, ?, ?>) att).getElementType();
+        } else {
+            return ((SingularAttribute<?, ?>) att).getType();
         }
     }