Fixed NOT_EQUAL implementation

Signed-off-by: Igor PIROG <[email protected]>

Author: ipirog

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

@@ -56,15 +56,15 @@ public static <X> Specification<X> equals(String field, String value) {
         );
     }
 
+    public static <X> Specification<X> notEqual(String field, String value) {
+        return (root, cq, cb) -> cb.notEqual(getColumnPath(root, field), value);
+    }
+
     public static <X> Specification<X> in(String field, List<String> values) {
         return (root, cq, cb) ->
                 cb.upper(getColumnPath(root, field).as(String.class)).in(values);
     }
 
-    public static <X> Specification<X> notEqual(String field, String value) {
-        return (root, cq, cb) -> cb.notEqual(getColumnPath(root, field), value);
-    }
-
     public static <X> Specification<X> contains(String field, String value) {
         return (root, cq, cb) -> cb.like(cb.upper(getColumnPath(root, field).as(String.class)), "%" + EscapeCharacter.DEFAULT.escape(value).toUpperCase() + "%", EscapeCharacter.DEFAULT.getEscapeCharacter());
     }
@@ -151,13 +151,20 @@ private static <X> Specification<X> appendTextFilterToSpecification(Specificatio
                             .map(Object::toString)
                             .map(String::toUpperCase)
                             .toList();
-                    completedSpecification = completedSpecification.and(generateInSpecification(resourceFilter.column(), inValues)
+                    completedSpecification = completedSpecification.and(
+                            resourceFilter.type() == ResourceFilterDTO.Type.NOT_EQUAL ?
+                            not(generateInSpecification(resourceFilter.column(), inValues)) :
+                            generateInSpecification(resourceFilter.column(), inValues)
                     );
                 } else if (resourceFilter.value() == null) {
                     // if the value is null, we build an impossible specification (trick to remove later on ?)
                     completedSpecification = completedSpecification.and(not(completedSpecification));
                 } else {
-                    completedSpecification = completedSpecification.and(equals(resourceFilter.column(), resourceFilter.value().toString()));
+                    completedSpecification = completedSpecification.and(
+                            resourceFilter.type() == ResourceFilterDTO.Type.NOT_EQUAL ?
+                            notEqual(resourceFilter.column(), resourceFilter.value().toString()) :
+                            equals(resourceFilter.column(), resourceFilter.value().toString())
+                    );
                 }
             }
             case CONTAINS -> {

src/test/java/org/gridsuite/computation/specification/CommonSpecificationBuilderTest.java

@@ -79,6 +79,8 @@ void testBuildSpecification() {
         // test data
         List<ResourceFilterDTO> resourceFilters = List.of(
                 new ResourceFilterDTO(TEXT, EQUALS, "dummyColumnValue", "dummyColumn"),
+                new ResourceFilterDTO(TEXT, NOT_EQUAL, "dummyColumnValue", "dummyColumn"),
+                new ResourceFilterDTO(TEXT, NOT_EQUAL, List.of("dummyColumnValue", "otherDummyColumnValue"), "dummyColumn"),
                 new ResourceFilterDTO(TEXT, STARTS_WITH, "dum", "dummyColumn"),
                 new ResourceFilterDTO(TEXT, IN, List.of("dummyColumnValue", "otherDummyColumnValue"), "dummyColumn"),
                 new ResourceFilterDTO(TEXT, IN, tooManyInValues, "dummyColumn"),