Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update powsyblcore dependency to 6.1.0 #363

Merged
merged 28 commits into from
Jan 29, 2024
Merged

Update powsyblcore dependency to 6.1.0 #363

merged 28 commits into from
Jan 29, 2024

Conversation

rolnico
Copy link
Member

@rolnico rolnico commented Nov 29, 2023 •
edited
Loading

Please check if the PR fulfills these requirements

  • The commit message follows our guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

Does this PR already have an issue describing the problem?

What kind of change does this PR introduce?

Dependency upgrade + bug fix

What is the current behavior?

PowSyBl-Network-store used powsybl-core v6.0.2
Terminals connect and disconnect methods were not consistent with the methods implemented in Core

What is the new behavior (if this is a feature change)?
Powsybl-core v6.1.0 is now used.
Terminals connect and disconnect methods are now consistent with the methods implemented in Core and tests are fixed.

Does this PR introduce a breaking change or deprecate an API?

  • Yes
  • No

If yes, please check if the following requirements are fulfilled

  • The Breaking Change or Deprecated label has been added
  • The migration steps are described in the following section

What changes might users need to make in their application due to this PR? (migration steps)

Other information:

@rolnico rolnico requested a review from geofjamg November 29, 2023 09:53
@rolnico rolnico force-pushed the nro/update_powsyblcore_to_6.1 branch from fe8deb4 to 8ae45cb Compare December 11, 2023 11:56
@rolnico rolnico requested a review from flo-dup December 11, 2023 12:35
@rolnico rolnico marked this pull request as ready for review December 13, 2023 08:52
obrix
obrix requested changes Jan 9, 2024
View reviewed changes
Copy link
Member

@obrix obrix left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some small adjustments needed and the branch need to be rebased on main. But looks good to me mostly.
Coverage can also probably be upped to 80%.

...k-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/SwitchPathValidator.java Show resolved Hide resolved
pom.xml Outdated Show resolved Hide resolved
rolnico added 11 commits January 9, 2024 11:43
@rolnico
Adaptat
6a36137 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
correct tests + swap switchAttributes with switchImpl, double edges f…
0b58a19 
…or internalconnections

Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
Add notification to listeners + delete unused dependency + fix tests …
e6e1186 
…+ replaced switch by java17 enhanced switch

Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
added javadoc
1a06637 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
added javadoc
2cf7713 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
fix
58e2063 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
delete unused method
dee1cfc 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
fix imports
0608922 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
replaced BranchStatus with OperatingStatus + delete duplicated depend…
1cfe1d1 
…ency

Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
replaced switch by java17 enhanced switch
0916e73 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
bump to powsybl-core 6.1.1 and powsybl-dependencies 2023.4.0 + add mi…
8c501f4 
…ssing author and licence

Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico rolnico force-pushed the nro/update_powsyblcore_to_6.1 branch from 49dc453 to 8c501f4 Compare January 9, 2024 10:43
antoinebhs
antoinebhs reviewed Jan 10, 2024
View reviewed changes
Copy link
Collaborator

@antoinebhs antoinebhs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tested the new implementation in TerminalImpl but it looks ok, I suggested some small changes. I will test more with the migration of Gridsuite to this version.

