Skip to content

Commit 8f04275

Browse files
ipirogMathieu-Deharbe
ipirog
and
Mathieu-Deharbe
authored
Rename field regulatingTerminalXXX into terminalRefConnectableXXX (#676)
Signed-off-by: Igor PIROG <[email protected]> Co-authored-by: Mathieu Deharbe <[email protected]>
1 parent 691e757 commit 8f04275

File tree

8 files changed

+111
-111
lines changed

8 files changed

+111
-111
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<sonar.organization>gridsuite</sonar.organization>
5353
<sonar.projectKey>org.gridsuite:network-modification-server</sonar.projectKey>
5454
<!-- TODO network-modification.version remove when upgrading gridsuite dependencies -->
55-
<network-modification.version>0.35.0</network-modification.version>
55+
<network-modification.version>0.36.0</network-modification.version>
5656
<powsybl-balances-adjustment.version>2.14.1</powsybl-balances-adjustment.version>
5757
</properties>
5858

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ private void assignRatioTapChanger(RatioTapChangerCreationInfos ratioTapChanger)
141141
this.ratioTapChangerTapPosition = ratioTapChanger.getTapPosition();
142142
this.ratioTapChangerRegulating = ratioTapChanger.isRegulating();
143143
this.ratioTapChangerTargetDeadband = ratioTapChanger.getTargetDeadband();
144-
this.ratioTapChangerTerminalRefConnectableId = ratioTapChanger.getRegulatingTerminalId();
145-
this.ratioTapChangerTerminalRefVoltageLevelId = ratioTapChanger.getRegulatingTerminalVlId();
146-
this.ratioTapChangerTerminalRefType = ratioTapChanger.getRegulatingTerminalType();
144+
this.ratioTapChangerTerminalRefConnectableId = ratioTapChanger.getTerminalRefConnectableId();
145+
this.ratioTapChangerTerminalRefVoltageLevelId = ratioTapChanger.getTerminalRefConnectableVlId();
146+
this.ratioTapChangerTerminalRefType = ratioTapChanger.getTerminalRefConnectableType();
147147
this.ratioTapChangerLoadTapChangingCapabilities = ratioTapChanger.isLoadTapChangingCapabilities();
148148
this.ratioTapChangerTargetV = ratioTapChanger.getTargetV();
149149
this.tapChangerSteps.addAll(TapChangerStepCreationEmbeddable.toEmbeddableRatioTapChangerSteps(ratioTapChanger.getSteps()));
@@ -154,9 +154,9 @@ private void assignPhaseTapChanger(PhaseTapChangerCreationInfos phaseTapChangerC
154154
this.phaseTapChangerTapPosition = phaseTapChangerCreationInfos.getTapPosition();
155155
this.phaseTapChangerRegulating = phaseTapChangerCreationInfos.isRegulating();
156156
this.phaseTapChangerTargetDeadband = phaseTapChangerCreationInfos.getTargetDeadband();
157-
this.phaseTapChangerTerminalRefConnectableId = phaseTapChangerCreationInfos.getRegulatingTerminalId();
158-
this.phaseTapChangerTerminalRefVoltageLevelId = phaseTapChangerCreationInfos.getRegulatingTerminalVlId();
159-
this.phaseTapChangerTerminalRefType = phaseTapChangerCreationInfos.getRegulatingTerminalType();
157+
this.phaseTapChangerTerminalRefConnectableId = phaseTapChangerCreationInfos.getTerminalRefConnectableId();
158+
this.phaseTapChangerTerminalRefVoltageLevelId = phaseTapChangerCreationInfos.getTerminalRefConnectableVlId();
159+
this.phaseTapChangerTerminalRefType = phaseTapChangerCreationInfos.getTerminalRefConnectableType();
160160
this.phaseTapChangerRegulationMode = phaseTapChangerCreationInfos.getRegulationMode();
161161
this.phaseTapChangerRegulationValue = phaseTapChangerCreationInfos.getRegulationValue();
162162
this.tapChangerSteps.addAll(TapChangerStepCreationEmbeddable.toEmbeddablePhaseTapChangerSteps(phaseTapChangerCreationInfos.getSteps()));
@@ -222,9 +222,9 @@ public TwoWindingsTransformerCreationInfos toModificationInfos() {
222222
.regulating(getRatioTapChangerRegulating())
223223
.loadTapChangingCapabilities(getRatioTapChangerLoadTapChangingCapabilities())
224224
.targetV(getRatioTapChangerTargetV())
225-
.regulatingTerminalId(getRatioTapChangerTerminalRefConnectableId())
226-
.regulatingTerminalVlId(getRatioTapChangerTerminalRefVoltageLevelId())
227-
.regulatingTerminalType(getRatioTapChangerTerminalRefType())
225+
.terminalRefConnectableId(getRatioTapChangerTerminalRefConnectableId())
226+
.terminalRefConnectableVlId(getRatioTapChangerTerminalRefVoltageLevelId())
227+
.terminalRefConnectableType(getRatioTapChangerTerminalRefType())
228228
.steps(ratioTapChangerStepCreationInfos)
229229
.build());
230230
}
@@ -240,9 +240,9 @@ public TwoWindingsTransformerCreationInfos toModificationInfos() {
240240
.loadTapChangingCapabilities(true)
241241
.regulationMode(getPhaseTapChangerRegulationMode())
242242
.regulationValue(getPhaseTapChangerRegulationValue())
243-
.regulatingTerminalId(getPhaseTapChangerTerminalRefConnectableId())
244-
.regulatingTerminalVlId(getPhaseTapChangerTerminalRefVoltageLevelId())
245-
.regulatingTerminalType(getPhaseTapChangerTerminalRefType())
243+
.terminalRefConnectableId(getPhaseTapChangerTerminalRefConnectableId())
244+
.terminalRefConnectableVlId(getPhaseTapChangerTerminalRefVoltageLevelId())
245+
.terminalRefConnectableType(getPhaseTapChangerTerminalRefType())
246246
.steps(phaseTapChangerStepCreationInfos)
247247
.build());
248248
}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -336,9 +336,9 @@ private void assignRatioTapChanger(RatioTapChangerModificationInfos ratioTapChan
336336
this.ratioTapChangerTapPosition = ratioTapChanger.getTapPosition() != null ? new IntegerModificationEmbedded(ratioTapChanger.getTapPosition()) : null;
337337
this.ratioTapChangerRegulating = ratioTapChanger.getRegulating() != null ? new BooleanModificationEmbedded(ratioTapChanger.getRegulating()) : null;
338338
this.ratioTapChangerTargetDeadband = ratioTapChanger.getTargetDeadband() != null ? new DoubleModificationEmbedded(ratioTapChanger.getTargetDeadband()) : null;
339-
this.ratioTapChangerTerminalRefConnectableId = ratioTapChanger.getRegulatingTerminalId() != null ? new StringModificationEmbedded(ratioTapChanger.getRegulatingTerminalId()) : null;
340-
this.ratioTapChangerTerminalRefVoltageLevelId = ratioTapChanger.getRegulatingTerminalVlId() != null ? new StringModificationEmbedded(ratioTapChanger.getRegulatingTerminalVlId()) : null;
341-
this.ratioTapChangerTerminalRefType = ratioTapChanger.getRegulatingTerminalType() != null ? new StringModificationEmbedded(ratioTapChanger.getRegulatingTerminalType()) : null;
339+
this.ratioTapChangerTerminalRefConnectableId = ratioTapChanger.getTerminalRefConnectableId() != null ? new StringModificationEmbedded(ratioTapChanger.getTerminalRefConnectableId()) : null;
340+
this.ratioTapChangerTerminalRefVoltageLevelId = ratioTapChanger.getTerminalRefConnectableVlId() != null ? new StringModificationEmbedded(ratioTapChanger.getTerminalRefConnectableVlId()) : null;
341+
this.ratioTapChangerTerminalRefType = ratioTapChanger.getTerminalRefConnectableType() != null ? new StringModificationEmbedded(ratioTapChanger.getTerminalRefConnectableType()) : null;
342342
this.ratioTapChangerLoadTapChangingCapabilities = ratioTapChanger.getLoadTapChangingCapabilities() != null ? new BooleanModificationEmbedded(ratioTapChanger.getLoadTapChangingCapabilities()) : null;
343343
this.ratioTapChangerTargetV = ratioTapChanger.getTargetV() != null ? new DoubleModificationEmbedded(ratioTapChanger.getTargetV()) : null;
344344
if (ratioTapChanger.getSteps() != null) {
@@ -355,9 +355,9 @@ private void assignPhaseTapChanger(PhaseTapChangerModificationInfos phaseTapChan
355355
this.phaseTapChangerLowTapPosition = phaseTapChanger.getLowTapPosition() != null ? new IntegerModificationEmbedded(phaseTapChanger.getLowTapPosition()) : null;
356356
this.phaseTapChangerTapPosition = phaseTapChanger.getTapPosition() != null ? new IntegerModificationEmbedded(phaseTapChanger.getTapPosition()) : null;
357357
this.phaseTapChangerTargetDeadband = phaseTapChanger.getTargetDeadband() != null ? new DoubleModificationEmbedded(phaseTapChanger.getTargetDeadband()) : null;
358-
this.phaseTapChangerTerminalRefConnectableId = phaseTapChanger.getRegulatingTerminalId() != null ? new StringModificationEmbedded(phaseTapChanger.getRegulatingTerminalId()) : null;
359-
this.phaseTapChangerTerminalRefVoltageLevelId = phaseTapChanger.getRegulatingTerminalVlId() != null ? new StringModificationEmbedded(phaseTapChanger.getRegulatingTerminalVlId()) : null;
360-
this.phaseTapChangerTerminalRefType = phaseTapChanger.getRegulatingTerminalType() != null ? new StringModificationEmbedded(phaseTapChanger.getRegulatingTerminalType()) : null;
358+
this.phaseTapChangerTerminalRefConnectableId = phaseTapChanger.getTerminalRefConnectableId() != null ? new StringModificationEmbedded(phaseTapChanger.getTerminalRefConnectableId()) : null;
359+
this.phaseTapChangerTerminalRefVoltageLevelId = phaseTapChanger.getTerminalRefConnectableVlId() != null ? new StringModificationEmbedded(phaseTapChanger.getTerminalRefConnectableVlId()) : null;
360+
this.phaseTapChangerTerminalRefType = phaseTapChanger.getTerminalRefConnectableType() != null ? new StringModificationEmbedded(phaseTapChanger.getTerminalRefConnectableType()) : null;
361361
this.phaseTapChangerRegulating = phaseTapChanger.getRegulating() != null ? new BooleanModificationEmbedded(phaseTapChanger.getRegulating()) : null;
362362
this.phaseTapChangerLoadTapChangingCapabilities = phaseTapChanger.getLoadTapChangingCapabilities() != null ? new BooleanModificationEmbedded(phaseTapChanger.getLoadTapChangingCapabilities()) : null;
363363
if (phaseTapChanger.getSteps() != null) {
@@ -444,9 +444,9 @@ public TwoWindingsTransformerModificationInfos toModificationInfos() {
444444
.regulating(IAttributeModificationEmbeddable.toAttributeModification(getRatioTapChangerRegulating()))
445445
.loadTapChangingCapabilities(IAttributeModificationEmbeddable.toAttributeModification(getRatioTapChangerLoadTapChangingCapabilities()))
446446
.targetV(IAttributeModificationEmbeddable.toAttributeModification(getRatioTapChangerTargetV()))
447-
.regulatingTerminalId(IAttributeModificationEmbeddable.toAttributeModification(getRatioTapChangerTerminalRefConnectableId()))
448-
.regulatingTerminalVlId(IAttributeModificationEmbeddable.toAttributeModification(getRatioTapChangerTerminalRefVoltageLevelId()))
449-
.regulatingTerminalType(IAttributeModificationEmbeddable.toAttributeModification(getRatioTapChangerTerminalRefType()))
447+
.terminalRefConnectableId(IAttributeModificationEmbeddable.toAttributeModification(getRatioTapChangerTerminalRefConnectableId()))
448+
.terminalRefConnectableVlId(IAttributeModificationEmbeddable.toAttributeModification(getRatioTapChangerTerminalRefVoltageLevelId()))
449+
.terminalRefConnectableType(IAttributeModificationEmbeddable.toAttributeModification(getRatioTapChangerTerminalRefType()))
450450
.steps(ratioTapChangerStepCreationInfos)
451451
.build());
452452

@@ -465,9 +465,9 @@ public TwoWindingsTransformerModificationInfos toModificationInfos() {
465465
.regulationValue(IAttributeModificationEmbeddable.toAttributeModification(getPhaseTapChangerRegulationValue()))
466466
.regulating(IAttributeModificationEmbeddable.toAttributeModification(getPhaseTapChangerRegulating()))
467467
.loadTapChangingCapabilities(IAttributeModificationEmbeddable.toAttributeModification(getPhaseTapChangerLoadTapChangingCapabilities()))
468-
.regulatingTerminalId(IAttributeModificationEmbeddable.toAttributeModification(getPhaseTapChangerTerminalRefConnectableId()))
469-
.regulatingTerminalVlId(IAttributeModificationEmbeddable.toAttributeModification(getPhaseTapChangerTerminalRefVoltageLevelId()))
470-
.regulatingTerminalType(IAttributeModificationEmbeddable.toAttributeModification(getPhaseTapChangerTerminalRefType()))
468+
.terminalRefConnectableId(IAttributeModificationEmbeddable.toAttributeModification(getPhaseTapChangerTerminalRefConnectableId()))
469+
.terminalRefConnectableVlId(IAttributeModificationEmbeddable.toAttributeModification(getPhaseTapChangerTerminalRefVoltageLevelId()))
470+
.terminalRefConnectableType(IAttributeModificationEmbeddable.toAttributeModification(getPhaseTapChangerTerminalRefType()))
471471
.steps(phaseTapChangerStepCreationInfos)
472472
.build());
473473

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ protected ModificationInfos buildModification() {
7878
.phaseTapChanger(PhaseTapChangerCreationInfos.builder()
7979
.lowTapPosition(1)
8080
.tapPosition(2)
81-
.regulatingTerminalId("idGenerator1")
82-
.regulatingTerminalVlId("v1")
81+
.terminalRefConnectableId("idGenerator1")
82+
.terminalRefConnectableVlId("v1")
8383
.regulating(false)
8484
.loadTapChangingCapabilities(true)
85-
.regulatingTerminalType("GENERATOR")
85+
.terminalRefConnectableType("GENERATOR")
8686
.regulationMode(PhaseTapChanger.RegulationMode.CURRENT_LIMITER)
8787
.steps(List.of(TapChangerStepCreationInfos.builder()
8888
.index(1)
@@ -117,9 +117,9 @@ protected ModificationInfos buildModification() {
117117
.tapPosition(6)
118118
.regulating(true)
119119
.targetDeadband(1.)
120-
.regulatingTerminalId("idGenerator1")
121-
.regulatingTerminalVlId("v2")
122-
.regulatingTerminalType("GENERATOR")
120+
.terminalRefConnectableId("idGenerator1")
121+
.terminalRefConnectableVlId("v2")
122+
.terminalRefConnectableType("GENERATOR")
123123
.loadTapChangingCapabilities(true)
124124
.targetV(5.)
125125
.steps(List.of(TapChangerStepCreationInfos.builder()
@@ -195,11 +195,11 @@ protected ModificationInfos buildModificationUpdate() {
195195
.phaseTapChanger(PhaseTapChangerCreationInfos.builder()
196196
.lowTapPosition(1)
197197
.tapPosition(2)
198-
.regulatingTerminalId("v1load")
199-
.regulatingTerminalVlId("v1")
198+
.terminalRefConnectableId("v1load")
199+
.terminalRefConnectableVlId("v1")
200200
.regulating(false)
201201
.loadTapChangingCapabilities(true)
202-
.regulatingTerminalType("LOAD")
202+
.terminalRefConnectableType("LOAD")
203203
.regulationMode(PhaseTapChanger.RegulationMode.CURRENT_LIMITER)
204204
.steps(List.of(TapChangerStepCreationInfos.builder()
205205
.index(1)
@@ -234,9 +234,9 @@ protected ModificationInfos buildModificationUpdate() {
234234
.tapPosition(6)
235235
.regulating(true)
236236
.targetDeadband(1.)
237-
.regulatingTerminalId("v2load")
238-
.regulatingTerminalVlId("v2")
239-
.regulatingTerminalType("LOAD")
237+
.terminalRefConnectableId("v2load")
238+
.terminalRefConnectableVlId("v2")
239+
.terminalRefConnectableType("LOAD")
240240
.loadTapChangingCapabilities(true)
241241
.targetV(5.)
242242
.steps(List.of(TapChangerStepCreationInfos.builder()
@@ -326,9 +326,9 @@ void testCreateTwoWindingsTransformerWithRatioTapChangerInBusBreaker() throws Ex
326326
.tapPosition(1)
327327
.regulating(true)
328328
.targetDeadband(null)
329-
.regulatingTerminalVlId("v1")
330-
.regulatingTerminalId("idGenerator1")
331-
.regulatingTerminalType("GENERATOR")
329+
.terminalRefConnectableVlId("v1")
330+
.terminalRefConnectableId("idGenerator1")
331+
.terminalRefConnectableType("GENERATOR")
332332
.loadTapChangingCapabilities(true)
333333
.targetV(220.)
334334
.steps(getTapChangerSteps())
@@ -387,9 +387,9 @@ void testCreateTwoWindingsTransformerWithPhaseTapChangerInBusBreaker() throws Ex
387387
.targetDeadband(null)
388388
.regulationMode(PhaseTapChanger.RegulationMode.ACTIVE_POWER_CONTROL)
389389
.regulationValue(10.0)
390-
.regulatingTerminalVlId("v1")
391-
.regulatingTerminalId("idGenerator1")
392-
.regulatingTerminalType("GENERATOR")
390+
.terminalRefConnectableVlId("v1")
391+
.terminalRefConnectableId("idGenerator1")
392+
.terminalRefConnectableType("GENERATOR")
393393
.steps(getTapChangerSteps())
394394
.build();
395395
TwoWindingsTransformerCreationInfos twoWindingsTransformerCreationInfos = TwoWindingsTransformerCreationInfos.builder()

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ protected ModificationInfos buildModification() {
6464
.phaseTapChanger(PhaseTapChangerCreationInfos.builder()
6565
.lowTapPosition(1)
6666
.tapPosition(2)
67-
.regulatingTerminalId("v1load")
68-
.regulatingTerminalVlId("v1")
67+
.terminalRefConnectableId("v1load")
68+
.terminalRefConnectableVlId("v1")
6969
.regulating(false)
7070
.loadTapChangingCapabilities(true)
71-
.regulatingTerminalType("LOAD")
71+
.terminalRefConnectableType("LOAD")
7272
.regulationMode(PhaseTapChanger.RegulationMode.CURRENT_LIMITER)
7373
.steps(List.of(TapChangerStepCreationInfos.builder()
7474
.index(1)
@@ -103,9 +103,9 @@ protected ModificationInfos buildModification() {
103103
.tapPosition(6)
104104
.regulating(true)
105105
.targetDeadband(1.)
106-
.regulatingTerminalId("v1load")
107-
.regulatingTerminalVlId("v1")
108-
.regulatingTerminalType("LOAD")
106+
.terminalRefConnectableId("v1load")
107+
.terminalRefConnectableVlId("v1")
108+
.terminalRefConnectableType("LOAD")
109109
.loadTapChangingCapabilities(true)
110110
.targetV(5.)
111111
.steps(List.of(TapChangerStepCreationInfos.builder()
@@ -186,11 +186,11 @@ protected ModificationInfos buildModificationUpdate() {
186186
.phaseTapChanger(PhaseTapChangerCreationInfos.builder()
187187
.lowTapPosition(1)
188188
.tapPosition(2)
189-
.regulatingTerminalId("v1load")
190-
.regulatingTerminalVlId("v1")
189+
.terminalRefConnectableId("v1load")
190+
.terminalRefConnectableVlId("v1")
191191
.regulating(false)
192192
.loadTapChangingCapabilities(true)
193-
.regulatingTerminalType("LOAD")
193+
.terminalRefConnectableType("LOAD")
194194
.regulationMode(PhaseTapChanger.RegulationMode.CURRENT_LIMITER)
195195
.steps(List.of(TapChangerStepCreationInfos.builder()
196196
.index(1)
@@ -225,9 +225,9 @@ protected ModificationInfos buildModificationUpdate() {
225225
.tapPosition(6)
226226
.regulating(true)
227227
.targetDeadband(1.)
228-
.regulatingTerminalId("v1load")
229-
.regulatingTerminalVlId("v1")
230-
.regulatingTerminalType("LOAD")
228+
.terminalRefConnectableId("v1load")
229+
.terminalRefConnectableVlId("v1")
230+
.terminalRefConnectableType("LOAD")
231231
.loadTapChangingCapabilities(true)
232232
.targetV(5.)
233233
.steps(List.of(TapChangerStepCreationInfos.builder()

0 commit comments

Comments
 (0)