Dicts - add support for insert or update on collections (#7462)

Author: clementetb

realm/realm-annotations-processor/src/main/java/io/realm/processor/RealmProxyClassGenerator.kt

@@ -669,30 +669,16 @@ public static void insertOrUpdate(Realm realm, Iterator<? extends RealmModel> ob
 
             OsList childrenOsList = new OsList(table.getUncheckedRow(objKey), columnInfo.childrenColKey);
             RealmList<some.test.EmbeddedClass> childrenList = ((some_test_EmbeddedClassSimpleParentRealmProxyInterface) object).realmGet$children();
-            if (childrenList != null && childrenList.size() == childrenOsList.size()) {
-                // For lists of equal lengths, we need to set each element directly as clearing the receiver list can be wrong if the input and target list are the same.
-                int objectCount = childrenList.size();
-                for (int i = 0; i < objectCount; i++) {
-                    some.test.EmbeddedClass childrenItem = childrenList.get(i);
+            childrenOsList.removeAll();
+            if (childrenList != null) {
+                for (some.test.EmbeddedClass childrenItem : childrenList) {
                     Long cacheItemIndexchildren = cache.get(childrenItem);
                     if (cacheItemIndexchildren != null) {
                         throw new IllegalArgumentException("Embedded objects can only have one parent pointing to them. This object was already copied, so another object is pointing to it: " + cacheItemIndexchildren.toString());
                     } else {
                         cacheItemIndexchildren = some_test_EmbeddedClassRealmProxy.insertOrUpdate(realm, table, columnInfo.childrenColKey, objKey, childrenItem, cache);
                     }
                 }
-            } else {
-                childrenOsList.removeAll();
-                if (childrenList != null) {
-                    for (some.test.EmbeddedClass childrenItem : childrenList) {
-                        Long cacheItemIndexchildren = cache.get(childrenItem);
-                        if (cacheItemIndexchildren != null) {
-                            throw new IllegalArgumentException("Embedded objects can only have one parent pointing to them. This object was already copied, so another object is pointing to it: " + cacheItemIndexchildren.toString());
-                        } else {
-                            cacheItemIndexchildren = some_test_EmbeddedClassRealmProxy.insertOrUpdate(realm, table, columnInfo.childrenColKey, objKey, childrenItem, cache);
-                        }
-                    }
-                }
             }
 
         }

realm/realm-annotations-processor/src/test/resources/io/realm/some_test_AllTypesRealmProxy.java

@@ -42,6 +42,7 @@ interface DictionaryTester : GenericTester {
     fun insert()
     fun insertList()
     fun insertOrUpdate()
+    fun insertOrUpdateList()
     fun copyToRealm()
     fun copyToRealmOrUpdate()
     fun copyFromRealm()

realm/realm-annotations-processor/src/test/resources/io/realm/some_test_EmbeddedClassSimpleParentRealmProxy.java

@@ -553,6 +553,56 @@ class ManagedDictionaryTester<T : Any>(
         }
     }
 
+    override fun insertOrUpdateList() {
+        // Instantiate container and set dictionary on container
+        val manualInstance = PrimaryKeyDictionaryContainer().apply {
+            name = "manual"
+            primaryKeyDictionaryProperty.get(this).putAll(initializedDictionary)
+        }
+        val emptyInstance = PrimaryKeyDictionaryContainer().apply {
+            name = "empty"
+        }
+
+        // insert into Realm
+        realm.executeTransaction {
+            realm.insertOrUpdate(listOf(emptyInstance, manualInstance))
+        }
+
+        // Get dictionary from container from Realm
+        val primaryKeyDictionaryContainer = realm.where<PrimaryKeyDictionaryContainer>()
+            .equalTo("name", "manual")
+            .findFirst()
+        assertNotNull(primaryKeyDictionaryContainer)
+        val dictionary = primaryKeyDictionaryProperty.get(primaryKeyDictionaryContainer)
+        assertFalse(dictionary.isEmpty())
+        initializedDictionary.forEach { key, value ->
+            typeAsserter.assertEqualsHelper(realm, value, dictionary[key])
+        }
+
+        if (testerClass == "String-NonLatin" || testerClass == "RealmAny-NonLatin") {
+            primaryKeyDictionaryProperty.get(manualInstance)[NEW_KEY_NON_LATIN] = alternativeDictionary[KEY_BYE_NON_LATIN]
+        } else {
+            primaryKeyDictionaryProperty.get(manualInstance)[NEW_KEY] = alternativeDictionary[KEY_BYE]
+        }
+
+        // Insert to Realm with non managed updated model
+        realm.executeTransaction {
+            realm.insertOrUpdate(listOf(emptyInstance, manualInstance))
+        }
+
+        val updatedContainer = realm.where<PrimaryKeyDictionaryContainer>()
+            .equalTo("name", "manual")
+            .findFirst()
+        assertNotNull(updatedContainer)
+        val updatedDictinary = primaryKeyDictionaryProperty.get(primaryKeyDictionaryContainer)
+        assertEquals(initializedDictionary.size + 1, updatedDictinary.size)
+        if (testerClass == "String-NonLatin" || testerClass == "RealmAny-NonLatin") {
+            typeAsserter.assertEqualsHelper(realm, alternativeDictionary[KEY_BYE_NON_LATIN], updatedDictinary[NEW_KEY_NON_LATIN])
+        } else {
+            typeAsserter.assertEqualsHelper(realm, alternativeDictionary[KEY_BYE], updatedDictinary[NEW_KEY])
+        }
+    }
+
     override fun copyFromRealm() {
         val allTypesObject = createCollectionAllTypesManagedContainerAndAssert(realm)
         assertNotNull(allTypesObject)

realm/realm-library/src/androidTest/kotlin/io/realm/DictionaryTester.kt

@@ -184,6 +184,11 @@ class ParameterizedDictionaryTests(
         tester.insertOrUpdate()
     }
 
+    @Test
+    fun insertOrUpdatedList() {
+        tester.insertOrUpdateList()
+    }
+
     @Test
     fun copyToRealm() {
         tester.copyToRealm()

realm/realm-library/src/androidTest/kotlin/io/realm/ManagedDictionaryTesters.kt

@@ -212,6 +212,7 @@ class UnmanagedDictionaryTester<T : Any>(
     override fun insert() = Unit                                            // Not applicable
     override fun insertList() = Unit                                        // Not applicable
     override fun insertOrUpdate() = Unit                                    // Not applicable
+    override fun insertOrUpdateList() = Unit                                // Not applicable
     override fun copyToRealm() = Unit                                       // Not applicable
     override fun copyToRealmOrUpdate() = Unit                               // Not applicable
     override fun copyFromRealm() = Unit                                     // Not applicable

realm/realm-library/src/androidTest/kotlin/io/realm/ParameterizedDictionaryTests.kt

@@ -1320,12 +1320,9 @@ public void insert(RealmModel object) {
      * transaction.
      * @throws io.realm.exceptions.RealmPrimaryKeyConstraintException if two objects with the same primary key is
      * inserted or if a primary key value already exists in the Realm.
-     * @throws UnsupportedOperationException if the object to insert contains a {@link RealmDictionary} or
-     * a {@link RealmSet}.
+     * @throws UnsupportedOperationException if the object to insert contains a {@link RealmSet}.
      * @see #copyToRealmOrUpdate(Iterable, ImportFlag...)
      * @see RealmSet
-     * @see RealmDictionary
-     * @see RealmMap
      */
     public void insertOrUpdate(Collection<? extends RealmModel> objects) {
         checkIfValidAndInTransaction();