From 73591dfa3ff8a801701f72c7d51e8b9775761c51 Mon Sep 17 00:00:00 2001 From: jamal-khey Date: Wed, 11 Oct 2023 14:13:47 +0200 Subject: [PATCH] set stashed status for all modification (#346) - add unit test to check stashed is set Signed-off-by: jamal-khey --- .../modification/server/entities/GroovyScriptEntity.java | 1 + .../equipment/creation/BatteryCreationEntity.java | 1 + .../creation/ConverterStationCreationEntity.java | 1 + .../equipment/creation/GeneratorCreationEntity.java | 1 + .../entities/equipment/creation/LineCreationEntity.java | 2 ++ .../entities/equipment/creation/LoadCreationEntity.java | 1 + .../creation/ShuntCompensatorCreationEntity.java | 1 + .../equipment/creation/SubstationCreationEntity.java | 1 + .../creation/TwoWindingsTransformerCreationEntity.java | 1 + .../equipment/creation/VoltageLevelCreationEntity.java | 3 ++- .../entities/equipment/creation/VscCreationEntity.java | 3 ++- .../equipment/deletion/EquipmentDeletionEntity.java | 1 + .../modification/BatteryModificationEntity.java | 1 + .../modification/BranchStatusModificationEntity.java | 1 + .../modification/DeleteAttachingLineEntity.java | 1 + .../modification/DeleteVoltageLevelOnLineEntity.java | 1 + .../equipment/modification/GenerationDispatchEntity.java | 1 + .../modification/GeneratorModificationEntity.java | 1 + .../equipment/modification/GeneratorScalingEntity.java | 1 + .../modification/LineAttachToVoltageLevelEntity.java | 1 + .../equipment/modification/LineModificationEntity.java | 1 + .../modification/LineSplitWithVoltageLevelEntity.java | 2 ++ .../modification/LinesAttachToSplitLinesEntity.java | 1 + .../equipment/modification/LoadModificationEntity.java | 1 + .../equipment/modification/LoadScalingEntity.java | 1 + .../modification/ShuntCompensatorModificationEntity.java | 1 + .../modification/SubstationModificationEntity.java | 1 + .../TwoWindingsTransformerModificationEntity.java | 1 + .../modification/VoltageInitModificationEntity.java | 1 + .../modification/VoltageLevelModificationEntity.java | 1 + .../attribute/EquipmentAttributeModificationEntity.java | 1 + .../modification/server/ModificationControllerTest.java | 2 +- .../modifications/AbstractNetworkModificationTest.java | 1 + .../modifications/BatteryCreationInBusBreakerTest.java | 2 ++ .../modifications/BatteryCreationInNodeBreakerTest.java | 2 ++ .../server/modifications/BatteryModificationTest.java | 2 ++ .../BranchStatusModificationEnergiseSideOneLineTest.java | 2 ++ .../BranchStatusModificationEnergiseSideTwoLineTest.java | 2 ++ .../BranchStatusModificationLockoutLineTest.java | 2 ++ .../BranchStatusModificationSwitchOnLineTest.java | 2 ++ .../BranchStatusModificationTrip2WTransformerTest.java | 2 ++ .../BranchStatusModificationTripLineTest.java | 2 ++ .../server/modifications/DeleteAttachingLineTest.java | 4 ++++ .../modifications/DeleteVoltageLevelOnLineTest.java | 3 +++ .../EquipmentAttributeModificationTest.java | 7 ++++++- .../server/modifications/EquipmentDeletionTest.java | 4 ++++ .../server/modifications/GenerationDispatchTest.java | 2 ++ .../modifications/GeneratorCreationInBusBreakerTest.java | 2 ++ .../GeneratorCreationInNodeBreakerTest.java | 2 ++ .../server/modifications/GeneratorModificationTest.java | 2 ++ .../server/modifications/GeneratorScalingTest.java | 7 ++++++- .../server/modifications/GroovyScriptTest.java | 3 +++ .../modifications/LineAttachToNewVoltageLevelTest.java | 4 ++++ .../modifications/LineAttachToVoltageLevelTest.java | 4 ++++ .../modifications/LineCreationInBusBreakerTest.java | 8 ++++++++ .../modifications/LineCreationInMixedTypologyTest.java | 2 ++ .../modifications/LineCreationInNodeBreakerTest.java | 2 ++ .../server/modifications/LineModificationTest.java | 6 ++++-- .../modifications/LineSplitWithNewVoltageLevelTest.java | 3 +++ .../modifications/LineSplitWithVoltageLevelTest.java | 3 +++ .../modifications/LinesAttachToSplitLinesTest.java | 2 ++ .../modifications/LoadCreationInBusBreakerTest.java | 2 ++ .../modifications/LoadCreationInNodeBreakerTest.java | 2 ++ .../server/modifications/LoadModificationTest.java | 3 +++ .../server/modifications/LoadScalingTest.java | 3 +++ .../ShuntCompensatorCreationInBusBreakerTest.java | 2 ++ .../ShuntCompensatorCreationInNodeBreakerTest.java | 2 ++ .../modifications/ShuntCompensatorModificationTest.java | 9 +++++++++ .../server/modifications/SubstationCreationTest.java | 2 ++ .../server/modifications/SubstationDeletionTest.java | 2 ++ .../server/modifications/SubstationModificationTest.java | 2 ++ .../TwoWindingsTransformerCreationBusBreakerTest.java | 5 +++++ .../TwoWindingsTransformerCreationMixedBreakerTest.java | 2 ++ .../TwoWindingsTransformerCreationNodeBreakerTest.java | 2 ++ .../TwoWindingsTransformerModificationTest.java | 6 ++++-- .../modifications/VoltageInitModificationTest.java | 3 +++ .../server/modifications/VoltageLevelCreationTest.java | 1 + .../server/modifications/VoltageLevelDeletionTest.java | 2 ++ .../modifications/VoltageLevelModificationTest.java | 3 +++ .../server/modifications/VscCreationTest.java | 2 ++ .../modification/server/utils/ModificationCreation.java | 3 +++ 81 files changed, 177 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gridsuite/modification/server/entities/GroovyScriptEntity.java b/src/main/java/org/gridsuite/modification/server/entities/GroovyScriptEntity.java index 3e7666564..367d6d6fc 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/GroovyScriptEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/GroovyScriptEntity.java @@ -51,6 +51,7 @@ public GroovyScriptInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .script(getScript()); } } diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BatteryCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BatteryCreationEntity.java index 960176f03..3679a57e3 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BatteryCreationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BatteryCreationEntity.java @@ -108,6 +108,7 @@ public BatteryCreationInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentName(getEquipmentName()) .voltageLevelId(getVoltageLevelId()) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/ConverterStationCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/ConverterStationCreationEntity.java index 42c7090ee..a829f8435 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/ConverterStationCreationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/ConverterStationCreationEntity.java @@ -83,6 +83,7 @@ private void assignAttributes(ConverterStationCreationInfos converterStationCrea public ConverterStationCreationInfos toConverterStationInfos() { return ConverterStationCreationInfos.builder() + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentName(getEquipmentName()) .lossFactor(getLossFactor()) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/GeneratorCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/GeneratorCreationEntity.java index 21e487176..273665095 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/GeneratorCreationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/GeneratorCreationEntity.java @@ -164,6 +164,7 @@ public GeneratorCreationInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentName(getEquipmentName()) .voltageLevelId(getVoltageLevelId()) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/LineCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/LineCreationEntity.java index 052296a7a..37fcea764 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/LineCreationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/LineCreationEntity.java @@ -48,6 +48,7 @@ public void update(ModificationInfos modificationInfos) { } private void assignAttributes(LineCreationInfos lineCreationInfos) { + setStashed(lineCreationInfos.getStashed()); shuntConductance1 = lineCreationInfos.getShuntConductance1(); shuntSusceptance1 = lineCreationInfos.getShuntSusceptance1(); shuntConductance2 = lineCreationInfos.getShuntConductance2(); @@ -64,6 +65,7 @@ public LineCreationInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentName(getEquipmentName()) .seriesResistance(getSeriesResistance()) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/LoadCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/LoadCreationEntity.java index 884f511e5..5e0015f12 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/LoadCreationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/LoadCreationEntity.java @@ -60,6 +60,7 @@ public LoadCreationInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentName(getEquipmentName()) .voltageLevelId(getVoltageLevelId()) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/ShuntCompensatorCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/ShuntCompensatorCreationEntity.java index 58f7e2173..084be3d51 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/ShuntCompensatorCreationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/ShuntCompensatorCreationEntity.java @@ -64,6 +64,7 @@ public ShuntCompensatorCreationInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentName(getEquipmentName()) .voltageLevelId(getVoltageLevelId()) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/SubstationCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/SubstationCreationEntity.java index f14dfd28f..1f67a9554 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/SubstationCreationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/SubstationCreationEntity.java @@ -64,6 +64,7 @@ public SubstationCreationInfos toSubstationCreationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentName(getEquipmentName()) .substationCountry(getCountry()) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/TwoWindingsTransformerCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/TwoWindingsTransformerCreationEntity.java index 9a1562b1d..1c37d200d 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/TwoWindingsTransformerCreationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/TwoWindingsTransformerCreationEntity.java @@ -177,6 +177,7 @@ public TwoWindingsTransformerCreationInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentName(getEquipmentName()) .seriesResistance(getSeriesResistance()) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VoltageLevelCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VoltageLevelCreationEntity.java index b6e1097d9..a24a53442 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VoltageLevelCreationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VoltageLevelCreationEntity.java @@ -81,7 +81,7 @@ public VoltageLevelCreationInfos toModificationInfos() { } public VoltageLevelCreationInfos toVoltageLevelCreationInfos() { - return toVoltageLevelCreationInfosBuilder().build(); + return toVoltageLevelCreationInfosBuilder().stashed(false).build(); } private VoltageLevelCreationInfos.VoltageLevelCreationInfosBuilder toVoltageLevelCreationInfosBuilder() { @@ -92,6 +92,7 @@ public VoltageLevelCreationInfos toVoltageLevelCreationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentName(getEquipmentName()) .substationId(getSubstationId()) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VscCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VscCreationEntity.java index eaf912a67..200f291a1 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VscCreationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VscCreationEntity.java @@ -93,6 +93,7 @@ public void update(@NonNull ModificationInfos modificationInfos) { } private void assignAttributes(VscCreationInfos vscCreationInfos) { + this.setStashed(vscCreationInfos.getStashed()); this.activePower = vscCreationInfos.getActivePower(); this.angleDroopActivePowerControl = vscCreationInfos.getAngleDroopActivePowerControl(); this.droop = vscCreationInfos.getDroop(); @@ -115,10 +116,10 @@ public VscCreationInfos toModificationInfos() { private VscCreationInfos.VscCreationInfosBuilder toVscCreationInfosBuilder() { ConverterStationCreationInfos converterStationCreationInfos1 = getConverterStation1() == null ? null : getConverterStation1().toConverterStationInfos(); ConverterStationCreationInfos converterStationCreationInfos2 = getConverterStation2() == null ? null : getConverterStation2().toConverterStationInfos(); - return VscCreationInfos.builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentName(getEquipmentName()) .activePower(getActivePower()) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/deletion/EquipmentDeletionEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/deletion/EquipmentDeletionEntity.java index 45bfbeaeb..76f93f53d 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/deletion/EquipmentDeletionEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/deletion/EquipmentDeletionEntity.java @@ -57,6 +57,7 @@ public EquipmentDeletionInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentType(getEquipmentType()); if (equipmentInfos != null) { diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BatteryModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BatteryModificationEntity.java index 08edb9cbe..9fe51554c 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BatteryModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BatteryModificationEntity.java @@ -131,6 +131,7 @@ public BatteryModificationInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp())) .voltageLevelId(AttributeModification.toAttributeModification(getVoltageLevelIdValue(), getVoltageLevelIdOp())) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchStatusModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchStatusModificationEntity.java index a8ac45857..cf3b4370b 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchStatusModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchStatusModificationEntity.java @@ -53,6 +53,7 @@ public BranchStatusModificationInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .action(getAction()) .energizedVoltageLevelId(getEnergizedVoltageLevelId()) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/DeleteAttachingLineEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/DeleteAttachingLineEntity.java index 227989294..efc036d63 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/DeleteAttachingLineEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/DeleteAttachingLineEntity.java @@ -61,6 +61,7 @@ public DeleteAttachingLineInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .lineToAttachTo1Id(getLineToAttachTo1Id()) .lineToAttachTo2Id(getLineToAttachTo2Id()) .attachedLineId(getAttachedLineId()) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/DeleteVoltageLevelOnLineEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/DeleteVoltageLevelOnLineEntity.java index 3020dbf7d..a2a1e1433 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/DeleteVoltageLevelOnLineEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/DeleteVoltageLevelOnLineEntity.java @@ -59,6 +59,7 @@ public DeleteVoltageLevelOnLineInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .lineToAttachTo1Id(getLineToAttachTo1Id()) .lineToAttachTo2Id(getLineToAttachTo2Id()) .replacingLine1Id(getReplacingLine1Id()) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GenerationDispatchEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GenerationDispatchEntity.java index fac1389fa..9c1a37273 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GenerationDispatchEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GenerationDispatchEntity.java @@ -164,6 +164,7 @@ public GenerationDispatchInfos toModificationInfos() { return GenerationDispatchInfos.builder() .date(getDate()) .uuid(getId()) + .stashed(getStashed()) .lossCoefficient(getLossCoefficient()) .defaultOutageRate(getDefaultOutageRate()) .generatorsWithoutOutage(toGeneratorsFilters(generatorsWithoutOutage)) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GeneratorModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GeneratorModificationEntity.java index aa573da53..1a0318aff 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GeneratorModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GeneratorModificationEntity.java @@ -270,6 +270,7 @@ public GeneratorModificationInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp())) .voltageLevelId(AttributeModification.toAttributeModification(getVoltageLevelIdValue(), getVoltageLevelIdOp())) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GeneratorScalingEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GeneratorScalingEntity.java index b42b22cd5..6cf5f9b13 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GeneratorScalingEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GeneratorScalingEntity.java @@ -35,6 +35,7 @@ public GeneratorScalingInfos toModificationInfos() { return GeneratorScalingInfos.builder() .date(getDate()) .uuid(getId()) + .stashed(getStashed()) .variationType(getVariationType()) .variations(getVariations().stream() .map(ScalingVariationEntity::toScalingVariationInfos) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineAttachToVoltageLevelEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineAttachToVoltageLevelEntity.java index 56d990733..cc020dff1 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineAttachToVoltageLevelEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineAttachToVoltageLevelEntity.java @@ -107,6 +107,7 @@ public LineAttachToVoltageLevelInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .lineToAttachToId(getLineToAttachToId()) .percent(getPercent()) .attachmentPointId(getAttachmentPointId()) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java index 47fac2bac..efa6cc936 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java @@ -83,6 +83,7 @@ public LineModificationInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp())) .seriesResistance(toAttributeModification(getSeriesResistance())) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineSplitWithVoltageLevelEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineSplitWithVoltageLevelEntity.java index 5f1354dfb..19d8bcf0c 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineSplitWithVoltageLevelEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineSplitWithVoltageLevelEntity.java @@ -65,6 +65,7 @@ public void update(@NonNull ModificationInfos modificationInfos) { } private void assignAttributes(LineSplitWithVoltageLevelInfos splitWithVoltageLevelInfos) { + setStashed(splitWithVoltageLevelInfos.getStashed()); lineToSplitId = splitWithVoltageLevelInfos.getLineToSplitId(); percent = splitWithVoltageLevelInfos.getPercent(); mayVoltageLevelCreation = null; // Need for the update @@ -89,6 +90,7 @@ public LineSplitWithVoltageLevelInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .lineToSplitId(getLineToSplitId()) .percent(getPercent()) .mayNewVoltageLevelInfos(mayVoltageLevelCreation == null ? null : mayVoltageLevelCreation.toVoltageLevelCreationInfos()) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LinesAttachToSplitLinesEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LinesAttachToSplitLinesEntity.java index f7a56aa83..da10735cf 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LinesAttachToSplitLinesEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LinesAttachToSplitLinesEntity.java @@ -86,6 +86,7 @@ private LinesAttachToSplitLinesInfos.LinesAttachToSplitLinesInfosBuilder toLines .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .lineToAttachTo1Id(getLineToAttachTo1Id()) .lineToAttachTo2Id(getLineToAttachTo2Id()) .attachedLineId(getAttachedLineId()) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LoadModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LoadModificationEntity.java index 7822bc235..3a62cf78f 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LoadModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LoadModificationEntity.java @@ -77,6 +77,7 @@ public LoadModificationInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp())) .voltageLevelId(AttributeModification.toAttributeModification(getVoltageLevelIdValue(), getVoltageLevelIdOp())) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LoadScalingEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LoadScalingEntity.java index 53b032488..6e10551f1 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LoadScalingEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LoadScalingEntity.java @@ -36,6 +36,7 @@ public LoadScalingInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .variationType(getVariationType()) .variations(getVariations().stream() .map(ScalingVariationEntity::toScalingVariationInfos) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/ShuntCompensatorModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/ShuntCompensatorModificationEntity.java index f59efed08..03e77fa14 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/ShuntCompensatorModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/ShuntCompensatorModificationEntity.java @@ -86,6 +86,7 @@ public ShuntCompensatorModificationInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .voltageLevelId(getVoltageLevelId()) .equipmentId(getEquipmentId()) .equipmentName(toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp())) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/SubstationModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/SubstationModificationEntity.java index 56848732f..3013173dc 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/SubstationModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/SubstationModificationEntity.java @@ -79,6 +79,7 @@ public SubstationModificationInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp())) .substationCountry(AttributeModification.toAttributeModification(getSubstationCountryValue(), getSubstationCountryOp())) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java index 398cb4d37..16849d9e1 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java @@ -348,6 +348,7 @@ public TwoWindingsTransformerModificationInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp())) .seriesResistance(AttributeModification.toAttributeModification(getSeriesResistance())) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageInitModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageInitModificationEntity.java index 2e19ffa8d..aacdf95f5 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageInitModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageInitModificationEntity.java @@ -157,6 +157,7 @@ public VoltageInitModificationInfos toModificationInfos() { return VoltageInitModificationInfos.builder() .date(getDate()) .uuid(getId()) + .stashed(getStashed()) .generators(toGeneratorsModification(generators)) .transformers(toTransformersModification(transformers)) .staticVarCompensators(toStaticVarCompensatorsModification(staticVarCompensators)) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageLevelModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageLevelModificationEntity.java index eddbb8e3f..bede68f4d 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageLevelModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageLevelModificationEntity.java @@ -99,6 +99,7 @@ public VoltageLevelModificationInfos toModificationInfos() { .uuid(getId()) .equipmentId(getEquipmentId()) .date(getDate()) + .stashed(getStashed()) .equipmentName(toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp())) .nominalVoltage(toAttributeModification(getNominalVoltage())) .lowVoltageLimit(toAttributeModification(getLowVoltageLimit())) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/attribute/EquipmentAttributeModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/attribute/EquipmentAttributeModificationEntity.java index 43173e1dc..56e5bfb52 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/attribute/EquipmentAttributeModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/attribute/EquipmentAttributeModificationEntity.java @@ -68,6 +68,7 @@ public EquipmentAttributeModificationInfos toModificationInfos() { .builder() .uuid(getId()) .date(getDate()) + .stashed(getStashed()) .equipmentId(getEquipmentId()) .equipmentAttributeName(getAttributeName()) .equipmentAttributeValue(getAttributeValue()) diff --git a/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java b/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java index 263174596..f796dc9c9 100644 --- a/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java +++ b/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java @@ -1291,7 +1291,7 @@ public void testCreateVoltageInitModification() throws Exception { .shuntCompensatorId("v6shunt") .sectionCount(1) .connect(false) - .build())) + .build())).stashed(false) .build(); MvcResult mvcResult = mockMvc.perform(post("/v1/groups/modification") diff --git a/src/test/java/org/gridsuite/modification/server/modifications/AbstractNetworkModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/AbstractNetworkModificationTest.java index a09304dc1..2a8454270 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/AbstractNetworkModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/AbstractNetworkModificationTest.java @@ -167,6 +167,7 @@ public void testRead() throws Exception { }); assertThat(receivedModification).recursivelyEquals(modificationToRead); + assertNotNull(receivedModification.getStashed()); } @Test diff --git a/src/test/java/org/gridsuite/modification/server/modifications/BatteryCreationInBusBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/BatteryCreationInBusBreakerTest.java index 179d3e990..45442cc4b 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/BatteryCreationInBusBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/BatteryCreationInBusBreakerTest.java @@ -37,6 +37,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return BatteryCreationInfos.builder() + .stashed(false) .equipmentId("idBattery2") .equipmentName("nameBattery2") .voltageLevelId("v1") @@ -60,6 +61,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return BatteryCreationInfos.builder() + .stashed(false) .equipmentId("idBattery2") .equipmentName("nameBatteryModified") .voltageLevelId("v1") diff --git a/src/test/java/org/gridsuite/modification/server/modifications/BatteryCreationInNodeBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/BatteryCreationInNodeBreakerTest.java index 0a82d2af3..f175654ae 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/BatteryCreationInNodeBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/BatteryCreationInNodeBreakerTest.java @@ -42,6 +42,7 @@ protected Network createNetwork(UUID networkUuid) { protected ModificationInfos buildModification() { // create new battery in voltage level with node/breaker topology (in voltage level "v2" and busbar section "1B") return BatteryCreationInfos.builder() + .stashed(false) .equipmentId("idBattery1") .equipmentName("idBattery1") .voltageLevelId("v2") @@ -65,6 +66,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return BatteryCreationInfos.builder() + .stashed(false) .equipmentId("idBattery2") .equipmentName("nameBatteryModified") .voltageLevelId("v1") diff --git a/src/test/java/org/gridsuite/modification/server/modifications/BatteryModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/BatteryModificationTest.java index 94ae20fec..c47f37f6b 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/BatteryModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/BatteryModificationTest.java @@ -39,6 +39,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return BatteryModificationInfos.builder() + .stashed(false) .equipmentId("v3Battery") .equipmentName(new AttributeModification<>("newV1Battery", OperationType.SET)) .activePowerSetpoint(new AttributeModification<>(80.0, OperationType.SET)) @@ -59,6 +60,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return BatteryModificationInfos.builder() + .stashed(false) .equipmentId("idBattery") .equipmentName(new AttributeModification<>("newV1BatteryEdited", OperationType.SET)) .activePowerSetpoint(new AttributeModification<>(81.0, OperationType.SET)) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationEnergiseSideOneLineTest.java b/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationEnergiseSideOneLineTest.java index 4d6215bfd..03d5e1262 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationEnergiseSideOneLineTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationEnergiseSideOneLineTest.java @@ -43,6 +43,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return BranchStatusModificationInfos.builder() + .stashed(false) .equipmentId(TARGET_LINE_ID) .energizedVoltageLevelId("vl1") .action(BranchStatusModificationInfos.ActionType.ENERGISE_END_ONE).build(); @@ -51,6 +52,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return BranchStatusModificationInfos.builder() + .stashed(false) .equipmentId("line1") .energizedVoltageLevelId("vl1_bis") .action(BranchStatusModificationInfos.ActionType.TRIP).build(); diff --git a/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationEnergiseSideTwoLineTest.java b/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationEnergiseSideTwoLineTest.java index 8781273de..13877556a 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationEnergiseSideTwoLineTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationEnergiseSideTwoLineTest.java @@ -43,6 +43,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return BranchStatusModificationInfos.builder() + .stashed(false) .equipmentId(TARGET_LINE_ID) .energizedVoltageLevelId("vl2") .action(BranchStatusModificationInfos.ActionType.ENERGISE_END_TWO).build(); @@ -51,6 +52,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return BranchStatusModificationInfos.builder() + .stashed(false) .equipmentId("line1") .energizedVoltageLevelId("vl2_bis") .action(BranchStatusModificationInfos.ActionType.TRIP).build(); diff --git a/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationLockoutLineTest.java b/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationLockoutLineTest.java index e89041959..69e4a45c7 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationLockoutLineTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationLockoutLineTest.java @@ -47,6 +47,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return BranchStatusModificationInfos.builder() + .stashed(false) .equipmentId(TARGET_LINE_ID) .action(BranchStatusModificationInfos.ActionType.LOCKOUT).build(); } @@ -54,6 +55,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return BranchStatusModificationInfos.builder() + .stashed(false) .equipmentId(UPDATE_BRANCH_ID) .action(BranchStatusModificationInfos.ActionType.SWITCH_ON).build(); } diff --git a/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationSwitchOnLineTest.java b/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationSwitchOnLineTest.java index 10012dfb5..e43350a7c 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationSwitchOnLineTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationSwitchOnLineTest.java @@ -37,6 +37,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return BranchStatusModificationInfos.builder() + .stashed(false) .equipmentId(TARGET_LINE_ID) .action(BranchStatusModificationInfos.ActionType.SWITCH_ON).build(); } @@ -44,6 +45,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return BranchStatusModificationInfos.builder() + .stashed(false) .equipmentId("line1") .action(BranchStatusModificationInfos.ActionType.TRIP).build(); } diff --git a/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationTrip2WTransformerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationTrip2WTransformerTest.java index cd231ee32..9e666a288 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationTrip2WTransformerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationTrip2WTransformerTest.java @@ -38,6 +38,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return BranchStatusModificationInfos.builder() + .stashed(false) .equipmentId(TARGET_BRANCH_ID) .action(BranchStatusModificationInfos.ActionType.TRIP).build(); } @@ -45,6 +46,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return BranchStatusModificationInfos.builder() + .stashed(false) .equipmentId(UPDATE_BRANCH_ID) .action(BranchStatusModificationInfos.ActionType.SWITCH_ON).build(); } diff --git a/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationTripLineTest.java b/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationTripLineTest.java index 23fd8f091..46f17fef6 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationTripLineTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationTripLineTest.java @@ -38,6 +38,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return BranchStatusModificationInfos.builder() + .stashed(false) .equipmentId(TARGET_LINE_ID) .action(BranchStatusModificationInfos.ActionType.TRIP).build(); } @@ -45,6 +46,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return BranchStatusModificationInfos.builder() + .stashed(false) .equipmentId(UPDATE_BRANCH_ID) .action(BranchStatusModificationInfos.ActionType.SWITCH_ON).build(); } diff --git a/src/test/java/org/gridsuite/modification/server/modifications/DeleteAttachingLineTest.java b/src/test/java/org/gridsuite/modification/server/modifications/DeleteAttachingLineTest.java index 91b71e4ba..b664cf8a7 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/DeleteAttachingLineTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/DeleteAttachingLineTest.java @@ -40,6 +40,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return DeleteAttachingLineInfos.builder() + .stashed(false) .lineToAttachTo1Id("l1") .lineToAttachTo2Id("l2") .attachedLineId("l3") @@ -51,6 +52,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return DeleteAttachingLineInfos.builder() + .stashed(false) .lineToAttachTo1Id("l1") .lineToAttachTo2Id("l2") .attachedLineId("l3") @@ -77,6 +79,7 @@ protected void assertAfterNetworkModificationDeletion() { public void createWithInvalidLineIdTest() throws Exception { // test create with incorrect line id DeleteAttachingLineInfos deleteAttachingLineInfos = DeleteAttachingLineInfos.builder() + .stashed(false) .lineToAttachTo1Id("l1") .lineToAttachTo2Id("ll") .attachedLineId("l2") @@ -93,6 +96,7 @@ public void createWithInvalidLineIdTest() throws Exception { @Test public void createWithNoAttachmentPointTest() throws Exception { DeleteAttachingLineInfos deleteAttachingLineInfos = DeleteAttachingLineInfos.builder() + .stashed(false) .lineToAttachTo1Id("l1") .lineToAttachTo2Id("l3") .attachedLineId("l1") diff --git a/src/test/java/org/gridsuite/modification/server/modifications/DeleteVoltageLevelOnLineTest.java b/src/test/java/org/gridsuite/modification/server/modifications/DeleteVoltageLevelOnLineTest.java index 6fffce604..e7a507c71 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/DeleteVoltageLevelOnLineTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/DeleteVoltageLevelOnLineTest.java @@ -40,6 +40,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return DeleteVoltageLevelOnLineInfos.builder() + .stashed(false) .lineToAttachTo1Id("l1") .lineToAttachTo2Id("l2") .replacingLine1Id("replacementLineId") @@ -50,6 +51,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return DeleteVoltageLevelOnLineInfos.builder() + .stashed(false) .lineToAttachTo1Id("line00") .lineToAttachTo2Id("line11") .replacingLine1Id("replacingLineId2") @@ -79,6 +81,7 @@ protected void assertAfterNetworkModificationDeletion() { public void createWithInvalidLineIdTest() throws Exception { // test create with incorrect line id DeleteVoltageLevelOnLineInfos deleteVoltageLevelOnLineInfos = DeleteVoltageLevelOnLineInfos.builder() + .stashed(false) .lineToAttachTo1Id("l1") .lineToAttachTo2Id("ll") .replacingLine1Id("replacementLineId") diff --git a/src/test/java/org/gridsuite/modification/server/modifications/EquipmentAttributeModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/EquipmentAttributeModificationTest.java index 9d2cfe76e..eb1a0533c 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/EquipmentAttributeModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/EquipmentAttributeModificationTest.java @@ -40,6 +40,7 @@ public void testEquipmentAttributeModificationInfos() throws Exception { UUID modificationUuid = UUID.randomUUID(); //We need to limit the precision to avoid database precision storage limit issue (postgres has a precision of 6 digits while h2 can go to 9) EquipmentAttributeModificationInfos modificationInfos = EquipmentAttributeModificationInfos.builder() + .stashed(false) .uuid(modificationUuid) .date(ZonedDateTime.of(2021, 2, 19, 0, 0, 0, 0, ZoneOffset.UTC).truncatedTo(ChronoUnit.MICROS)) .equipmentId("equipmentId") @@ -47,9 +48,10 @@ public void testEquipmentAttributeModificationInfos() throws Exception { .equipmentAttributeValue("equipmentAttributeValue") .equipmentType(IdentifiableType.VOLTAGE_LEVEL) .build(); - assertEquals(String.format("EquipmentAttributeModificationInfos(super=EquipmentModificationInfos(super=ModificationInfos(uuid=%s, date=2021-02-19T00:00Z, stashed=null), equipmentId=equipmentId), equipmentAttributeName=equipmentAttributeName, equipmentAttributeValue=equipmentAttributeValue, equipmentType=VOLTAGE_LEVEL)", modificationUuid), modificationInfos.toString()); + assertEquals(String.format("EquipmentAttributeModificationInfos(super=EquipmentModificationInfos(super=ModificationInfos(uuid=%s, date=2021-02-19T00:00Z, stashed=false), equipmentId=equipmentId), equipmentAttributeName=equipmentAttributeName, equipmentAttributeValue=equipmentAttributeValue, equipmentType=VOLTAGE_LEVEL)", modificationUuid), modificationInfos.toString()); EquipmentAttributeModificationInfos switchStatusModificationInfos = EquipmentAttributeModificationInfos.builder() + .stashed(false) .equipmentType(IdentifiableType.SWITCH) .equipmentAttributeName("open") .equipmentAttributeValue(true) @@ -128,6 +130,7 @@ private void switchModifications(String extraParams, String switchId1, String sw public void testWithErrors() throws Exception { // bad equipment attribute name EquipmentAttributeModificationInfos switchStatusModificationInfos = EquipmentAttributeModificationInfos.builder() + .stashed(false) .equipmentType(IdentifiableType.SWITCH) .equipmentAttributeName("close") // bad .equipmentAttributeValue(true) @@ -158,6 +161,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected EquipmentAttributeModificationInfos buildModification() { return EquipmentAttributeModificationInfos.builder() + .stashed(false) .equipmentType(IdentifiableType.SWITCH) .equipmentAttributeName("open") .equipmentAttributeValue(true) @@ -168,6 +172,7 @@ protected EquipmentAttributeModificationInfos buildModification() { @Override protected EquipmentAttributeModificationInfos buildModificationUpdate() { return EquipmentAttributeModificationInfos.builder() + .stashed(false) .equipmentType(IdentifiableType.SWITCH) .equipmentAttributeName("open") .equipmentAttributeValue(false) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/EquipmentDeletionTest.java b/src/test/java/org/gridsuite/modification/server/modifications/EquipmentDeletionTest.java index 67c32b6a9..aa2458f26 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/EquipmentDeletionTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/EquipmentDeletionTest.java @@ -48,6 +48,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return EquipmentDeletionInfos.builder() + .stashed(false) .equipmentType("LOAD") .equipmentId("v1load") .build(); @@ -56,6 +57,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return EquipmentDeletionInfos.builder() + .stashed(false) .equipmentType("GENERATOR") .equipmentId("idGenerator") .build(); @@ -75,6 +77,7 @@ protected void assertAfterNetworkModificationDeletion() { public void testOkWhenRemovingIsolatedEquipment() throws Exception { EquipmentDeletionInfos equipmentDeletionInfos = EquipmentDeletionInfos.builder() + .stashed(false) .equipmentType("LOAD") .equipmentId("v5load") .build(); @@ -115,6 +118,7 @@ private void deleteHvdcLineWithShuntCompensator(String shuntNameToBeRemoved, boo new HvdcLccDeletionInfos(shuntData, null) : new HvdcLccDeletionInfos(null, shuntData); EquipmentDeletionInfos equipmentDeletionInfos = EquipmentDeletionInfos.builder() + .stashed(false) .equipmentType("HVDC_LINE") .equipmentId(hvdcLineName) .equipmentInfos(hvdcLccDeletionInfos) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/GenerationDispatchTest.java b/src/test/java/org/gridsuite/modification/server/modifications/GenerationDispatchTest.java index 6ab293647..6c1e5bdbc 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/GenerationDispatchTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/GenerationDispatchTest.java @@ -569,6 +569,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return GenerationDispatchInfos.builder() + .stashed(false) .lossCoefficient(20.) .defaultOutageRate(0.) .generatorsWithoutOutage(List.of()) @@ -581,6 +582,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return GenerationDispatchInfos.builder() + .stashed(false) .lossCoefficient(50.) .defaultOutageRate(25.) .generatorsWithoutOutage(List.of(GeneratorsFilterInfos.builder().id(UUID.randomUUID()).name("name1").build())) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInBusBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInBusBreakerTest.java index e7b5ad6ce..53565d323 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInBusBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInBusBreakerTest.java @@ -39,6 +39,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return GeneratorCreationInfos.builder() + .stashed(false) .equipmentId("idGenerator2") .equipmentName("nameGenerator2") .voltageLevelId("v1") @@ -76,6 +77,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return GeneratorCreationInfos.builder() + .stashed(false) .equipmentId("idGenerator2") .equipmentName("nameGeneratorModified") .voltageLevelId("v1") diff --git a/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInNodeBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInNodeBreakerTest.java index dc331d12c..d1c25f2d1 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInNodeBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInNodeBreakerTest.java @@ -43,6 +43,7 @@ protected Network createNetwork(UUID networkUuid) { protected ModificationInfos buildModification() { // create new generator in voltage level with node/breaker topology (in voltage level "v2" and busbar section "1B") return GeneratorCreationInfos.builder() + .stashed(false) .equipmentId("idGenerator1") .equipmentName("idGenerator1") .voltageLevelId("v2") @@ -80,6 +81,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return GeneratorCreationInfos.builder() + .stashed(false) .equipmentId("idGenerator2") .equipmentName("nameGeneratorModified") .voltageLevelId("v1") diff --git a/src/test/java/org/gridsuite/modification/server/modifications/GeneratorModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/GeneratorModificationTest.java index 6363e7d40..afa10df75 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/GeneratorModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/GeneratorModificationTest.java @@ -41,6 +41,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return GeneratorModificationInfos.builder() + .stashed(false) .equipmentId("idGenerator") .energySource(new AttributeModification<>(EnergySource.SOLAR, OperationType.SET)) .equipmentName(new AttributeModification<>("newV1Generator", OperationType.SET)) @@ -77,6 +78,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return GeneratorModificationInfos.builder() + .stashed(false) .equipmentId("idGenerator") .energySource(new AttributeModification<>(EnergySource.HYDRO, OperationType.SET)) .equipmentName(new AttributeModification<>("newV1GeneratorEdited", OperationType.SET)) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/GeneratorScalingTest.java b/src/test/java/org/gridsuite/modification/server/modifications/GeneratorScalingTest.java index 16c35ea46..f6a90204c 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/GeneratorScalingTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/GeneratorScalingTest.java @@ -120,7 +120,7 @@ public void testCreate() throws Exception { wireMockUtils.verifyGetRequest(stubId, PATH, handleQueryParams(getNetworkUuid(), filters.stream().map(FilterEquipments::getFilterId).collect(Collectors.toList())), false); assertEquals( - String.format("ScalingInfos(super=ModificationInfos(uuid=null, date=null, stashed=null), variations=[ScalingVariationInfos(id=null, filters=[FilterInfos(id=%s, name=filter1)], variationMode=PROPORTIONAL_TO_PMAX, variationValue=50.0, reactiveVariationMode=null), ScalingVariationInfos(id=null, filters=[FilterInfos(id=%s, name=filter2)], variationMode=REGULAR_DISTRIBUTION, variationValue=50.0, reactiveVariationMode=null), ScalingVariationInfos(id=null, filters=[FilterInfos(id=%s, name=filter3)], variationMode=STACKING_UP, variationValue=50.0, reactiveVariationMode=null), ScalingVariationInfos(id=null, filters=[FilterInfos(id=%s, name=filter4)], variationMode=VENTILATION, variationValue=50.0, reactiveVariationMode=null), ScalingVariationInfos(id=null, filters=[FilterInfos(id=%s, name=filter1), FilterInfos(id=%s, name=filter5)], variationMode=PROPORTIONAL, variationValue=50.0, reactiveVariationMode=null)], variationType=DELTA_P)", + String.format("ScalingInfos(super=ModificationInfos(uuid=null, date=null, stashed=false), variations=[ScalingVariationInfos(id=null, filters=[FilterInfos(id=%s, name=filter1)], variationMode=PROPORTIONAL_TO_PMAX, variationValue=50.0, reactiveVariationMode=null), ScalingVariationInfos(id=null, filters=[FilterInfos(id=%s, name=filter2)], variationMode=REGULAR_DISTRIBUTION, variationValue=50.0, reactiveVariationMode=null), ScalingVariationInfos(id=null, filters=[FilterInfos(id=%s, name=filter3)], variationMode=STACKING_UP, variationValue=50.0, reactiveVariationMode=null), ScalingVariationInfos(id=null, filters=[FilterInfos(id=%s, name=filter4)], variationMode=VENTILATION, variationValue=50.0, reactiveVariationMode=null), ScalingVariationInfos(id=null, filters=[FilterInfos(id=%s, name=filter1), FilterInfos(id=%s, name=filter5)], variationMode=PROPORTIONAL, variationValue=50.0, reactiveVariationMode=null)], variationType=DELTA_P)", FILTER_ID_1, FILTER_ID_2, FILTER_ID_3, FILTER_ID_4, FILTER_ID_1, FILTER_ID_5), buildModification().toString() ); @@ -163,6 +163,7 @@ public void testVentilationModeWithoutDistributionKey() throws Exception { .build(); ModificationInfos modificationToCreate = GeneratorScalingInfos.builder() + .stashed(false) .uuid(GENERATOR_SCALING_ID) .date(ZonedDateTime.now().truncatedTo(ChronoUnit.MICROS)) .variationType(VariationType.DELTA_P) @@ -198,6 +199,7 @@ public void testFilterWithWrongIds() throws Exception { .filters(List.of(filter)) .build(); var generatorScalingInfo = GeneratorScalingInfos.builder() + .stashed(false) .variationType(VariationType.TARGET_P) .variations(List.of(variation)) .build(); @@ -240,6 +242,7 @@ public void testScalingCreationWithWarning() throws Exception { .filters(List.of(filter, filter2)) .build(); var generatorScalingInfo = GeneratorScalingInfos.builder() + .stashed(false) .variationType(VariationType.TARGET_P) .variations(List.of(variation)) .build(); @@ -322,6 +325,7 @@ protected ModificationInfos buildModification() { .build(); return GeneratorScalingInfos.builder() + .stashed(false) //.date(ZonedDateTime.now().truncatedTo(ChronoUnit.MICROS)) .variationType(VariationType.DELTA_P) .variations(List.of(variation1, variation2, variation3, variation4, variation5)) @@ -342,6 +346,7 @@ protected ModificationInfos buildModificationUpdate() { .build(); return GeneratorScalingInfos.builder() + .stashed(false) .uuid(GENERATOR_SCALING_ID) //.date(ZonedDateTime.now().truncatedTo(ChronoUnit.MICROS)) .variationType(VariationType.TARGET_P) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/GroovyScriptTest.java b/src/test/java/org/gridsuite/modification/server/modifications/GroovyScriptTest.java index 83c858387..e82f68b5b 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/GroovyScriptTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/GroovyScriptTest.java @@ -39,6 +39,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return GroovyScriptInfos.builder() + .stashed(false) .script("network.getGenerator('idGenerator').targetP=12\n") .build(); } @@ -46,6 +47,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return GroovyScriptInfos.builder() + .stashed(false) .script("network.getGenerator('idGenerator').targetP=15\n") .build(); } @@ -65,6 +67,7 @@ public void testGroovy() throws Exception { MvcResult mvcResult; GroovyScriptInfos groovyScriptInfos = GroovyScriptInfos.builder() + .stashed(false) .script("network.getGenerator('idGenerator').targetP=12\n") .build(); String groovyScriptInfosJson = mapper.writeValueAsString(groovyScriptInfos); diff --git a/src/test/java/org/gridsuite/modification/server/modifications/LineAttachToNewVoltageLevelTest.java b/src/test/java/org/gridsuite/modification/server/modifications/LineAttachToNewVoltageLevelTest.java index 1addadeba..75e576e17 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/LineAttachToNewVoltageLevelTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/LineAttachToNewVoltageLevelTest.java @@ -26,6 +26,7 @@ public class LineAttachToNewVoltageLevelTest extends AbstractNetworkModification private LineCreationInfos getAttachmentLine() { return LineCreationInfos.builder() + .stashed(false) .equipmentId("attachmentLine") .seriesResistance(50.6) .seriesReactance(25.3) @@ -34,6 +35,7 @@ private LineCreationInfos getAttachmentLine() { private VoltageLevelCreationInfos getNewVoltageLevel() { return VoltageLevelCreationInfos.builder() + .stashed(false) .equipmentId("newVoltageLevel") .equipmentName("NewVoltageLevel") .nominalVoltage(379.3) @@ -57,6 +59,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return LineAttachToVoltageLevelInfos.builder() + .stashed(false) .lineToAttachToId("line3") .percent(20.0) .attachmentPointId("AttPointId") @@ -75,6 +78,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return LineAttachToVoltageLevelInfos.builder() + .stashed(false) .lineToAttachToId("line3") .percent(10.0) .attachmentPointId("AttPointId") // created VL diff --git a/src/test/java/org/gridsuite/modification/server/modifications/LineAttachToVoltageLevelTest.java b/src/test/java/org/gridsuite/modification/server/modifications/LineAttachToVoltageLevelTest.java index ebeaf839d..a50b89a92 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/LineAttachToVoltageLevelTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/LineAttachToVoltageLevelTest.java @@ -34,6 +34,7 @@ public class LineAttachToVoltageLevelTest extends AbstractNetworkModificationTes private LineCreationInfos getAttachmentLine(String lineName) { return LineCreationInfos.builder() + .stashed(false) .equipmentId(lineName) .seriesResistance(50.6) .seriesReactance(25.3) @@ -42,6 +43,7 @@ private LineCreationInfos getAttachmentLine(String lineName) { private VoltageLevelCreationInfos getNewVoltageLevel() { return VoltageLevelCreationInfos.builder() + .stashed(false) .equipmentId("newVoltageLevel") .equipmentName("NewVoltageLevel") .nominalVoltage(379.3) @@ -65,6 +67,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return LineAttachToVoltageLevelInfos.builder() + .stashed(false) .lineToAttachToId("line3") .percent(10.0) .attachmentPointId("AttPointId") // created VL @@ -83,6 +86,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return LineAttachToVoltageLevelInfos.builder() + .stashed(false) .lineToAttachToId("line2") .percent(30.0) .attachmentPointId("newAttPointId") diff --git a/src/test/java/org/gridsuite/modification/server/modifications/LineCreationInBusBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/LineCreationInBusBreakerTest.java index 389f3d82c..a4a65a603 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/LineCreationInBusBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/LineCreationInBusBreakerTest.java @@ -46,6 +46,7 @@ public void testCreateWithErrors() throws Exception { public void testCreateLineOptionalParameters() throws Exception { // create new line without shunt conductance or reactance LineCreationInfos lineCreationInfosNoShunt = LineCreationInfos.builder() + .stashed(false) .equipmentId("idLine1") .equipmentName("nameLine1") .seriesResistance(100.0) @@ -69,6 +70,7 @@ public void testCreateLineOptionalParameters() throws Exception { public void testCreateLineOptionalParameters2() throws Exception { // create new line without shunt conductance or reactance LineCreationInfos lineCreationInfosNoShunt = LineCreationInfos.builder() + .stashed(false) .equipmentId("idLine1") .equipmentName("nameLine1") .seriesResistance(100.0) @@ -96,6 +98,7 @@ public void testCreateLineOptionalParameters2() throws Exception { @Test public void testCreateLineOptionalParameters3() throws Exception { LineCreationInfos lineCreationInfosPermanentLimitOK = LineCreationInfos.builder() + .stashed(false) .equipmentId("idLine2") .equipmentName("nameLine2") .seriesResistance(100.0) @@ -120,6 +123,7 @@ public void testCreateLineOptionalParameters3() throws Exception { @Test public void testCreateLineOptionalParameters4() throws Exception { LineCreationInfos lineCreationInfosPermanentLimitOK = LineCreationInfos.builder() + .stashed(false) .equipmentId("idLine2") .equipmentName("nameLine2") .seriesResistance(100.0) @@ -146,6 +150,7 @@ public void testCreateLineOptionalParameters4() throws Exception { @Test public void testCreateLineOptionalParameters5() throws Exception { LineCreationInfos lineCreationInfosPermanentLimitNOK = LineCreationInfos.builder() + .stashed(false) .equipmentId("idLine2") .equipmentName("nameLine2") .seriesResistance(100.0) @@ -165,6 +170,7 @@ public void testCreateLineOptionalParameters5() throws Exception { @Test public void testCreateLineOptionalParameters6() throws Exception { LineCreationInfos lineCreationInfosOK = LineCreationInfos.builder() + .stashed(false) .equipmentId("idLine3") .equipmentName("nameLine3") .seriesResistance(100.0) @@ -192,6 +198,7 @@ protected ModificationInfos buildModification() { // between voltage level "v1" and busbar section "bus1" and // voltage level "v2" and busbar section "bus2" return LineCreationInfos.builder() + .stashed(false) .equipmentId("idLine1") .equipmentName("nameLine1") .seriesResistance(100.0) @@ -212,6 +219,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return LineCreationInfos.builder() + .stashed(false) .equipmentId("idLineEdited1") .equipmentName("nameLineEdited1") .seriesResistance(200.0) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/LineCreationInMixedTypologyTest.java b/src/test/java/org/gridsuite/modification/server/modifications/LineCreationInMixedTypologyTest.java index ce1ae7167..115dbf6af 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/LineCreationInMixedTypologyTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/LineCreationInMixedTypologyTest.java @@ -33,6 +33,7 @@ protected ModificationInfos buildModification() { // between voltage level "v1" and busbar section "1.1" type NODE_BREAKER and // voltage level "v2" and busbar section "bus2 type BUS_BREAKER" return LineCreationInfos.builder() + .stashed(false) .equipmentId("idLine1") .equipmentName("nameLine1") .seriesResistance(100.0) @@ -57,6 +58,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return LineCreationInfos.builder() + .stashed(false) .equipmentId("idLineEdited1") .equipmentName("nameLineEdited1") .seriesResistance(200.0) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/LineCreationInNodeBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/LineCreationInNodeBreakerTest.java index 8b906a116..6455414e9 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/LineCreationInNodeBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/LineCreationInNodeBreakerTest.java @@ -237,6 +237,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return LineCreationInfos.builder() + .stashed(false) .equipmentId("idLine") .equipmentName("nameLine") .seriesResistance(100.0) @@ -261,6 +262,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return LineCreationInfos.builder() + .stashed(false) .equipmentId("idLineEdited") .equipmentName("nameLineEdited") .seriesResistance(110.0) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/LineModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/LineModificationTest.java index 0e63bea44..c9bc5edfb 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/LineModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/LineModificationTest.java @@ -40,7 +40,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { - return LineModificationInfos.builder().equipmentId("line1") + return LineModificationInfos.builder().stashed(false).equipmentId("line1") .equipmentName(new AttributeModification<>("LineModified", OperationType.SET)) .currentLimits1(CurrentLimitsModificationInfos.builder() .temporaryLimits(List.of(CurrentTemporaryLimitModificationInfos.builder() @@ -64,7 +64,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { - return LineModificationInfos.builder().equipmentId("line1") + return LineModificationInfos.builder().stashed(false).equipmentId("line1") .equipmentName(new AttributeModification<>("LineModified1", OperationType.SET)) .seriesReactance(new AttributeModification<>(1.1, OperationType.SET)) .seriesResistance(new AttributeModification<>(2.1, OperationType.SET)) @@ -288,6 +288,7 @@ public void testTemporaryLimitsModification() throws Exception { .endTemporaryLimit() .add(); LineModificationInfos lineModificationInfos = LineModificationInfos.builder() + .stashed(false) .equipmentId("line1") .equipmentName(new AttributeModification<>("LineModified", OperationType.SET)) .currentLimits1(CurrentLimitsModificationInfos.builder() @@ -320,6 +321,7 @@ public void testTemporaryLimitsModification() throws Exception { // Modify name and no modification on temporary limits line.setName(null); LineModificationInfos lineModificationInfos1 = LineModificationInfos.builder() + .stashed(false) .equipmentId("line1") .equipmentName(new AttributeModification<>("ModifiedName", OperationType.SET)) .build(); diff --git a/src/test/java/org/gridsuite/modification/server/modifications/LineSplitWithNewVoltageLevelTest.java b/src/test/java/org/gridsuite/modification/server/modifications/LineSplitWithNewVoltageLevelTest.java index bb5243d5a..8b1cec609 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/LineSplitWithNewVoltageLevelTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/LineSplitWithNewVoltageLevelTest.java @@ -51,6 +51,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { VoltageLevelCreationInfos vl1 = VoltageLevelCreationInfos.builder() + .stashed(false) .equipmentId("newVoltageLevel") .equipmentName("NewVoltageLevel") .nominalVoltage(379.3) @@ -66,6 +67,7 @@ protected ModificationInfos buildModification() { .build(); return LineSplitWithVoltageLevelInfos.builder() + .stashed(false) .lineToSplitId("line2") .percent(10.0) .mayNewVoltageLevelInfos(vl1) @@ -81,6 +83,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return LineSplitWithVoltageLevelInfos.builder() + .stashed(false) .lineToSplitId("line2Edited") .percent(20.0) .mayNewVoltageLevelInfos(null) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/LineSplitWithVoltageLevelTest.java b/src/test/java/org/gridsuite/modification/server/modifications/LineSplitWithVoltageLevelTest.java index cf73a146e..04942a729 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/LineSplitWithVoltageLevelTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/LineSplitWithVoltageLevelTest.java @@ -40,6 +40,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return LineSplitWithVoltageLevelInfos.builder() + .stashed(false) .lineToSplitId("line2") .percent(10.0) .mayNewVoltageLevelInfos(null) @@ -55,6 +56,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { VoltageLevelCreationInfos vl1 = VoltageLevelCreationInfos.builder() + .stashed(false) .equipmentId("newVoltageLevel") .equipmentName("NewVoltageLevel") .nominalVoltage(379.3) @@ -70,6 +72,7 @@ protected ModificationInfos buildModificationUpdate() { .build(); return LineSplitWithVoltageLevelInfos.builder() + .stashed(false) .lineToSplitId("line2Edited") .percent(20.0) .mayNewVoltageLevelInfos(vl1) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/LinesAttachToSplitLinesTest.java b/src/test/java/org/gridsuite/modification/server/modifications/LinesAttachToSplitLinesTest.java index 543f4c05b..71294a1cb 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/LinesAttachToSplitLinesTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/LinesAttachToSplitLinesTest.java @@ -38,6 +38,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return LinesAttachToSplitLinesInfos.builder() + .stashed(false) .lineToAttachTo1Id("l1") .lineToAttachTo2Id("l2") .attachedLineId("l3") @@ -53,6 +54,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return LinesAttachToSplitLinesInfos.builder() + .stashed(false) .lineToAttachTo1Id("newline1") .lineToAttachTo2Id("newline2") .attachedLineId("newline3") diff --git a/src/test/java/org/gridsuite/modification/server/modifications/LoadCreationInBusBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/LoadCreationInBusBreakerTest.java index 6645020b6..b1704b5a7 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/LoadCreationInBusBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/LoadCreationInBusBreakerTest.java @@ -30,6 +30,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return LoadCreationInfos.builder() + .stashed(false) .equipmentId("idLoad1") .equipmentName("nameLoad1") .voltageLevelId("v1") @@ -45,6 +46,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return LoadCreationInfos.builder() + .stashed(false) .equipmentId("idLoadEdited1") .equipmentName("nameLoadEdited1") .voltageLevelId("v1Edited") diff --git a/src/test/java/org/gridsuite/modification/server/modifications/LoadCreationInNodeBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/LoadCreationInNodeBreakerTest.java index 2e025cdf7..9483ea768 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/LoadCreationInNodeBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/LoadCreationInNodeBreakerTest.java @@ -100,6 +100,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return LoadCreationInfos.builder() + .stashed(false) .equipmentId("idLoad1") .equipmentName("nameLoad1") .voltageLevelId("v2") @@ -115,6 +116,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return LoadCreationInfos.builder() + .stashed(false) .equipmentId("idLoad1Edited") .equipmentName("nameLoad1Edited") .voltageLevelId("v2Edited") diff --git a/src/test/java/org/gridsuite/modification/server/modifications/LoadModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/LoadModificationTest.java index e320262df..27eca5d34 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/LoadModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/LoadModificationTest.java @@ -38,6 +38,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return LoadModificationInfos.builder() + .stashed(false) .equipmentId("v1load") .equipmentName(new AttributeModification<>("nameLoad1", OperationType.SET)) .loadType(new AttributeModification<>(LoadType.FICTITIOUS, OperationType.SET)) @@ -49,6 +50,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return LoadModificationInfos.builder() + .stashed(false) .equipmentId("v1load") .equipmentName(new AttributeModification<>("nameLoadEdited1", OperationType.SET)) .loadType(new AttributeModification<>(LoadType.AUXILIARY, OperationType.SET)) @@ -81,6 +83,7 @@ protected void assertAfterNetworkModificationDeletion() { public void testCreateWithErrors() throws Exception { // Unset an attribute that should not be null LoadModificationInfos loadModificationInfos = LoadModificationInfos.builder() + .stashed(false) .equipmentId("v1load") .loadType(new AttributeModification<>(null, OperationType.UNSET)) .build(); diff --git a/src/test/java/org/gridsuite/modification/server/modifications/LoadScalingTest.java b/src/test/java/org/gridsuite/modification/server/modifications/LoadScalingTest.java index 3c5ae32ca..ffccc21d5 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/LoadScalingTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/LoadScalingTest.java @@ -179,6 +179,7 @@ public void testVentilationModeWithoutDistributionKey() throws Exception { .build(); ModificationInfos modificationToCreate = LoadScalingInfos.builder() + .stashed(false) .uuid(LOAD_SCALING_ID) .date(ZonedDateTime.now().truncatedTo(ChronoUnit.MICROS)) .variationType(VariationType.DELTA_P) @@ -347,6 +348,7 @@ protected ModificationInfos buildModification() { .build(); return LoadScalingInfos.builder() + .stashed(false) .date(ZonedDateTime.now().truncatedTo(ChronoUnit.MICROS)) .variationType(VariationType.DELTA_P) .variations(List.of(variation1, variation2, variation3, variation4, variation5)) @@ -368,6 +370,7 @@ protected ModificationInfos buildModificationUpdate() { .build(); return LoadScalingInfos.builder() + .stashed(false) .uuid(LOAD_SCALING_ID) .date(ZonedDateTime.now().truncatedTo(ChronoUnit.MICROS)) .variationType(VariationType.TARGET_P) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/ShuntCompensatorCreationInBusBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/ShuntCompensatorCreationInBusBreakerTest.java index f2253983f..48579f379 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/ShuntCompensatorCreationInBusBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/ShuntCompensatorCreationInBusBreakerTest.java @@ -50,6 +50,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return ShuntCompensatorCreationInfos.builder() + .stashed(false) .date(ZonedDateTime.now().truncatedTo(ChronoUnit.MICROS)) .equipmentId("shuntOneId") .equipmentName("hopOne") @@ -65,6 +66,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return ShuntCompensatorCreationInfos.builder() + .stashed(false) .date(ZonedDateTime.now().truncatedTo(ChronoUnit.MICROS)) .equipmentId("shuntOneIdEdited") .equipmentName("hopEdited") diff --git a/src/test/java/org/gridsuite/modification/server/modifications/ShuntCompensatorCreationInNodeBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/ShuntCompensatorCreationInNodeBreakerTest.java index cd68be3a4..c969d08ea 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/ShuntCompensatorCreationInNodeBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/ShuntCompensatorCreationInNodeBreakerTest.java @@ -42,6 +42,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return ShuntCompensatorCreationInfos.builder() + .stashed(false) .date(ZonedDateTime.now().truncatedTo(ChronoUnit.MICROS)) .equipmentId("shuntOneId") .equipmentName("hop") @@ -58,6 +59,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return ShuntCompensatorCreationInfos.builder() + .stashed(false) .date(ZonedDateTime.now().truncatedTo(ChronoUnit.MICROS)) .equipmentId("shuntOneIdEdited") .equipmentName("hopEdited") diff --git a/src/test/java/org/gridsuite/modification/server/modifications/ShuntCompensatorModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/ShuntCompensatorModificationTest.java index a77ddb794..0276c3dd6 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/ShuntCompensatorModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/ShuntCompensatorModificationTest.java @@ -43,6 +43,7 @@ protected Network createNetwork(UUID networkUuid) { @Test public void testEquipmentWithWrongId() { var shuntCompensator = ShuntCompensatorModificationInfos.builder() + .stashed(false) .equipmentId("wrong id") .build(); @@ -57,6 +58,7 @@ public void testEquipmentWithWrongId() { @Test public void testWrongVoltageLevelId() { var shuntCompensator = ShuntCompensatorModificationInfos.builder() + .stashed(false) .equipmentId("v5shunt") .voltageLevelId("wrongVLId") .build(); @@ -74,6 +76,7 @@ public void testShuntCompensatorWithMultipleSections() { var shuntCompensator = getNetwork().getShuntCompensator("v5shunt"); ShuntCompensatorModificationInfos modificationInfos = ShuntCompensatorModificationInfos.builder() + .stashed(false) .equipmentId("v5shunt") .voltageLevelId("v5") .shuntCompensatorType(new AttributeModification<>(ShuntCompensatorType.REACTOR, OperationType.SET)) @@ -98,6 +101,7 @@ public void testCreateModificationWithShuntCompensatorType() { assertEquals(1.0, model.getBPerSection(), 0); ShuntCompensatorModificationInfos modificationInfos = ShuntCompensatorModificationInfos.builder() + .stashed(false) .equipmentId("v7shunt") .voltageLevelId("v5") .shuntCompensatorType(new AttributeModification<>(ShuntCompensatorType.REACTOR, OperationType.SET)) @@ -121,6 +125,7 @@ public void testCreateModificationWithSusceptancePerSection() { assertEquals(1.0, model.getBPerSection(), 0); ShuntCompensatorModificationInfos modificationInfos = ShuntCompensatorModificationInfos.builder() + .stashed(false) .equipmentId("v7shunt") .voltageLevelId("v5") .susceptancePerSection(AttributeModification.toAttributeModification(3.0, OperationType.SET)) @@ -142,6 +147,7 @@ public void testCreateModificationWithQAtNominalV() { createShuntCompensator(v6, "v8shunt", "v8shunt", 6, 225., 10, true, 1, 1, 2, 1, "feeder_v8shunt", 50, ConnectablePosition.Direction.BOTTOM); ShuntCompensatorModificationInfos modificationInfos1 = ShuntCompensatorModificationInfos.builder() + .stashed(false) .equipmentId("v7shunt") .voltageLevelId("v5") .qAtNominalV(new AttributeModification<>(30.5, OperationType.SET)) @@ -149,6 +155,7 @@ public void testCreateModificationWithQAtNominalV() { .build(); ShuntCompensatorModificationInfos modificationInfos2 = ShuntCompensatorModificationInfos.builder() + .stashed(false) .equipmentId("v8shunt") .voltageLevelId("v6") .qAtNominalV(new AttributeModification<>(30.5, OperationType.SET)) @@ -178,6 +185,7 @@ protected ModificationInfos buildModification() { createShuntCompensator(v2, "v7shunt", "v7shunt", 15, 225., 10, true, 1, 1, 2, 1, "feeder_v7shunt", 40, ConnectablePosition.Direction.BOTTOM); return ShuntCompensatorModificationInfos.builder() + .stashed(false) .equipmentId("v7shunt") .shuntCompensatorType(new AttributeModification<>(ShuntCompensatorType.CAPACITOR, OperationType.SET)) .qAtNominalV(new AttributeModification<>(15.0, OperationType.SET)) @@ -189,6 +197,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return ShuntCompensatorModificationInfos.builder() + .stashed(false) .equipmentId("v2shunt") .voltageLevelId("v2") .susceptancePerSection(new AttributeModification<>(0.5, OperationType.SET)) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/SubstationCreationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/SubstationCreationTest.java index b8c793587..977a417ba 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/SubstationCreationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/SubstationCreationTest.java @@ -36,6 +36,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return SubstationCreationInfos.builder() + .stashed(false) .equipmentId("SubstationId") .equipmentName("SubstationName") .substationCountry(Country.AF) @@ -46,6 +47,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return SubstationCreationInfos.builder() + .stashed(false) .equipmentId("SubstationIdEdited") .equipmentName("SubstationNameEdited") .substationCountry(Country.CI) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/SubstationDeletionTest.java b/src/test/java/org/gridsuite/modification/server/modifications/SubstationDeletionTest.java index c26e5ceb5..3eb4cf4d0 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/SubstationDeletionTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/SubstationDeletionTest.java @@ -28,6 +28,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return EquipmentDeletionInfos.builder() + .stashed(false) .equipmentType("SUBSTATION") .equipmentId("s1") .build(); @@ -36,6 +37,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return EquipmentDeletionInfos.builder() + .stashed(false) .equipmentType("LINE") .equipmentId("v2") .build(); diff --git a/src/test/java/org/gridsuite/modification/server/modifications/SubstationModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/SubstationModificationTest.java index 67b405a8f..9cc69bc91 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/SubstationModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/SubstationModificationTest.java @@ -40,6 +40,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return SubstationModificationInfos.builder() + .stashed(false) .equipmentId("s3") .equipmentName(new AttributeModification<>("newName", OperationType.SET)) .substationCountry(new AttributeModification<>(Country.BQ, OperationType.SET)) @@ -53,6 +54,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return SubstationModificationInfos.builder() + .stashed(false) .equipmentId("s3") .equipmentName(new AttributeModification<>("newNameEdited1", OperationType.SET)) .substationCountry(new AttributeModification<>(Country.JP, OperationType.SET)) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreationBusBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreationBusBreakerTest.java index f1e7599c2..67c3ee57c 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreationBusBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreationBusBreakerTest.java @@ -41,6 +41,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return TwoWindingsTransformerCreationInfos.builder() + .stashed(false) .equipmentId("new2wt") .equipmentName("new2wt") .seriesResistance(1.) @@ -146,6 +147,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return TwoWindingsTransformerCreationInfos.builder() + .stashed(false) .equipmentId("new2wtUpdate") .equipmentName("new2wtUpdate") .seriesResistance(2.3) @@ -304,6 +306,7 @@ public void testCreateTwoWindingsTransformerWithRatioTapChangerInBusBreaker() th .build(); // create new 2wt in voltage level with bus/breaker topology TwoWindingsTransformerCreationInfos twoWindingsTransformerCreationInfos = TwoWindingsTransformerCreationInfos.builder() + .stashed(false) .equipmentId("id2wt1") .equipmentName("2wtName") .voltageLevelId1("v1") @@ -321,6 +324,7 @@ public void testCreateTwoWindingsTransformerWithRatioTapChangerInBusBreaker() th .build(); testCreateTwoWindingsTransformerInBusBreaker(twoWindingsTransformerCreationInfos, 1); TwoWindingsTransformerCreationInfos twoWindingsTransformerCreationInfos2 = TwoWindingsTransformerCreationInfos.builder() + .stashed(false) .equipmentId("id2wt1WithRatioTapChanger2") .equipmentName("2wtName") .voltageLevelId1("v1") @@ -356,6 +360,7 @@ public void testCreateTwoWindingsTransformerWithPhaseTapChangerInBusBreaker() th .steps(getTapChangerSteps()) .build(); TwoWindingsTransformerCreationInfos twoWindingsTransformerCreationInfos = TwoWindingsTransformerCreationInfos.builder() + .stashed(false) .equipmentId("id2wt1WithPhaseTapChanger") .equipmentName("2wtName") .voltageLevelId1("v1") diff --git a/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreationMixedBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreationMixedBreakerTest.java index c5044811d..81d9a8189 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreationMixedBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreationMixedBreakerTest.java @@ -36,6 +36,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return TwoWindingsTransformerCreationInfos.builder() + .stashed(false) .equipmentId("id2wt1") .equipmentName("2wtName") .voltageLevelId1("v1") @@ -139,6 +140,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return TwoWindingsTransformerCreationInfos.builder() + .stashed(false) .equipmentId("new2wtUpdate") .equipmentName("new2wtUpdate") .seriesResistance(2.3) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreationNodeBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreationNodeBreakerTest.java index 8a9135df9..bad14c75d 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreationNodeBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreationNodeBreakerTest.java @@ -42,6 +42,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return TwoWindingsTransformerCreationInfos.builder() + .stashed(false) .equipmentId("new2wt") .equipmentName("new2wt") .seriesResistance(1.) @@ -147,6 +148,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return TwoWindingsTransformerCreationInfos.builder() + .stashed(false) .equipmentId("new2wtUpdate") .equipmentName("new2wtUpdate") .seriesResistance(10.) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerModificationTest.java index 34da2824a..02e9c3830 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerModificationTest.java @@ -42,7 +42,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { - return TwoWindingsTransformerModificationInfos.builder().equipmentId("trf1") + return TwoWindingsTransformerModificationInfos.builder().stashed(false).equipmentId("trf1") .equipmentName(new AttributeModification<>("2wt modified name", OperationType.SET)) .seriesResistance(new AttributeModification<>(1., OperationType.SET)) .seriesReactance(new AttributeModification<>(2., OperationType.SET)) @@ -132,7 +132,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { - return TwoWindingsTransformerModificationInfos.builder().equipmentId("trf1") + return TwoWindingsTransformerModificationInfos.builder().stashed(false).equipmentId("trf1") .equipmentName(new AttributeModification<>("2wt modified name again", OperationType.SET)) .seriesResistance(new AttributeModification<>(1.1, OperationType.SET)) .seriesReactance(new AttributeModification<>(2.1, OperationType.SET)) @@ -285,6 +285,7 @@ public void testCreateWithErrors() throws Exception { @Test public void testRatioTapChangerModification() throws Exception { TwoWindingsTransformerModificationInfos twoWindingsTransformerModificationInfos = TwoWindingsTransformerModificationInfos.builder() + .stashed(false) .equipmentId("trf1") .phaseTapChanger(PhaseTapChangerModificationInfos.builder() .build()) @@ -401,6 +402,7 @@ public void testRatioTapChangerModification() throws Exception { @Test public void testPhaseTapChangerModification() throws Exception { TwoWindingsTransformerModificationInfos twoWindingsTransformerModificationInfos = TwoWindingsTransformerModificationInfos.builder() + .stashed(false) .equipmentId("trf2") .ratioTapChanger(RatioTapChangerModificationInfos.builder() .build()) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/VoltageInitModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/VoltageInitModificationTest.java index 876593409..e58de17b1 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/VoltageInitModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/VoltageInitModificationTest.java @@ -94,6 +94,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return VoltageInitModificationInfos.builder() + .stashed(false) .generators(List.of( VoltageInitGeneratorModificationInfos.builder() .generatorId("idGenerator") @@ -188,6 +189,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return VoltageInitModificationInfos.builder() + .stashed(false) .generators(List.of( VoltageInitGeneratorModificationInfos.builder() .generatorId("idGenerator") @@ -249,6 +251,7 @@ private void testVoltageInitShunt(String shuntCompensatorId, int currentSectionC getNetwork().getShuntCompensator(shuntCompensatorId).setSectionCount(currentSectionCount); VoltageInitModificationInfos modification = VoltageInitModificationInfos.builder() + .stashed(false) .generators(List.of()) .transformers(List.of()) .staticVarCompensators(List.of()) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelCreationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelCreationTest.java index a74af0df2..616b76d49 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelCreationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelCreationTest.java @@ -47,6 +47,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return VoltageLevelCreationInfos.builder() + .stashed(false) .equipmentId("VoltageLevelIdEdited") .equipmentName("VoltageLevelEdited") .substationId("s2") diff --git a/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelDeletionTest.java b/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelDeletionTest.java index c71083674..353d075ca 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelDeletionTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelDeletionTest.java @@ -28,6 +28,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return EquipmentDeletionInfos.builder() + .stashed(false) .equipmentType("VOLTAGE_LEVEL") .equipmentId("v1") .build(); @@ -36,6 +37,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return EquipmentDeletionInfos.builder() + .stashed(false) .equipmentType("LINE") .equipmentId("v2") .build(); diff --git a/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelModificationTest.java index 9d1b64cd8..6e33a6664 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelModificationTest.java @@ -38,6 +38,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return VoltageLevelModificationInfos.builder() + .stashed(false) .equipmentId("v1") .equipmentName(new AttributeModification<>("test 1", OperationType.SET)) .nominalVoltage(new AttributeModification<>(420D, OperationType.SET)) @@ -51,6 +52,7 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { return VoltageLevelModificationInfos.builder() + .stashed(false) .equipmentId("v1") .equipmentName(new AttributeModification<>("test 2", OperationType.SET)) .nominalVoltage(new AttributeModification<>(450D, OperationType.SET)) @@ -92,6 +94,7 @@ public void testModifyShortCircuitExtension() throws Exception { applyModification(infos); VoltageLevelModificationInfos updatedInfos = VoltageLevelModificationInfos.builder() + .stashed(false) .equipmentId("v1") .ipMax(new AttributeModification<>(0.9, OperationType.SET)) .build(); diff --git a/src/test/java/org/gridsuite/modification/server/modifications/VscCreationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/VscCreationTest.java index 9324bf8fa..381aaa15f 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/VscCreationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/VscCreationTest.java @@ -51,6 +51,7 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { return VscCreationInfos.builder() + .stashed(false) .equipmentId("vsc1") .equipmentName("vsc1Name") .dcNominalVoltage(39.) @@ -120,6 +121,7 @@ private ConverterStationCreationInfos buildConverterStationWithReactiveCapabilit @Override protected ModificationInfos buildModificationUpdate() { return VscCreationInfos.builder() + .stashed(false) .equipmentId("vsc1") .equipmentName("vsc2Name") .dcNominalVoltage(53.) diff --git a/src/test/java/org/gridsuite/modification/server/utils/ModificationCreation.java b/src/test/java/org/gridsuite/modification/server/utils/ModificationCreation.java index 472f4cf87..ca7b82248 100644 --- a/src/test/java/org/gridsuite/modification/server/utils/ModificationCreation.java +++ b/src/test/java/org/gridsuite/modification/server/utils/ModificationCreation.java @@ -23,6 +23,7 @@ private ModificationCreation() { public static VoltageLevelCreationInfos getCreationVoltageLevel(String substationId, String voltageLevelId, String voltageLevelName) { return VoltageLevelCreationInfos.builder() + .stashed(false) .equipmentId(voltageLevelId) .equipmentName(voltageLevelName) .substationId(substationId) @@ -39,6 +40,7 @@ public static VoltageLevelCreationInfos getCreationVoltageLevel(String substatio public static BatteryCreationInfos getCreationBattery(String vlId, String batteryId, String batteryName, String busOrBusbarSectionId) { return BatteryCreationInfos.builder() + .stashed(false) .equipmentId(batteryId) .equipmentName(batteryName) .voltageLevelId(vlId) @@ -62,6 +64,7 @@ public static BatteryCreationInfos getCreationBattery(String vlId, String batter public static GeneratorCreationInfos getCreationGenerator(String vlId, String generatorId, String generatorName, String busOrBusbarSectionId, String regulatingTerminalId, String regulatingTerminalType, String regulatingTerminalVlId) { return GeneratorCreationInfos.builder() + .stashed(false) .equipmentId(generatorId) .equipmentName(generatorName) .voltageLevelId(vlId)