Skip to content

Upgrade for powsybl-dependencies version 2025.2.0 #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheMaskedTurtle merged 2 commits into from
Nov 17, 2025
Merged

Upgrade for powsybl-dependencies version 2025.2.0 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a81e2dd
Upgrade for powsybl-dependencies version 2025.2.0
FranckLecuyer Oct 23, 2025
c901b6a
Merge branch 'main' into powsybl_dependencies_v2025.2.0
FranckLecuyer Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<lombok.version>1.18.34</lombok.version>
<org-apache-commons.version>4.4</org-apache-commons.version>
<org.hamcrest.version>2.2</org.hamcrest.version>
<powsybl-dependencies.version>2025.1.0</powsybl-dependencies.version>
<powsybl-dependencies.version>2025.2.0</powsybl-dependencies.version>
<sonar.organization>gridsuite</sonar.organization>
<sonar.projectKey>org.gridsuite:filter</sonar.projectKey>
</properties>
Expand Down
13 changes: 13 additions & 0 deletions src/main/java/org/gridsuite/filter/utils/FilterServiceUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.gridsuite.filter.identifierlistfilter.IdentifierListFilter;

import java.util.List;
import java.util.Set;
import java.util.UUID;

/**
Expand Down Expand Up @@ -41,6 +42,18 @@ public static List<IdentifiableAttributes> getIdentifiableAttributes(AbstractFil
}
}

public static List<FilterEquipments> getFilterEquipmentsFromUuid(Network network, List<UUID> uuids, FilterLoader filterLoader) {
return getFilterEquipmentsFromUuid(network, uuids, filterLoader, Set.of());
}

public static List<FilterEquipments> getFilterEquipmentsFromUuid(Network network, List<UUID> uuids, FilterLoader filterLoader, Set<FilterType> filterTypesToExclude) {
List<AbstractFilter> 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<FilterEquipments> getFilterEquipmentsFromUuid(Network network, UUID uuid, FilterLoader filterLoader) {
List<AbstractFilter> filters = filterLoader.getFilters(List.of(uuid));
return filters.stream()
Expand Down