Skip to content

Commit c2acd81

Browse files
authored
Gridsuite dependencies v42.0.0 (#267)
Signed-off-by: Etienne LESOT <[email protected]>
1 parent 9fc9269 commit c2acd81

File tree

4 files changed

+9
-22
lines changed

4 files changed

+9
-22
lines changed

pom.xml

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@
4242
</developers>
4343

4444
<properties>
45-
<!-- FIXME to remove at next upgrade of powsybl-ws-dependencies -->
46-
<powsybl-network-store.version>1.28.0</powsybl-network-store.version>
47-
<gridsuite-dependencies.version>41.0.0</gridsuite-dependencies.version>
45+
46+
<gridsuite-dependencies.version>42.0.0</gridsuite-dependencies.version>
4847
<sonar.organization>gridsuite</sonar.organization>
4948
<sonar.projectKey>org.gridsuite:network-map-server</sonar.projectKey>
5049
</properties>
@@ -81,25 +80,7 @@
8180

8281
<dependencyManagement>
8382
<dependencies>
84-
<!-- overrides of imports -->
85-
<!-- FIXME to remove at next upgrade of powsybl-ws-dependencies -->
86-
<dependency>
87-
<groupId>com.powsybl</groupId>
88-
<artifactId>powsybl-network-store-model</artifactId>
89-
<version>${powsybl-network-store.version}</version>
90-
</dependency>
91-
<!-- FIXME to remove at next upgrade of powsybl-ws-dependencies -->
92-
<dependency>
93-
<groupId>com.powsybl</groupId>
94-
<artifactId>powsybl-network-store-iidm-impl</artifactId>
95-
<version>${powsybl-network-store.version}</version>
96-
</dependency>
97-
<!-- FIXME to remove at next upgrade of powsybl-ws-dependencies -->
98-
<dependency>
99-
<groupId>com.powsybl</groupId>
100-
<artifactId>powsybl-network-store-client</artifactId>
101-
<version>${powsybl-network-store.version}</version>
102-
</dependency>
83+
10384

10485
<!-- imports -->
10586
<dependency>

src/main/java/org/gridsuite/network/map/dto/definition/staticvarcompensator/StaticVarCompensatorFormInfos.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ public class StaticVarCompensatorFormInfos extends ElementInfosWithProperties {
4242

4343
private StaticVarCompensator.RegulationMode regulationMode;
4444

45+
@JsonInclude(JsonInclude.Include.NON_NULL)
46+
private Boolean isRegulating;
47+
4548
@JsonInclude(JsonInclude.Include.NON_NULL)
4649
private String busOrBusbarSectionId;
4750

src/main/java/org/gridsuite/network/map/dto/mapper/StaticVarCompensatorInfosMapper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ private static StaticVarCompensatorFormInfos toFormInfos(Identifiable<?> identif
4848
.voltageLevelId(terminal.getVoltageLevel().getId())
4949
.nominalV(nullIfNan(terminal.getVoltageLevel().getNominalV()))
5050
.regulationMode(staticVarCompensator.getRegulationMode())
51+
.isRegulating(staticVarCompensator.isRegulating())
5152
.maxSusceptance(nullIfNan(staticVarCompensator.getBmax()))
5253
.minSusceptance(nullIfNan(staticVarCompensator.getBmin()))
5354
.voltageSetpoint(nullIfNan(staticVarCompensator.getVoltageSetpoint()))

src/test/resources/static-var-compensators-form-data.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"connectionPosition": 0,
1616
"connectionDirection": "TOP"
1717
},
18+
"isRegulating": false,
1819
"busOrBusbarSectionId": "NGEN",
1920
"standbyAutomatonInfos": {
2021
"standby": true,
@@ -36,6 +37,7 @@
3637
"regulationMode": "VOLTAGE",
3738
"voltageSetpoint": 200.0,
3839
"reactivePowerSetpoint": 100.0,
40+
"isRegulating": false,
3941
"busOrBusbarSectionId": "NNEW2",
4042
"connectablePosition": {
4143
"connectionDirection": null

0 commit comments

Comments
 (0)