Skip to content

Commit 02719ac

Browse files
EtienneLtMathieu-Deharbe
EtienneLt
and
Mathieu-Deharbe
authored
Gridsuite dependencies v42.0.0 (#657)
Signed-off-by: Etienne LESOT <[email protected]> Co-authored-by: Mathieu DEHARBE <[email protected]>
1 parent d573397 commit 02719ac

14 files changed

+146
-153
lines changed

‎pom.xml‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,13 @@
4444
</developers>
4545

4646
<properties>
47-
<!-- FIXME to remove at next upgrade of powsybl-ws-dependencies -->
48-
<powsybl-network-store.version>1.28.0</powsybl-network-store.version>
49-
<gridsuite-dependencies.version>41.0.0</gridsuite-dependencies.version>
47+
<gridsuite-dependencies.version>42.0.0</gridsuite-dependencies.version>
5048
<db-util.version>1.0.5</db-util.version>
5149
<mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>
5250
<liquibase-hibernate-package>org.gridsuite.modification.server</liquibase-hibernate-package>
5351
<sonar.coverage.exclusions>**/migration/**/*</sonar.coverage.exclusions>
5452
<sonar.organization>gridsuite</sonar.organization>
5553
<sonar.projectKey>org.gridsuite:network-modification-server</sonar.projectKey>
56-
<!-- TODO network-modification.version remove when upgrading gridsuite dependencies -->
57-
<network-modification.version>0.25.0</network-modification.version>
5854
</properties>
5955

6056
<build>
@@ -90,32 +86,14 @@
9086
<dependencyManagement>
9187
<dependencies>
9288
<!-- overrides of imports -->
93-
<!-- FIXME to remove at next upgrade of powsybl-ws-dependencies -->
94-
<dependency>
95-
<groupId>com.powsybl</groupId>
96-
<artifactId>powsybl-network-store-model</artifactId>
97-
<version>${powsybl-network-store.version}</version>
98-
</dependency>
99-
<!-- FIXME to remove at next upgrade of powsybl-ws-dependencies -->
100-
<dependency>
101-
<groupId>com.powsybl</groupId>
102-
<artifactId>powsybl-network-store-iidm-impl</artifactId>
103-
<version>${powsybl-network-store.version}</version>
104-
</dependency>
105-
<!-- FIXME to remove at next upgrade of powsybl-ws-dependencies -->
106-
<dependency>
107-
<groupId>com.powsybl</groupId>
108-
<artifactId>powsybl-network-store-client</artifactId>
109-
<version>${powsybl-network-store.version}</version>
110-
</dependency>
89+
11190
<dependency><!-- To remove when integrate in next release of gridsuite-dependencies or powsybl-ws-dependencies -->
11291
<groupId>com.squareup.okhttp3</groupId>
11392
<artifactId>okhttp-bom</artifactId>
11493
<version>${mockwebserver3.version}</version>
11594
<type>pom</type>
11695
<scope>import</scope>
11796
</dependency>
118-
11997
<!-- imports -->
12098
<dependency>
12199
<groupId>org.gridsuite</groupId>
@@ -139,7 +117,6 @@
139117
<dependency>
140118
<groupId>org.gridsuite</groupId>
141119
<artifactId>gridsuite-network-modification</artifactId>
142-
<version>${network-modification.version}</version>
143120
</dependency>
144121
<dependency>
145122
<groupId>com.powsybl</groupId>

‎src/main/java/org/gridsuite/modification/server/entities/equipment/creation/StaticCompensatorCreationEntity.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ public class StaticCompensatorCreationEntity extends InjectionCreationEntity {
4141
@Column(name = "regulationMode")
4242
private StaticVarCompensator.RegulationMode regulationMode;
4343

44+
@Column(name = "regulating")
45+
private boolean regulating;
46+
4447
@Column
4548
private Double voltageSetpoint;
4649

@@ -102,6 +105,7 @@ private void assignAttributes(StaticVarCompensatorCreationInfos creationInfos) {
102105
this.maxQAtNominalV = creationInfos.getMaxQAtNominalV();
103106
this.minQAtNominalV = creationInfos.getMinQAtNominalV();
104107
this.regulationMode = creationInfos.getRegulationMode();
108+
this.regulating = creationInfos.isRegulating();
105109
this.voltageSetpoint = creationInfos.getVoltageSetpoint();
106110
this.reactivePowerSetpoint = creationInfos.getReactivePowerSetpoint();
107111
this.voltageRegulationType = creationInfos.getVoltageRegulationType();
@@ -144,6 +148,7 @@ public StaticVarCompensatorCreationInfos toModificationInfos() {
144148
.minQAtNominalV(getMinQAtNominalV())
145149
.maxQAtNominalV(getMaxQAtNominalV())
146150
.regulationMode(getRegulationMode())
151+
.regulating(isRegulating())
147152
.reactivePowerSetpoint(getReactivePowerSetpoint())
148153
.voltageSetpoint(getVoltageSetpoint())
149154
.voltageRegulationType(getVoltageRegulationType())

‎src/main/java/org/gridsuite/modification/server/entities/equipment/creation/TwoWindingsTransformerCreationEntity.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class TwoWindingsTransformerCreationEntity extends BranchCreationEntity {
5353
@Column(name = "phasetapchangertapposition")
5454
private Integer phaseTapChangerTapPosition;
5555

56-
@Column(name = "phasetapchangerregulating")
56+
@Column(name = "phase_tap_changer_regulating")
5757
private Boolean phaseTapChangerRegulating;
5858

5959
@Column(name = "phasetapchangertargetdeadband")
@@ -237,6 +237,8 @@ public TwoWindingsTransformerCreationInfos toModificationInfos() {
237237
.tapPosition(getPhaseTapChangerTapPosition())
238238
.targetDeadband(getPhaseTapChangerTargetDeadband())
239239
.regulating(getPhaseTapChangerRegulating())
240+
// loadTapChangingCapabilities always true because in gridsuite the user can't change it
241+
.loadTapChangingCapabilities(true)
240242
.regulationMode(getPhaseTapChangerRegulationMode())
241243
.regulationValue(getPhaseTapChangerRegulationValue())
242244
.regulatingTerminalId(getPhaseTapChangerTerminalRefConnectableId())

‎src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,22 @@ public class TwoWindingsTransformerModificationEntity extends BranchModification
269269
})
270270
private DoubleModificationEmbedded phaseTapChangerRegulationValue;
271271

272+
@Column(name = "phase_tap_changer_regulating")
273+
@Embedded
274+
@AttributeOverrides(value = {
275+
@AttributeOverride(name = "value", column = @Column(name = "phase_tap_changer_regulating")),
276+
@AttributeOverride(name = "opType", column = @Column(name = "phase_tap_changer_regulating_op"))
277+
})
278+
private BooleanModificationEmbedded phaseTapChangerRegulating;
279+
280+
@Column(name = "phase_tap_changer_load_tap_changing_capabilities")
281+
@Embedded
282+
@AttributeOverrides(value = {
283+
@AttributeOverride(name = "value", column = @Column(name = "phase_tap_changer_load_tap_changing_capabilities")),
284+
@AttributeOverride(name = "opType", column = @Column(name = "phase_tap_changer_load_tap_changing_capabilities_op"))
285+
})
286+
private BooleanModificationEmbedded phaseTapChangerLoadTapChangingCapabilities;
287+
272288
@Embedded
273289
@AttributeOverrides(value = {
274290
@AttributeOverride(name = "value", column = @Column(name = "phasetapchangertobeestimated")),
@@ -342,6 +358,8 @@ private void assignPhaseTapChanger(PhaseTapChangerModificationInfos phaseTapChan
342358
this.phaseTapChangerTerminalRefConnectableId = phaseTapChanger.getRegulatingTerminalId() != null ? new StringModificationEmbedded(phaseTapChanger.getRegulatingTerminalId()) : null;
343359
this.phaseTapChangerTerminalRefVoltageLevelId = phaseTapChanger.getRegulatingTerminalVlId() != null ? new StringModificationEmbedded(phaseTapChanger.getRegulatingTerminalVlId()) : null;
344360
this.phaseTapChangerTerminalRefType = phaseTapChanger.getRegulatingTerminalType() != null ? new StringModificationEmbedded(phaseTapChanger.getRegulatingTerminalType()) : null;
361+
this.phaseTapChangerRegulating = phaseTapChanger.getRegulating() != null ? new BooleanModificationEmbedded(phaseTapChanger.getRegulating()) : null;
362+
this.phaseTapChangerLoadTapChangingCapabilities = phaseTapChanger.getLoadTapChangingCapabilities() != null ? new BooleanModificationEmbedded(phaseTapChanger.getLoadTapChangingCapabilities()) : null;
345363
if (phaseTapChanger.getSteps() != null) {
346364
this.tapChangerSteps.addAll(TapChangerStepCreationEmbeddable.toEmbeddablePhaseTapChangerSteps(phaseTapChanger.getSteps()));
347365
}
@@ -446,6 +464,8 @@ public TwoWindingsTransformerModificationInfos toModificationInfos() {
446464
.targetDeadband(IAttributeModificationEmbeddable.toAttributeModification(getPhaseTapChangerTargetDeadband()))
447465
.regulationMode(IAttributeModificationEmbeddable.toAttributeModification(getPhaseTapChangerRegulationMode()))
448466
.regulationValue(IAttributeModificationEmbeddable.toAttributeModification(getPhaseTapChangerRegulationValue()))
467+
.regulating(IAttributeModificationEmbeddable.toAttributeModification(getPhaseTapChangerRegulating()))
468+
.loadTapChangingCapabilities(IAttributeModificationEmbeddable.toAttributeModification(getPhaseTapChangerLoadTapChangingCapabilities()))
449469
.regulatingTerminalId(IAttributeModificationEmbeddable.toAttributeModification(getPhaseTapChangerTerminalRefConnectableId()))
450470
.regulatingTerminalVlId(IAttributeModificationEmbeddable.toAttributeModification(getPhaseTapChangerTerminalRefVoltageLevelId()))
451471
.regulatingTerminalType(IAttributeModificationEmbeddable.toAttributeModification(getPhaseTapChangerTerminalRefType()))

‎src/main/resources/db/changelog/changesets/changelog_20250722T125427Z.xml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
2+
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
3+
<changeSet author="lesoteti (generated)" id="1753188911693-31">
4+
<addColumn tableName="two_windings_transformer_modification">
5+
<column name="phase_tap_changer_load_tap_changing_capabilities" type="boolean"/>
6+
</addColumn>
7+
</changeSet>
8+
<changeSet author="lesoteti (generated)" id="1753188911693-32">
9+
<addColumn tableName="two_windings_transformer_modification">
10+
<column name="phase_tap_changer_load_tap_changing_capabilities_op" type="varchar(255)"/>
11+
</addColumn>
12+
</changeSet>
13+
<changeSet author="lesoteti (generated)" id="1753188911693-33">
14+
<renameColumn newColumnName="phase_tap_changer_regulating"
15+
oldColumnName="phasetapchangerregulating"
16+
tableName="two_windings_transformer_creation"/>
17+
</changeSet>
18+
<changeSet author="lesoteti (generated)" id="1753188911693-34">
19+
<addColumn tableName="two_windings_transformer_modification">
20+
<column name="phase_tap_changer_regulating" type="boolean"/>
21+
</addColumn>
22+
</changeSet>
23+
<changeSet author="lesoteti (generated)" id="1753188911693-35">
24+
<addColumn tableName="two_windings_transformer_modification">
25+
<column name="phase_tap_changer_regulating_op" type="varchar(255)"/>
26+
</addColumn>
27+
</changeSet>
28+
<changeSet author="lesoteti (generated)" id="1753188911693-36">
29+
<addColumn tableName="static_var_compensator_creation">
30+
<column name="regulating" type="boolean"/>
31+
</addColumn>
32+
</changeSet>
33+
<changeSet author="deharbemat" id="1753188911693-37">
34+
<addColumn tableName="two_windings_transformer_creation">
35+
<column name="phase_tap_changer_load_tap_changing_capabilities" type="boolean"/>
36+
</addColumn>
37+
</changeSet>
38+
<changeSet author="deharbemat" id="1753188911693-99">
39+
<sqlFile
40+
encoding="UTF-8"
41+
path="migrationRegulationMode_20250710T121805Z.sql"
42+
relativeToChangelogFile="true"
43+
splitStatements="true"
44+
stripComments="true"/>
45+
</changeSet>
46+
</databaseChangeLog>

‎src/main/resources/db/changelog/changesets/migrationRegulationMode_20250710T121805Z.sql‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
UPDATE two_windings_transformer_creation SET phase_tap_changer_regulating = 'false' WHERE phasetapchangerregulationmode = 'FIXED_TAP';
2+
UPDATE two_windings_transformer_creation SET phase_tap_changer_regulating = 'true' WHERE phasetapchangerregulationmode <> 'FIXED_TAP';
3+
UPDATE two_windings_transformer_creation SET phasetapchangerregulationmode = NULL WHERE phasetapchangerregulationmode = 'FIXED_TAP';
4+
5+
UPDATE two_windings_transformer_modification
6+
SET phase_tap_changer_regulating = 'false', phase_tap_changer_regulating_op = 'SET'
7+
WHERE phasetapchangerregulationmode = 'FIXED_TAP' AND phasetapchangerregulationmode_op = 'SET';
8+
9+
UPDATE two_windings_transformer_modification
10+
SET phase_tap_changer_regulating = 'true', phase_tap_changer_regulating_op = 'SET'
11+
WHERE phasetapchangerregulationmode <> 'FIXED_TAP' AND phasetapchangerregulationmode_op = 'SET';
12+
13+
UPDATE two_windings_transformer_modification
14+
SET phasetapchangerregulationmode = NULL, phasetapchangerregulationmode_op = NULL
15+
WHERE phasetapchangerregulationmode = 'FIXED_TAP';
16+
17+
UPDATE static_var_compensator_creation SET regulating = 'false' WHERE regulation_mode = 'OFF';
18+
UPDATE static_var_compensator_creation SET regulating = 'true' WHERE regulation_mode <> 'OFF';
19+
UPDATE static_var_compensator_creation SET regulation_mode = NULL WHERE regulation_mode = 'OFF';

‎src/main/resources/db/changelog/db.changelog-master.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,3 +372,6 @@ databaseChangeLog:
372372
- include:
373373
file: changesets/changelog_20250620T115827Z.xml
374374
relativeToChangelogFile: true
375+
- include:
376+
file: changesets/changelog_20250722T125427Z.xml
377+
relativeToChangelogFile: true

‎src/test/java/org/gridsuite/modification/server/modifications/StaticVarCompensatorCreationInNodeBreakerTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.Map;
2424
import java.util.UUID;
2525

26-
import static com.powsybl.iidm.network.StaticVarCompensator.RegulationMode.OFF;
2726
import static com.powsybl.iidm.network.StaticVarCompensator.RegulationMode.VOLTAGE;
2827
import static org.gridsuite.modification.NetworkModificationException.Type.*;
2928
import static org.gridsuite.modification.server.report.NetworkModificationServerReportResourceBundle.ERROR_MESSAGE_KEY;
@@ -290,7 +289,9 @@ void testCreateWithStandbyAutomatonErrors() throws Exception {
290289
assertLogMessage("CREATE_STATIC_VAR_COMPENSATOR_ERROR : " +
291290
"StaticVarCompensator 'idStaticVarCompensator2' : b0 must be within the range of minimum susceptance and maximum susceptance",
292291
ERROR_MESSAGE_KEY, reportService);
293-
compensatorCreationInfos.setRegulationMode(OFF);
292+
compensatorCreationInfos.setRegulating(false);
293+
compensatorCreationInfos.setB0(250.0);
294+
compensatorCreationInfos.setRegulationMode(StaticVarCompensator.RegulationMode.REACTIVE_POWER);
294295
compensatorCreationInfos.setStandby(true);
295296

296297
compensatorCreationInfosJson = getJsonBody(compensatorCreationInfos, null);

‎src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreationBusBreakerTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ protected ModificationInfos buildModification() {
8484
.regulatingTerminalId("idGenerator1")
8585
.regulatingTerminalVlId("v1")
8686
.regulating(false)
87+
.loadTapChangingCapabilities(true)
8788
.regulatingTerminalType("GENERATOR")
8889
.regulationMode(PhaseTapChanger.RegulationMode.CURRENT_LIMITER)
8990
.steps(List.of(TapChangerStepCreationInfos.builder()
@@ -203,6 +204,7 @@ protected ModificationInfos buildModificationUpdate() {
203204
.regulatingTerminalId("v1load")
204205
.regulatingTerminalVlId("v1")
205206
.regulating(false)
207+
.loadTapChangingCapabilities(true)
206208
.regulatingTerminalType("LOAD")
207209
.regulationMode(PhaseTapChanger.RegulationMode.CURRENT_LIMITER)
208210
.steps(List.of(TapChangerStepCreationInfos.builder()

‎src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreationMixedBreakerTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ protected ModificationInfos buildModification() {
6666
.regulatingTerminalId("v1load")
6767
.regulatingTerminalVlId("v1")
6868
.regulating(false)
69+
.loadTapChangingCapabilities(true)
6970
.regulatingTerminalType("LOAD")
7071
.regulationMode(PhaseTapChanger.RegulationMode.CURRENT_LIMITER)
7172
.steps(List.of(TapChangerStepCreationInfos.builder()
@@ -189,6 +190,7 @@ protected ModificationInfos buildModificationUpdate() {
189190
.regulatingTerminalId("v1load")
190191
.regulatingTerminalVlId("v1")
191192
.regulating(false)
193+
.loadTapChangingCapabilities(true)
192194
.regulatingTerminalType("LOAD")
193195
.regulationMode(PhaseTapChanger.RegulationMode.CURRENT_LIMITER)
194196
.steps(List.of(TapChangerStepCreationInfos.builder()

0 commit comments

Comments
 (0)