no need for a consumer when we can return

Author: Tristan-WorkGH

src/main/java/org/gridsuite/network/map/dto/common/CurrentLimitsData.java

@@ -8,8 +8,8 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
 import lombok.With;
 import org.springframework.util.CollectionUtils;
 
@@ -22,7 +22,7 @@
  */
 @Builder
 @With
-@Getter
+@Data
 @EqualsAndHashCode
 public class CurrentLimitsData {
     // may be null in case we just need the selected limit set and don't really need its name/id

src/main/java/org/gridsuite/network/map/dto/mapper/LineInfosMapper.java

@@ -65,11 +65,10 @@ private static LineFormInfos toFormInfos(Identifiable<?> identifiable) {
                 .b1(line.getB1())
                 .g2(line.getG2())
                 .b2(line.getB2())
-                .properties(getProperties(line))
                 .selectedOperationalLimitsGroup1(line.getSelectedOperationalLimitsGroupId1().orElse(null))
-                .selectedOperationalLimitsGroup2(line.getSelectedOperationalLimitsGroupId2().orElse(null));
-
-        mergeCurrentLimits(line.getOperationalLimitsGroups1(), line.getOperationalLimitsGroups2(), builder::currentLimits);
+                .selectedOperationalLimitsGroup2(line.getSelectedOperationalLimitsGroupId2().orElse(null))
+                .currentLimits(mergeCurrentLimits(line.getOperationalLimitsGroups1(), line.getOperationalLimitsGroups2()))
+                .properties(getProperties(line));
 
         buildCurrentLimits(line.getOperationalLimitsGroups1(), builder::currentLimits1);
         buildCurrentLimits(line.getOperationalLimitsGroups2(), builder::currentLimits2);

src/main/java/org/gridsuite/network/map/dto/mapper/TwoWindingsTransformerInfosMapper.java

@@ -66,6 +66,9 @@ private static TwoWindingsTransformerFormInfos toFormInfos(Identifiable<?> ident
                 .g(twoWT.getG())
                 .ratedU1(twoWT.getRatedU1())
                 .ratedU2(twoWT.getRatedU2())
+                .selectedOperationalLimitsGroup1(twoWT.getSelectedOperationalLimitsGroupId1().orElse(null))
+                .selectedOperationalLimitsGroup2(twoWT.getSelectedOperationalLimitsGroupId2().orElse(null))
+                .currentLimits(mergeCurrentLimits(twoWT.getOperationalLimitsGroups1(), twoWT.getOperationalLimitsGroups2()))
                 .properties(getProperties(twoWT));
 
         builder.busOrBusbarSectionId1(getBusOrBusbarSection(terminal1))
@@ -77,10 +80,6 @@ private static TwoWindingsTransformerFormInfos toFormInfos(Identifiable<?> ident
         builder.q2(nullIfNan(terminal2.getQ()));
         builder.i1(nullIfNan(terminal1.getI()));
         builder.i2(nullIfNan(terminal2.getI()));
-        builder.selectedOperationalLimitsGroup1(twoWT.getSelectedOperationalLimitsGroupId1().orElse(null));
-        builder.selectedOperationalLimitsGroup2(twoWT.getSelectedOperationalLimitsGroupId2().orElse(null));
-
-        mergeCurrentLimits(twoWT.getOperationalLimitsGroups1(), twoWT.getOperationalLimitsGroups2(), builder::currentLimits);
 
         buildCurrentLimits(twoWT.getOperationalLimitsGroups1(), builder::currentLimits1);
         buildCurrentLimits(twoWT.getOperationalLimitsGroups2(), builder::currentLimits2);

src/main/java/org/gridsuite/network/map/dto/utils/ElementUtils.java

@@ -13,6 +13,7 @@
 import org.gridsuite.network.map.dto.common.*;
 import org.gridsuite.network.map.dto.definition.extension.*;
 import org.gridsuite.network.map.dto.definition.threewindingstransformer.ThreeWindingsTransformerTabInfos;
+import org.springframework.lang.Nullable;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
@@ -97,11 +98,9 @@ public static void buildCurrentLimits(Collection<OperationalLimitsGroup> current
      * Combine 2 sides in one list.
      * @return id of the selected operation limits group 1 and 2 if they have been renamed
      */
-    public static void mergeCurrentLimits(Collection<OperationalLimitsGroup> operationalLimitsGroups1,
-                                                          Collection<OperationalLimitsGroup> operationalLimitsGroups2,
-                                                          Consumer<List<CurrentLimitsData>> build) {
-        List<CurrentLimitsData> mergedLimitsData = new ArrayList<>();
-
+    @Nullable
+    public static List<CurrentLimitsData> mergeCurrentLimits(final Collection<OperationalLimitsGroup> operationalLimitsGroups1,
+                                                             final Collection<OperationalLimitsGroup> operationalLimitsGroups2) {
         // Build temporary limit from side 1 and 2
         final List<CurrentLimitsData> currentLimitsData1 = operationalLimitsGroups1.stream()
             .map(ElementUtils::operationalLimitsGroupToMapDataCurrentLimits).toList();
@@ -112,20 +111,19 @@ public static void mergeCurrentLimits(Collection<OperationalLimitsGroup> operati
         // simple case : one of the arrays are empty
         if (currentLimitsData2.isEmpty() && !currentLimitsData1.isEmpty()) {
             for (final CurrentLimitsData currentLimitsData : currentLimitsData1) {
-                mergedLimitsData.add(currentLimitsData.withApplicability(SIDE1));
+                currentLimitsData.setApplicability(SIDE1);
             }
-            build.accept(mergedLimitsData);
-            return;
+            return currentLimitsData1;
         }
         if (currentLimitsData1.isEmpty() && !currentLimitsData2.isEmpty()) {
             for (final CurrentLimitsData currentLimitsData : currentLimitsData2) {
-                mergedLimitsData.add(currentLimitsData.withApplicability(SIDE2));
+                currentLimitsData.setApplicability(SIDE2);
             }
-            build.accept(mergedLimitsData);
-            return;
+            return currentLimitsData2;
         }
 
         // more complex case
+        List<CurrentLimitsData> mergedLimitsData = new ArrayList<>(currentLimitsData1.size() + currentLimitsData2.size());
         for (final CurrentLimitsData limitsData : currentLimitsData1) {
             final Optional<CurrentLimitsData> l2 = currentLimitsData2.stream().filter(l -> l.getId().equals(limitsData.getId())).findFirst();
             if (l2.isPresent()) {
@@ -151,9 +149,7 @@ public static void mergeCurrentLimits(Collection<OperationalLimitsGroup> operati
             mergedLimitsData.add(limitsData.withApplicability(SIDE2));
         }
 
-        if (!mergedLimitsData.isEmpty()) {
-            build.accept(mergedLimitsData);
-        }
+        return mergedLimitsData.isEmpty() ? null : mergedLimitsData;
     }
 
     public static Optional<StandbyAutomatonInfos> toStandbyAutomaton(StaticVarCompensator staticVarCompensator) {

src/test/java/org/gridsuite/network/map/utils/ElementUtilsTest.java

@@ -23,7 +23,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
 import java.util.stream.Stream;
 
 @ExtendWith({ SoftAssertionsExtension.class, MockitoExtension.class })
@@ -161,19 +160,17 @@ void nonNanPermLimitAndNonEmptyTempLimit() {
         }
     }
 
-    /** Tests for {@link ElementUtils#mergeCurrentLimits(Collection, Collection, Consumer)} */
+    /** Tests for {@link ElementUtils#mergeCurrentLimits(Collection, Collection)} */
     @Nested
-    @DisplayName("fn mergeCurrentLimits(…, …, …)")
+    @DisplayName("fn mergeCurrentLimits(…, …)")
     class MergeCurrentLimitsTest {
         @ParameterizedTest(name = ParameterizedTest.INDEX_PLACEHOLDER)
         @MethodSource("mergeCurrentLimitsTestData")
         void shouldNotThrow(
                 final Collection<OperationalLimitsGroup> olg1,
                 final Collection<OperationalLimitsGroup> olg2,
                 final List<CurrentLimitsData> expected) {
-            AtomicReference<List<CurrentLimitsData>> results = new AtomicReference<>();
-            ElementUtils.mergeCurrentLimits(olg1, olg2, results::set);
-            assertThat(results.get()).as("Result").isEqualTo(expected);
+            assertThat(ElementUtils.mergeCurrentLimits(olg1, olg2)).as("Result").isEqualTo(expected);
         }
 
         private static Stream<Arguments> mergeCurrentLimitsTestData() {
@@ -275,8 +272,8 @@ void shouldThrowOnNanLimit(final SoftAssertions softly) {
             final var l1 = List.of(MockUtils.mockOperationalLimitsGroup("group1", Double.NaN, List.of(MockUtils.mockTemporaryLimits(100, "temporary1", 50.0), MockUtils.mockTemporaryLimits(150, "temporary2", 70.0))));
             final var l2 = List.of(MockUtils.mockOperationalLimitsGroup("group1", 220.0, List.of(MockUtils.mockTemporaryLimits(100, "temporary1", 50.0), MockUtils.mockTemporaryLimits(150, "temporary2", 70.0))));
             AtomicReference<List<CurrentLimitsData>> results = new AtomicReference<>();
-            softly.assertThatNullPointerException().isThrownBy(() -> ElementUtils.mergeCurrentLimits(l1, l2, results::set));
-            softly.assertThatNullPointerException().isThrownBy(() -> ElementUtils.mergeCurrentLimits(l2, l1, results::set));
+            softly.assertThatNullPointerException().isThrownBy(() -> ElementUtils.mergeCurrentLimits(l1, l2));
+            softly.assertThatNullPointerException().isThrownBy(() -> ElementUtils.mergeCurrentLimits(l2, l1));
         }
 
         // TODO what to do when one side has duplicate ID?