Skip to content

Commit 1d7549f

Browse files
committed
It seems there are misuses of EQUALS operator with a list of parameters :/
Signed-off-by: Igor PIROG <[email protected]>
1 parent 3b08d72 commit 1d7549f

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

src/main/java/org/gridsuite/computation/utils/SpecificationUtils.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,15 +143,7 @@ private static <X> Specification<X> appendTextFilterToSpecification(Specificatio
143143
Specification<X> completedSpecification = specification;
144144

145145
switch (resourceFilter.type()) {
146-
case NOT_EQUAL, EQUALS -> {
147-
if (resourceFilter.value() == null) {
148-
// if the value is null, we build an impossible specification (trick to remove later on ?)
149-
completedSpecification = completedSpecification.and(not(completedSpecification));
150-
} else {
151-
completedSpecification = completedSpecification.and(equals(resourceFilter.column(), resourceFilter.value().toString()));
152-
}
153-
}
154-
case IN -> {
146+
case NOT_EQUAL, EQUALS, IN -> {
155147
// this type can manage one value or a list of values (with OR)
156148
if (resourceFilter.value() instanceof Collection<?> valueList) {
157149
// implicitly an IN resourceFilter type because only IN may have value lists as filter value
@@ -164,6 +156,8 @@ private static <X> Specification<X> appendTextFilterToSpecification(Specificatio
164156
} else if (resourceFilter.value() == null) {
165157
// if the value is null, we build an impossible specification (trick to remove later on ?)
166158
completedSpecification = completedSpecification.and(not(completedSpecification));
159+
} else {
160+
completedSpecification = completedSpecification.and(equals(resourceFilter.column(), resourceFilter.value().toString()));
167161
}
168162
}
169163
case CONTAINS -> {

0 commit comments

Comments
 (0)