File tree Expand file tree Collapse file tree 1 file changed +3
-9
lines changed
src/main/java/org/gridsuite/computation/utils Expand file tree Collapse file tree 1 file changed +3
-9
lines changed Original file line number Diff line number Diff line change @@ -143,15 +143,7 @@ private static <X> Specification<X> appendTextFilterToSpecification(Specificatio
143
143
Specification <X > completedSpecification = specification ;
144
144
145
145
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 -> {
155
147
// this type can manage one value or a list of values (with OR)
156
148
if (resourceFilter .value () instanceof Collection <?> valueList ) {
157
149
// 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
164
156
} else if (resourceFilter .value () == null ) {
165
157
// if the value is null, we build an impossible specification (trick to remove later on ?)
166
158
completedSpecification = completedSpecification .and (not (completedSpecification ));
159
+ } else {
160
+ completedSpecification = completedSpecification .and (equals (resourceFilter .column (), resourceFilter .value ().toString ()));
167
161
}
168
162
}
169
163
case CONTAINS -> {
You can’t perform that action at this time.
0 commit comments