clean : unused modificationtoexclude

Signed-off-by: maissa SOUISSI <[email protected]>
gridsuite · Oct 10, 2024 · 7c02126 · 7c02126
1 parent ffd24f7
commit 7c02126
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 31 deletions.
diff --git a/src/main/java/org/gridsuite/modification/server/dto/BuildInfos.java b/src/main/java/org/gridsuite/modification/server/dto/BuildInfos.java
@@ -13,9 +13,7 @@
 import lombok.Setter;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.UUID;
 
 /**
@@ -35,9 +33,4 @@ public class BuildInfos {
 
     private List<ReportInfos> reportsInfos = new ArrayList<>();
 
-    private Set<UUID> modificationsToExclude = new HashSet<>();
-
-    public void addModificationToExclude(UUID modificationUuid) {
-        modificationsToExclude.add(modificationUuid);
-    }
 }
diff --git a/src/main/java/org/gridsuite/modification/server/service/NetworkModificationService.java b/src/main/java/org/gridsuite/modification/server/service/NetworkModificationService.java
@@ -183,9 +183,7 @@ public NetworkModificationResult buildVariant(@NonNull UUID networkUuid, @NonNul
                 }
                 modificationInfos.add(
                     Pair.of(reporterId,
-                        modificationsByGroup.stream()
-                            .filter(e -> !buildInfos.getModificationsToExclude().contains(e.getUuid()))
-                            .collect(Collectors.toList()))
+                        modificationsByGroup)
                 );
 
             }

diff --git a/src/test/java/org/gridsuite/modification/server/service/BuildTest.java b/src/test/java/org/gridsuite/modification/server/service/BuildTest.java
@@ -280,8 +280,7 @@ public void runBuildForLineSplits() throws Exception {
         BuildInfos buildInfos = new BuildInfos(VariantManagerConstants.INITIAL_VARIANT_ID,
             NetworkCreation.VARIANT_ID,
             List.of(TEST_GROUP_ID, TEST_GROUP_ID_2),
-            List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1), new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_2)),
-            new HashSet<>());
+            List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1), new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_2)));
         mockMvc.perform(post(uriString, TEST_NETWORK_ID)
                                 .contentType(MediaType.APPLICATION_JSON)
                                 .content(mapper.writeValueAsString(buildInfos)))
@@ -297,8 +296,7 @@ public void runBuildForLineSplits() throws Exception {
         BuildInfos newBuildInfos = new BuildInfos(NetworkCreation.VARIANT_ID,
             VARIANT_ID_2,
             List.of(),
-            List.of(),
-            new HashSet<>());
+            List.of());
         mockMvc.perform(post(uriString, TEST_NETWORK_ID)
                                 .contentType(MediaType.APPLICATION_JSON)
                                 .content(mapper.writeValueAsString(newBuildInfos)))
@@ -322,8 +320,7 @@ public void runBuildWithEmptyGroupTest() throws Exception {
         BuildInfos buildInfos = new BuildInfos(VariantManagerConstants.INITIAL_VARIANT_ID,
             NetworkCreation.VARIANT_ID,
             List.of(TEST_GROUP_ID),
-            List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1)),
-            new HashSet<>());
+            List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1)));
         String expectedBody = mapper.writeValueAsString(ReportNode.newRootReportNode()
                 .withMessageTemplate(TEST_SUB_REPORTER_ID_1.toString(), TEST_SUB_REPORTER_ID_1.toString())
                 .build());
@@ -425,8 +422,7 @@ public void testIndexationAfterBuild() throws Exception {
         BuildInfos buildInfos = new BuildInfos(VariantManagerConstants.INITIAL_VARIANT_ID,
             NetworkCreation.VARIANT_ID,
             List.of(TEST_GROUP_ID),
-            List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1)),
-            new HashSet<>());
+            List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1)));
 
         // Build variant
         networkModificationService.buildVariant(TEST_NETWORK_ID, buildInfos);
@@ -704,8 +700,7 @@ public void runBuildTest() throws Exception {
         BuildInfos buildInfos = new BuildInfos(VariantManagerConstants.INITIAL_VARIANT_ID,
             NetworkCreation.VARIANT_ID,
             List.of(TEST_GROUP_ID, TEST_GROUP_ID_2),
-            List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1), new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_2)),
-            new HashSet<>());
+            List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1), new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_2)));
         String buildInfosJson = objectWriter.writeValueAsString(buildInfos);
         mockMvc.perform(post(uriString, TEST_NETWORK_ID).contentType(MediaType.APPLICATION_JSON).content(buildInfosJson))
             .andExpect(status().isOk());
@@ -803,8 +798,7 @@ public void runBuildTest() throws Exception {
         BuildInfos newBuildInfos = new BuildInfos(NetworkCreation.VARIANT_ID,
             VARIANT_ID_2,
             Collections.emptyList(),
-            Collections.emptyList(),
-            new HashSet<>());
+            Collections.emptyList());
         buildInfosJson = objectWriter.writeValueAsString(newBuildInfos);
         mockMvc.perform(post(uriString, TEST_NETWORK_ID).contentType(MediaType.APPLICATION_JSON).content(buildInfosJson)).andExpect(status().isOk());
 
@@ -852,9 +846,6 @@ public void runBuildTest() throws Exception {
             }
         });
 
-        buildInfos.addModificationToExclude(lineModificationEntityUuid.get());
-        buildInfos.addModificationToExclude(loadCreationEntityUuid.get());
-        buildInfos.addModificationToExclude(equipmentDeletionEntityUuid.get());
         buildInfosJson = objectWriter.writeValueAsString(buildInfos);
 
         mockMvc.perform(post(uriString, TEST_NETWORK_ID).content(buildInfosJson).contentType(MediaType.APPLICATION_JSON))
@@ -919,8 +910,7 @@ public void runBuildWithStashedModificationsTest() throws Exception {
         BuildInfos buildInfos = new BuildInfos(VariantManagerConstants.INITIAL_VARIANT_ID,
             NetworkCreation.VARIANT_ID,
             List.of(TEST_GROUP_ID),
-            List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1)),
-            new HashSet<>());
+            List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1)));
         networkModificationService.buildVariant(TEST_NETWORK_ID, buildInfos);
 
         // test that only non stashed modifications have been made on variant VARIANT_ID
@@ -945,8 +935,7 @@ public void stopBuildTest() throws Exception {
         BuildInfos buildInfos = new BuildInfos(VariantManagerConstants.INITIAL_VARIANT_ID,
             NetworkCreation.VARIANT_ID,
             List.of(TEST_GROUP_ID),
-            List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1)),
-            Set.of());
+            List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1)));
         String buildInfosJson = mapper.writeValueAsString(buildInfos);
         CompletableFuture.runAsync(() -> {
             try {
@@ -984,8 +973,7 @@ public void runBuildWithReportErrorTest() throws Exception {
         BuildInfos buildInfos = new BuildInfos(VariantManagerConstants.INITIAL_VARIANT_ID,
             NetworkCreation.VARIANT_ID,
             List.of(TEST_GROUP_ID),
-            List.of(new ReportInfos(TEST_ERROR_REPORT_ID, TEST_SUB_REPORTER_ID_1)),
-            Set.of());
+            List.of(new ReportInfos(TEST_ERROR_REPORT_ID, TEST_SUB_REPORTER_ID_1)));
         mockMvc.perform(post(uriString, TEST_NETWORK_ID)
             .contentType(MediaType.APPLICATION_JSON)
             .content(mapper.writeValueAsString(buildInfos)))