clean

Signed-off-by: David BRAQUART <[email protected]>

Author: dbraquart

src/main/java/org/gridsuite/securityanalysis/server/dto/PreContingencyLimitViolationResultDTO.java

@@ -14,9 +14,9 @@
 import lombok.experimental.FieldNameConstants;
 import org.gridsuite.securityanalysis.server.entities.PreContingencyLimitViolationEntity;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 
 @Getter
 @AllArgsConstructor
@@ -41,12 +41,13 @@ public static PreContingencyLimitViolationResultDTO toDto(PreContingencyLimitVio
     }
 
     public List<String> toCsvRow(Map<String, String> translations, String language) {
-        if (this.getLimitViolation() == null) {
-            return List.of();
+        List<String> csvRow = List.of();
+
+        if (this.getLimitViolation() != null) {
+            csvRow = List.of(this.getSubjectId());
+            return Stream.concat(csvRow.stream(), this.getLimitViolation().toCsvRow(translations, language).stream()).toList();
         }
-        List<String> csvRow = new ArrayList<>();
-        csvRow.add(this.getSubjectId());
-        csvRow.addAll(this.getLimitViolation().toCsvRow(translations, language));
+
         return csvRow;
     }
 }

src/test/java/org/gridsuite/securityanalysis/server/util/TestUtils.java

@@ -77,13 +77,11 @@ public static List<String> readLinesFromFilePath(String resourceFileName, int nb
             InputStream inputStream = Files.newInputStream(resourceFilePath);
             try (BufferedReader br = new BufferedReader(new InputStreamReader(inputStream))) {
                 String line;
-                int lineCount = 0;
-                while ((line = br.readLine()) != null && (nbLines == -1 || lineCount < nbLines)) {
-                    if (lineCount == 0 && line.startsWith(utf8Bom)) {
+                while ((line = br.readLine()) != null && (nbLines == -1 || lines.size() < nbLines)) {
+                    if (lines.isEmpty() && line.startsWith(utf8Bom)) {
                         line = line.substring(utf8Bom.length()); // skip BOM
                     }
                     lines.add(line);
-                    lineCount++;
                 }
             }
         } catch (IOException ex) {