From a81e2dd5a5786285b697eea6e3c7a77622816412 Mon Sep 17 00:00:00 2001 From: Franck LECUYER Date: Thu, 23 Oct 2025 15:56:32 +0200 Subject: [PATCH] Upgrade for powsybl-dependencies version 2025.2.0 Signed-off-by: Franck LECUYER --- pom.xml | 2 +- .../gridsuite/filter/utils/FilterServiceUtils.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1d219b6..1967579 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 1.18.34 4.4 2.2 - 2025.1.0 + 2025.2.0 gridsuite org.gridsuite:filter diff --git a/src/main/java/org/gridsuite/filter/utils/FilterServiceUtils.java b/src/main/java/org/gridsuite/filter/utils/FilterServiceUtils.java index c37726f..11e5226 100644 --- a/src/main/java/org/gridsuite/filter/utils/FilterServiceUtils.java +++ b/src/main/java/org/gridsuite/filter/utils/FilterServiceUtils.java @@ -14,6 +14,7 @@ import org.gridsuite.filter.identifierlistfilter.IdentifierListFilter; import java.util.List; +import java.util.Set; import java.util.UUID; /** @@ -41,6 +42,18 @@ public static List getIdentifiableAttributes(AbstractFil } } + public static List getFilterEquipmentsFromUuid(Network network, List uuids, FilterLoader filterLoader) { + return getFilterEquipmentsFromUuid(network, uuids, filterLoader, Set.of()); + } + + public static List getFilterEquipmentsFromUuid(Network network, List uuids, FilterLoader filterLoader, Set filterTypesToExclude) { + List filters = filterLoader.getFilters(uuids); + return filters.stream() + .filter(filter -> filter != null && !filterTypesToExclude.contains(filter.getType())) + .map(filter -> filter.toFilterEquipments(FilterServiceUtils.getIdentifiableAttributes(filter, network, filterLoader))) + .toList(); + } + public static List getFilterEquipmentsFromUuid(Network network, UUID uuid, FilterLoader filterLoader) { List filters = filterLoader.getFilters(List.of(uuid)); return filters.stream()