add check on null value of rccpoint

gridsuite · Nov 19, 2024 · 6147888 · 6147888
1 parent 40f52c0
commit 6147888
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/main/java/org/gridsuite/modification/server/dto/DTOUtils.java b/src/main/java/org/gridsuite/modification/server/dto/DTOUtils.java
@@ -8,9 +8,7 @@
 
 import org.gridsuite.modification.server.entities.equipment.modification.ReactiveCapabilityCurveModificationEmbeddable;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * @author jamal kheyyad <jamal.kheyyad at rte-france.com>
@@ -20,15 +18,19 @@ private DTOUtils() {
     }
 
     public static List<ReactiveCapabilityCurveModificationInfos> convertToReactiveCapabilityCurveModificationInfos(List<ReactiveCapabilityCurveModificationEmbeddable> rCCpoints) {
-        return Optional.ofNullable(rCCpoints)
-                .orElse(Collections.emptyList()).stream().map(value -> value == null
+        if (rCCpoints == null || rCCpoints.isEmpty()) {
+            return null;
+        }
+        return rCCpoints.stream()
+                .map(value -> value == null
                         ? new ReactiveCapabilityCurveModificationInfos(null, null, null, null, null, null)
                         : new ReactiveCapabilityCurveModificationInfos(
                         value.getMinQ(),
                         value.getOldMinQ(),
                         value.getMaxQ(),
                         value.getOldMaxQ(),
                         value.getP(),
-                        value.getOldP())).toList();
+                        value.getOldP()))
+                .toList();
     }
 }