-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade powsybl-ws-dependencies v2.18.0 and add regulating point for …
…ratio and phase tap changers (#84) * add regulating point for ratio and phase tap changers * upgrade powsybl ws dependencies to v2.18.0 * fix test broken when upgrading network-store-version Signed-off-by: Etienne LESOT <[email protected]>
- Loading branch information
Showing
10 changed files
with
796 additions
and
300 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
192 changes: 0 additions & 192 deletions
192
network-store-server/src/main/java/com/powsybl/network/store/server/Mappings.java
Large diffs are not rendered by default.
Oops, something went wrong.
340 changes: 271 additions & 69 deletions
340
...k-store-server/src/main/java/com/powsybl/network/store/server/NetworkStoreRepository.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
...-store-server/src/main/java/com/powsybl/network/store/server/dto/RegulatingOwnerInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /** | ||
| * Copyright (c) 2024, RTE (http://www.rte-france.com) | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
| */ | ||
| package com.powsybl.network.store.server.dto; | ||
|
|
||
| import com.powsybl.network.store.model.RegulatingTapChangerType; | ||
| import com.powsybl.network.store.model.ResourceType; | ||
| import lombok.AllArgsConstructor; | ||
| import lombok.Data; | ||
| import lombok.NoArgsConstructor; | ||
|
|
||
| import java.util.UUID; | ||
|
|
||
| /** | ||
| * @author Etienne Lesot <etienne.lesot at rte-france.com> | ||
| */ | ||
| @Data | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class RegulatingOwnerInfo { | ||
|
|
||
| public RegulatingOwnerInfo(String equipmentId, ResourceType equipmentType, UUID networkUuid, int variantNum) { | ||
| this(equipmentId, equipmentType, RegulatingTapChangerType.NONE, networkUuid, variantNum); | ||
| } | ||
|
|
||
| private String equipmentId; | ||
|
|
||
| private ResourceType equipmentType; | ||
|
|
||
| private RegulatingTapChangerType regulatingTapChangerType; | ||
|
|
||
| private UUID networkUuid; | ||
|
|
||
| private int variantNum; | ||
| } |
74 changes: 74 additions & 0 deletions
74
...rk-store-server/src/main/resources/db/changelog/changesets/changelog_20241205T110000Z.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog | ||
| https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> | ||
|
|
||
| <changeSet id="2986331049275-7" author="lesoteti"> | ||
| <addColumn tableName="regulatingpoint"> | ||
| <column name="regulatingtapchangertype" type="VARCHAR"/> | ||
| </addColumn> | ||
| <update tableName="regulatingpoint"> | ||
| <column name="regulatingtapchangertype" value="NONE"/> | ||
| </update> | ||
| <addNotNullConstraint tableName="regulatingpoint" columnName="regulatingtapchangertype"/> | ||
| </changeSet> | ||
| <changeSet id="2986331049275-8" author="lesoteti"> | ||
| <dropPrimaryKey tableName="regulatingpoint"/> | ||
| <addPrimaryKey columnNames="networkuuid, variantnum, regulatingequipmenttype, regulatingtapchangertype, regulatingequipmentid" | ||
| constraintName="regulatingpoint_pkey" tableName="regulatingpoint"/> | ||
| <sqlFile | ||
| path="twt_regulationPoint_20241205T110000Z.sql" | ||
| relativeToChangelogFile="true" | ||
| splitStatements="true" | ||
| stripComments="true"/> | ||
| <!-- twowindingstransformer --> | ||
| <!-- ratio --> | ||
| <dropColumn tableName="twowindingstransformer" columnName="ratiotapchangerregulationmode"/> | ||
| <dropColumn tableName="twowindingstransformer" columnName="ratiotapchangerterminalrefconnectableid"/> | ||
| <dropColumn tableName="twowindingstransformer" columnName="ratiotapchangerterminalrefside"/> | ||
| <dropColumn tableName="twowindingstransformer" columnName="ratiotapchangerregulating"/> | ||
| <!-- phase --> | ||
| <dropColumn tableName="twowindingstransformer" columnName="phasetapchangerregulationmode"/> | ||
| <dropColumn tableName="twowindingstransformer" columnName="phasetapchangerterminalrefconnectableid"/> | ||
| <dropColumn tableName="twowindingstransformer" columnName="phasetapchangerterminalrefside"/> | ||
| <dropColumn tableName="twowindingstransformer" columnName="phasetapchangerregulating"/> | ||
|
|
||
| <!-- threewindingstransformer --> | ||
| <!-- side 1 --> | ||
| <!-- ratio --> | ||
| <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerregulationmode1"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerterminalrefconnectableid1"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerterminalrefside1"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerregulating1"/> | ||
| <!-- phase --> | ||
| <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerregulationmode1"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerterminalrefconnectableid1"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerterminalrefside1"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerregulating1"/> | ||
|
|
||
| <!-- side 2 --> | ||
| <!-- ratio --> | ||
| <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerregulationmode2"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerterminalrefconnectableid2"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerterminalrefside2"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerregulating2"/> | ||
| <!-- phase --> | ||
| <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerregulationmode2"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerterminalrefconnectableid2"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerterminalrefside2"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerregulating2"/> | ||
|
|
||
| <!-- side 3 --> | ||
| <!-- ratio --> | ||
| <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerregulationmode3"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerterminalrefconnectableid3"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerterminalrefside3"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerregulating3"/> | ||
| <!-- phase --> | ||
| <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerregulationmode3"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerterminalrefconnectableid3"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerterminalrefside3"/> | ||
| <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerregulating3"/> | ||
| </changeSet> | ||
| </databaseChangeLog> |
Oops, something went wrong.