Improvements after review comments

Signed-off-by: BOUHOURS Antoine <[email protected]>
gridsuite · Dec 19, 2023 · 00dde0b · 00dde0b
1 parent d75f6a0
commit 00dde0b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 19 deletions.
diff --git a/src/main/java/org/gridsuite/modification/server/ModificationType.java b/src/main/java/org/gridsuite/modification/server/ModificationType.java
@@ -23,7 +23,7 @@ public enum ModificationType {
     GENERATOR_CREATION(PreloadingStrategy.NONE),
     GENERATOR_MODIFICATION(PreloadingStrategy.NONE),
     EQUIPMENT_DELETION(PreloadingStrategy.NONE),
-    BY_FILTER_DELETION(PreloadingStrategy.NONE),
+    BY_FILTER_DELETION(PreloadingStrategy.COLLECTION),
     LINE_CREATION(PreloadingStrategy.NONE),
     LINE_MODIFICATION(PreloadingStrategy.NONE),
     TWO_WINDINGS_TRANSFORMER_CREATION(PreloadingStrategy.NONE),

diff --git a/...org/gridsuite/modification/server/entities/equipment/deletion/ByFilterDeletionEntity.java b/...org/gridsuite/modification/server/entities/equipment/deletion/ByFilterDeletionEntity.java
@@ -66,19 +66,9 @@ public ByFilterDeletionInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
-                .filters(this.getFilters().stream()
+                .filters(getFilters().stream()
                         .map(filter -> new FilterInfos(filter.getFilterId(), filter.getName()))
                         .collect(Collectors.toList()))
                 .equipmentType(getEquipmentType()).build();
     }
-
-    @Override
-    public boolean equals(Object o) {
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
 }
diff --git a/...cations/AbstractByFilterDeletionTest.java → ...eletion/AbstractByFilterDeletionTest.java b/...cations/AbstractByFilterDeletionTest.java → ...eletion/AbstractByFilterDeletionTest.java
@@ -1,11 +1,12 @@
-package org.gridsuite.modification.server.modifications;
+package org.gridsuite.modification.server.modifications.byfilterdeletion;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.matching.StringValuePattern;
 import com.powsybl.iidm.network.IdentifiableType;
 import lombok.SneakyThrows;
 import org.gridsuite.modification.server.dto.*;
+import org.gridsuite.modification.server.modifications.AbstractNetworkModificationTest;
 import org.junit.Test;
 import org.springframework.http.MediaType;
 

diff --git a/...ations/EquipmentByFilterDeletionTest.java → ...letion/EquipmentByFilterDeletionTest.java b/...ations/EquipmentByFilterDeletionTest.java → ...letion/EquipmentByFilterDeletionTest.java
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-package org.gridsuite.modification.server.modifications;
+package org.gridsuite.modification.server.modifications.byfilterdeletion;
 
 import com.powsybl.iidm.network.IdentifiableType;
 import com.powsybl.iidm.network.Network;

diff --git a/...tions/SubstationByFilterDeletionTest.java → ...etion/SubstationByFilterDeletionTest.java b/...tions/SubstationByFilterDeletionTest.java → ...etion/SubstationByFilterDeletionTest.java
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.gridsuite.modification.server.modifications;
+package org.gridsuite.modification.server.modifications.byfilterdeletion;
 
 import com.powsybl.iidm.network.IdentifiableType;
 import com.powsybl.iidm.network.Network;
@@ -64,6 +64,7 @@ protected String getEquipmentNotFoundMessage() {
         return "Substation not found";
     }
 
+    @Override
     protected List<FilterEquipments> getTestFilters() {
         IdentifiableAttributes substation1 = getIdentifiableAttributes(SUBSTATION_ID_1);
         IdentifiableAttributes substation2 = getIdentifiableAttributes(SUBSTATION_ID_2);

diff --git a/...ons/VoltageLevelByFilterDeletionTest.java → ...ion/VoltageLevelByFilterDeletionTest.java b/...ons/VoltageLevelByFilterDeletionTest.java → ...ion/VoltageLevelByFilterDeletionTest.java
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.gridsuite.modification.server.modifications;
+package org.gridsuite.modification.server.modifications.byfilterdeletion;
 
 import com.powsybl.iidm.network.IdentifiableType;
 import com.powsybl.iidm.network.Network;
@@ -30,9 +30,6 @@ public class VoltageLevelByFilterDeletionTest extends AbstractByFilterDeletionTe
     private static final String VOLTAGE_LEVEL_ID_3 = "v3";
     private static final String VOLTAGE_LEVEL_ID_4 = "v4";
 
-    public static final String PATH = "/v1/filters/export";
-    public static final String VOLTAGE_LEVEL_WRONG_ID_1 = "wrongId1";
-
     @Before
     public void specificSetUp() {
         FilterService.setFilterServerBaseUri(wireMockServer.baseUrl());
@@ -70,6 +67,7 @@ protected String getEquipmentNotFoundMessage() {
         return "Voltage level not found";
     }
 
+    @Override
     protected List<FilterEquipments> getTestFilters() {
         IdentifiableAttributes vl1 = getIdentifiableAttributes(VOLTAGE_LEVEL_ID_1);
         IdentifiableAttributes vl2 = getIdentifiableAttributes(VOLTAGE_LEVEL_ID_2);