Fix initialization of collection cache for extensions (#487)

Signed-off-by: BOUHOURS Antoine <[email protected]>
powsybl · Dec 6, 2024 · 0e44a4c · 0e44a4c
1 parent 169f4dd
commit 0e44a4c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/...rk-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/CollectionCache.java b/...rk-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/CollectionCache.java
@@ -120,6 +120,7 @@ public List<Resource<T>> getCachedResources() {
      */
     public void init() {
         fullyLoaded = true;
+        fullyLoadedExtensions = true;
     }
 
     public boolean isFullyLoaded() {

diff --git a/...tore-iidm-impl/src/test/java/com/powsybl/network/store/iidm/impl/CollectionCacheTest.java b/...tore-iidm-impl/src/test/java/com/powsybl/network/store/iidm/impl/CollectionCacheTest.java
@@ -334,6 +334,24 @@ public void removeResourceThenGetContainerTest() {
         assertEquals(1, collectionCache.getContainerResources(NETWORK_UUID, Resource.INITIAL_VARIANT_NUM, "vl1").size());
     }
 
+    @Test
+    public void initExtensionsTest() {
+        assertEquals(Arrays.asList(l1, l2, l3), collectionCache.getResources(NETWORK_UUID, Resource.INITIAL_VARIANT_NUM));
+        assertFalse(mockNetworkStoreClient.isExtensionAttributeLoaderCalled());
+        assertFalse(mockNetworkStoreClient.isExtensionAttributesLoaderByResourceTypeAndNameCalled());
+        assertFalse(mockNetworkStoreClient.isExtensionAttributesLoaderByIdCalled());
+        assertFalse(mockNetworkStoreClient.isExtensionAttributesLoaderByResourceTypeCalled());
+        collectionCache.init(); // it means we trust cache content and no more server loading
+        collectionCache.getExtensionAttributes(NETWORK_UUID, Resource.INITIAL_VARIANT_NUM, ResourceType.LOAD, "l1", "activePowerControl");
+        collectionCache.getAllExtensionsAttributesByResourceTypeAndExtensionName(NETWORK_UUID, Resource.INITIAL_VARIANT_NUM, ResourceType.LOAD, "activePowerControl");
+        collectionCache.getAllExtensionsAttributesByIdentifiableId(NETWORK_UUID, Resource.INITIAL_VARIANT_NUM, ResourceType.LOAD, "l1");
+        collectionCache.getAllExtensionsAttributesByResourceType(NETWORK_UUID, Resource.INITIAL_VARIANT_NUM, ResourceType.LOAD);
+        assertFalse(mockNetworkStoreClient.isExtensionAttributeLoaderCalled());
+        assertFalse(mockNetworkStoreClient.isExtensionAttributesLoaderByResourceTypeAndNameCalled());
+        assertFalse(mockNetworkStoreClient.isExtensionAttributesLoaderByIdCalled());
+        assertFalse(mockNetworkStoreClient.isExtensionAttributesLoaderByResourceTypeCalled());
+    }
+
     @Test
     public void getExtensionAttributesWithResourceNotCachedMustThrow() {
         PowsyblException exception = assertThrows(PowsyblException.class, () -> collectionCache.getExtensionAttributes(NETWORK_UUID, Resource.INITIAL_VARIANT_NUM, ResourceType.LOAD, "l1", "activePowerControl"));