[Blazebit#1111] Fix issues with validation error when using updatable…

… singular collection attribute
Mobe91 · Jun 9, 2020 · acf93b6 · acf93b6
1 parent 7b10b15
commit acf93b6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,7 +12,7 @@ None
 
 ### Bug fixes
 
-None
+* Fix issues with entity view validation errors when using singular collection attributes
 
 ### Backwards-incompatible changes
 

diff --git a/...ew/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractAttribute.java b/...ew/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractAttribute.java
@@ -797,25 +797,33 @@ private static boolean isCompatible(javax.persistence.metamodel.Attribute<?, ?>
         if (updatable) {
             if (entityAttributeElementType != null) {
                 if (viewAttributeElementType != null) {
-                    // Mapping a plural entity attribute to a plural view attribute
+                    if (singular) {
+                        return viewAttributeType == entityAttributeType && viewAttributeElementType == entityAttributeElementType;
+                    } else {
+                        // Mapping a plural entity attribute to a plural view attribute
 
-                    // Indexed lists or maps must map to indexed lists or maps again if they want to be updatable
-                    if (attribute instanceof ListAttribute<?, ?>) {
-                        if (!List.class.isAssignableFrom(viewAttributeType)) {
-                            return false;
-                        }
-                    } else if (attribute instanceof MapAttribute<?, ?, ?>) {
-                        if (!Map.class.isAssignableFrom(viewAttributeType)) {
+                        // Indexed lists or maps must map to indexed lists or maps again if they want to be updatable
+                        if (attribute instanceof ListAttribute<?, ?>) {
+                            if (!List.class.isAssignableFrom(viewAttributeType)) {
+                                return false;
+                            }
+                        } else if (attribute instanceof MapAttribute<?, ?, ?>) {
+                            if (!Map.class.isAssignableFrom(viewAttributeType)) {
+                                return false;
+                            }
+                        } else if (!Collection.class.isAssignableFrom(viewAttributeType)) {
+                            // For all other plural attributes, we allow any collection type
                             return false;
                         }
-                    } else if (!Collection.class.isAssignableFrom(viewAttributeType)) {
-                        // For all other plural attributes, we allow any collection type
-                        return false;
+                        return viewAttributeElementType == entityAttributeElementType;
                     }
-                    return viewAttributeElementType == entityAttributeElementType;
                 } else {
-                    // Mapping a plural entity attribute to a singular view attribute
-                    return viewAttributeType == entityAttributeElementType;
+                    if (singular) {
+                        return viewAttributeType == entityAttributeType;
+                    } else {
+                        // Mapping a plural entity attribute to a singular view attribute
+                        return viewAttributeType == entityAttributeElementType;
+                    }
                 }
             } else {
                 if (viewAttributeElementType != null) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ None @@
     ### Bug fixes
-    None
+    * Fix issues with entity view validation errors when using singular collection attributes
     ### Backwards-incompatible changes
@@ Expand Down @@