Skip to content

Add support for EQUALS number filter in SpecificationUtils #11

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
merged 1 commit into from
Aug 19, 2025
Merged

Add support for EQUALS number filter in SpecificationUtils #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions src/main/java/org/gridsuite/computation/utils/SpecificationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
/**
* Copyright (c) 2025, RTE (http://www.rte-france.com)
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

/**
* Copyright (c) 2025, RTE (http://www.rte-france.com)
* This Source Code Form is subject to the terms of the Mozilla Public
Expand Down Expand Up @@ -236,6 +229,8 @@ private static <X> Specification<X> appendNumberFilterToSpecification(Specificat
specification.and(lessThanOrEqual(resourceFilter.column(), valueDouble, tolerance));
case GREATER_THAN_OR_EQUAL ->
specification.and(greaterThanOrEqual(resourceFilter.column(), valueDouble, tolerance));
case EQUALS -> specification.and(greaterThanOrEqual(resourceFilter.column(), valueDouble, tolerance))
.and(lessThanOrEqual(resourceFilter.column(), valueDouble, tolerance));
default ->
throw new IllegalArgumentException("The filter type " + resourceFilter.type() + " is not supported with the data type " + resourceFilter.dataType());
};
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/org/gridsuite/computation/specification/CommonSpecificationBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ void testBuildSpecification() {
new ResourceFilterDTO(TEXT, CONTAINS, List.of("partialValue1", "partialValue2"), "dummyColumn"),
new ResourceFilterDTO(NUMBER, LESS_THAN_OR_EQUAL, 100.0157, "dummyNumberColumn"),
new ResourceFilterDTO(NUMBER, GREATER_THAN_OR_EQUAL, 10, "dummyNumberColumn", 0.1),
new ResourceFilterDTO(NUMBER, NOT_EQUAL, 10, "parent.dummyNumberColumn")
new ResourceFilterDTO(NUMBER, NOT_EQUAL, 10, "parent.dummyNumberColumn"),
new ResourceFilterDTO(NUMBER, EQUALS, 42.000, "dummyNumberColumn")
);
List<ResourceFilterDTO> resourceFiltersWithChildren = List.of(
new ResourceFilterDTO(NUMBER, NOT_EQUAL, 10, "parent.dummyNumberColumn")
Expand Down