From 00dde0bfac409a7ffc487f6442a15d8db95ebfc3 Mon Sep 17 00:00:00 2001 From: BOUHOURS Antoine Date: Tue, 19 Dec 2023 13:43:58 +0100 Subject: [PATCH] Improvements after review comments Signed-off-by: BOUHOURS Antoine --- .../modification/server/ModificationType.java | 2 +- .../equipment/deletion/ByFilterDeletionEntity.java | 12 +----------- .../AbstractByFilterDeletionTest.java | 3 ++- .../EquipmentByFilterDeletionTest.java | 2 +- .../SubstationByFilterDeletionTest.java | 3 ++- .../VoltageLevelByFilterDeletionTest.java | 6 ++---- 6 files changed, 9 insertions(+), 19 deletions(-) rename src/test/java/org/gridsuite/modification/server/modifications/{ => byfilterdeletion}/AbstractByFilterDeletionTest.java (98%) rename src/test/java/org/gridsuite/modification/server/modifications/{ => byfilterdeletion}/EquipmentByFilterDeletionTest.java (97%) rename src/test/java/org/gridsuite/modification/server/modifications/{ => byfilterdeletion}/SubstationByFilterDeletionTest.java (96%) rename src/test/java/org/gridsuite/modification/server/modifications/{ => byfilterdeletion}/VoltageLevelByFilterDeletionTest.java (94%) diff --git a/src/main/java/org/gridsuite/modification/server/ModificationType.java b/src/main/java/org/gridsuite/modification/server/ModificationType.java index 071e8bbbb..0d0067a11 100644 --- 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/src/main/java/org/gridsuite/modification/server/entities/equipment/deletion/ByFilterDeletionEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/deletion/ByFilterDeletionEntity.java index 8fcd4d5c6..cff8826eb 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/deletion/ByFilterDeletionEntity.java +++ b/src/main/java/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/src/test/java/org/gridsuite/modification/server/modifications/AbstractByFilterDeletionTest.java b/src/test/java/org/gridsuite/modification/server/modifications/byfilterdeletion/AbstractByFilterDeletionTest.java similarity index 98% rename from src/test/java/org/gridsuite/modification/server/modifications/AbstractByFilterDeletionTest.java rename to src/test/java/org/gridsuite/modification/server/modifications/byfilterdeletion/AbstractByFilterDeletionTest.java index c89b4ac76..2cacfcfad 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/AbstractByFilterDeletionTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/byfilterdeletion/AbstractByFilterDeletionTest.java @@ -1,4 +1,4 @@ -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; @@ -6,6 +6,7 @@ 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/src/test/java/org/gridsuite/modification/server/modifications/EquipmentByFilterDeletionTest.java b/src/test/java/org/gridsuite/modification/server/modifications/byfilterdeletion/EquipmentByFilterDeletionTest.java similarity index 97% rename from src/test/java/org/gridsuite/modification/server/modifications/EquipmentByFilterDeletionTest.java rename to src/test/java/org/gridsuite/modification/server/modifications/byfilterdeletion/EquipmentByFilterDeletionTest.java index fe74733ed..388e836c3 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/EquipmentByFilterDeletionTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/byfilterdeletion/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/src/test/java/org/gridsuite/modification/server/modifications/SubstationByFilterDeletionTest.java b/src/test/java/org/gridsuite/modification/server/modifications/byfilterdeletion/SubstationByFilterDeletionTest.java similarity index 96% rename from src/test/java/org/gridsuite/modification/server/modifications/SubstationByFilterDeletionTest.java rename to src/test/java/org/gridsuite/modification/server/modifications/byfilterdeletion/SubstationByFilterDeletionTest.java index 773f903e6..49152d7cb 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/SubstationByFilterDeletionTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/byfilterdeletion/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 getTestFilters() { IdentifiableAttributes substation1 = getIdentifiableAttributes(SUBSTATION_ID_1); IdentifiableAttributes substation2 = getIdentifiableAttributes(SUBSTATION_ID_2); diff --git a/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelByFilterDeletionTest.java b/src/test/java/org/gridsuite/modification/server/modifications/byfilterdeletion/VoltageLevelByFilterDeletionTest.java similarity index 94% rename from src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelByFilterDeletionTest.java rename to src/test/java/org/gridsuite/modification/server/modifications/byfilterdeletion/VoltageLevelByFilterDeletionTest.java index 0cb60afc1..cbb46f7ea 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelByFilterDeletionTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/byfilterdeletion/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 getTestFilters() { IdentifiableAttributes vl1 = getIdentifiableAttributes(VOLTAGE_LEVEL_ID_1); IdentifiableAttributes vl2 = getIdentifiableAttributes(VOLTAGE_LEVEL_ID_2);