renaming reorga of AbstractCommonSpecificationBuilder

Signed-off-by: Mathieu DEHARBE <[email protected]>

Author: Mathieu-Deharbe

src/main/java/org/gridsuite/securityanalysis/server/repositories/specifications/ContingencySpecificationBuilder.java

@@ -42,11 +42,11 @@ public Path<UUID> getResultIdPath(Root<ContingencyEntity> root) {
 
     @Override
     public Specification<ContingencyEntity> addSpecificFilterWhenNoChildrenFilter() {
-        return this.childrenNotEmpty().or(SpecificationUtils.notEqual(ContingencyEntity.Fields.status, LoadFlowResult.ComponentResult.Status.CONVERGED.name()));
+        return this.addSpecificFilterWhenChildrenFilters().or(SpecificationUtils.notEqual(ContingencyEntity.Fields.status, LoadFlowResult.ComponentResult.Status.CONVERGED.name()));
     }
 
     @Override
-    public Specification<ContingencyEntity> childrenNotEmpty() {
+    public Specification<ContingencyEntity> addSpecificFilterWhenChildrenFilters() {
         return SpecificationUtils.isNotEmpty(ContingencyEntity.Fields.contingencyLimitViolations);
     }
 }

src/main/java/org/gridsuite/securityanalysis/server/repositories/specifications/SubjectLimitViolationSpecificationBuilder.java

@@ -39,12 +39,12 @@ public Path<UUID> getResultIdPath(Root<SubjectLimitViolationEntity> root) {
     }
 
     @Override
-    public Specification<SubjectLimitViolationEntity> childrenNotEmpty() {
+    public Specification<SubjectLimitViolationEntity> addSpecificFilterWhenChildrenFilters() {
         return SpecificationUtils.isNotEmpty(SubjectLimitViolationEntity.Fields.contingencyLimitViolations);
     }
 
     @Override
     public Specification<SubjectLimitViolationEntity> addSpecificFilterWhenNoChildrenFilter() {
-        return this.childrenNotEmpty();
+        return this.addSpecificFilterWhenChildrenFilters();
     }
 }

src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisResultService.java

@@ -290,7 +290,7 @@ public Page<ContingencyEntity> findContingenciesPage(UUID resultUuid, List<Resou
         assertNmKContingenciesSortAllowed(pageable.getSort());
         Pageable modifiedPageable = addDefaultSortAndRemoveChildrenSorting(pageable, ContingencyEntity.Fields.uuid);
 
-        Specification<ContingencyEntity> specification = contingencySpecificationBuilder.buildSpecification(resultUuid, resourceFilters);
+        Specification<ContingencyEntity> specification = contingencySpecificationBuilder.buildSpecification(resultUuid, resourceFilters, false);
         // WARN org.hibernate.hql.internal.ast.QueryTranslatorImpl -
         // HHH000104: firstResult/maxResults specified with collection fetch; applying in memory!
         // cf. https://vladmihalcea.com/fix-hibernate-hhh000104-entity-fetch-pagination-warning-message/
@@ -326,7 +326,7 @@ public Page<SubjectLimitViolationEntity> findSubjectLimitViolationsPage(UUID res
         Objects.requireNonNull(resultUuid);
         assertNmKSubjectLimitViolationsSortAllowed(pageable.getSort());
         Pageable modifiedPageable = addDefaultSortAndRemoveChildrenSorting(pageable, SubjectLimitViolationEntity.Fields.id);
-        Specification<SubjectLimitViolationEntity> specification = subjectLimitViolationSpecificationBuilder.buildSpecification(resultUuid, resourceFilters);
+        Specification<SubjectLimitViolationEntity> specification = subjectLimitViolationSpecificationBuilder.buildSpecification(resultUuid, resourceFilters, false);
         // WARN org.hibernate.hql.internal.ast.QueryTranslatorImpl -
         // HHH000104: firstResult/maxResults specified with collection fetch; applying in memory!
         // cf. https://vladmihalcea.com/fix-hibernate-hhh000104-entity-fetch-pagination-warning-message/