Add collection impact

src/main/java/org/gridsuite/modification/server/dto/NetworkModificationResult.java

@@ -10,7 +10,6 @@
 import lombok.Builder;
 import lombok.Data;
 import org.gridsuite.modification.server.impacts.AbstractBaseImpact;
-import org.gridsuite.modification.server.impacts.AbstractBaseImpact.ImpactType;
 import org.gridsuite.modification.server.impacts.SimpleElementImpact;
 
 import java.util.List;
@@ -54,7 +53,7 @@ public ApplicationStatus max(ApplicationStatus other) {
 
     public Set<String> getImpactedSubstationsIds() {
         return networkImpacts.stream()
-            .filter(impact -> impact.getType() == ImpactType.SIMPLE)
+            .filter(impact -> impact.isSimple())
             .flatMap(impact -> ((SimpleElementImpact) impact).getSubstationIds().stream())
             .collect(Collectors.toCollection(TreeSet::new)); // using TreeSet to keep natural order
     }

src/main/java/org/gridsuite/modification/server/impacts/AbstractBaseImpact.java

@@ -6,6 +6,7 @@
  */
 package org.gridsuite.modification.server.impacts;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.powsybl.iidm.network.IdentifiableType;
@@ -45,4 +46,10 @@ public enum ImpactType {
     private ImpactType type;
 
     private IdentifiableType elementType;
+
+    @JsonIgnore
+    public abstract boolean isSimple();
+
+    @JsonIgnore
+    public abstract boolean isCollection();
 }

src/main/java/org/gridsuite/modification/server/impacts/CollectionElementImpact.java

@@ -24,4 +24,12 @@ public class CollectionElementImpact extends AbstractBaseImpact {
     public ImpactType getType() {
         return ImpactType.COLLECTION;
     }
+
+    public boolean isSimple() {
+        return false;
+    }
+
+    public boolean isCollection() {
+        return true;
+    }
 }

src/main/java/org/gridsuite/modification/server/impacts/SimpleElementImpact.java

@@ -11,6 +11,8 @@
 
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 /**
  * This class describes an element type network impact
  * This type of network impact only describes an individual impacted item and the list of associated substations
@@ -43,4 +45,27 @@ public enum SimpleImpactType {
     public ImpactType getType() {
         return ImpactType.SIMPLE;
     }
+
+    public boolean isSimple() {
+        return true;
+    }
+
+    public boolean isCollection() {
+        return false;
+    }
+
+    @JsonIgnore
+    public boolean isCreation() {
+        return getSimpleImpactType() == SimpleImpactType.CREATION;
+    }
+
+    @JsonIgnore
+    public boolean isModification() {
+        return getSimpleImpactType() == SimpleImpactType.MODIFICATION;
+    }
+
+    @JsonIgnore
+    public boolean isDeletion() {
+        return getSimpleImpactType() == SimpleImpactType.DELETION;
+    }
 }

src/main/java/org/gridsuite/modification/server/modifications/NetworkModificationApplicator.java

@@ -52,14 +52,16 @@ public class NetworkModificationApplicator {
 
     @Getter private final FilterService filterService;
 
+    @Value("${impacts.collection-threshold:50}")
     private Integer collectionThreshold;
 
     public NetworkModificationApplicator(NetworkStoreService networkStoreService, EquipmentInfosService equipmentInfosService,
-                                         ReportService reportService, FilterService filterService, @Value("${impacts.collection-threshold:50}") Integer collectionThreshold) {
+                                         ReportService reportService, FilterService filterService, /*TODO REMOVE*/ Integer collectionThreshold) {
         this.networkStoreService = networkStoreService;
         this.equipmentInfosService = equipmentInfosService;
         this.reportService = reportService;
         this.filterService = filterService;
+        // TODO REMOVE from constructor when VoltageInitReportTest becomes a @SpringBootTest
         this.collectionThreshold = collectionThreshold;
     }
 

src/main/java/org/gridsuite/modification/server/modifications/NetworkStoreListener.java

@@ -45,7 +45,7 @@ public class NetworkStoreListener implements NetworkListener {
 
     private final Set<SimpleElementImpact> simpleImpacts = new LinkedHashSet<>();
 
-    private Integer collectionThreshold;
+    private final Integer collectionThreshold;
 
     protected NetworkStoreListener(Network network, UUID networkUuid,
                                    NetworkStoreService networkStoreService, EquipmentInfosService equipmentInfosService, Integer collectionThreshold) {
@@ -274,51 +274,53 @@ private List<AbstractBaseImpact> flushNetworkImpacts() {
                     .build());
         }
 
-        return new ArrayList<>(reduceNetworkImpacts());
+        return reduceNetworkImpacts();
     }
 
     private boolean isAllNetworkImpacted() {
         Set<String> allImpactedSubstationsIds = simpleImpacts.stream().flatMap(i -> i.getSubstationIds().stream()).collect(Collectors.toSet());
         return allImpactedSubstationsIds.size() >= collectionThreshold;
     }
 