pom.xml Outdated Show resolved Hide resolved
pom.xml Outdated Show resolved Hide resolved
...re-model/src/main/java/com/powsybl/network/store/model/TwoWindingsTransformerAttributes.java Outdated Show resolved Hide resolved
...-model/src/main/java/com/powsybl/network/store/model/ThreeWindingsTransformerAttributes.java Outdated Show resolved Hide resolved
network-store-model/src/main/java/com/powsybl/network/store/model/LineAttributes.java Outdated Show resolved Hide resolved
...-store-iidm-impl/src/test/java/com/powsybl/network/store/iidm/impl/tck/MergeNetworkTest.java Outdated Show resolved Hide resolved
network-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/TerminalImpl.java Outdated Show resolved Hide resolved
network-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/TerminalImpl.java Outdated Show resolved Hide resolved
...idm-impl/src/main/java/com/powsybl/network/store/iidm/impl/ThreeWindingsTransformerImpl.java Outdated Show resolved Hide resolved
...l/src/main/java/com/powsybl/network/store/iidm/impl/extensions/OperatingStatusAdderImpl.java Outdated Show resolved Hide resolved
@rolnico
deleted redundant import of powsybl-core + fixed description for cons…
268afcd 
…istency + swapped annotation from @test to @OverRide

Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
typo
6b9e1f1 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
extracted method isSwitchOperableAndPresent to avoid duplication
10d487a 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
change variable name from limitType to type for consistency
9b697a9 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
error message changed for consistency
254328a 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
removed unused import
c5f66ef 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
removed unused import
9ca08c2 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico @antoinebhs
initialise reportercontext
896f709 
Co-authored-by: Antoine Bouhours <123802855+antoinebhs@users.noreply.github.com>
Signed-off-by: Nicolas Rol <135979730+rolnico@users.noreply.github.com>
@rolnico
changed createObjectMapper
0625c8f 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
update powsybl-dependency to 2023.4.1
bcb9a61 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
changed description
f615e46 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico @antoinebhs
Extends Idenfiable instead of Connectable
3357658 
Co-authored-by: Antoine Bouhours <123802855+antoinebhs@users.noreply.github.com>
Signed-off-by: Nicolas Rol <135979730+rolnico@users.noreply.github.com>
antoinebhs
antoinebhs reviewed Jan 24, 2024
View reviewed changes
...l/src/main/java/com/powsybl/network/store/iidm/impl/extensions/OperatingStatusAdderImpl.java Outdated Show resolved Hide resolved
...l/src/main/java/com/powsybl/network/store/iidm/impl/extensions/OperatingStatusAdderImpl.java Outdated Show resolved Hide resolved
...l/src/main/java/com/powsybl/network/store/iidm/impl/extensions/OperatingStatusAdderImpl.java Outdated Show resolved Hide resolved
...in/java/com/powsybl/network/store/iidm/impl/extensions/OperatingStatusAdderImplProvider.java Outdated Show resolved Hide resolved
...in/java/com/powsybl/network/store/iidm/impl/extensions/OperatingStatusAdderImplProvider.java Outdated Show resolved Hide resolved
...m-impl/src/main/java/com/powsybl/network/store/iidm/impl/extensions/OperatingStatusImpl.java Outdated Show resolved Hide resolved
...m-impl/src/main/java/com/powsybl/network/store/iidm/impl/extensions/OperatingStatusImpl.java Outdated Show resolved Hide resolved
rolnico and others added 4 commits January 24, 2024 11:40
@rolnico
added JavaTimeModule back to objectMapper
1c848c3 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico @antoinebhs
Apply suggestions from code review
6b015b6 
Co-authored-by: Antoine Bouhours <123802855+antoinebhs@users.noreply.github.com>
Signed-off-by: Nicolas Rol <135979730+rolnico@users.noreply.github.com>
@rolnico
corrections
a481862 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico
corrections continued
9d9bc99 
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
@rolnico rolnico requested a review from obrix January 24, 2024 14:44
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions

66.5% Coverage on New Code (required ≥ 80%)

See analysis details on SonarCloud

@flo-dup flo-dup merged commit 0332613 into main Jan 29, 2024
3 of 4 checks passed
@flo-dup flo-dup deleted the nro/update_powsyblcore_to_6.1 branch January 29, 2024 09:39
@rolnico rolnico mentioned this pull request Feb 8, 2024
Merged
7 tasks
@antoinebhs antoinebhs mentioned this pull request Oct 30, 2024
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@antoinebhs antoinebhs antoinebhs approved these changes

@obrix obrix obrix approved these changes

@geofjamg geofjamg Awaiting requested review from geofjamg

@flo-dup flo-dup Awaiting requested review from flo-dup

Assignees
No one assigned
Labels
breaking change
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rolnico @obrix @antoinebhs @flo-dup