Merge pull request #1236 from microsoft/andrueastman/backingStore

Fixes unnecessary subscription invocations in backinstore.

Author: andrueastman

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.7] - 2024-04-23
+
+### Changed
+
+- Fixes performance bottleneck when using the backing store due to unnecessary subscription invocations.
+
 ## [1.1.6] - 2024-04-18
 
 ### Changed

components/abstractions/src/main/java/com/microsoft/kiota/store/InMemoryBackingStore.java

@@ -116,7 +116,10 @@ private Object getValueFromWrapper(final String entryKey, final Pair<Boolean, Ob
         if (wrapper != null) {
             final Boolean hasChanged = wrapper.getValue0();
             if (!this.returnOnlyChangedValues || Boolean.TRUE.equals(hasChanged)) {
-                ensureCollectionPropertyIsConsistent(entryKey, wrapper.getValue1());
+                if (Boolean.FALSE.equals(
+                        hasChanged)) { // no need property has already been flagged.
+                    ensureCollectionPropertyIsConsistent(entryKey, wrapper.getValue1());
+                }
                 if (wrapper.getValue1() instanceof Pair) {
                     Pair<?, ?> collectionTuple = (Pair<?, ?>) wrapper.getValue1();
                     return collectionTuple.getValue0();

components/abstractions/src/test/java/com/microsoft/kiota/store/InMemoryBackingStoreTest.java

@@ -9,6 +9,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
 
 class InMemoryBackingStoreTest {
     @Test
@@ -392,4 +394,32 @@ void TestsBackingStoreEmbeddedInModelWithByUpdatingNestedIBackedModelCollectionP
                 (List<String>) colleaguesList.get(0).getBackingStore().get("businessPhones");
         assertEquals(1, businessPhones.size());
     }
+
+    @Test
+    void TestsBackingStoreEmbeddedWithMultipleNestedModelsCollectionsAndAdditionalData() {
+        // Arrange dummy user with initialized backing store
+        AtomicInteger invocationCount = new AtomicInteger();
+        var testUser = new TestEntity();
+        testUser.getBackingStore()
+                .subscribe(
+                        "testSubscription",
+                        (keyString, oldObject, newObject) -> {
+                            invocationCount.getAndIncrement();
+                        });
+        testUser.setId("84c747c1-d2c0-410d-ba50-fc23e0b4abbe"); // invocation 1
+
+        var colleagues = new ArrayList<TestEntity>();
+        for (int i = 0; i < 10; i++) {
+            var colleague = new TestEntity();
+            colleague.setId(UUID.randomUUID().toString());
+            colleague.setBusinessPhones(Arrays.asList(new String[] {"+1 234 567 891"}));
+            colleague.getAdditionalData().put("count", i);
+            colleagues.add(colleague);
+        }
+        testUser.setColleagues(colleagues); // invocation 2
+
+        testUser.getBackingStore().setIsInitializationCompleted(true); // initialize
+
+        assertEquals(2, invocationCount.get()); // only for setting the id and the colleagues
+    }
 }

gradle.properties

@@ -26,7 +26,7 @@ org.gradle.caching=true
 mavenGroupId         = com.microsoft.kiota
 mavenMajorVersion = 1
 mavenMinorVersion = 1
-mavenPatchVersion = 6
+mavenPatchVersion = 7
 mavenArtifactSuffix =
 
 #These values are used to run functional tests