springboot3.5.6

pom.xml

@@ -43,7 +43,7 @@
 
     <properties>
 
-        <gridsuite-dependencies.version>44.0.0</gridsuite-dependencies.version>
+        <gridsuite-dependencies.version>44.1.0-SNAPSHOT</gridsuite-dependencies.version>
         <liquibase-hibernate-package>org.gridsuite.shortcircuit.server</liquibase-hibernate-package>
         <db-util.version>1.0.5</db-util.version>
         <mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>

src/main/java/org/gridsuite/shortcircuit/server/repositories/specifications/FaultResultSpecificationBuilder.java

@@ -49,15 +49,15 @@ public Specification<FaultResultEntity> buildSpecification(UUID resultUuid, List
         // since sql joins generates duplicate results, we need to use distinct here
         Specification<FaultResultEntity> specification = SpecificationUtils.distinct();
         // filter by resultUuid
-        specification = specification.and(Specification.where(resultUuidEquals(resultUuid)));
+        specification = specification.and(resultUuidEquals(resultUuid));
 
         return SpecificationUtils.appendFiltersToSpecification(specification, resourceFilters);
     }
 
     public Specification<FaultResultEntity> buildFeedersSpecification(List<UUID> uuids, List<ResourceFilterDTO> resourceFilters) {
         List<ResourceFilterDTO> childrenResourceFilter = resourceFilters.stream().filter(this::isNotParentFilter)
                 .toList();
-        Specification<FaultResultEntity> specification = Specification.where(uuidIn(uuids));
+        Specification<FaultResultEntity> specification = uuidIn(uuids);
 
         return SpecificationUtils.appendFiltersToSpecification(specification, childrenResourceFilter);
     }

src/main/java/org/gridsuite/shortcircuit/server/repositories/specifications/FeederResultSpecificationBuilder.java

@@ -29,7 +29,7 @@ public static Specification<FeederResultEntity> resultUuidEquals(UUID value) {
     }
 
     public static Specification<FeederResultEntity> buildSpecification(UUID resultUuid, List<ResourceFilterDTO> resourceFilters) {
-        Specification<FeederResultEntity> specification = Specification.where(resultUuidEquals(resultUuid));
+        Specification<FeederResultEntity> specification = resultUuidEquals(resultUuid);
         return SpecificationUtils.appendFiltersToSpecification(specification, resourceFilters);
     }
 }

src/main/java/org/gridsuite/shortcircuit/server/service/ShortCircuitAnalysisResultService.java

@@ -285,12 +285,26 @@ public Page<FaultResultEntity> findFaultResultsPage(ShortCircuitAnalysisResultEn
         // cf. https://vladmihalcea.com/fix-hibernate-hhh000104-entity-fetch-pagination-warning-message/
         // We must separate in two requests, one with pagination the other one with Join Fetch
 
-        Page<FaultResultRepository.EntityId> uuidPage = faultResultRepository.findBy(specification, q ->
-                q.project(FaultResultEntity.Fields.faultResultUuid)
-                        .as(FaultResultRepository.EntityId.class)
-                        .sortBy(modifiedPageable.getSort())
-                        .page(modifiedPageable)
-        );
+        List<String> projectionProperties = new ArrayList<>();
+        projectionProperties.add(FaultResultEntity.Fields.faultResultUuid);
+
+        for (Sort.Order order : modifiedPageable.getSort()) {
+            String property = order.getProperty();
+            if (!property.equals(FaultResultEntity.Fields.faultResultUuid) && !projectionProperties.contains(property)) {
+                projectionProperties.add(property);
+            }
+        }
+
+        Page<FaultResultRepository.EntityId> uuidPage = faultResultRepository.findBy(specification, q -> {
+            var query = q.as(FaultResultRepository.EntityId.class)
+                    .sortBy(modifiedPageable.getSort());
+            if (projectionProperties.size() == 1) {
+                query = query.project(FaultResultEntity.Fields.faultResultUuid);
+            } else {
+                query = query.project(projectionProperties.toArray(new String[0]));
+            }
+            return query.page(modifiedPageable);
+        });
 
         if (!uuidPage.hasContent()) {
             return Page.empty();