-    private Set<AbstractBaseImpact> reduceNetworkImpacts() {
-        Set<AbstractBaseImpact> reducedImpacts = new HashSet<>();
+    private List<AbstractBaseImpact> reduceNetworkImpacts() {
+        List<AbstractBaseImpact> reducedImpacts = new ArrayList<>();
         Set<String> impactedSubstationsIds = new HashSet<>();
 
         // Impacts type collection
-        Arrays.stream(IdentifiableType.values()).forEach(elementType -> {
-            Set<SimpleElementImpact> impacts = getSimpleImpacts(elementType);
+        for (IdentifiableType elementType : IdentifiableType.values()) {
+            List<SimpleElementImpact> impacts = getSimpleImpacts(elementType);
             if (impacts.size() >= collectionThreshold) {
                 reducedImpacts.add(CollectionElementImpact.builder()
                     .elementType(elementType)
                     .build());
             } else {
-                impactedSubstationsIds.addAll(impacts.stream().flatMap(i -> i.getSubstationIds().stream()).collect(Collectors.toSet()));
+                impactedSubstationsIds.addAll(impacts.stream().flatMap(i -> i.getSubstationIds().stream()).toList());
             }
-        });
+        }
 
         // Impacts type simple for substation only
-        reducedImpacts.addAll(impactedSubstationsIds.stream().map(id ->
-            SimpleElementImpact.builder()
-                .simpleImpactType(SimpleImpactType.MODIFICATION)
-                .elementType(IdentifiableType.SUBSTATION)
-                .elementId(id)
-                .substationIds(Set.of(id))
-                .build()
-        ).collect(Collectors.toSet()));
+        reducedImpacts.addAll(
+            impactedSubstationsIds.stream().map(id ->
+                SimpleElementImpact.builder()
+                    .simpleImpactType(SimpleImpactType.MODIFICATION)
+                    .elementType(IdentifiableType.SUBSTATION)
+                    .elementId(id)
+                    .substationIds(Set.of(id))
+                    .build()
+            ).toList()
+        );
 
         // Impacts type simple for deletion only
-        reducedImpacts.addAll(simpleImpacts.stream().filter(i -> i.getSimpleImpactType() == SimpleImpactType.DELETION).collect(Collectors.toSet()));
+        reducedImpacts.addAll(simpleImpacts.stream().filter(i -> i.isDeletion()).distinct().toList());
 
         return reducedImpacts;
     }
 
-    private Set<SimpleElementImpact> getSimpleImpacts(IdentifiableType elementType) {
+    private List<SimpleElementImpact> getSimpleImpacts(IdentifiableType elementType) {
         return simpleImpacts.stream()
-                .filter(i -> i.getSimpleImpactType() != SimpleImpactType.DELETION)
-                .filter(i -> i.getElementType() == elementType)
-                .collect(Collectors.toSet());
+                .filter(i -> !i.isDeletion() && i.getElementType() == elementType)
+                .distinct()
+                .toList();
     }
 
 }

src/test/java/org/gridsuite/modification/server/Impacts/ElementImpactTest.java

@@ -13,7 +13,6 @@
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
@@ -68,7 +67,7 @@ public void testElementImpact() throws IOException {
 
         assertEquals("[s1, s2, s3, s4]", result.getImpactedSubstationsIds().toString());
 
-        HashSet<AbstractBaseImpact> impactsSet = new HashSet<>(List.of(creationImpact, creationImpact, creationImpact));
+        Set<AbstractBaseImpact> impactsSet = Set.copyOf(List.of(creationImpact, creationImpact, creationImpact));
 
         assertEquals("[{\"type\":\"SIMPLE\",\"elementType\":\"LINE\",\"simpleImpactType\":\"CREATION\",\"elementId\":\"lineId\",\"substationIds\":[\"s1\",\"s2\"]}]", mapper.writeValueAsString(impactsSet));
     }
@@ -96,7 +95,7 @@ public void testCollectionElementImpact() {
 
         assertEquals(Set.of(), result.getImpactedSubstationsIds());
 
-        HashSet<AbstractBaseImpact> impactsSet = new HashSet<>(List.of(linesCollectionImpact, linesCollectionImpact, linesCollectionImpact));
+        Set<AbstractBaseImpact> impactsSet = Set.copyOf(List.of(linesCollectionImpact, linesCollectionImpact, linesCollectionImpact));
 
         assertEquals("[{\"type\":\"COLLECTION\",\"elementType\":\"LINE\"}]", mapper.writeValueAsString(impactsSet));
     }

src/test/java/org/gridsuite/modification/server/Impacts/TestImpactUtils.java

@@ -59,14 +59,14 @@ private static void testEmptyImpacts(ApplicationStatus globalApplicationStatusEx
         assertThat(networkModificationResult).recursivelyEquals(resultExpected);
     }
 
-    public static void testElementImpacts(ObjectMapper mapper, String resultAsString, int nbImpacts, Set<IdentifiableType> collectionImpactElementTypes, Set<String> substationIds) throws JsonProcessingException {
+    public static void testElementImpacts(ObjectMapper mapper, String resultAsString, int nbImpacts, Set<IdentifiableType> elementTypes, Set<String> substationIds) throws JsonProcessingException {
         Optional<NetworkModificationResult> networkModificationResult = mapper.readValue(resultAsString, new TypeReference<>() { });
         assertTrue(networkModificationResult.isPresent());
 
         assertEquals(ApplicationStatus.ALL_OK, networkModificationResult.get().getApplicationStatus());
         assertEquals(new TreeSet<>(substationIds), networkModificationResult.get().getImpactedSubstationsIds());
         assertEquals(nbImpacts, networkModificationResult.get().getNetworkImpacts().size());
-        assertThat(networkModificationResult.get().getNetworkImpacts()).containsAll(collectionImpactElementTypes.stream().map(TestImpactUtils::createCollectionElementImpact).toList());
+        assertThat(networkModificationResult.get().getNetworkImpacts()).containsAll(elementTypes.stream().map(TestImpactUtils::createCollectionElementImpact).toList());
     }
 
     public static void testElementImpacts(ObjectMapper mapper, String resultAsString, List<AbstractBaseImpact> elementImpactsExpected) throws JsonProcessingException {
@@ -94,7 +94,7 @@ public static void testElementImpact(SimpleImpactType type, ObjectMapper mapper,
         NetworkModificationResult resultExpected = NetworkModificationResult.builder()
             .applicationStatus(ApplicationStatus.ALL_OK)
             .lastGroupApplicationStatus(ApplicationStatus.ALL_OK)
-            .networkImpacts(createSubstationImpacts(new HashSet<>(substationIds)))
+            .networkImpacts(createSubstationImpacts(substationIds))
             .build();
         assertThat(networkModificationResult.get()).recursivelyEquals(resultExpected);
     }
@@ -157,20 +157,18 @@ public static void testBranchImpacts(ObjectMapper mapper, SimpleImpactType type,
     private static List<AbstractBaseImpact> createBranchImpacts(SimpleImpactType type, IdentifiableType branchType, String branchId,
                                                                  String breakerId1, String disconnectorId1, String substationId1,
                                                                  String breakerId2, String disconnectorId2, String substationId2) {
-        LinkedList<AbstractBaseImpact> impacts = new LinkedList<>();
+        List<AbstractBaseImpact> impacts = new ArrayList<>();
         if (type == SimpleImpactType.DELETION) {
             List<SimpleElementImpact> switchImpacts = List.of(
-                createElementImpact(SimpleImpactType.DELETION, branchType, branchId, new HashSet<>(List.of(substationId1, substationId2))),
+                createElementImpact(SimpleImpactType.DELETION, branchType, branchId, Set.copyOf(List.of(substationId1, substationId2))),
                 createElementImpact(SimpleImpactType.DELETION, IdentifiableType.SWITCH, breakerId1, Set.of(substationId1)),
                 createElementImpact(SimpleImpactType.DELETION, IdentifiableType.SWITCH, disconnectorId1, Set.of(substationId1)),
                 createElementImpact(SimpleImpactType.DELETION, IdentifiableType.SWITCH, breakerId2, Set.of(substationId2)),
                 createElementImpact(SimpleImpactType.DELETION, IdentifiableType.SWITCH, disconnectorId2, Set.of(substationId2))
             );
             impacts.addAll(0, switchImpacts);
         } else {
-            Set<String> substationIds = new HashSet<>();
-            substationIds.addAll(List.of(substationId1, substationId2));
-            impacts.addAll(createSubstationImpacts(substationIds));
+            impacts.addAll(createSubstationImpacts(Set.copyOf(List.of(substationId1, substationId2))));
         }
         return impacts;
     }

src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java

@@ -29,7 +29,6 @@
 import org.gridsuite.modification.server.elasticsearch.EquipmentInfosService;
 import org.gridsuite.modification.server.elasticsearch.TombstonedEquipmentInfosRepository;
 import org.gridsuite.modification.server.impacts.AbstractBaseImpact;
-import org.gridsuite.modification.server.impacts.CollectionElementImpact;
 import org.gridsuite.modification.server.impacts.SimpleElementImpact;
 import org.gridsuite.modification.server.modifications.ModificationUtils;
 import org.gridsuite.modification.server.repositories.NetworkModificationRepository;
@@ -1135,11 +1134,6 @@ private void testMultipleDeletionImpacts(String networkModificationResultAsStrin
 
                 // Equipment has been added as TombstonedEquipmentInfos in ElasticSearch
                 assertTrue(existTombstonedEquipmentInfos(simpleImpact.getElementId(), TEST_NETWORK_ID, VariantManagerConstants.INITIAL_VARIANT_ID));
-            } else if (impact instanceof CollectionElementImpact) {
-                // Hard to check because
-                // Not all equipments of this collection impact type have been removed from the network
-                // Not all equipments of this collection impact type have been added as TombstonedEquipmentInfos in ElasticSearch
-                // There is no equipmentType in the TombstonedEquipmentInfos entity
             }
         }
 

src/test/java/org/gridsuite/modification/server/modifications/byfilterdeletion/AbstractByFilterDeletionTest.java

@@ -17,6 +17,8 @@
 import java.util.stream.Collectors;
 
 import static org.gridsuite.modification.server.utils.TestUtils.assertLogMessage;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.gridsuite.modification.server.Impacts.TestImpactUtils.createCollectionElementImpact;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -36,7 +38,7 @@ public abstract class AbstractByFilterDeletionTest extends AbstractNetworkModifi
 
     @Override
     protected void assertResultImpacts(List<AbstractBaseImpact> impacts) {
-        // TODO later
+        assertThat(impacts).containsExactly(createCollectionElementImpact(getIdentifiableType()));
     }
 
     @Test

src/test/java/org/gridsuite/modification/server/modifications/tabularcreations/TabularGeneratorCreationsTest.java

@@ -9,13 +9,15 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.powsybl.iidm.network.EnergySource;
+import com.powsybl.iidm.network.IdentifiableType;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.network.extensions.ConnectablePosition;
 import lombok.SneakyThrows;
 import org.gridsuite.modification.server.ModificationType;
 import org.gridsuite.modification.server.dto.GeneratorCreationInfos;
 import org.gridsuite.modification.server.dto.ModificationInfos;
 import org.gridsuite.modification.server.dto.TabularCreationInfos;
+import org.gridsuite.modification.server.impacts.AbstractBaseImpact;
 import org.gridsuite.modification.server.modifications.AbstractNetworkModificationTest;
 import org.gridsuite.modification.server.utils.NetworkCreation;
 import org.junit.Test;
@@ -29,7 +31,9 @@
 
 import static com.vladmihalcea.sql.SQLStatementCountValidator.assertSelectCount;
 import static com.vladmihalcea.sql.SQLStatementCountValidator.reset;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.gridsuite.modification.server.utils.TestUtils.assertLogMessage;
+import static org.gridsuite.modification.server.Impacts.TestImpactUtils.createCollectionElementImpact;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -156,6 +160,11 @@ protected void assertAfterNetworkModificationDeletion() {
         assertNull(getNetwork().getGenerator("id4"));
     }
 
+    @Override
+    protected void assertResultImpacts(List<AbstractBaseImpact> impacts) {
+        assertThat(impacts).containsExactly(createCollectionElementImpact(IdentifiableType.GENERATOR));
+    }
+
     @Test
     public void testCheckSqlRequestsCount() throws Exception {
         UUID modificationUuid = saveModification(buildModification());

src/test/resources/application-default.yml

@@ -4,18 +4,18 @@ spring:
     properties:
       dialect: org.hibernate.dialect.H2Dialect
       hibernate:
-        '[format_sql]': true
-        '[generate_statistics]': true
+        format_sql: true
+        generate_statistics: true
         dialect: org.hibernate.dialect.H2Dialect
     hibernate:
       #to turn off schema validation that fails (because of clob types) and blocks tests even if the schema is compatible
       ddl-auto: none
 logging:
-  level: 
-    '[org.springframework.orm.jpa]': INFO
-    '[org.springframework.transaction]': INFO
-    '[org.hibernate.SQL]': INFO
-    '[org.hibernate.type.descriptor.sql.BasicBinder]': INFO
+  level:
+    org.springframework.orm.jpa: INFO
+    org.springframework.transaction: INFO
+    org.hibernate.SQL: INFO
+    org.hibernate.type.descriptor.sql.BasicBinder: INFO
 gridsuite:
   services:
     report-server: