From 0503e32c0c8f0d288ce22a4f4d9ce96062cfd965 Mon Sep 17 00:00:00 2001
From: Samir Romdhani <samir.romdhani_externe@rte-france.com>
Date: Tue, 19 May 2026 11:18:54 +0200
Subject: [PATCH] optimize Network#getConnectables(Class), avoid full scan

Signed-off-by: Samir Romdhani <samir.romdhani_externe@rte-france.com>
---
 .../java/com/powsybl/iidm/network/impl/NetworkImpl.java   | 2 +-
 .../java/com/powsybl/iidm/network/impl/NetworkIndex.java  | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/NetworkImpl.java b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/NetworkImpl.java
index 6ac2d051e74..646b50479cf 100644
--- a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/NetworkImpl.java
+++ b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/NetworkImpl.java
@@ -954,7 +954,7 @@ public <C extends Connectable> Iterable<C> getConnectables(Class<C> clazz) {
 
     @Override
     public <C extends Connectable> Stream<C> getConnectableStream(Class<C> clazz) {
-        return index.getAll().stream().filter(clazz::isInstance).map(clazz::cast);
+        return index.streamAssignable(clazz);
     }
 
     @Override
diff --git a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/NetworkIndex.java b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/NetworkIndex.java
index 1f5012ac875..1da8fd470b5 100644
--- a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/NetworkIndex.java
+++ b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/NetworkIndex.java
@@ -14,6 +14,7 @@
 
 import java.io.PrintStream;
 import java.util.*;
+import java.util.stream.Stream;
 
 /**
  *
@@ -119,6 +120,13 @@ <T extends Identifiable> Set<T> getAll(Class<T> clazz) {
         return (Set<T>) all;
     }
 
+    <T extends Identifiable> Stream<T> streamAssignable(Class<T> clazz) {
+        return objectsByClass.entrySet().stream()
+                .filter(e -> clazz.isAssignableFrom(e.getKey()))
+                .flatMap(e -> e.getValue().stream())
+                .map(clazz::cast);
+    }
+
     boolean contains(String id) {
         String idFromPotentialAlias = idByAlias.getOrDefault(id, id);
         checkId(idFromPotentialAlias);